diff --git a/account_asset_management/__manifest__.py b/account_asset_management/__manifest__.py
index aec81acc3..32d504301 100644
--- a/account_asset_management/__manifest__.py
+++ b/account_asset_management/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     'name': 'Assets Management',
-    'version': '12.0.1.2.0',
+    'version': '12.0.2.0.0',
     'license': 'AGPL-3',
     'depends': [
         'account',
diff --git a/account_asset_management/i18n/account_asset_management.pot b/account_asset_management/i18n/account_asset_management.pot
index 85cf9f682..f955f650e 100644
--- a/account_asset_management/i18n/account_asset_management.pot
+++ b/account_asset_management/i18n/account_asset_management.pot
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid "\n"
 "Error while processing asset '%s': %s"
@@ -93,6 +93,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -212,11 +228,6 @@ msgstr ""
 msgid "Check this if you want to automatically confirm the assets of this profile when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid "Choose the method to use to compute the amount of depreciation lines.\n"
@@ -248,8 +259,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -341,6 +358,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -351,6 +369,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -375,13 +394,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -393,14 +412,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -472,6 +491,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -506,13 +526,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid "Error while processing asset '%s': \n"
 "\n"
@@ -541,7 +555,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -569,6 +583,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -577,7 +592,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -618,7 +633,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -646,6 +661,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -656,6 +672,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -666,6 +683,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -674,13 +692,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -692,12 +710,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -707,11 +726,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -728,7 +742,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -746,13 +760,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -806,7 +819,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -889,6 +902,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -925,7 +943,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid "The '_compute_year_amount' method is only intended for Time Method 'Number of Years."
 msgstr ""
@@ -943,13 +961,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid "The duration of the asset conflicts with the posted depreciation table entry dates."
 msgstr ""
@@ -1022,17 +1040,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1053,7 +1064,7 @@ msgid "When an asset is created, the status is 'Draft'.\n"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1075,7 +1086,7 @@ msgid "You are not allowed to remove an accounting entry linked to an asset.\n"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1105,7 +1116,7 @@ msgid "You cannot change an accounting item linked to an asset depreciation line
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1117,7 +1128,7 @@ msgid "You cannot delete a depreciation line with an associated accounting entry
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/am.po b/account_asset_management/i18n/am.po
index 5e656837a..0fa978c9d 100644
--- a/account_asset_management/i18n/am.po
+++ b/account_asset_management/i18n/am.po
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -104,6 +104,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -229,11 +245,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -276,8 +287,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -372,6 +389,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -382,6 +400,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -406,13 +425,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -424,14 +443,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -503,6 +522,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -537,13 +557,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -573,7 +587,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -601,6 +615,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -609,7 +624,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -654,7 +669,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -682,6 +697,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -692,6 +708,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -702,6 +719,7 @@ msgstr "Última actualización por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -710,13 +728,13 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -728,12 +746,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -743,11 +762,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -764,7 +778,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -782,13 +796,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -842,7 +855,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -929,6 +942,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -967,7 +985,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -988,13 +1006,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1075,17 +1093,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1110,7 +1121,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1134,7 +1145,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1169,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1182,7 +1193,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/ar.po b/account_asset_management/i18n/ar.po
index ceb4c79ce..4f59e94a5 100644
--- a/account_asset_management/i18n/ar.po
+++ b/account_asset_management/i18n/ar.po
@@ -30,7 +30,7 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -110,6 +110,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "حساب الأصول"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "حساب الأصول"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "فئات الأصول"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -241,11 +260,6 @@ msgid ""
 msgstr ""
 "تحقق من هذا إذا كنت تريد التأكد تلقائياً من أصول فئة تم إنشاؤها بواسطة فواتير."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -288,8 +302,14 @@ msgstr ""
 msgid "Close"
 msgstr "إغلاق"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -385,6 +405,7 @@ msgstr "إنشاء حركات الأصول"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -395,6 +416,7 @@ msgstr "أنشئ بواسطة"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -419,13 +441,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "تدريجي"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -437,14 +459,14 @@ msgid "Degressive Factor"
 msgstr "عامل الإستهلاك"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -517,6 +539,7 @@ msgstr "اسم الأستهلاك"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -551,13 +574,7 @@ msgid "Entries"
 msgstr "مُدخلات"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -587,7 +604,7 @@ msgid "General"
 msgstr "عام"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -615,6 +632,7 @@ msgstr "المؤرخات"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -623,7 +641,7 @@ msgid "ID"
 msgstr "المعرف"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -668,7 +686,7 @@ msgid "Journal"
 msgstr "السجل اليومي"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -696,6 +714,7 @@ msgstr "عناصر دفتر اليومية"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -706,6 +725,7 @@ msgstr "آخر تعديل في"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -716,6 +736,7 @@ msgstr "آخر تحديث بواسطة"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -724,13 +745,13 @@ msgid "Last Updated on"
 msgstr "آخر تحديث في"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "محدد"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "القيمة المحفوظة"
@@ -742,12 +763,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "الاسم"
@@ -757,11 +779,6 @@ msgstr "الاسم"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -778,7 +795,7 @@ msgid "Notes"
 msgstr "الملاحظات"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -796,13 +813,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "أصول رئيسية"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -858,7 +876,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -945,6 +963,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "القيمة المحفوظة"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "بحث فئة الأصول"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -984,7 +1008,7 @@ msgid "Status"
 msgstr "الحالة"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1005,13 +1029,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1092,17 +1116,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "النوع"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1128,7 +1145,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "سنة"
@@ -1152,7 +1169,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1187,7 +1204,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1200,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/bg.po b/account_asset_management/i18n/bg.po
index d704d4867..5e8e15d92 100644
--- a/account_asset_management/i18n/bg.po
+++ b/account_asset_management/i18n/bg.po
@@ -38,7 +38,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -118,6 +118,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -243,11 +259,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -290,8 +301,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -386,6 +403,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -396,6 +414,7 @@ msgstr "Създадено от"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -420,13 +439,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -438,14 +457,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -517,6 +536,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -551,13 +571,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -587,7 +601,7 @@ msgid "General"
 msgstr "Основни"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -615,6 +629,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -623,7 +638,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -668,7 +683,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -696,6 +711,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -706,6 +722,7 @@ msgstr "Последно обновено на"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -716,6 +733,7 @@ msgstr "Последно обновено от"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -724,13 +742,13 @@ msgid "Last Updated on"
 msgstr "Последно обновено на"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -742,12 +760,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Име"
@@ -757,11 +776,6 @@ msgstr "Име"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -778,7 +792,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -796,13 +810,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -856,7 +869,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -943,6 +956,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -981,7 +999,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1002,13 +1020,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1089,17 +1107,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Вид"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1124,7 +1135,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1148,7 +1159,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1183,7 +1194,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1196,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/bs.po b/account_asset_management/i18n/bs.po
index 7c7f315a0..f5640396c 100644
--- a/account_asset_management/i18n/bs.po
+++ b/account_asset_management/i18n/bs.po
@@ -31,7 +31,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -111,6 +111,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Konto osnovnog sredstva"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Konto osnovnog sredstva"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Grupe osnovnih sredstava"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -243,11 +262,6 @@ msgstr ""
 "Označite ovo ako želite da automatski potvrdite osnovna sredstva ove "
 "kategorije kada su kreirani od fakture."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -290,8 +304,14 @@ msgstr ""
 msgid "Close"
 msgstr "Zatvori"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -387,6 +407,7 @@ msgstr "Kreirana kretanja amortizacije"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -397,6 +418,7 @@ msgstr "Kreirao"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -421,13 +443,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Silazno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -439,14 +461,14 @@ msgid "Degressive Factor"
 msgstr "Silazni faktor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -519,6 +541,7 @@ msgstr "Naziv amortizacije"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -553,13 +576,7 @@ msgid "Entries"
 msgstr "Zapisi"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -589,7 +606,7 @@ msgid "General"
 msgstr "Opšte"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -617,6 +634,7 @@ msgstr "Istorija"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -625,7 +643,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -670,7 +688,7 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -698,6 +716,7 @@ msgstr "Stavke dnevnika"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -708,6 +727,7 @@ msgstr "Zadnje mijenjano"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -718,6 +738,7 @@ msgstr "Zadnji ažurirao"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -726,13 +747,13 @@ msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linearno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Vrijednost likvidacije"
@@ -744,12 +765,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Naziv"
@@ -759,11 +781,6 @@ msgstr "Naziv"
 msgid "Next Period Depreciation"
 msgstr "Sljedeći period amortizacije"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -780,7 +797,7 @@ msgid "Notes"
 msgstr "Zabilješke"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -798,13 +815,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Nadređeno osnovno sredstvo"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -860,7 +878,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -947,6 +965,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Vrijednost likvidacije"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Pretraži kategoriju osnovnog sredstva"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -986,7 +1010,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1007,13 +1031,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1094,17 +1118,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Vrsta"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1130,7 +1147,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Godina"
@@ -1154,7 +1171,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1189,7 +1206,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1202,7 +1219,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/ca.po b/account_asset_management/i18n/ca.po
index 29c7dbb69..8821b5742 100644
--- a/account_asset_management/i18n/ca.po
+++ b/account_asset_management/i18n/ca.po
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -107,6 +107,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Compta d'actiu"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Compta d'actiu"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Categories d'actiu"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -235,11 +254,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -282,8 +296,14 @@ msgstr ""
 msgid "Close"
 msgstr "Tanca"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -378,6 +398,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -388,6 +409,7 @@ msgstr "Creat per"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -412,13 +434,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -430,14 +452,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -510,6 +532,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -544,13 +567,7 @@ msgid "Entries"
 msgstr "Assentaments"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -581,7 +598,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -609,6 +626,7 @@ msgstr "Història"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -617,7 +635,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -662,7 +680,7 @@ msgid "Journal"
 msgstr "Diari"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -690,6 +708,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -700,6 +719,7 @@ msgstr "Darrera modificació el"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -710,6 +730,7 @@ msgstr "Darrera Actualització per"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -718,13 +739,13 @@ msgid "Last Updated on"
 msgstr "Darrera Actualització el"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Valor de salvaguarda"
@@ -736,12 +757,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Mes"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nom"
@@ -751,11 +773,6 @@ msgstr "Nom"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -772,7 +789,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -790,13 +807,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -850,7 +866,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -937,6 +953,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Valor de salvaguarda"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -975,7 +996,7 @@ msgid "Status"
 msgstr "Estat"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -996,13 +1017,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1083,17 +1104,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipus"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Vista"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1118,7 +1132,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1142,7 +1156,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1177,7 +1191,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1190,7 +1204,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1231,6 +1245,9 @@ msgid ""
 "date for which accounting entries need to be generated."
 msgstr ""
 
+#~ msgid "View"
+#~ msgstr "Vista"
+
 #, fuzzy
 #~ msgid "No Fiscal Year defined."
 #~ msgstr "Exercici Fiscal "
diff --git a/account_asset_management/i18n/ca_ES.po b/account_asset_management/i18n/ca_ES.po
index 902db7ad9..e917bb939 100644
--- a/account_asset_management/i18n/ca_ES.po
+++ b/account_asset_management/i18n/ca_ES.po
@@ -28,7 +28,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -108,6 +108,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -233,11 +249,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -280,8 +291,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -376,6 +393,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -386,6 +404,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -410,13 +429,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -428,14 +447,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -507,6 +526,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -541,13 +561,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -577,7 +591,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -605,6 +619,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -613,7 +628,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -658,7 +673,7 @@ msgid "Journal"
 msgstr "Diari"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -686,6 +701,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -696,6 +712,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -706,6 +723,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -714,13 +732,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -732,12 +750,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -747,11 +766,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -768,7 +782,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -786,13 +800,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -846,7 +859,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -933,6 +946,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -971,7 +989,7 @@ msgid "Status"
 msgstr "Estat"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -992,13 +1010,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1079,17 +1097,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1114,7 +1125,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1138,7 +1149,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1173,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1186,7 +1197,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/cs.po b/account_asset_management/i18n/cs.po
index bdb1ff08b..c051ead92 100644
--- a/account_asset_management/i18n/cs.po
+++ b/account_asset_management/i18n/cs.po
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -107,6 +107,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Účet majetku"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Účet majetku"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Kategorie majetku"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -239,11 +258,6 @@ msgstr ""
 "Zaškrtněte toto, pokud chcete automaticky potvrdit majetky pro tutu "
 "kategorii, když jsou vytvořeny pomocí dokladů."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -286,8 +300,14 @@ msgstr ""
 msgid "Close"
 msgstr "Zavřít"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -383,6 +403,7 @@ msgstr "Vytvořit pohyby majetku"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -393,6 +414,7 @@ msgstr "Vytvořil(a)"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -417,13 +439,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Klesající"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -435,14 +457,14 @@ msgid "Degressive Factor"
 msgstr "Činitel klesání"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -515,6 +537,7 @@ msgstr "Jméno odpisu"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -549,13 +572,7 @@ msgid "Entries"
 msgstr "Položky"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -585,7 +602,7 @@ msgid "General"
 msgstr "Obecné"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -613,6 +630,7 @@ msgstr "Historie"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -621,7 +639,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -666,7 +684,7 @@ msgid "Journal"
 msgstr "Deník"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -694,6 +712,7 @@ msgstr "Položky deníku"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -704,6 +723,7 @@ msgstr "Naposled upraveno"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -714,6 +734,7 @@ msgstr "Naposled upraveno"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -722,13 +743,13 @@ msgid "Last Updated on"
 msgstr "Naposled upraveno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineární"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Záchranná hodnota"
@@ -740,12 +761,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Název"
@@ -755,11 +777,6 @@ msgstr "Název"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -776,7 +793,7 @@ msgid "Notes"
 msgstr "Poznámky"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -794,13 +811,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Nadřazený majetek"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -856,7 +874,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -943,6 +961,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Záchranná hodnota"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Hledat kategorii majetku"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -982,7 +1006,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1003,13 +1027,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1090,17 +1114,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Druh"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1126,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Rok"
@@ -1150,7 +1167,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1185,7 +1202,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1198,7 +1215,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/da.po b/account_asset_management/i18n/da.po
index a89dd12ca..fc07b0124 100644
--- a/account_asset_management/i18n/da.po
+++ b/account_asset_management/i18n/da.po
@@ -33,7 +33,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -113,6 +113,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -238,11 +254,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -285,8 +296,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -381,6 +398,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -391,6 +409,7 @@ msgstr "Oprettet af"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -415,13 +434,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -433,14 +452,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -512,6 +531,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -546,13 +566,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -582,7 +596,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -610,6 +624,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -618,7 +633,7 @@ msgid "ID"
 msgstr "Id"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -663,7 +678,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -691,6 +706,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -701,6 +717,7 @@ msgstr "Sidst ændret den"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -711,6 +728,7 @@ msgstr "Sidst opdateret af"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -719,13 +737,13 @@ msgid "Last Updated on"
 msgstr "Sidst opdateret den"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -737,12 +755,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Navn"
@@ -752,11 +771,6 @@ msgstr "Navn"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -773,7 +787,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -791,13 +805,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -851,7 +864,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -938,6 +951,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -976,7 +994,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -997,13 +1015,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1084,17 +1102,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Type"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1119,7 +1130,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1143,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1178,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1191,7 +1202,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/de.po b/account_asset_management/i18n/de.po
index 4b57acb5a..028cfbebf 100644
--- a/account_asset_management/i18n/de.po
+++ b/account_asset_management/i18n/de.po
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -104,6 +104,25 @@ msgstr "Journalbuchung zur Löschung der Anlage '%s'"
 msgid "Asset Account"
 msgstr "Anlagen Konto"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Anlagen Konto"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Anlagenpositionen"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -236,11 +255,6 @@ msgstr ""
 "Aktivieren, wenn die Anlage dieser Kategorie automatisch mit der Verbuchung "
 "der Rechnung bestätigt werden soll."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr "Untergeordnete Anlagen"
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -298,8 +312,14 @@ msgstr ""
 msgid "Close"
 msgstr "Schließen"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -397,6 +417,7 @@ msgstr "Erzeugte Anlagenbuchungen"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -407,6 +428,7 @@ msgstr "Erstellt von"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -435,13 +457,13 @@ msgstr ""
 "Konto."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Degressiv"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -453,14 +475,14 @@ msgid "Degressive Factor"
 msgstr "Degressiver Faktor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr "Degressiv-Linear"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr "Degressiv-Linear wird nur für das Zeit-Verfahren = Jahr unterstützt."
@@ -533,6 +555,7 @@ msgstr "Abschreibung Bezeichnung"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -567,13 +590,7 @@ msgid "Entries"
 msgstr "Buchungen"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr "Fehler! Anlagen dürfen nicht rekursiv angelegt werden."
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -605,7 +622,7 @@ msgid "General"
 msgstr "Allgemein"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr "Erzeuge Buchungen zur Anlagenlöschung"
@@ -633,6 +650,7 @@ msgstr "Verlauf"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -641,7 +659,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr "Unzulässiger Wert %s in asset.method."
@@ -690,7 +708,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -718,6 +736,7 @@ msgstr "Journaleinträge"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -728,6 +747,7 @@ msgstr "Zuletzt geändert am"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -738,6 +758,7 @@ msgstr "Zuletzt geändert von"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -746,13 +767,13 @@ msgid "Last Updated on"
 msgstr "Zuletzt geändert am"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linear"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Liquidationswert"
@@ -764,12 +785,13 @@ msgid "Min-Value Account"
 msgstr "Verlust bei Verkauf"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Monat"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Bezeichnung"
@@ -779,11 +801,6 @@ msgstr "Bezeichnung"
 msgid "Next Period Depreciation"
 msgstr "Nächste Abschreibungsperiode"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normal"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -800,7 +817,7 @@ msgid "Notes"
 msgstr "Bemerkungen"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -818,13 +835,14 @@ msgid "Other Information"
 msgstr "Sonstige Information"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Übergeordnete Anlage"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Left"
 msgid "Parent Path"
@@ -880,7 +898,7 @@ msgid "Purchase Value"
 msgstr "Anschaffungswert"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr "Quartal"
@@ -974,6 +992,12 @@ msgstr "Verkaufserlös"
 msgid "Salvage Value"
 msgstr "Liquidationswert"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Suche Anlagen Kategorie"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -1016,7 +1040,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1039,13 +1063,13 @@ msgid "The Sale Value must be positive!"
 msgstr "Der Verkaufserlöse muss positiv sein."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1141,17 +1165,10 @@ msgid "Trigger Date"
 msgstr "Auslösedatum"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Art"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Sicht"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1181,7 +1198,7 @@ msgstr ""
 "Werden Löschungen gebucht, so geht die Anlage in den Status 'Gelöscht' über."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Jahr"
@@ -1209,7 +1226,7 @@ msgstr ""
 "müssen solche Buchungen aus der Anlage heraus erstellen."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr "Sie dürfen nur Anlagen im Status 'Entwurf' löschen."
@@ -1252,7 +1269,7 @@ msgstr ""
 "einer Anlagenabschreibung verknüpft ist."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1269,7 +1286,7 @@ msgstr ""
 "löschen."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1321,6 +1338,18 @@ msgstr ""
 "hinzufügen, wenn der Abschreibungsbeginn von dem der zu erzeugenden "
 "Finanzbuchungen abweicht."
 
+#~ msgid "Child Assets"
+#~ msgstr "Untergeordnete Anlagen"
+
+#~ msgid "Error ! You can not create recursive assets."
+#~ msgstr "Fehler! Anlagen dürfen nicht rekursiv angelegt werden."
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "View"
+#~ msgstr "Sicht"
+
 #, fuzzy
 #~ msgid "No Fiscal Year defined."
 #~ msgstr "Geschäftsjahr"
diff --git a/account_asset_management/i18n/el_GR.po b/account_asset_management/i18n/el_GR.po
index 8a71627dc..fab46f91a 100644
--- a/account_asset_management/i18n/el_GR.po
+++ b/account_asset_management/i18n/el_GR.po
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -109,6 +109,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -234,11 +250,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -281,8 +292,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -377,6 +394,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -387,6 +405,7 @@ msgstr "Δημιουργήθηκε από "
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -411,13 +430,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -429,14 +448,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -508,6 +527,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -542,13 +562,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -578,7 +592,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -606,6 +620,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -614,7 +629,7 @@ msgid "ID"
 msgstr "Κωδικός"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -659,7 +674,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -687,6 +702,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -697,6 +713,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -707,6 +724,7 @@ msgstr "Τελευταία ενημέρωση από"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -715,13 +733,13 @@ msgid "Last Updated on"
 msgstr "Τελευταία ενημέρωση στις"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -733,12 +751,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -748,11 +767,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -769,7 +783,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -787,13 +801,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -847,7 +860,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -934,6 +947,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -972,7 +990,7 @@ msgid "Status"
 msgstr "Κατάσταση"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -993,13 +1011,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1080,17 +1098,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1115,7 +1126,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1139,7 +1150,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1174,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1187,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/en_AU.po b/account_asset_management/i18n/en_AU.po
index 996d25e29..1ecaa5d9f 100644
--- a/account_asset_management/i18n/en_AU.po
+++ b/account_asset_management/i18n/en_AU.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/en_GB.po b/account_asset_management/i18n/en_GB.po
index 627251e8c..849553d4b 100644
--- a/account_asset_management/i18n/en_GB.po
+++ b/account_asset_management/i18n/en_GB.po
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -109,6 +109,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Asset Account"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Asset Account"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Asset Categories"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -241,11 +260,6 @@ msgstr ""
 "Check this if you want to automatically confirm the assets of this category "
 "when created by invoices."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -288,8 +302,14 @@ msgstr ""
 msgid "Close"
 msgstr "Close"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -385,6 +405,7 @@ msgstr "Created Asset Moves"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -395,6 +416,7 @@ msgstr "Created by"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -419,13 +441,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Degressive"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -437,14 +459,14 @@ msgid "Degressive Factor"
 msgstr "Degressive Factor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -517,6 +539,7 @@ msgstr "Depreciation Name"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -551,13 +574,7 @@ msgid "Entries"
 msgstr "Entries"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -587,7 +604,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -615,6 +632,7 @@ msgstr "History"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -623,7 +641,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -668,7 +686,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -696,6 +714,7 @@ msgstr "Journal Items"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -706,6 +725,7 @@ msgstr "Last Modified on"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -716,6 +736,7 @@ msgstr "Last Updated by"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -724,13 +745,13 @@ msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linear"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Salvage Value"
@@ -742,12 +763,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Name"
@@ -757,11 +779,6 @@ msgstr "Name"
 msgid "Next Period Depreciation"
 msgstr "Next Period Depreciation"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -778,7 +795,7 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -796,13 +813,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Parent Asset"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -858,7 +876,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -945,6 +963,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Salvage Value"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Search Asset Category"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -984,7 +1008,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1005,13 +1029,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1092,17 +1116,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Type"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1128,7 +1145,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Year"
@@ -1152,7 +1169,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1187,7 +1204,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr "You cannot delete an asset that contains posted depreciation lines."
@@ -1200,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr "You cannot delete an asset that contains posted depreciation lines."
diff --git a/account_asset_management/i18n/es.po b/account_asset_management/i18n/es.po
index 790ea7b03..d750407ae 100644
--- a/account_asset_management/i18n/es.po
+++ b/account_asset_management/i18n/es.po
@@ -36,7 +36,7 @@ msgstr ""
 "X-Generator: Weblate 3.7.1\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -120,6 +120,26 @@ msgstr "Asiento de eliminación del activo '%s'"
 msgid "Asset Account"
 msgstr "Cuenta de activo"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Cuenta de activo"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+#| msgid "Asset Profiles"
+msgid "Asset Groups"
+msgstr "Categorías de activo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -251,11 +271,6 @@ msgstr ""
 "Valide si desea confirmar automáticamente los activos de esta categoría "
 "cuando se crean desde las facturas."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr "Activos hijos"
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -320,8 +335,14 @@ msgstr ""
 msgid "Close"
 msgstr "Cerrar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -418,6 +439,7 @@ msgstr "Asientos de activos creados"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -428,6 +450,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -456,13 +479,13 @@ msgstr ""
 "cuenta."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Decreciente"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -474,14 +497,14 @@ msgid "Degressive Factor"
 msgstr "Factor decreciente"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr "Decreciente-Lineal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr "Decreciente-Lineal sólo está soportado para el método de tiempo = Año."
@@ -553,6 +576,7 @@ msgstr "Nombre de la amortización"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -587,13 +611,7 @@ msgid "Entries"
 msgstr "Asientos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr "Error. No puede crear activos recursivos."
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -623,7 +641,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr "Generar asientos de eliminación de activo"
@@ -651,6 +669,7 @@ msgstr "Historial"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -659,7 +678,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr "Valor ilegal %s en asset.method."
@@ -710,7 +729,7 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -738,6 +757,7 @@ msgstr "Apuntes contables"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -748,6 +768,7 @@ msgstr "Última modificación el"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -758,6 +779,7 @@ msgstr "Última actualización por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -766,13 +788,13 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Lineal hasta Valor Residual"
@@ -784,12 +806,13 @@ msgid "Min-Value Account"
 msgstr "Cuenta para pérdida de valor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Mes"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -799,11 +822,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr "Amortización del siguiente período"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normal"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -820,7 +838,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -838,13 +856,14 @@ msgid "Other Information"
 msgstr "Otra información"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Activo padre"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr "Ruta padre"
 
@@ -898,7 +917,7 @@ msgid "Purchase Value"
 msgstr "Valor de compra"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr "Trimestre"
@@ -992,6 +1011,13 @@ msgstr "Valor de venta"
 msgid "Salvage Value"
 msgstr "Valor de salvaguarda"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+#| msgid "Search Asset Profile"
+msgid "Search Asset Group"
+msgstr "Buscar categoría de activo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -1032,7 +1058,7 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1055,13 +1081,13 @@ msgid "The Sale Value must be positive!"
 msgstr "El valor de venta debe ser positivo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1158,17 +1184,10 @@ msgid "Trigger Date"
 msgstr "Fecha de disparo"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Vista"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1201,7 +1220,7 @@ msgstr ""
 "'Eliminado'."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Año"
@@ -1229,7 +1248,7 @@ msgstr ""
 "Debe eliminarlo desde  el activo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr "Sólo puede eliminar activos en estado borrador."
@@ -1271,7 +1290,7 @@ msgstr ""
 "activo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1285,7 +1304,7 @@ msgid ""
 msgstr "No puede eliminar una línea de amortización con un asiento enlazado."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1337,6 +1356,18 @@ msgstr ""
 "diferente de la fecha para la que loas asientos contables necesitan ser "
 "generados."
 
+#~ msgid "Child Assets"
+#~ msgstr "Activos hijos"
+
+#~ msgid "Error ! You can not create recursive assets."
+#~ msgstr "Error. No puede crear activos recursivos."
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
 #~ msgid "No Fiscal Year defined."
 #~ msgstr "No se ha definido el Ejercicio Fiscal."
 
diff --git a/account_asset_management/i18n/es_AR.po b/account_asset_management/i18n/es_AR.po
index 41323a1e9..59626751d 100644
--- a/account_asset_management/i18n/es_AR.po
+++ b/account_asset_management/i18n/es_AR.po
@@ -48,7 +48,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -128,6 +128,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -253,11 +269,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -300,8 +311,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -396,6 +413,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -406,6 +424,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -430,13 +449,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -448,14 +467,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -527,6 +546,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -561,13 +581,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -597,7 +611,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -625,6 +639,7 @@ msgstr "Historial"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -633,7 +648,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -678,7 +693,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -706,6 +721,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -716,6 +732,7 @@ msgstr "Última modificación en"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -726,6 +743,7 @@ msgstr "Última actualización realizada por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -734,13 +752,13 @@ msgid "Last Updated on"
 msgstr "Última actualización el"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -752,12 +770,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -767,11 +786,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -788,7 +802,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -806,13 +820,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -866,7 +879,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -953,6 +966,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -991,7 +1009,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1012,13 +1030,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1099,17 +1117,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1134,7 +1145,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1158,7 +1169,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1193,7 +1204,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1206,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_CL.po b/account_asset_management/i18n/es_CL.po
index 1c25f3489..ec331b7e3 100644
--- a/account_asset_management/i18n/es_CL.po
+++ b/account_asset_management/i18n/es_CL.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "Última modificación en"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Última actualización de"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -738,11 +757,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_CO.po b/account_asset_management/i18n/es_CO.po
index 78d03dcd4..a0f2cd38d 100644
--- a/account_asset_management/i18n/es_CO.po
+++ b/account_asset_management/i18n/es_CO.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "Última Modificación el"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Actualizado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Actualizado"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -738,11 +757,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_CR.po b/account_asset_management/i18n/es_CR.po
index 0fcee4046..e5be04cc8 100644
--- a/account_asset_management/i18n/es_CR.po
+++ b/account_asset_management/i18n/es_CR.po
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -105,6 +105,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Cuenta de activo"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Cuenta de activo"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Categorías de activo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -237,11 +256,6 @@ msgstr ""
 "Valide si desea confirmar automáticamente el activo de esta categoría cuando "
 "es creado desde una factura."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -284,8 +298,14 @@ msgstr ""
 msgid "Close"
 msgstr "Cerrar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -381,6 +401,7 @@ msgstr "Movimientos de activos creados"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -391,6 +412,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -415,13 +437,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Regresivo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -433,14 +455,14 @@ msgid "Degressive Factor"
 msgstr "Factor degresivo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -513,6 +535,7 @@ msgstr "Nombre depreciación"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -547,13 +570,7 @@ msgid "Entries"
 msgstr "Asientos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -583,7 +600,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -611,6 +628,7 @@ msgstr "Historia"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -619,7 +637,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -664,7 +682,7 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -692,6 +710,7 @@ msgstr "Elementos diario"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -702,6 +721,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -712,6 +732,7 @@ msgstr "Ultima actualización por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -720,13 +741,13 @@ msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Valor de salvaguarda"
@@ -738,12 +759,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -753,11 +775,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -774,7 +791,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -792,13 +809,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Padre del activo"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -854,7 +872,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -941,6 +959,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Valor de salvaguarda"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Buscar categoría de activo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -980,7 +1004,7 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1001,13 +1025,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1088,17 +1112,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1124,7 +1141,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Año"
@@ -1148,7 +1165,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1183,7 +1200,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1196,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_DO.po b/account_asset_management/i18n/es_DO.po
index 3424ea53a..51e5baa96 100644
--- a/account_asset_management/i18n/es_DO.po
+++ b/account_asset_management/i18n/es_DO.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "Última modificación en"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Última actualización de"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -738,11 +757,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_EC.po b/account_asset_management/i18n/es_EC.po
index 221e6b572..510dbab55 100644
--- a/account_asset_management/i18n/es_EC.po
+++ b/account_asset_management/i18n/es_EC.po
@@ -34,7 +34,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -114,6 +114,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Cuenta de Activo Fijo"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Cuenta de Activo Fijo"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Categorías de Activo Fijo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -246,11 +265,6 @@ msgstr ""
 "Valide si desea confirmar automáticamente el activo de esta categoría cuando "
 "es creado desde una factura."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -293,8 +307,14 @@ msgstr ""
 msgid "Close"
 msgstr "Cerrar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -390,6 +410,7 @@ msgstr "Movimientos de activos creados"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -400,6 +421,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -424,13 +446,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Disminución"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -442,14 +464,14 @@ msgid "Degressive Factor"
 msgstr "Factor degresivo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -522,6 +544,7 @@ msgstr "Nombre depreciación"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -556,13 +579,7 @@ msgid "Entries"
 msgstr "Asientos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -592,7 +609,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -620,6 +637,7 @@ msgstr "Histórico"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -628,7 +646,7 @@ msgid "ID"
 msgstr "ID (identificación)"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -673,7 +691,7 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -701,6 +719,7 @@ msgstr "Asientos Contables"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -711,6 +730,7 @@ msgstr "Última modificación en"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -721,6 +741,7 @@ msgstr "Última actualización de"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -729,13 +750,13 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Valor de salvaguarda"
@@ -747,12 +768,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -762,11 +784,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -783,7 +800,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -801,13 +818,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Padre del activo"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -863,7 +881,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -950,6 +968,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Valor de salvaguarda"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Buscar categoría de activo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -989,7 +1013,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1010,13 +1034,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1097,17 +1121,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1133,7 +1150,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Año"
@@ -1157,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1192,7 +1209,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1205,7 +1222,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_ES.po b/account_asset_management/i18n/es_ES.po
index 16e938ee6..2ba4e7ebd 100644
--- a/account_asset_management/i18n/es_ES.po
+++ b/account_asset_management/i18n/es_ES.po
@@ -33,7 +33,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -113,6 +113,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -238,11 +254,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -285,8 +296,14 @@ msgstr ""
 msgid "Close"
 msgstr "Cerrar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -381,6 +398,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -391,6 +409,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -415,13 +434,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -433,14 +452,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -512,6 +531,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -546,13 +566,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -582,7 +596,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -610,6 +624,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -618,7 +633,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -663,7 +678,7 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -691,6 +706,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -701,6 +717,7 @@ msgstr "Última modificación en"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -711,6 +728,7 @@ msgstr "Última actualización por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -719,13 +737,13 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -737,12 +755,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -752,11 +771,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -773,7 +787,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -791,13 +805,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -851,7 +864,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -938,6 +951,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -976,7 +994,7 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -997,13 +1015,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1084,17 +1102,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1119,7 +1130,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1143,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1178,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1191,7 +1202,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_MX.po b/account_asset_management/i18n/es_MX.po
index 52709deb6..21980cea2 100644
--- a/account_asset_management/i18n/es_MX.po
+++ b/account_asset_management/i18n/es_MX.po
@@ -37,7 +37,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -117,6 +117,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Cuenta de activo"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Cuenta de activo"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Categorías de activo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -249,11 +268,6 @@ msgstr ""
 "Valide si desea confirmar automáticamente el activo de esta categoría cuando "
 "es creado desde una factura."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -296,8 +310,14 @@ msgstr ""
 msgid "Close"
 msgstr "Cerrar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -393,6 +413,7 @@ msgstr "Movimientos de activos creados"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -403,6 +424,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -427,13 +449,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Regresivo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -445,14 +467,14 @@ msgid "Degressive Factor"
 msgstr "Factor degresivo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -525,6 +547,7 @@ msgstr "Nombre depreciación"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -559,13 +582,7 @@ msgid "Entries"
 msgstr "Asientos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -595,7 +612,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -623,6 +640,7 @@ msgstr "Histórico"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -631,7 +649,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -676,7 +694,7 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -704,6 +722,7 @@ msgstr "Elementos diario"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -714,6 +733,7 @@ msgstr "Ultima modificacion realizada"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -724,6 +744,7 @@ msgstr "Ultima actualizacion por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -732,13 +753,13 @@ msgid "Last Updated on"
 msgstr "Ultima actualización realizada"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Valor de salvaguarda"
@@ -750,12 +771,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -765,11 +787,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -786,7 +803,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -804,13 +821,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Activo padre"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -866,7 +884,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -953,6 +971,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Valor de salvaguarda"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Buscar categoría de activo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -992,7 +1016,7 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1013,13 +1037,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1100,17 +1124,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1136,7 +1153,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Año"
@@ -1160,7 +1177,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1195,7 +1212,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1208,7 +1225,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_PE.po b/account_asset_management/i18n/es_PE.po
index 5dbbdcbd3..986c56c31 100644
--- a/account_asset_management/i18n/es_PE.po
+++ b/account_asset_management/i18n/es_PE.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "Ultima Modificación en"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Actualizado última vez por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Ultima Actualización"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -738,11 +757,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_PY.po b/account_asset_management/i18n/es_PY.po
index 4c15fceb3..e39387ab5 100644
--- a/account_asset_management/i18n/es_PY.po
+++ b/account_asset_management/i18n/es_PY.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Ultima actualización por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Ultima actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -738,11 +757,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/es_VE.po b/account_asset_management/i18n/es_VE.po
index 7a8b12145..7902c30c6 100644
--- a/account_asset_management/i18n/es_VE.po
+++ b/account_asset_management/i18n/es_VE.po
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -107,6 +107,24 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+msgid "Asset Group"
+msgstr "valor de activos"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "valor de activos"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -235,11 +253,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -282,8 +295,14 @@ msgstr ""
 msgid "Close"
 msgstr "Cerrar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -378,6 +397,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -388,6 +408,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -412,13 +433,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -430,14 +451,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -510,6 +531,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -544,13 +566,7 @@ msgid "Entries"
 msgstr "Asientos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -580,7 +596,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -608,6 +624,7 @@ msgstr "Historia"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -616,7 +633,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -661,7 +678,7 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -689,6 +706,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -699,6 +717,7 @@ msgstr "Modificada por última vez"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -709,6 +728,7 @@ msgstr "Última actualización realizada por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -717,13 +737,13 @@ msgid "Last Updated on"
 msgstr "Ultima actualizacion en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -735,12 +755,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nombre"
@@ -750,11 +771,6 @@ msgstr "Nombre"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normal"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -771,7 +787,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -789,13 +805,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -849,7 +864,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -936,6 +951,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -974,7 +994,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -995,13 +1015,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1082,17 +1102,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Vista"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1117,7 +1130,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1141,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1176,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1189,7 +1202,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1230,6 +1243,12 @@ msgid ""
 "date for which accounting entries need to be generated."
 msgstr ""
 
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
 #~ msgid "Asset Category"
 #~ msgstr "Categoría de activo"
 
diff --git a/account_asset_management/i18n/et.po b/account_asset_management/i18n/et.po
index 79d4d473c..8c13f6885 100644
--- a/account_asset_management/i18n/et.po
+++ b/account_asset_management/i18n/et.po
@@ -41,7 +41,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -121,6 +121,24 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+msgid "Asset Group"
+msgstr "Varade kategooriad"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Varade kategooriad"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -249,11 +267,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -296,8 +309,14 @@ msgstr ""
 msgid "Close"
 msgstr "Sulge"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -393,6 +412,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -403,6 +423,7 @@ msgstr "Loonud"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -427,13 +448,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -445,14 +466,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -525,6 +546,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -559,13 +581,7 @@ msgid "Entries"
 msgstr "Kirjed"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -595,7 +611,7 @@ msgid "General"
 msgstr "Üldine"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -623,6 +639,7 @@ msgstr "Ajalugu"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -631,7 +648,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -676,7 +693,7 @@ msgid "Journal"
 msgstr "Päevik"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -704,6 +721,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -714,6 +732,7 @@ msgstr "Viimati muudetud"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -724,6 +743,7 @@ msgstr "Viimati uuendatud"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -732,13 +752,13 @@ msgid "Last Updated on"
 msgstr "Viimati uuendatud"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineaarne"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Jääkväärtus"
@@ -750,12 +770,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nimi"
@@ -765,11 +786,6 @@ msgstr "Nimi"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -786,7 +802,7 @@ msgid "Notes"
 msgstr "Märkmed"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -804,13 +820,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Ülem"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -866,7 +883,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -953,6 +970,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Jääkväärtus"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -991,7 +1013,7 @@ msgid "Status"
 msgstr "Olek"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1012,13 +1034,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1099,17 +1121,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tüüp"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1134,7 +1149,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Aasta"
@@ -1158,7 +1173,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1193,7 +1208,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1206,7 +1221,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/eu.po b/account_asset_management/i18n/eu.po
index e5b561b11..12ef24526 100644
--- a/account_asset_management/i18n/eu.po
+++ b/account_asset_management/i18n/eu.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr "Itxi"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Nork sortua"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Last Updated by"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Hilabete"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Izena"
@@ -738,11 +757,6 @@ msgstr "Izena"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Mota"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Urtea"
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/fa.po b/account_asset_management/i18n/fa.po
index 844d64032..0af754be8 100644
--- a/account_asset_management/i18n/fa.po
+++ b/account_asset_management/i18n/fa.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "ایجاد شده توسط"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "عمومی"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "شناسه"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "تاریخ آخرین به‌روزرسانی"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "آخرین به روز رسانی توسط"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "آخرین به روز رسانی در"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "نام"
@@ -738,11 +757,6 @@ msgstr "نام"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "نوع"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/fi.po b/account_asset_management/i18n/fi.po
index 25efe1b32..4f117da0c 100644
--- a/account_asset_management/i18n/fi.po
+++ b/account_asset_management/i18n/fi.po
@@ -34,7 +34,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -114,6 +114,24 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset"
+msgid "Asset Group"
+msgstr "Varat"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -239,11 +257,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -286,8 +299,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -382,6 +401,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -392,6 +412,7 @@ msgstr "Luonut"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -416,13 +437,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -434,14 +455,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -513,6 +534,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -547,13 +569,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -583,7 +599,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -611,6 +627,7 @@ msgstr "Historia"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -619,7 +636,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -664,7 +681,7 @@ msgid "Journal"
 msgstr "Piväkirja"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -692,6 +709,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -702,6 +720,7 @@ msgstr "Viimeksi muokattu"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -712,6 +731,7 @@ msgstr "Viimeksi päivittänyt"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -720,13 +740,13 @@ msgid "Last Updated on"
 msgstr "Viimeksi päivitetty"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -738,12 +758,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Kuukausi"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nimi"
@@ -753,11 +774,6 @@ msgstr "Nimi"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normaali"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -774,7 +790,7 @@ msgid "Notes"
 msgstr "Huomautukset"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -792,13 +808,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -852,7 +867,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -939,6 +954,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -977,7 +997,7 @@ msgid "Status"
 msgstr "Tila"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -998,13 +1018,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1085,17 +1105,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tyyppi"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1120,7 +1133,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Vuosi"
@@ -1144,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1179,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1192,7 +1205,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1233,6 +1246,9 @@ msgid ""
 "date for which accounting entries need to be generated."
 msgstr ""
 
+#~ msgid "Normal"
+#~ msgstr "Normaali"
+
 #~ msgid "Ending date"
 #~ msgstr "Päättymispäivämäärä"
 
diff --git a/account_asset_management/i18n/fr.po b/account_asset_management/i18n/fr.po
index 2ef31b202..4d7dc0897 100644
--- a/account_asset_management/i18n/fr.po
+++ b/account_asset_management/i18n/fr.po
@@ -33,7 +33,7 @@ msgstr ""
 "X-Generator: Weblate 3.7.1\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -117,6 +117,26 @@ msgstr "Immobilisation '%s' Pièce comptable de sortie"
 msgid "Asset Account"
 msgstr "Compte d'immobilisation"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Compte d'immobilisation"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+#| msgid "Asset Profiles"
+msgid "Asset Groups"
+msgstr "Catégories d'immobilisation"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -247,11 +267,6 @@ msgstr ""
 "Cochez cette case si vous souhaitez confirmer automatiquement les "
 "immobilisations de cette catégorie lorsqu'elles sont créées par des factures."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr "Immobilisations enfants"
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -318,8 +333,14 @@ msgstr ""
 msgid "Close"
 msgstr "Clôturer"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -416,6 +437,7 @@ msgstr "Écritures d'amortissement créées"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -426,6 +448,7 @@ msgstr "Créer par"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -453,13 +476,13 @@ msgstr ""
 "facture sur ce compte."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Dégressif"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr "Dégressif  jusqu'à la valeur de revente"
@@ -471,14 +494,14 @@ msgid "Degressive Factor"
 msgstr "Taux dégréssif"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr "Dégressif-Linéaire"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -551,6 +574,7 @@ msgstr "Nom de l'amortissement"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -585,13 +609,7 @@ msgid "Entries"
 msgstr "Pièces comptables"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr "Erreur ! Vous ne pouvez pas créer des immobilisations récursives."
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -624,7 +642,7 @@ msgid "General"
 msgstr "Général"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr "Générer la pièce comptable de sortie"
@@ -652,6 +670,7 @@ msgstr "Historique"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -660,7 +679,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr "Valeur illégale %s dans asset.method."
@@ -711,7 +730,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -739,6 +758,7 @@ msgstr "Écritures comptables"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -749,6 +769,7 @@ msgstr "Dernière modification le"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -759,6 +780,7 @@ msgstr "Dernière mise à jour par"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -767,13 +789,13 @@ msgid "Last Updated on"
 msgstr "Dernière mis à jour le"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linéaire"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Linéaire jusqu'à la valeur de revente"
@@ -785,12 +807,13 @@ msgid "Min-Value Account"
 msgstr "Compte de moins-value"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Mois"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nom"
@@ -800,11 +823,6 @@ msgstr "Nom"
 msgid "Next Period Depreciation"
 msgstr "Période d'amortissement suivante"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normale"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -821,7 +839,7 @@ msgid "Notes"
 msgstr "Commentaires"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -839,13 +857,14 @@ msgid "Other Information"
 msgstr "Autres informations"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Immobilisation parente"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr "Chemin parent"
 
@@ -899,7 +918,7 @@ msgid "Purchase Value"
 msgstr "Valeur d'achat"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr "Trimestre"
@@ -993,6 +1012,13 @@ msgstr "Valeur de vente"
 msgid "Salvage Value"
 msgstr "Valeur de revente"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+#| msgid "Search Asset Profile"
+msgid "Search Asset Group"
+msgstr "Rechercher une catégorie d'immobilisation"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -1033,7 +1059,7 @@ msgid "Status"
 msgstr "Statut"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1057,13 +1083,13 @@ msgid "The Sale Value must be positive!"
 msgstr "La valeur de la vente doit être positive !"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr "La date de début doit précéder la date de fin."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1160,17 +1186,10 @@ msgid "Trigger Date"
 msgstr "Date de déclenchement"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Type"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Rapport"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1201,7 +1220,7 @@ msgstr ""
 "Quand l'immobilisation est sortie, son statut prend la valeur  'Sortie'."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Année"
@@ -1230,7 +1249,7 @@ msgstr ""
 "Vous devez générer ces pièces depuis l'immobilisation."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr "Vous ne pouvez supprimer que des immobilisations 'Brouillon'."
@@ -1273,7 +1292,7 @@ msgstr ""
 "d'amortissement."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1290,7 +1309,7 @@ msgstr ""
 "comptable."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1343,6 +1362,18 @@ msgstr ""
 "exercices fiscaux précédents si la date de début de l'immobilisation diffère "
 "de la date à laquelle des pièces comptables doivent être générées."
 
+#~ msgid "Child Assets"
+#~ msgstr "Immobilisations enfants"
+
+#~ msgid "Error ! You can not create recursive assets."
+#~ msgstr "Erreur ! Vous ne pouvez pas créer des immobilisations récursives."
+
+#~ msgid "Normal"
+#~ msgstr "Normale"
+
+#~ msgid "View"
+#~ msgstr "Rapport"
+
 #~ msgid "No Fiscal Year defined."
 #~ msgstr "Aucun exercice défini."
 
diff --git a/account_asset_management/i18n/fr_BE.po b/account_asset_management/i18n/fr_BE.po
index 7ce5ba3c2..5206632f7 100644
--- a/account_asset_management/i18n/fr_BE.po
+++ b/account_asset_management/i18n/fr_BE.po
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -97,6 +97,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -222,11 +238,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -269,8 +280,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -365,6 +382,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -375,6 +393,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -399,13 +418,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -417,14 +436,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -496,6 +515,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -530,13 +550,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -566,7 +580,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -594,6 +608,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -602,7 +617,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -647,7 +662,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -675,6 +690,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -685,6 +701,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -695,6 +712,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -703,13 +721,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -721,12 +739,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -736,11 +755,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -757,7 +771,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -775,13 +789,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -835,7 +848,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -922,6 +935,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -960,7 +978,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -981,13 +999,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1068,17 +1086,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1103,7 +1114,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1127,7 +1138,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1162,7 +1173,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1175,7 +1186,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/fr_CA.po b/account_asset_management/i18n/fr_CA.po
index 4106ee84c..90e947175 100644
--- a/account_asset_management/i18n/fr_CA.po
+++ b/account_asset_management/i18n/fr_CA.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Créé par"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "Identifiant"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Dernière mise à jour par"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nom"
@@ -738,11 +757,6 @@ msgstr "Nom"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/fr_CH.po b/account_asset_management/i18n/fr_CH.po
index 60c6f1b8f..f06f28475 100644
--- a/account_asset_management/i18n/fr_CH.po
+++ b/account_asset_management/i18n/fr_CH.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr "Fermer"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Créé par"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "Dernière modification le"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Modifié par"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Modifié le"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/fr_FR.po b/account_asset_management/i18n/fr_FR.po
index 92ce87856..b61dcfb37 100644
--- a/account_asset_management/i18n/fr_FR.po
+++ b/account_asset_management/i18n/fr_FR.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/gl.po b/account_asset_management/i18n/gl.po
index b422a1bcb..b0d63be37 100644
--- a/account_asset_management/i18n/gl.po
+++ b/account_asset_management/i18n/gl.po
@@ -36,7 +36,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -116,6 +116,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Conta do activo"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Conta do activo"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Categorías de activos"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -244,11 +263,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -291,8 +305,14 @@ msgstr ""
 msgid "Close"
 msgstr "Pechar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -387,6 +407,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -397,6 +418,7 @@ msgstr "Creado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -421,13 +443,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -439,14 +461,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -518,6 +540,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -552,13 +575,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -588,7 +605,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -616,6 +633,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -624,7 +642,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -669,7 +687,7 @@ msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -697,6 +715,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -707,6 +726,7 @@ msgstr "Última modificación"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -717,6 +737,7 @@ msgstr "ültima actualización por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -725,13 +746,13 @@ msgid "Last Updated on"
 msgstr "Última actualización en"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -743,12 +764,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -758,11 +780,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -779,7 +796,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -797,13 +814,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -857,7 +873,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -944,6 +960,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -982,7 +1003,7 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1003,13 +1024,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1098,17 +1119,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1133,7 +1147,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1157,7 +1171,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1192,7 +1206,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1205,7 +1219,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/gl_ES.po b/account_asset_management/i18n/gl_ES.po
index 7a9ed93c4..9aa435c06 100644
--- a/account_asset_management/i18n/gl_ES.po
+++ b/account_asset_management/i18n/gl_ES.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/gu.po b/account_asset_management/i18n/gu.po
index 5fb706494..27aa65d55 100644
--- a/account_asset_management/i18n/gu.po
+++ b/account_asset_management/i18n/gu.po
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -100,6 +100,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -225,11 +241,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -272,8 +283,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -368,6 +385,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -378,6 +396,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -402,13 +421,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -420,14 +439,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -499,6 +518,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -533,13 +553,7 @@ msgid "Entries"
 msgstr "પ્રવેશો"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -569,7 +583,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -597,6 +611,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -605,7 +620,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -650,7 +665,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -678,6 +693,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -688,6 +704,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -698,6 +715,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -706,13 +724,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -724,12 +742,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -739,11 +758,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -760,7 +774,7 @@ msgid "Notes"
 msgstr "નોંધ"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -778,13 +792,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -838,7 +851,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -925,6 +938,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -963,7 +981,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -984,13 +1002,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1071,17 +1089,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1106,7 +1117,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1130,7 +1141,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1165,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1178,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/he.po b/account_asset_management/i18n/he.po
index 16f85b18d..6b2a6120e 100644
--- a/account_asset_management/i18n/he.po
+++ b/account_asset_management/i18n/he.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "נוצר על ידי"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "כללי"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "מזהה"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "תאריך שינוי אחרון"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "עודכן לאחרונה על ידי"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "עודכן לאחרונה על"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "שם"
@@ -738,11 +757,6 @@ msgstr "שם"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "סוג"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/hi.po b/account_asset_management/i18n/hi.po
index 383eef6bf..bc5bdc5dc 100644
--- a/account_asset_management/i18n/hi.po
+++ b/account_asset_management/i18n/hi.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/hr.po b/account_asset_management/i18n/hr.po
index ba52a9a33..802c36492 100644
--- a/account_asset_management/i18n/hr.po
+++ b/account_asset_management/i18n/hr.po
@@ -43,7 +43,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -123,6 +123,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Konto sredstva"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Konto sredstva"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Grupe o. sredstava"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -252,11 +271,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -299,8 +313,14 @@ msgstr ""
 msgid "Close"
 msgstr "Zatvori"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -396,6 +416,7 @@ msgstr "Stvorena knjiženja imovine"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -406,6 +427,7 @@ msgstr "Kreirao"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -430,13 +452,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -448,14 +470,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -528,6 +550,7 @@ msgstr "Naziv amortizacije"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -562,13 +585,7 @@ msgid "Entries"
 msgstr "Stavke"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -598,7 +615,7 @@ msgid "General"
 msgstr "Općenito"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -626,6 +643,7 @@ msgstr "Povijest"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -634,7 +652,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -679,7 +697,7 @@ msgid "Journal"
 msgstr "Temeljnica"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -707,6 +725,7 @@ msgstr "Stavke dnevnika"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -717,6 +736,7 @@ msgstr "Zadnja izmjena dana"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -727,6 +747,7 @@ msgstr "Zadnji ažurirao"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -735,13 +756,13 @@ msgid "Last Updated on"
 msgstr "Zadnje ažurirano dana"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linearno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Salvage Value"
@@ -753,12 +774,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Naziv"
@@ -768,11 +790,6 @@ msgstr "Naziv"
 msgid "Next Period Depreciation"
 msgstr "Sljedeći period amortizacije"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -789,7 +806,7 @@ msgid "Notes"
 msgstr "Bilješke"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -807,13 +824,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Nadređena imovina"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -869,7 +887,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -956,6 +974,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Salvage Value"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Pretraži kategoriju imovine"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -995,7 +1019,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1016,13 +1040,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1103,17 +1127,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tip"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1139,7 +1156,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Godina"
@@ -1163,7 +1180,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1198,7 +1215,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1211,7 +1228,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/hr_HR.po b/account_asset_management/i18n/hr_HR.po
index e777a2eeb..8f470439f 100644
--- a/account_asset_management/i18n/hr_HR.po
+++ b/account_asset_management/i18n/hr_HR.po
@@ -20,7 +20,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -100,6 +100,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -225,11 +241,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -272,8 +283,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -368,6 +385,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -378,6 +396,7 @@ msgstr "Kreirao"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -402,13 +421,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -420,14 +439,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -499,6 +518,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -533,13 +553,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -569,7 +583,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -597,6 +611,7 @@ msgstr "Povijest"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -605,7 +620,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -650,7 +665,7 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -678,6 +693,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -688,6 +704,7 @@ msgstr "Zadnje modificirano"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -698,6 +715,7 @@ msgstr "Zadnji ažurirao"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -706,13 +724,13 @@ msgid "Last Updated on"
 msgstr "Zadnje ažurirano"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -724,12 +742,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -739,11 +758,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -760,7 +774,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -778,13 +792,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -838,7 +851,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -925,6 +938,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -963,7 +981,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -984,13 +1002,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1071,17 +1089,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1106,7 +1117,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1130,7 +1141,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1165,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1178,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/hu.po b/account_asset_management/i18n/hu.po
index 97889d710..52f65effd 100644
--- a/account_asset_management/i18n/hu.po
+++ b/account_asset_management/i18n/hu.po
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -109,6 +109,24 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+msgid "Asset Group"
+msgstr "Eszköz kategóriák"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Eszköz kategóriák"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -238,11 +256,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -285,8 +298,14 @@ msgstr ""
 msgid "Close"
 msgstr "Lezár"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -381,6 +400,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -391,6 +411,7 @@ msgstr "Készítette"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -415,13 +436,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Degresszív"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -433,14 +454,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -513,6 +534,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -547,13 +569,7 @@ msgid "Entries"
 msgstr "Tételek"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -583,7 +599,7 @@ msgid "General"
 msgstr "Általános"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -611,6 +627,7 @@ msgstr "Előzmény"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -619,7 +636,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -664,7 +681,7 @@ msgid "Journal"
 msgstr "Napló"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -692,6 +709,7 @@ msgstr "Könyvelési tételsorok"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -702,6 +720,7 @@ msgstr "Utolsó frissítés dátuma"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -712,6 +731,7 @@ msgstr "Utoljára frissítve, által"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -720,13 +740,13 @@ msgid "Last Updated on"
 msgstr "Utoljára frissítve "
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineáris"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -738,12 +758,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Név"
@@ -753,11 +774,6 @@ msgstr "Név"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -774,7 +790,7 @@ msgid "Notes"
 msgstr "Megjegyzések"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -792,13 +808,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -852,7 +867,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -939,6 +954,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -977,7 +997,7 @@ msgid "Status"
 msgstr "Státusz"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -998,13 +1018,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1085,17 +1105,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Típus"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1120,7 +1133,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Év"
@@ -1144,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1179,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1192,7 +1205,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/id.po b/account_asset_management/i18n/id.po
index ae9bed3b1..351291467 100644
--- a/account_asset_management/i18n/id.po
+++ b/account_asset_management/i18n/id.po
@@ -34,7 +34,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -114,6 +114,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -239,11 +255,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -286,8 +297,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -382,6 +399,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -392,6 +410,7 @@ msgstr "Dibuat oleh"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -416,13 +435,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -434,14 +453,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -514,6 +533,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -548,13 +568,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -584,7 +598,7 @@ msgid "General"
 msgstr "Umum"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -612,6 +626,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -620,7 +635,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -665,7 +680,7 @@ msgid "Journal"
 msgstr "Jurnal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -693,6 +708,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -703,6 +719,7 @@ msgstr "Terakhir Dimodifikasi pada"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -713,6 +730,7 @@ msgstr "Diperbaharui oleh"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -721,13 +739,13 @@ msgid "Last Updated on"
 msgstr "Diperbaharui pada"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -739,12 +757,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nama"
@@ -754,11 +773,6 @@ msgstr "Nama"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -775,7 +789,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -793,13 +807,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -853,7 +866,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -940,6 +953,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -978,7 +996,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -999,13 +1017,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1086,17 +1104,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Jenis"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1121,7 +1132,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1145,7 +1156,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1180,7 +1191,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1193,7 +1204,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/it.po b/account_asset_management/i18n/it.po
index 03db3908e..b27d77cf7 100644
--- a/account_asset_management/i18n/it.po
+++ b/account_asset_management/i18n/it.po
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -103,6 +103,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Conto Immo bilizzazione"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Conto Immo bilizzazione"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Categorie Immobilizzazioni"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -235,11 +254,6 @@ msgstr ""
 "Selezionare per confermare automaticamento le immobilizzazioni di questa "
 "categoria quando create dalle fatture."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -282,8 +296,14 @@ msgstr ""
 msgid "Close"
 msgstr "Chiudi"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -379,6 +399,7 @@ msgstr "Movimenti Immobilizzazioni Creati"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -389,6 +410,7 @@ msgstr "Creato da"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -413,13 +435,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Regressivo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -431,14 +453,14 @@ msgid "Degressive Factor"
 msgstr "Tasso Degressivo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -511,6 +533,7 @@ msgstr "Nome Ammortamento"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -545,13 +568,7 @@ msgid "Entries"
 msgstr "Registrazioni"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -581,7 +598,7 @@ msgid "General"
 msgstr "Generale"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -609,6 +626,7 @@ msgstr "Storico"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -617,7 +635,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -662,7 +680,7 @@ msgid "Journal"
 msgstr "Sezionale"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -690,6 +708,7 @@ msgstr "Voci Sezionale"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -700,6 +719,7 @@ msgstr "Ultima modifica il"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -710,6 +730,7 @@ msgstr "Last Updated by"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -718,13 +739,13 @@ msgid "Last Updated on"
 msgstr "Last Updated on"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Costante"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Valore di Realizzo"
@@ -736,12 +757,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Mese"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nome"
@@ -751,11 +773,6 @@ msgstr "Nome"
 msgid "Next Period Depreciation"
 msgstr "Prossimo Periodo di Ammortamento"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -772,7 +789,7 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -790,13 +807,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Immobilizzazione Padre"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -852,7 +870,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -939,6 +957,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Valore di Realizzo"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Ricerca Categoria Immobilizzazioni"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -978,7 +1002,7 @@ msgid "Status"
 msgstr "Stato"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -999,13 +1023,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1086,17 +1110,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1122,7 +1139,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Anno"
@@ -1146,7 +1163,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1181,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1194,7 +1211,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/ja.po b/account_asset_management/i18n/ja.po
index c9c281ce9..cc3451e3a 100644
--- a/account_asset_management/i18n/ja.po
+++ b/account_asset_management/i18n/ja.po
@@ -39,7 +39,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -119,6 +119,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "資産アカウント"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "資産アカウント"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "資産分類"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -251,11 +270,6 @@ msgstr ""
 "請求書によって作成されたこの分類の資産を自動的に確認したい場合はこれをチェッ"
 "クして下さい。"
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -298,8 +312,14 @@ msgstr ""
 msgid "Close"
 msgstr "閉じる"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -395,6 +415,7 @@ msgstr "作成済資産の移動"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -405,6 +426,7 @@ msgstr "作成者"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -429,13 +451,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "逓減"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -447,14 +469,14 @@ msgid "Degressive Factor"
 msgstr "逓減係数"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -527,6 +549,7 @@ msgstr "減価償却名"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -561,13 +584,7 @@ msgid "Entries"
 msgstr "エントリー"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -597,7 +614,7 @@ msgid "General"
 msgstr "一般"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -625,6 +642,7 @@ msgstr "履歴"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -633,7 +651,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -678,7 +696,7 @@ msgid "Journal"
 msgstr "仕訳帳"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -706,6 +724,7 @@ msgstr "仕訳項目"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -716,6 +735,7 @@ msgstr "最終更新日"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -726,6 +746,7 @@ msgstr "最終更新者"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -734,13 +755,13 @@ msgid "Last Updated on"
 msgstr "最終更新日"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "リニア"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "サルベージ価値"
@@ -752,12 +773,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "名前"
@@ -767,11 +789,6 @@ msgstr "名前"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -788,7 +805,7 @@ msgid "Notes"
 msgstr "注記"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -806,13 +823,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "親資産"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -868,7 +886,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -955,6 +973,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "サルベージ価値"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "資産分類の検索"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -994,7 +1018,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1015,13 +1039,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1102,17 +1126,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "タイプ"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1138,7 +1155,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "年"
@@ -1162,7 +1179,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1197,7 +1214,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1210,7 +1227,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/ko.po b/account_asset_management/i18n/ko.po
index a2a8bd33c..631202208 100644
--- a/account_asset_management/i18n/ko.po
+++ b/account_asset_management/i18n/ko.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "작성자"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "일반"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "최근 수정"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "최근 갱신한 사람"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "최근 갱신 날짜"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "이름"
@@ -738,11 +757,6 @@ msgstr "이름"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "유형"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/lo.po b/account_asset_management/i18n/lo.po
index f662eb537..ff835bb8c 100644
--- a/account_asset_management/i18n/lo.po
+++ b/account_asset_management/i18n/lo.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/lt.po b/account_asset_management/i18n/lt.po
index 011ef7353..e57889675 100644
--- a/account_asset_management/i18n/lt.po
+++ b/account_asset_management/i18n/lt.po
@@ -29,7 +29,7 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -109,6 +109,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Ilgalaikio turto sąskaita"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Ilgalaikio turto sąskaita"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Ilgalaikio turto kategorijos"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -241,11 +260,6 @@ msgstr ""
 "Ilgalaikis turtas sukurtas iš sąskaitos faktūros ir priklausantis šiai "
 "kategorijai bus automatiškai patvirtintas."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -288,8 +302,14 @@ msgstr ""
 msgid "Close"
 msgstr "Uždaryta"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -385,6 +405,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -395,6 +416,7 @@ msgstr "Sukūrė"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -419,13 +441,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Dvigubo balanso"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -437,14 +459,14 @@ msgid "Degressive Factor"
 msgstr "Nusidėvėjimo procentas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -517,6 +539,7 @@ msgstr "Pavadinimas"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -551,13 +574,7 @@ msgid "Entries"
 msgstr "Įrašai"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -587,7 +604,7 @@ msgid "General"
 msgstr "Bendra"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -615,6 +632,7 @@ msgstr "Istorija"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -623,7 +641,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -668,7 +686,7 @@ msgid "Journal"
 msgstr "Žurnalas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -696,6 +714,7 @@ msgstr "DK įrašai"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -706,6 +725,7 @@ msgstr "Paskutinį kartą keista"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -716,6 +736,7 @@ msgstr "Paskutinį kartą atnaujino"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -724,13 +745,13 @@ msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Tiesinis"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Likvidacinė kaina"
@@ -742,12 +763,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Pavadinimas"
@@ -757,11 +779,6 @@ msgstr "Pavadinimas"
 msgid "Next Period Depreciation"
 msgstr "Likutinė vertė"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -778,7 +795,7 @@ msgid "Notes"
 msgstr "Pastabos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -796,13 +813,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Tėvinis ilgalaikis turtas"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -858,7 +876,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -945,6 +963,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Likvidacinė kaina"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -983,7 +1006,7 @@ msgid "Status"
 msgstr "Būsena"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1004,13 +1027,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1091,17 +1114,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipas"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1126,7 +1142,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Metai"
@@ -1150,7 +1166,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1185,7 +1201,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1198,7 +1214,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/lt_LT.po b/account_asset_management/i18n/lt_LT.po
index 4cd89cce9..59297fd08 100644
--- a/account_asset_management/i18n/lt_LT.po
+++ b/account_asset_management/i18n/lt_LT.po
@@ -20,7 +20,7 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -100,6 +100,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -225,11 +241,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -272,8 +283,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -368,6 +385,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -378,6 +396,7 @@ msgstr "Sukūrė"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -402,13 +421,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -420,14 +439,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -499,6 +518,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -533,13 +553,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -569,7 +583,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -597,6 +611,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -605,7 +620,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -650,7 +665,7 @@ msgid "Journal"
 msgstr "Žurnalas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -678,6 +693,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -688,6 +704,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -698,6 +715,7 @@ msgstr "Paskutinį kartą atnaujino"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -706,13 +724,13 @@ msgid "Last Updated on"
 msgstr "Paskutinį kartą atnaujinta"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -724,12 +742,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -739,11 +758,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -760,7 +774,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -778,13 +792,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -838,7 +851,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -925,6 +938,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -963,7 +981,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -984,13 +1002,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1071,17 +1089,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1106,7 +1117,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1130,7 +1141,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1165,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1178,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/lv.po b/account_asset_management/i18n/lv.po
index 13ba5c9ea..8346eb59c 100644
--- a/account_asset_management/i18n/lv.po
+++ b/account_asset_management/i18n/lv.po
@@ -20,7 +20,7 @@ msgstr ""
 "2);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -100,6 +100,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -225,11 +241,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -272,8 +283,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -368,6 +385,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -378,6 +396,7 @@ msgstr "Izveidoja"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -402,13 +421,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -420,14 +439,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -499,6 +518,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -533,13 +553,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -569,7 +583,7 @@ msgid "General"
 msgstr "Vispārēji"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -597,6 +611,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -605,7 +620,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -650,7 +665,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -678,6 +693,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -688,6 +704,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -698,6 +715,7 @@ msgstr "Pēdējo reizi atjaunoja"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -706,13 +724,13 @@ msgid "Last Updated on"
 msgstr "Pēdējās izmaiņas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -724,12 +742,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nosaukums"
@@ -739,11 +758,6 @@ msgstr "Nosaukums"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -760,7 +774,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -778,13 +792,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -838,7 +851,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -925,6 +938,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -963,7 +981,7 @@ msgid "Status"
 msgstr "Statuss"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -984,13 +1002,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1071,17 +1089,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tips"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1106,7 +1117,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1130,7 +1141,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1165,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1178,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/mk.po b/account_asset_management/i18n/mk.po
index d4e17994a..2278a55a5 100644
--- a/account_asset_management/i18n/mk.po
+++ b/account_asset_management/i18n/mk.po
@@ -37,7 +37,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -117,6 +117,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Сметка средства"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Сметка средства"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Категории на средства"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -249,11 +268,6 @@ msgstr ""
 "Означете го ова доколку сакате автоматски да ги потврдите средствата од оваа "
 "категорија кога креирате фактури."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -296,8 +310,14 @@ msgstr ""
 msgid "Close"
 msgstr "Затвори"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -393,6 +413,7 @@ msgstr "Креирани движења на средство"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -403,6 +424,7 @@ msgstr "Креирано од"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -427,13 +449,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Дегресивна"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -445,14 +467,14 @@ msgid "Degressive Factor"
 msgstr "Фактор на дегресија"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -525,6 +547,7 @@ msgstr "Име на амортизација"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -559,13 +582,7 @@ msgid "Entries"
 msgstr "Записи"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -595,7 +612,7 @@ msgid "General"
 msgstr "Општо"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -623,6 +640,7 @@ msgstr "Историја"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -631,7 +649,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -676,7 +694,7 @@ msgid "Journal"
 msgstr "Дневник"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -704,6 +722,7 @@ msgstr "Ставки на дневник"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -714,6 +733,7 @@ msgstr "Последна промена на"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -724,6 +744,7 @@ msgstr "Последно ажурирање од"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -732,13 +753,13 @@ msgid "Last Updated on"
 msgstr "Последно ажурирање на"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Линеарно"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -750,12 +771,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Име"
@@ -765,11 +787,6 @@ msgstr "Име"
 msgid "Next Period Depreciation"
 msgstr "Следен период за амортизација"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -786,7 +803,7 @@ msgid "Notes"
 msgstr "Белешки"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -804,13 +821,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Средство Родител"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -866,7 +884,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -953,6 +971,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Барај категорија на средство"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -992,7 +1016,7 @@ msgid "Status"
 msgstr "Статус"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1013,13 +1037,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1100,17 +1124,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Тип"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1136,7 +1153,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Година"
@@ -1160,7 +1177,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1195,7 +1212,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1209,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/mn.po b/account_asset_management/i18n/mn.po
index ffcd7d253..63d7bd3de 100644
--- a/account_asset_management/i18n/mn.po
+++ b/account_asset_management/i18n/mn.po
@@ -38,7 +38,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -118,6 +118,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Хөрөнгийн данс"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Хөрөнгийн данс"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Хөрөнгийн ангилал"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -250,11 +269,6 @@ msgstr ""
 "Энэ ангилалын хөрөнгүүд нь нэхэмжлэлээр үүсгэгдэхдээ автоматаар батлагдахаар "
 "бол үүнийг тэмдэглэ."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -297,8 +311,14 @@ msgstr ""
 msgid "Close"
 msgstr "Хаах"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -394,6 +414,7 @@ msgstr "Үүсгэгдсэн Хөрөнгийн Хөдөлгөөнүүд"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -404,6 +425,7 @@ msgstr "Үүсгэгч"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -428,13 +450,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Бууруулах"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -446,14 +468,14 @@ msgid "Degressive Factor"
 msgstr "Буурах Үзүүлэлт"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -526,6 +548,7 @@ msgstr "Элэгдлийн Нэр"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -560,13 +583,7 @@ msgid "Entries"
 msgstr "Бичилтүүд"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -596,7 +613,7 @@ msgid "General"
 msgstr "Ерөнхий"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -624,6 +641,7 @@ msgstr "Түүх"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -632,7 +650,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -677,7 +695,7 @@ msgid "Journal"
 msgstr "Журнал"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -705,6 +723,7 @@ msgstr "Журналын бичилт"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -715,6 +734,7 @@ msgstr "Сүүлийн засвар хийсэн огноо"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -725,6 +745,7 @@ msgstr "Сүүлийн засвар хийсэн"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -733,13 +754,13 @@ msgid "Last Updated on"
 msgstr "Сүүлийн засвар хийсэн огноо"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Шугаман"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Үлдэх өртөг"
@@ -751,12 +772,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Нэр"
@@ -766,11 +788,6 @@ msgstr "Нэр"
 msgid "Next Period Depreciation"
 msgstr "Элэгдүүлэлтийн дараагийн мөчлөг"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -787,7 +804,7 @@ msgid "Notes"
 msgstr "Тэмдэглэл"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -805,13 +822,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Эцэг хөрөнгө"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -867,7 +885,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -954,6 +972,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Үлдэх өртөг"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Хөрөнгийн ангилалаар хайх"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -993,7 +1017,7 @@ msgid "Status"
 msgstr "Төлөв"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1014,13 +1038,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1101,17 +1125,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Төрөл"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1137,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Жил"
@@ -1161,7 +1178,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1196,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr "Элэгдэл бодогдсон хөрөнгүүдийг устгах боломжгүй."
@@ -1209,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr "Элэгдэл бодогдсон хөрөнгүүдийг устгах боломжгүй."
diff --git a/account_asset_management/i18n/nb.po b/account_asset_management/i18n/nb.po
index d470a9f61..2c386be4d 100644
--- a/account_asset_management/i18n/nb.po
+++ b/account_asset_management/i18n/nb.po
@@ -32,7 +32,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -112,6 +112,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Eiendel Konto"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Eiendel Konto"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Eiendel kategorier"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -244,11 +263,6 @@ msgstr ""
 "Sjekk dette hvis du ønsker å automatisk bekrefte eiendeler i denne "
 "kategorien når laget av fakturaer."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -291,8 +305,14 @@ msgstr ""
 msgid "Close"
 msgstr "Lukke"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -388,6 +408,7 @@ msgstr "Opprettet eiendel trekk."
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -398,6 +419,7 @@ msgstr "Opprettet av"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -422,13 +444,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -440,14 +462,14 @@ msgid "Degressive Factor"
 msgstr "degressive faktor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -520,6 +542,7 @@ msgstr "Avskrivninger Navn"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -554,13 +577,7 @@ msgid "Entries"
 msgstr "Inngang"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -590,7 +607,7 @@ msgid "General"
 msgstr "Genrelt"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -618,6 +635,7 @@ msgstr "Historie"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -626,7 +644,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -671,7 +689,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -699,6 +717,7 @@ msgstr "Journal Elementer"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -709,6 +728,7 @@ msgstr "Sist oppdatert "
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -719,6 +739,7 @@ msgstr "Sist oppdatert av"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -727,13 +748,13 @@ msgid "Last Updated on"
 msgstr "Sist oppdatert"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineær"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Restverdi"
@@ -745,12 +766,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Måned"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Navn"
@@ -760,11 +782,6 @@ msgstr "Navn"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normal"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -781,7 +798,7 @@ msgid "Notes"
 msgstr "Notater"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -799,13 +816,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "overordnede Eiendel"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -861,7 +879,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -948,6 +966,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Restverdi"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Søk eiendel Kategori"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -987,7 +1011,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1008,13 +1032,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1095,17 +1119,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Type"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1131,7 +1148,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "År"
@@ -1155,7 +1172,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1190,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1203,7 +1220,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1244,6 +1261,9 @@ msgid ""
 "date for which accounting entries need to be generated."
 msgstr ""
 
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
 #~ msgid "# of Depreciation Lines"
 #~ msgstr "Ant. Avskrivninger linjer"
 
diff --git a/account_asset_management/i18n/nb_NO.po b/account_asset_management/i18n/nb_NO.po
index 2469cac16..2737c7c37 100644
--- a/account_asset_management/i18n/nb_NO.po
+++ b/account_asset_management/i18n/nb_NO.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Laget av"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "Sist endret den"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Sist oppdatert av"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Sist oppdatert den"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/nl.po b/account_asset_management/i18n/nl.po
index 7928a7495..ddb20812e 100644
--- a/account_asset_management/i18n/nl.po
+++ b/account_asset_management/i18n/nl.po
@@ -32,7 +32,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -112,6 +112,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Activa rekening"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Activa rekening"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Activa categorieën"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -244,11 +263,6 @@ msgstr ""
 "Vink dit aan als u automatisch de activa van deze categorie wilt bevestigen "
 "als deze worden aangemaakt door een facturen."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -291,8 +305,14 @@ msgstr ""
 msgid "Close"
 msgstr "Afsluiten"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -388,6 +408,7 @@ msgstr "Maak activa mutaties"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -398,6 +419,7 @@ msgstr "Aangemaakt door"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -422,13 +444,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Degressief"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -440,14 +462,14 @@ msgid "Degressive Factor"
 msgstr "Degressief factor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -520,6 +542,7 @@ msgstr "Afschrijvingsnaam"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -554,13 +577,7 @@ msgid "Entries"
 msgstr "Boekingen"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -590,7 +607,7 @@ msgid "General"
 msgstr "Algemeen"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -618,6 +635,7 @@ msgstr "Historie"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -626,7 +644,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -671,7 +689,7 @@ msgid "Journal"
 msgstr "Dagboek"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -699,6 +717,7 @@ msgstr "Boekingsregels"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -709,6 +728,7 @@ msgstr "Laatst bijgewerkt op"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -719,6 +739,7 @@ msgstr "Laatst bijgewerkt door"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -727,13 +748,13 @@ msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineair"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Restwaarde"
@@ -745,12 +766,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Naam"
@@ -760,11 +782,6 @@ msgstr "Naam"
 msgid "Next Period Depreciation"
 msgstr "Volgende afschrijf periode"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -781,7 +798,7 @@ msgid "Notes"
 msgstr "Notities"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -799,13 +816,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Bovenliggende activa"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -861,7 +879,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -948,6 +966,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Restwaarde"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Zoek in activa categorie"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -987,7 +1011,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1008,13 +1032,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1095,17 +1119,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Type"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1131,7 +1148,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Jaar"
@@ -1155,7 +1172,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1190,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1205,7 +1222,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/nl_BE.po b/account_asset_management/i18n/nl_BE.po
index 18e70e12a..1bd03d6e7 100644
--- a/account_asset_management/i18n/nl_BE.po
+++ b/account_asset_management/i18n/nl_BE.po
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -107,6 +107,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Investeringsrekening"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Investeringsrekening"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Investeringscategorieën"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -239,11 +258,6 @@ msgstr ""
 "Schakel dit in als u de investeringen in deze categorie automatisch wilt "
 "bevestigen vanaf de factuur."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -286,8 +300,14 @@ msgstr ""
 msgid "Close"
 msgstr "Afsluiten"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -383,6 +403,7 @@ msgstr "Gemaakte investeringsboekingen"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -393,6 +414,7 @@ msgstr "Gemaakt door"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -417,13 +439,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Degressief"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -435,14 +457,14 @@ msgid "Degressive Factor"
 msgstr "Degressieve factor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -515,6 +537,7 @@ msgstr "Afschrijvingsnaam"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -549,13 +572,7 @@ msgid "Entries"
 msgstr "Boekingen"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -585,7 +602,7 @@ msgid "General"
 msgstr "Algemeen"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -613,6 +630,7 @@ msgstr "Historiek"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -621,7 +639,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -666,7 +684,7 @@ msgid "Journal"
 msgstr "Journaal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -694,6 +712,7 @@ msgstr "Boekingslijnen"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -704,6 +723,7 @@ msgstr "Laatst Aangepast op"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -714,6 +734,7 @@ msgstr "Laatst bijgewerkt door"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -722,13 +743,13 @@ msgid "Last Updated on"
 msgstr "Laatst bijgewerkt op"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Lineair"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Restwaarde"
@@ -740,12 +761,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Naam"
@@ -755,11 +777,6 @@ msgstr "Naam"
 msgid "Next Period Depreciation"
 msgstr "Volgende afschrijvingsperiode"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -776,7 +793,7 @@ msgid "Notes"
 msgstr "Opmerkingen"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -794,13 +811,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Hoofdinvestering"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -856,7 +874,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -943,6 +961,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Restwaarde"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Investeringscategorie zoeken"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -982,7 +1006,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1003,13 +1027,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1090,17 +1114,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Type"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1126,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Jaar"
@@ -1150,7 +1167,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1185,7 +1202,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1198,7 +1215,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/pl.po b/account_asset_management/i18n/pl.po
index 74b447ce4..60ae59392 100644
--- a/account_asset_management/i18n/pl.po
+++ b/account_asset_management/i18n/pl.po
@@ -34,7 +34,7 @@ msgstr ""
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -114,6 +114,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Konto środków trwałych"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Konto środków trwałych"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Kategorie środków"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -242,11 +261,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -289,8 +303,14 @@ msgstr ""
 msgid "Close"
 msgstr "Zamknięte"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -385,6 +405,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -395,6 +416,7 @@ msgstr "Utworzone przez"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -419,13 +441,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -437,14 +459,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -517,6 +539,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -551,13 +574,7 @@ msgid "Entries"
 msgstr "Zapisy"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -587,7 +604,7 @@ msgid "General"
 msgstr "Ogólne"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -615,6 +632,7 @@ msgstr "Historia"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -623,7 +641,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -668,7 +686,7 @@ msgid "Journal"
 msgstr "Dziennik"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -696,6 +714,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -706,6 +725,7 @@ msgstr "Ostatnio modyfikowano"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -716,6 +736,7 @@ msgstr "Ostatnio modyfikowane przez"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -724,13 +745,13 @@ msgid "Last Updated on"
 msgstr "Ostatnia zmiana"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Liniowo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Wartość końcowa"
@@ -742,12 +763,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nazwa"
@@ -757,11 +779,6 @@ msgstr "Nazwa"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -778,7 +795,7 @@ msgid "Notes"
 msgstr "Uwagi"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -796,13 +813,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -856,7 +872,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -943,6 +959,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Wartość końcowa"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -981,7 +1002,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1002,13 +1023,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1089,17 +1110,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Typ"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1124,7 +1138,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Rok"
@@ -1148,7 +1162,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1183,7 +1197,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1196,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/pt.po b/account_asset_management/i18n/pt.po
index 309b1d184..72feb122f 100644
--- a/account_asset_management/i18n/pt.po
+++ b/account_asset_management/i18n/pt.po
@@ -28,7 +28,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -108,6 +108,25 @@ msgstr "Mov. Diário Remoção Ativo '%s'"
 msgid "Asset Account"
 msgstr "Conta de Ativo"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Conta de Ativo"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Linhas do Ativo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -240,11 +259,6 @@ msgstr ""
 "Marque esta opção se quiser confirmar automaticamente os ativos dessa "
 "categoria quando criados por faturas."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr "Componentes do Ativo"
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -305,8 +319,14 @@ msgstr ""
 msgid "Close"
 msgstr "Fechar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -405,6 +425,7 @@ msgstr "Movimento de ativos criados"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -415,6 +436,7 @@ msgstr "Criado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -443,13 +465,13 @@ msgstr ""
 "conta."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Decrescente"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -461,14 +483,14 @@ msgid "Degressive Factor"
 msgstr "Fator de decréscimo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr "Decrescente-Constante"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr "O Decrescente-Constante só é suportado quando o Método Tempo é Anual"
@@ -541,6 +563,7 @@ msgstr "Nome da Depreciação"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -575,13 +598,7 @@ msgid "Entries"
 msgstr "Movimentos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr "Erro! Não pode criar ativos recursivos"
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -613,7 +630,7 @@ msgid "General"
 msgstr "Geral"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr "Gerar Movs. de Remoção de Ativo"
@@ -641,6 +658,7 @@ msgstr "Histórico"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -649,7 +667,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr "Valor ilegal %s em asset.method"
@@ -700,7 +718,7 @@ msgid "Journal"
 msgstr "Diário"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -728,6 +746,7 @@ msgstr "Item do Diário"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -738,6 +757,7 @@ msgstr "Modificado a última vez por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -748,6 +768,7 @@ msgstr "Atualizado pela última vez por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -756,13 +777,13 @@ msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Constante"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Valor Residual"
@@ -774,12 +795,13 @@ msgid "Min-Value Account"
 msgstr "Conta de Menos-Valias"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Mês"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nome"
@@ -789,11 +811,6 @@ msgstr "Nome"
 msgid "Next Period Depreciation"
 msgstr "Deprecição Período Seguinte"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normal"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -810,7 +827,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -828,13 +845,14 @@ msgid "Other Information"
 msgstr "Outras informações"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Ativo Ascendente"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Left"
 msgid "Parent Path"
@@ -890,7 +908,7 @@ msgid "Purchase Value"
 msgstr "Valor de Compra"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr "Trimestre"
@@ -984,6 +1002,12 @@ msgstr "Valor de Venda"
 msgid "Salvage Value"
 msgstr "Valor Residual"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Pesquisar categoria de ativos"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -1026,7 +1050,7 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1048,13 +1072,13 @@ msgid "The Sale Value must be positive!"
 msgstr "O Valor de Venda tem que ser positivo!"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1150,17 +1174,10 @@ msgid "Trigger Date"
 msgstr "Data de acionamento"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Vista"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1193,7 +1210,7 @@ msgstr ""
 "'Removido'."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Ano"
@@ -1221,7 +1238,7 @@ msgstr ""
 "Deve fazê-lo através do ativo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr "Apenas pode remover ativos no estado Rascunho."
@@ -1264,7 +1281,7 @@ msgstr ""
 "de ativo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1280,7 +1297,7 @@ msgstr ""
 "associado."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr "Não pode apagar um ativo que contenha linha de depreciação registadas."
@@ -1330,6 +1347,18 @@ msgstr ""
 "fiscais anteriores se a Data de Início de Depreciação é diferente da data "
 "para a qual é necessário gerar movs. contabilísticos."
 
+#~ msgid "Child Assets"
+#~ msgstr "Componentes do Ativo"
+
+#~ msgid "Error ! You can not create recursive assets."
+#~ msgstr "Erro! Não pode criar ativos recursivos"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
 #, fuzzy
 #~ msgid "No Fiscal Year defined."
 #~ msgstr "Ano Fiscal"
diff --git a/account_asset_management/i18n/pt_BR.po b/account_asset_management/i18n/pt_BR.po
index 5c3baf13a..54b8bc0f7 100644
--- a/account_asset_management/i18n/pt_BR.po
+++ b/account_asset_management/i18n/pt_BR.po
@@ -40,7 +40,7 @@ msgstr ""
 "X-Generator: Weblate 3.7.1\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -124,6 +124,26 @@ msgstr "Transação de Remoção do Ativo '%s'"
 msgid "Asset Account"
 msgstr "Conta do Patrimônio"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Conta do Patrimônio"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+#| msgid "Asset Profiles"
+msgid "Asset Groups"
+msgstr "Perfis do Ativo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -255,11 +275,6 @@ msgstr ""
 "Marque se você deseja confirmar automaticamente os ativos desse perfil "
 "quando criado por faturas."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr "Ativos-filho"
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -323,8 +338,14 @@ msgstr ""
 msgid "Close"
 msgstr "Fechar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -421,6 +442,7 @@ msgstr "Movimentações de ativos criadas"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -431,6 +453,7 @@ msgstr "Criado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -457,13 +480,13 @@ msgstr ""
 "Perfil de Ativo Padrão para criação de linhas de fatura com esta conta."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Decrescente"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr "Decrescente  até Valor Residual"
@@ -475,14 +498,14 @@ msgid "Degressive Factor"
 msgstr "Fator de Decréscimo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr "Decréscimo Linear"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr "Decréscimo Linear somente é suportado para Método Temporal = Ano."
@@ -554,6 +577,7 @@ msgstr "Nome da Depreciação"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -588,13 +612,7 @@ msgid "Entries"
 msgstr "Lançamentos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr "Erro! Você não pode criar ativos recursivos."
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -627,7 +645,7 @@ msgid "General"
 msgstr "Geral"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr "Criar lançamentos de Remoção de Ativos"
@@ -655,6 +673,7 @@ msgstr "Histórico"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -663,7 +682,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr "Valor ilegal %s em asset.method."
@@ -712,7 +731,7 @@ msgid "Journal"
 msgstr "Diário"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -740,6 +759,7 @@ msgstr "Itens do Diário"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -750,6 +770,7 @@ msgstr "Última atualização em"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -760,6 +781,7 @@ msgstr "Última atualização por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -768,13 +790,13 @@ msgid "Last Updated on"
 msgstr "Última atualização em"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linear"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Linear até Valor Residual"
@@ -786,12 +808,13 @@ msgid "Min-Value Account"
 msgstr "Conta Valor Perdido"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Mês"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nome"
@@ -801,11 +824,6 @@ msgstr "Nome"
 msgid "Next Period Depreciation"
 msgstr "Depreciação do Próximo Período"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normal"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -822,7 +840,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -840,13 +858,14 @@ msgid "Other Information"
 msgstr "Outras Informações"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Ativo-Pai"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr "Caminho-Pai"
 
@@ -900,7 +919,7 @@ msgid "Purchase Value"
 msgstr "Valor de Compra"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr "Trimestre"
@@ -994,6 +1013,13 @@ msgstr "Valor de Venda"
 msgid "Salvage Value"
 msgstr "Valor Residual"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+#| msgid "Search Asset Profile"
+msgid "Search Asset Group"
+msgstr "Procurar Perfil de Ativo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -1034,7 +1060,7 @@ msgid "Status"
 msgstr "Situação"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1057,13 +1083,13 @@ msgid "The Sale Value must be positive!"
 msgstr "O Valor de Venda deve ser positivo!"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr "A Data Inicial deve preceder a Data Final."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1159,17 +1185,10 @@ msgid "Trigger Date"
 msgstr "Data de Disparo"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Ver"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1200,7 +1219,7 @@ msgstr ""
 "Quando são criados lançamentos de remoção, o status se torna 'Removido'."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Ano"
@@ -1229,7 +1248,7 @@ msgstr ""
 "Você deve removê-los a partir do ativo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr "Você só pode remover ativos com situação 'Provisório'."
@@ -1272,7 +1291,7 @@ msgstr ""
 "depreciação de ativo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1289,7 +1308,7 @@ msgstr ""
 "contábil."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1340,6 +1359,18 @@ msgstr ""
 "anterior se a Data Inicial de Depreciação é diferente da data para a qual os "
 "lançamentos contábeis devem ser gerados."
 
+#~ msgid "Child Assets"
+#~ msgstr "Ativos-filho"
+
+#~ msgid "Error ! You can not create recursive assets."
+#~ msgstr "Erro! Você não pode criar ativos recursivos."
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "View"
+#~ msgstr "Ver"
+
 #~ msgid "No Fiscal Year defined."
 #~ msgstr "Ano Fiscal não definido."
 
diff --git a/account_asset_management/i18n/pt_PT.po b/account_asset_management/i18n/pt_PT.po
index 782dfa9da..add685d92 100644
--- a/account_asset_management/i18n/pt_PT.po
+++ b/account_asset_management/i18n/pt_PT.po
@@ -30,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -110,6 +110,25 @@ msgstr "Mov. de Remoção em Diário do Ativo '%s'"
 msgid "Asset Account"
 msgstr "Conta de Ativo"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Conta de Ativo"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Linhas do Ativo"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -242,11 +261,6 @@ msgstr ""
 "Marque esta opção se quiser confirmar automaticamente os ativos dessa "
 "categoria quando criados por faturas."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr "Componentes do Ativo"
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -307,8 +321,14 @@ msgstr ""
 msgid "Close"
 msgstr "Fechar"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -407,6 +427,7 @@ msgstr "Movimento de ativos criados"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -417,6 +438,7 @@ msgstr "Criado por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -445,13 +467,13 @@ msgstr ""
 "conta."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Decrescente"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -463,14 +485,14 @@ msgid "Degressive Factor"
 msgstr "Fator de decréscimo"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr "Decrescente-Constante"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr "O Decrescente-Constante só é suportado quando o Método Tempo é Anual"
@@ -543,6 +565,7 @@ msgstr "Nome da Depreciação"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -577,13 +600,7 @@ msgid "Entries"
 msgstr "Movimentos"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr "Erro! Não pode criar ativos recursivos"
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -615,7 +632,7 @@ msgid "General"
 msgstr "Geral"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr "Gerar Movs. de Remoção de Ativo"
@@ -643,6 +660,7 @@ msgstr "Histórico"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -651,7 +669,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr "Valor ilegal %s em asset.method"
@@ -702,7 +720,7 @@ msgid "Journal"
 msgstr "Diário"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -730,6 +748,7 @@ msgstr "Item do Diário"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -740,6 +759,7 @@ msgstr "Modificado pela última vez em"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -750,6 +770,7 @@ msgstr "Atualizado pela última vez por"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -758,13 +779,13 @@ msgid "Last Updated on"
 msgstr "Atualizado pela última vez em"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Constante"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Valor Residual"
@@ -776,12 +797,13 @@ msgid "Min-Value Account"
 msgstr "Conta de Menos-Valias"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Mês"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nome"
@@ -791,11 +813,6 @@ msgstr "Nome"
 msgid "Next Period Depreciation"
 msgstr "Deprecição Período Seguinte"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normal"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -812,7 +829,7 @@ msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -830,13 +847,14 @@ msgid "Other Information"
 msgstr "Outras informações"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Ativo Ascendente"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Left"
 msgid "Parent Path"
@@ -892,7 +910,7 @@ msgid "Purchase Value"
 msgstr "Valor de Compra"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr "Trimestre"
@@ -986,6 +1004,12 @@ msgstr "Valor de Venda"
 msgid "Salvage Value"
 msgstr "Valor Residual"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Pesquisar categoria de ativos"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -1028,7 +1052,7 @@ msgid "Status"
 msgstr "Estado"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1050,13 +1074,13 @@ msgid "The Sale Value must be positive!"
 msgstr "O Valor de Venda tem que ser positivo!"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1152,17 +1176,10 @@ msgid "Trigger Date"
 msgstr "Data de acionamento"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Vista"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1195,7 +1212,7 @@ msgstr ""
 "'Removido'."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Ano"
@@ -1223,7 +1240,7 @@ msgstr ""
 "Deve fazê-lo através do ativo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr "Apenas pode remover ativos no estado Rascunho."
@@ -1266,7 +1283,7 @@ msgstr ""
 "de ativo."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1282,7 +1299,7 @@ msgstr ""
 "associado."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr "Não pode apagar um ativo que contenha linha de depreciação registadas."
@@ -1332,6 +1349,18 @@ msgstr ""
 "fiscais anteriores se a Data de Início de Depreciação é diferente da data "
 "para a qual é necessário gerar movs. contabilísticos."
 
+#~ msgid "Child Assets"
+#~ msgstr "Componentes do Ativo"
+
+#~ msgid "Error ! You can not create recursive assets."
+#~ msgstr "Erro! Não pode criar ativos recursivos"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "View"
+#~ msgstr "Vista"
+
 #, fuzzy
 #~ msgid "No Fiscal Year defined."
 #~ msgstr "Ano Fiscal"
diff --git a/account_asset_management/i18n/ro.po b/account_asset_management/i18n/ro.po
index 2e7875f6d..77658684a 100644
--- a/account_asset_management/i18n/ro.po
+++ b/account_asset_management/i18n/ro.po
@@ -34,7 +34,7 @@ msgstr ""
 "2:1));\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -114,6 +114,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Cont Active"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Cont Active"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Categorii de active"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -246,11 +265,6 @@ msgstr ""
 "Bifati aceasta casuta daca doriti sa confirmati automat activele din aceasta "
 "categorie atunci cand sunt create de facturi."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -293,8 +307,14 @@ msgstr ""
 msgid "Close"
 msgstr "Inchide"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -390,6 +410,7 @@ msgstr "Miscari de active create"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -400,6 +421,7 @@ msgstr "Creat de"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -424,13 +446,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Degresiv"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -442,14 +464,14 @@ msgid "Degressive Factor"
 msgstr "Factor degresiv"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -522,6 +544,7 @@ msgstr "Numele Devalorizarii"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -556,13 +579,7 @@ msgid "Entries"
 msgstr "Inregistrari"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -592,7 +609,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -620,6 +637,7 @@ msgstr "Istoric"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -628,7 +646,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -673,7 +691,7 @@ msgid "Journal"
 msgstr "Registru"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -701,6 +719,7 @@ msgstr "Elementele Jurnalului"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -711,6 +730,7 @@ msgstr "Ultima actualizare în"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -721,6 +741,7 @@ msgstr "Ultima actualizare făcută de"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -729,13 +750,13 @@ msgid "Last Updated on"
 msgstr "Ultima actualizare la"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Liniar"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Valoarea deja amortizata"
@@ -747,12 +768,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Nume"
@@ -762,11 +784,6 @@ msgstr "Nume"
 msgid "Next Period Depreciation"
 msgstr "Urmatoarea Perioada a Devalorizarii"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -783,7 +800,7 @@ msgid "Notes"
 msgstr "Note"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -801,13 +818,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Active Principale"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -863,7 +881,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -950,6 +968,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Valoarea deja amortizata"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Cauta Categoria de Active"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -989,7 +1013,7 @@ msgid "Status"
 msgstr "Stare"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1010,13 +1034,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1097,17 +1121,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1133,7 +1150,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "An"
@@ -1157,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1192,7 +1209,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1206,7 +1223,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/ru.po b/account_asset_management/i18n/ru.po
index 89ddd9543..80db15115 100644
--- a/account_asset_management/i18n/ru.po
+++ b/account_asset_management/i18n/ru.po
@@ -38,7 +38,7 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -118,6 +118,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Счет активов"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Счет активов"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Категории активов"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -247,11 +266,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -294,8 +308,14 @@ msgstr ""
 msgid "Close"
 msgstr "Закрыть"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -391,6 +411,7 @@ msgstr "Созданные операции по активам"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -401,6 +422,7 @@ msgstr "Создано"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -425,13 +447,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Нисходящий"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -443,14 +465,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -523,6 +545,7 @@ msgstr "Название амортизации"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -557,13 +580,7 @@ msgid "Entries"
 msgstr "Записи"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -593,7 +610,7 @@ msgid "General"
 msgstr "Общий"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -621,6 +638,7 @@ msgstr "История"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -629,7 +647,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -674,7 +692,7 @@ msgid "Journal"
 msgstr "Журнал"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -702,6 +720,7 @@ msgstr "Элементы журнала"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -712,6 +731,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -722,6 +742,7 @@ msgstr "Последний раз обновлено"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -730,13 +751,13 @@ msgid "Last Updated on"
 msgstr "Последний раз обновлено"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Линейный"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Ликвидационная стоимость"
@@ -748,12 +769,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Название"
@@ -763,11 +785,6 @@ msgstr "Название"
 msgid "Next Period Depreciation"
 msgstr "Следующий период амортизации"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -784,7 +801,7 @@ msgid "Notes"
 msgstr "Примечания"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -802,13 +819,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Родительский актив"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -864,7 +882,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -951,6 +969,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Ликвидационная стоимость"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Поиск категории актива"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -990,7 +1014,7 @@ msgid "Status"
 msgstr "Статус"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1011,13 +1035,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1098,17 +1122,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1134,7 +1151,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Год"
@@ -1158,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1193,7 +1210,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1207,7 +1224,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/sk.po b/account_asset_management/i18n/sk.po
index 4d6caf32e..ec88d742c 100644
--- a/account_asset_management/i18n/sk.po
+++ b/account_asset_management/i18n/sk.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Vytvoril"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr "Všeobecný"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "Posledná modifikácia"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Naposledy upravil"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Naposledy upravené"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Meno"
@@ -738,11 +757,6 @@ msgstr "Meno"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Typ"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/sk_SK.po b/account_asset_management/i18n/sk_SK.po
index d8ccab15b..95b4130eb 100644
--- a/account_asset_management/i18n/sk_SK.po
+++ b/account_asset_management/i18n/sk_SK.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/sl.po b/account_asset_management/i18n/sl.po
index 4e4072c79..fd336d6ca 100644
--- a/account_asset_management/i18n/sl.po
+++ b/account_asset_management/i18n/sl.po
@@ -30,7 +30,7 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -110,6 +110,25 @@ msgstr "Dnevniški vnos odstranitve sredstva '%s'"
 msgid "Asset Account"
 msgstr "Konto osnovnega sredstva"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Konto osnovnega sredstva"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Postavke sredstev"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -242,11 +261,6 @@ msgstr ""
 "Preveri,če želiš avtomatsko potrditi osnovna sredstva te kategorije,ki so "
 "bila kreirana z računi."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr "Podrejena sredstva"
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -304,8 +318,14 @@ msgstr ""
 msgid "Close"
 msgstr "Zapri"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -403,6 +423,7 @@ msgstr "Kreirane vknjižbe osnovnega sredstva"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -413,6 +434,7 @@ msgstr "Ustvaril"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -439,13 +461,13 @@ msgstr ""
 "Privzeta kategorija sredstva pri ustvarjanju postavk računa za ta konto."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Degresivno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -457,14 +479,14 @@ msgid "Degressive Factor"
 msgstr "Degresivni faktor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr "Degresivno-linearna"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr "Degresivno-linearna metoda je podprta le če je časovna metoda = leto."
@@ -537,6 +559,7 @@ msgstr "Ime amortizacije"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -571,13 +594,7 @@ msgid "Entries"
 msgstr "Vnosi"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr "Napaka! Ne morete ustvarjati rekurzivnih sredstev."
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -609,7 +626,7 @@ msgid "General"
 msgstr "Splošno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr "Ustvari vnose odstranitve sredstva"
@@ -637,6 +654,7 @@ msgstr "Zgodovina"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -645,7 +663,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr "Neveljavna vrednost %s v asset.method."
@@ -694,7 +712,7 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -722,6 +740,7 @@ msgstr "Postavke"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -732,6 +751,7 @@ msgstr "Zadnjič spremenjeno"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -742,6 +762,7 @@ msgstr "Zadnjič posodobil"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -750,13 +771,13 @@ msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linearno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Ostanek vrednosti"
@@ -768,12 +789,13 @@ msgid "Min-Value Account"
 msgstr "Konto zmanjšane vrednosti"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr "Mesec"
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Naziv"
@@ -783,11 +805,6 @@ msgstr "Naziv"
 msgid "Next Period Depreciation"
 msgstr "Naslednje obdobje amortizacije"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normalna"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -804,7 +821,7 @@ msgid "Notes"
 msgstr "Opombe"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -822,13 +839,14 @@ msgid "Other Information"
 msgstr "Drugi podatki"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Nadrejeno osnovno sredstvo"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Left"
 msgid "Parent Path"
@@ -884,7 +902,7 @@ msgid "Purchase Value"
 msgstr "Nabavna vrednost"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr "Četrtletje"
@@ -978,6 +996,12 @@ msgstr "Prodajna vrednost"
 msgid "Salvage Value"
 msgstr "Ostanek vrednosti"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Iskanje po kategoriji osnovnega sredstva"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -1020,7 +1044,7 @@ msgid "Status"
 msgstr "Status"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1041,13 +1065,13 @@ msgid "The Sale Value must be positive!"
 msgstr "Prodajna vrednost mora biti pozitivna!"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1143,17 +1167,10 @@ msgid "Trigger Date"
 msgstr "Datum sprožitve"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tip"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Prikaz"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1185,7 +1202,7 @@ msgstr ""
 "Ob nastanku vnosov odstranitve preide status sredstva v 'odstranjeno'."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Leto"
@@ -1213,7 +1230,7 @@ msgstr ""
 "Take vnose bi morali odstranjevati iz sredstva."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr "Brišete lahko le sredstva v stanju 'osnutek'."
@@ -1256,7 +1273,7 @@ msgstr ""
 "spreminjati."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1271,7 +1288,7 @@ msgstr ""
 "Amortizacijske postavke povezane s knjigovodskim vnosom ne morete brisati."
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr "Ni možno brisati osnovnega sredstva , ki ima vknjižene amortizacije."
@@ -1321,6 +1338,18 @@ msgstr ""
 "let, če je začetni datum amortizacije drugačen od datuma, na katerega se "
 "knjigovodski vnosi ustvarjajo."
 
+#~ msgid "Child Assets"
+#~ msgstr "Podrejena sredstva"
+
+#~ msgid "Error ! You can not create recursive assets."
+#~ msgstr "Napaka! Ne morete ustvarjati rekurzivnih sredstev."
+
+#~ msgid "Normal"
+#~ msgstr "Normalna"
+
+#~ msgid "View"
+#~ msgstr "Prikaz"
+
 #, fuzzy
 #~ msgid "No Fiscal Year defined."
 #~ msgstr "Fiskalno leto"
diff --git a/account_asset_management/i18n/sr.po b/account_asset_management/i18n/sr.po
index 06b1e5a3b..aea9bcfc7 100644
--- a/account_asset_management/i18n/sr.po
+++ b/account_asset_management/i18n/sr.po
@@ -20,7 +20,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -100,6 +100,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -225,11 +241,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -272,8 +283,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -368,6 +385,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -378,6 +396,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -402,13 +421,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -420,14 +439,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -499,6 +518,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -533,13 +553,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -569,7 +583,7 @@ msgid "General"
 msgstr "Opšte"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -597,6 +611,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -605,7 +620,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -650,7 +665,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -678,6 +693,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -688,6 +704,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -698,6 +715,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -706,13 +724,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -724,12 +742,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Ime"
@@ -739,11 +758,6 @@ msgstr "Ime"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -760,7 +774,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -778,13 +792,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -838,7 +851,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -925,6 +938,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -963,7 +981,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -984,13 +1002,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1071,17 +1089,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tip"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1106,7 +1117,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1130,7 +1141,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1165,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1178,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/sr@latin.po b/account_asset_management/i18n/sr@latin.po
index 52540dfe3..8e106a13f 100644
--- a/account_asset_management/i18n/sr@latin.po
+++ b/account_asset_management/i18n/sr@latin.po
@@ -32,7 +32,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -112,6 +112,24 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+msgid "Asset Group"
+msgstr "Sredstva"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Sredstva"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -238,11 +256,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -285,8 +298,14 @@ msgstr ""
 msgid "Close"
 msgstr "Zatvori"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -381,6 +400,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -391,6 +411,7 @@ msgstr "Kreirao"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -415,13 +436,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -433,14 +454,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -512,6 +533,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -546,13 +568,7 @@ msgid "Entries"
 msgstr "Stavke"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -582,7 +598,7 @@ msgid "General"
 msgstr "Opšte"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -610,6 +626,7 @@ msgstr "Istorijat"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -618,7 +635,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -663,7 +680,7 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -691,6 +708,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -701,6 +719,7 @@ msgstr "Zadnja izmjena"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -711,6 +730,7 @@ msgstr "Zadnja izmjena"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -719,13 +739,13 @@ msgid "Last Updated on"
 msgstr "Zadnja izmjena"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linearno"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -737,12 +757,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Ime:"
@@ -752,11 +773,6 @@ msgstr "Ime:"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -773,7 +789,7 @@ msgid "Notes"
 msgstr "Napomene"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -791,13 +807,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -851,7 +866,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -938,6 +953,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -976,7 +996,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -997,13 +1017,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1084,17 +1104,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tip"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1119,7 +1132,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1143,7 +1156,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1178,7 +1191,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1191,7 +1204,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/sv.po b/account_asset_management/i18n/sv.po
index 81ff2efd2..526b3ec09 100644
--- a/account_asset_management/i18n/sv.po
+++ b/account_asset_management/i18n/sv.po
@@ -57,7 +57,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -137,6 +137,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Tillgångskonto"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Tillgångskonto"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Tillgångskategori"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -269,11 +288,6 @@ msgstr ""
 "Kryssa i denna ruta om du automatiskt vill bekräfta tillgångar i denna "
 "kategori när de skapas via leverantörsfakturor."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -316,8 +330,14 @@ msgstr ""
 msgid "Close"
 msgstr "Stäng"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -413,6 +433,7 @@ msgstr "Skapade tillgångsändringar"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -423,6 +444,7 @@ msgstr "Skapad av"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -447,13 +469,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Stegvis avskrivning"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -465,14 +487,14 @@ msgid "Degressive Factor"
 msgstr "Avskrivnings faktor"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -545,6 +567,7 @@ msgstr "Avskrivningsnamn"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -579,13 +602,7 @@ msgid "Entries"
 msgstr "Poster"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -615,7 +632,7 @@ msgid "General"
 msgstr "Allmän"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -643,6 +660,7 @@ msgstr "Historik"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -651,7 +669,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -696,7 +714,7 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -724,6 +742,7 @@ msgstr "Transaktioner"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -734,6 +753,7 @@ msgstr "Senast redigerad"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -744,6 +764,7 @@ msgstr "Senast uppdaterad av"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -752,13 +773,13 @@ msgid "Last Updated on"
 msgstr "Senast uppdaterad"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Linjär"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Restvärde"
@@ -770,12 +791,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Namn"
@@ -785,11 +807,6 @@ msgstr "Namn"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr "Normal"
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -806,7 +823,7 @@ msgid "Notes"
 msgstr "Anteckningar"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -824,13 +841,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Överliggande tillgång"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -886,7 +904,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -973,6 +991,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Restvärde"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Sök tillgångskategori"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -1012,7 +1036,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1033,13 +1057,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1120,17 +1144,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Typ"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1156,7 +1173,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "År"
@@ -1180,7 +1197,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1215,7 +1232,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1228,7 +1245,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1269,6 +1286,9 @@ msgid ""
 "date for which accounting entries need to be generated."
 msgstr ""
 
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
 #~ msgid "# of Depreciation Lines"
 #~ msgstr "# avskrivningsrader"
 
diff --git a/account_asset_management/i18n/th.po b/account_asset_management/i18n/th.po
index 97d20c6a2..711eb06a6 100644
--- a/account_asset_management/i18n/th.po
+++ b/account_asset_management/i18n/th.po
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -103,6 +103,24 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+msgid "Asset Group"
+msgstr "หมวดหมู่สินทรัพย์"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "หมวดหมู่สินทรัพย์"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -231,11 +249,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -278,8 +291,14 @@ msgstr ""
 msgid "Close"
 msgstr "ปิด"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -375,6 +394,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -385,6 +405,7 @@ msgstr "สร้างโดย"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -409,13 +430,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -427,14 +448,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -506,6 +527,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -540,13 +562,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -576,7 +592,7 @@ msgid "General"
 msgstr "ทั่วไป"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -604,6 +620,7 @@ msgstr "ประวัติ"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -612,7 +629,7 @@ msgid "ID"
 msgstr "รหัส"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -657,7 +674,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -685,6 +702,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -695,6 +713,7 @@ msgstr "แก้ไขครั้งสุดท้ายเมื่อ"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -705,6 +724,7 @@ msgstr "อัพเดทครั้งสุดท้ายโดย"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -713,13 +733,13 @@ msgid "Last Updated on"
 msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "เชิงเส้น"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -731,12 +751,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "ชื่อ"
@@ -746,11 +767,6 @@ msgstr "ชื่อ"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -767,7 +783,7 @@ msgid "Notes"
 msgstr "บันทึกย่อ"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -785,13 +801,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -845,7 +860,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -932,6 +947,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -970,7 +990,7 @@ msgid "Status"
 msgstr "สถานะ"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -991,13 +1011,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1078,17 +1098,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "ชนิด"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1113,7 +1126,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "ปี"
@@ -1137,7 +1150,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1172,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1185,7 +1198,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/tr.po b/account_asset_management/i18n/tr.po
index 55b3f140d..899030267 100644
--- a/account_asset_management/i18n/tr.po
+++ b/account_asset_management/i18n/tr.po
@@ -38,7 +38,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -118,6 +118,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "Demirbaş Hesabı"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "Demirbaş Hesabı"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Demirbaş Kategorileri"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -250,11 +269,6 @@ msgstr ""
 "Faturalar oluşturulurken bu kategorideki demirbaşların otomatikmen "
 "onaylanmasını istiyorsanız bunu işaretleyin."
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -297,8 +311,14 @@ msgstr ""
 msgid "Close"
 msgstr "Kapat"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -394,6 +414,7 @@ msgstr "Oluşturulan Demirbaş Hareketleri"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -404,6 +425,7 @@ msgstr "Oluşturan"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -428,13 +450,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "Azalan"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -446,14 +468,14 @@ msgid "Degressive Factor"
 msgstr "Azalma Faktörü"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -526,6 +548,7 @@ msgstr "Amortisman Adı"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -560,13 +583,7 @@ msgid "Entries"
 msgstr "Kayıtlar"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -596,7 +613,7 @@ msgid "General"
 msgstr "Genel"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -624,6 +641,7 @@ msgstr "Geçmiş"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -632,7 +650,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -677,7 +695,7 @@ msgid "Journal"
 msgstr "Günlük"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -705,6 +723,7 @@ msgstr "Günlük Maddeleri"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -715,6 +734,7 @@ msgstr "Son değişiklik"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -725,6 +745,7 @@ msgstr "Son güncelleyen"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -733,13 +754,13 @@ msgid "Last Updated on"
 msgstr "Son güncelleme"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Doğrusal"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "Hurda Değeri"
@@ -751,12 +772,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Adı"
@@ -766,11 +788,6 @@ msgstr "Adı"
 msgid "Next Period Depreciation"
 msgstr "Sonraki dönemdeki Amortisman"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -787,7 +804,7 @@ msgid "Notes"
 msgstr "Notlar"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -805,13 +822,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "Ana Demirbaş"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Left"
 msgid "Parent Path"
@@ -867,7 +885,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -954,6 +972,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "Hurda Değeri"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "Demirbaş Kategorisi Ara"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -993,7 +1017,7 @@ msgid "Status"
 msgstr "Durum"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1014,13 +1038,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1101,17 +1125,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tipi"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1137,7 +1154,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "Yıl"
@@ -1161,7 +1178,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1196,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr "İşlenmiş yıpranma kalemleri içeren bir varlığı silemezsiniz."
@@ -1209,7 +1226,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr "İşlenmiş yıpranma kalemleri içeren bir varlığı silemezsiniz."
diff --git a/account_asset_management/i18n/tr_TR.po b/account_asset_management/i18n/tr_TR.po
index 8428b308d..e79b31808 100644
--- a/account_asset_management/i18n/tr_TR.po
+++ b/account_asset_management/i18n/tr_TR.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Oluşturan"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "Kimlik"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr "En son güncelleme tarihi"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "En son güncelleyen "
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "En son güncelleme tarihi"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Ad"
@@ -738,11 +757,6 @@ msgstr "Ad"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr "Notlar"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr "Diğer bilgiler"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr "Durum"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Tip"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr "Görüntüle"
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
@@ -1218,6 +1229,9 @@ msgid ""
 "date for which accounting entries need to be generated."
 msgstr ""
 
+#~ msgid "View"
+#~ msgstr "Görüntüle"
+
 #~ msgid "User"
 #~ msgstr "Kullanıcı"
 
diff --git a/account_asset_management/i18n/uk.po b/account_asset_management/i18n/uk.po
index 3f6fddef5..ca8245e65 100644
--- a/account_asset_management/i18n/uk.po
+++ b/account_asset_management/i18n/uk.po
@@ -20,7 +20,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -100,6 +100,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -225,11 +241,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -272,8 +283,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -368,6 +385,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -378,6 +396,7 @@ msgstr "Створив"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -402,13 +421,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -420,14 +439,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -499,6 +518,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -533,13 +553,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -569,7 +583,7 @@ msgid "General"
 msgstr "Загальне"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -597,6 +611,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -605,7 +620,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -650,7 +665,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -678,6 +693,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -688,6 +704,7 @@ msgstr "Остання модифікація"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -698,6 +715,7 @@ msgstr "Востаннє оновив"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -706,13 +724,13 @@ msgid "Last Updated on"
 msgstr "Останнє оновлення"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -724,12 +742,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Name"
@@ -739,11 +758,6 @@ msgstr "Name"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -760,7 +774,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -778,13 +792,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -838,7 +851,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -925,6 +938,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -963,7 +981,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -984,13 +1002,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1071,17 +1089,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Тип"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1106,7 +1117,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1130,7 +1141,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1165,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1178,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/vi.po b/account_asset_management/i18n/vi.po
index 965c96ff6..c55755952 100644
--- a/account_asset_management/i18n/vi.po
+++ b/account_asset_management/i18n/vi.po
@@ -50,7 +50,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -130,6 +130,24 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+msgid "Asset Group"
+msgstr "Tài sản"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "Tài sản"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -256,11 +274,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -303,8 +316,14 @@ msgstr ""
 msgid "Close"
 msgstr "Ðóng"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -399,6 +418,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -409,6 +429,7 @@ msgstr "Được tạo bởi"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -433,13 +454,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -451,14 +472,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -530,6 +551,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -564,13 +586,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -600,7 +616,7 @@ msgid "General"
 msgstr "General"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -628,6 +644,7 @@ msgstr "Lịch sử"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -636,7 +653,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -681,7 +698,7 @@ msgid "Journal"
 msgstr "Sổ nhật ký"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -709,6 +726,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -719,6 +737,7 @@ msgstr "Sửa lần cuối vào"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -729,6 +748,7 @@ msgstr "Last Updated by"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -737,13 +757,13 @@ msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "Tuyến tính"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -755,12 +775,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "Tên"
@@ -770,11 +791,6 @@ msgstr "Tên"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -791,7 +807,7 @@ msgid "Notes"
 msgstr "Các ghi chú"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -809,13 +825,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -869,7 +884,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -956,6 +971,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -994,7 +1014,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1015,13 +1035,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1102,17 +1122,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "Loại"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1137,7 +1150,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1161,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1196,7 +1209,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1209,7 +1222,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/vi_VN.po b/account_asset_management/i18n/vi_VN.po
index 98ea50d24..1b02d48f4 100644
--- a/account_asset_management/i18n/vi_VN.po
+++ b/account_asset_management/i18n/vi_VN.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -99,6 +99,22 @@ msgstr ""
 msgid "Asset Account"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+msgid "Asset Group"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+msgid "Asset Groups"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -224,11 +240,6 @@ msgid ""
 "when created by invoices."
 msgstr ""
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -271,8 +282,14 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -367,6 +384,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -377,6 +395,7 @@ msgstr "Tạo bởi"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -401,13 +420,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -419,14 +438,14 @@ msgid "Degressive Factor"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -498,6 +517,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -532,13 +552,7 @@ msgid "Entries"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -568,7 +582,7 @@ msgid "General"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -596,6 +610,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -604,7 +619,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -649,7 +664,7 @@ msgid "Journal"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -677,6 +692,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -687,6 +703,7 @@ msgstr ""
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -697,6 +714,7 @@ msgstr "Cập nhật lần cuối bởi"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -705,13 +723,13 @@ msgid "Last Updated on"
 msgstr "Cập nhật lần cuối vào"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, python-format
 msgid "Linear up to Salvage Value"
 msgstr ""
@@ -723,12 +741,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr ""
@@ -738,11 +757,6 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -759,7 +773,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -777,13 +791,12 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+msgid "Parent Asset Group"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 msgid "Parent Path"
 msgstr ""
 
@@ -837,7 +850,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -924,6 +937,11 @@ msgstr ""
 msgid "Salvage Value"
 msgstr ""
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+msgid "Search Asset Group"
+msgstr ""
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 msgid "Search Asset Profile"
@@ -962,7 +980,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -983,13 +1001,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1070,17 +1088,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 msgid "View Asset Moves"
@@ -1105,7 +1116,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr ""
@@ -1129,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1164,7 +1175,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1177,7 +1188,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/i18n/zh_CN.po b/account_asset_management/i18n/zh_CN.po
index 2ea6615ed..8ea3c06b3 100644
--- a/account_asset_management/i18n/zh_CN.po
+++ b/account_asset_management/i18n/zh_CN.po
@@ -34,7 +34,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -114,6 +114,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "资产科目"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "资产科目"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "资产类别"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -244,11 +263,6 @@ msgid ""
 "when created by invoices."
 msgstr "如果你像让这类固定资产在开发票之后自动确认为“运行”状态，勾选这里。"
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -291,8 +305,14 @@ msgstr ""
 msgid "Close"
 msgstr "报废"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -388,6 +408,7 @@ msgstr "新建固定资产会计凭证"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -398,6 +419,7 @@ msgstr "创建者"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -422,13 +444,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "递减"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -440,14 +462,14 @@ msgid "Degressive Factor"
 msgstr "递减因子"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -520,6 +542,7 @@ msgstr "折旧说明"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -554,13 +577,7 @@ msgid "Entries"
 msgstr "分录"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -590,7 +607,7 @@ msgid "General"
 msgstr "基本设置"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -618,6 +635,7 @@ msgstr "历史"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -626,7 +644,7 @@ msgid "ID"
 msgstr "ID"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -671,7 +689,7 @@ msgid "Journal"
 msgstr "凭证簿"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -699,6 +717,7 @@ msgstr "日记帐项目"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -709,6 +728,7 @@ msgstr "最后修改时间"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -719,6 +739,7 @@ msgstr "最后更新者"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -727,13 +748,13 @@ msgid "Last Updated on"
 msgstr "上次更新日期"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "线性"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "细分值"
@@ -745,12 +766,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "名称"
@@ -760,11 +782,6 @@ msgstr "名称"
 msgid "Next Period Depreciation"
 msgstr "下个期间的折旧"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -781,7 +798,7 @@ msgid "Notes"
 msgstr "备注"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -799,13 +816,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "上级资产"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -861,7 +879,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -948,6 +966,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "细分值"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "搜索资产类别"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -987,7 +1011,7 @@ msgid "Status"
 msgstr "状态"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1008,13 +1032,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1095,17 +1119,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "类型"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1131,7 +1148,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "年"
@@ -1155,7 +1172,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1190,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, fuzzy, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr "您不能删除一个包含有折旧行的资产"
@@ -1203,7 +1220,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr "您不能删除一个包含有折旧行的资产"
diff --git a/account_asset_management/i18n/zh_TW.po b/account_asset_management/i18n/zh_TW.po
index 88b33ce5a..42be558e0 100644
--- a/account_asset_management/i18n/zh_TW.po
+++ b/account_asset_management/i18n/zh_TW.po
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1014
+#: code:addons/account_asset_management/models/account_asset.py:971
 #, python-format
 msgid ""
 "\n"
@@ -107,6 +107,25 @@ msgstr ""
 msgid "Asset Account"
 msgstr "資產科目"
 
+#. module: account_asset_management
+#: model:ir.model,name:account_asset_management.model_account_asset_group
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_tree
+#, fuzzy
+#| msgid "Asset Account"
+msgid "Asset Group"
+msgstr "資產科目"
+
+#. module: account_asset_management
+#: model:ir.actions.act_window,name:account_asset_management.account_asset_group_action
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__group_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__group_ids
+#: model:ir.ui.menu,name:account_asset_management.account_asset_group_menu
+#, fuzzy
+msgid "Asset Groups"
+msgstr "資產類別"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 msgid "Asset Line"
@@ -237,11 +256,6 @@ msgid ""
 "when created by invoices."
 msgstr "當你在建立發票時，如果你想要自動確認固定資產類別，必須先檢查這個"
 
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__child_ids
-msgid "Child Assets"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,help:account_asset_management.field_account_asset__method
 msgid ""
@@ -284,8 +298,14 @@ msgstr ""
 msgid "Close"
 msgstr "關閉"
 
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__code
+msgid "Code"
+msgstr ""
+
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__company_id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
 msgid "Company"
@@ -381,6 +401,7 @@ msgstr "建立資產轉移"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_uid
@@ -391,6 +412,7 @@ msgstr "建立者"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__create_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__create_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__create_date
@@ -415,13 +437,13 @@ msgid "Default Asset Profile when creating invoice lines with this account."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:118
+#: code:addons/account_asset_management/models/account_asset_profile.py:120
 #, python-format
 msgid "Degressive"
 msgstr "遞減"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:120
+#: code:addons/account_asset_management/models/account_asset_profile.py:122
 #, python-format
 msgid "Degressive  up to Salvage Value"
 msgstr ""
@@ -433,14 +455,14 @@ msgid "Degressive Factor"
 msgstr "遞減因素"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:119
+#: code:addons/account_asset_management/models/account_asset_profile.py:121
 #, python-format
 msgid "Degressive-Linear"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:262
-#: code:addons/account_asset_management/models/account_asset_profile.py:148
+#: code:addons/account_asset_management/models/account_asset.py:237
+#: code:addons/account_asset_management/models/account_asset_profile.py:150
 #, python-format
 msgid "Degressive-Linear is only supported for Time Method = Year."
 msgstr ""
@@ -513,6 +535,7 @@ msgstr "折舊名稱"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__display_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__display_name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__display_name
@@ -547,13 +570,7 @@ msgid "Entries"
 msgstr "分錄"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:253
-#, python-format
-msgid "Error ! You can not create recursive assets."
-msgstr ""
-
-#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1017
+#: code:addons/account_asset_management/models/account_asset.py:974
 #, python-format
 msgid ""
 "Error while processing asset '%s': \n"
@@ -583,7 +600,7 @@ msgid "General"
 msgstr "一般"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:444
+#: code:addons/account_asset_management/models/account_asset.py:401
 #, python-format
 msgid "Generate Asset Removal entries"
 msgstr ""
@@ -611,6 +628,7 @@ msgstr "歷史記錄"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__id
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__id
@@ -619,7 +637,7 @@ msgid "ID"
 msgstr "編號"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:760
+#: code:addons/account_asset_management/models/account_asset.py:717
 #, python-format
 msgid "Illegal value %s in asset.method."
 msgstr ""
@@ -664,7 +682,7 @@ msgid "Journal"
 msgstr "帳簿"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:464
+#: code:addons/account_asset_management/models/account_asset.py:421
 #: model:ir.model,name:account_asset_management.model_account_move
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
 #, python-format
@@ -692,6 +710,7 @@ msgstr "帳簿項目"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute____last_update
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile____last_update
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger____last_update
@@ -702,6 +721,7 @@ msgstr "最後修改:"
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_uid
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_uid
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_uid
@@ -712,6 +732,7 @@ msgstr "最後更新："
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__write_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__write_date
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__write_date
@@ -720,13 +741,13 @@ msgid "Last Updated on"
 msgstr "最後更新於"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:116
+#: code:addons/account_asset_management/models/account_asset_profile.py:118
 #, python-format
 msgid "Linear"
 msgstr "直線"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:117
+#: code:addons/account_asset_management/models/account_asset_profile.py:119
 #, fuzzy, python-format
 msgid "Linear up to Salvage Value"
 msgstr "殘值"
@@ -738,12 +759,13 @@ msgid "Min-Value Account"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:126
+#: code:addons/account_asset_management/models/account_asset_profile.py:128
 #, python-format
 msgid "Month"
 msgstr ""
 
 #. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__name
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
 msgid "Name"
 msgstr "名稱"
@@ -753,11 +775,6 @@ msgstr "名稱"
 msgid "Next Period Depreciation"
 msgstr ""
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "Normal"
-msgstr ""
-
 #. module: account_asset_management
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__note
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__note
@@ -774,7 +791,7 @@ msgid "Notes"
 msgstr "備註"
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:138
+#: code:addons/account_asset_management/models/account_asset_profile.py:140
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_number
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_number
 #, python-format
@@ -792,13 +809,14 @@ msgid "Other Information"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__parent_id
-msgid "Parent Asset"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_id
+#, fuzzy
+#| msgid "Parent Asset"
+msgid "Parent Asset Group"
 msgstr "母公司資產"
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_group__parent_path
 #, fuzzy
 #| msgid "Parent Asset"
 msgid "Parent Path"
@@ -854,7 +872,7 @@ msgid "Purchase Value"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:127
+#: code:addons/account_asset_management/models/account_asset_profile.py:129
 #, python-format
 msgid "Quarter"
 msgstr ""
@@ -941,6 +959,12 @@ msgstr ""
 msgid "Salvage Value"
 msgstr "殘值"
 
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_group_view_search
+#, fuzzy
+msgid "Search Asset Group"
+msgstr "搜索資產類別"
+
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
 #, fuzzy
@@ -980,7 +1004,7 @@ msgid "Status"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:733
+#: code:addons/account_asset_management/models/account_asset.py:690
 #, python-format
 msgid ""
 "The '_compute_year_amount' method is only intended for Time Method 'Number "
@@ -1001,13 +1025,13 @@ msgid "The Sale Value must be positive!"
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:272
+#: code:addons/account_asset_management/models/account_asset.py:247
 #, python-format
 msgid "The Start Date must precede the Ending Date."
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:536
+#: code:addons/account_asset_management/models/account_asset.py:493
 #, python-format
 msgid ""
 "The duration of the asset conflicts with the posted depreciation table entry "
@@ -1088,17 +1112,10 @@ msgid "Trigger Date"
 msgstr ""
 
 #. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__type
 #: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__type
-#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
 msgid "Type"
 msgstr "類型"
 
-#. module: account_asset_management
-#: selection:account.asset,type:0
-msgid "View"
-msgstr ""
-
 #. module: account_asset_management
 #: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
 #, fuzzy
@@ -1124,7 +1141,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_profile.py:128
+#: code:addons/account_asset_management/models/account_asset_profile.py:130
 #, python-format
 msgid "Year"
 msgstr "年度"
@@ -1148,7 +1165,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:382
+#: code:addons/account_asset_management/models/account_asset.py:340
 #, python-format
 msgid "You can only delete assets in draft state."
 msgstr ""
@@ -1183,7 +1200,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:295
+#: code:addons/account_asset_management/models/account_asset.py:270
 #, python-format
 msgid "You cannot change the profile of an asset with accounting entries."
 msgstr ""
@@ -1196,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:386
+#: code:addons/account_asset_management/models/account_asset.py:344
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
diff --git a/account_asset_management/migrations/12.0.1.2.0/openupgrade_analysis.txt b/account_asset_management/migrations/12.0.1.0.0/openupgrade_analysis.txt
similarity index 100%
rename from account_asset_management/migrations/12.0.1.2.0/openupgrade_analysis.txt
rename to account_asset_management/migrations/12.0.1.0.0/openupgrade_analysis.txt
diff --git a/account_asset_management/migrations/12.0.1.2.0/openupgrade_analysis_work.txt b/account_asset_management/migrations/12.0.1.0.0/openupgrade_analysis_work.txt
similarity index 99%
rename from account_asset_management/migrations/12.0.1.2.0/openupgrade_analysis_work.txt
rename to account_asset_management/migrations/12.0.1.0.0/openupgrade_analysis_work.txt
index a633337c9..1f6b39c46 100644
--- a/account_asset_management/migrations/12.0.1.2.0/openupgrade_analysis_work.txt
+++ b/account_asset_management/migrations/12.0.1.0.0/openupgrade_analysis_work.txt
@@ -198,4 +198,4 @@ DEL ir.ui.view: account_asset.view_account_asset_search
 DEL ir.ui.view: account_asset.view_asset_asset_report_search
 DEL ir.ui.view: account_asset.view_asset_depreciation_confirmation_wizard
 DEL ir.ui.view: account_asset.view_invoice_asset_category
-DEL ir.ui.view: account_asset.view_product_template_form_inherit
\ No newline at end of file
+DEL ir.ui.view: account_asset.view_product_template_form_inherit
diff --git a/account_asset_management/migrations/12.0.1.0.0/post-migration.py b/account_asset_management/migrations/12.0.1.0.0/post-migration.py
new file mode 100644
index 000000000..a3facbad1
--- /dev/null
+++ b/account_asset_management/migrations/12.0.1.0.0/post-migration.py
@@ -0,0 +1,73 @@
+# Copyright 2019 Apps2GROW - Henrik Norlin
+# Copyright 2019 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openupgradelib import openupgrade
+from psycopg2 import sql
+
+
+def adjust_asset_values(env):
+    """Avoid method_time != 'year' when possible + adjust other values
+    in assets and asset profiles.
+    """
+    # Copy analytic account value
+    openupgrade.logged_query(
+        env.cr, """
+        UPDATE account_asset aa
+        SET account_analytic_id = aap.account_analytic_id
+        FROm account_asset_profile aap
+        WHERE aa.profile_id = aap.id""",
+    )
+    # Adjust method_time, method_number and method_period
+    number = sql.Identifier(openupgrade.get_legacy_name('method_number'))
+    period = sql.Identifier(openupgrade.get_legacy_name('method_period'))
+    for table in ['account_asset_profile', 'account_asset']:
+        table = sql.Identifier(table)
+        openupgrade.logged_query(
+            env.cr, sql.SQL("""
+            UPDATE {table}
+            SET method_time = 'year',
+                method_number = ({number} * {period}) / 12
+            WHERE MOD({number} * {period}, 12) = 0
+            """).format(
+                number=number,
+                period=period,
+                table=table,
+            ),
+        )
+        openupgrade.logged_query(
+            env.cr, sql.SQL("""
+            UPDATE {table}
+            SET method_period = (CASE
+                    WHEN {period} = 1 THEN 'month'
+                    WHEN {period} = 3 THEN 'quarter'
+                    WHEN {period} = 12 THEN 'year'
+                END)
+            WHERE {period} IN (1, 3, 12)
+            """).format(
+                period=period,
+                table=table,
+            ),
+        )
+
+
+def adjust_aml_values(env):
+    openupgrade.logged_query(
+        env.cr, """
+        UPDATE account_move_line aml
+        SET asset_id = aa.id,
+            asset_profile_id = aa.profile_id
+        FROM account_asset aa,
+            account_asset_line aal
+        WHERE aal.move_id = aml.move_id
+            AND aa.id = aal.asset_id""",
+    )
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    copied_column = openupgrade.get_legacy_name('method_time')
+    if not openupgrade.column_exists(env.cr, 'account_asset', copied_column):
+        # We avoid this migration if `account_asset` was not installed in v11
+        return
+    adjust_asset_values(env)
+    adjust_aml_values(env)
diff --git a/account_asset_management/migrations/12.0.1.0.0/pre-migration.py b/account_asset_management/migrations/12.0.1.0.0/pre-migration.py
new file mode 100644
index 000000000..61ef3ce31
--- /dev/null
+++ b/account_asset_management/migrations/12.0.1.0.0/pre-migration.py
@@ -0,0 +1,65 @@
+# Copyright 2019 Apps2GROW - Henrik Norlin
+# Copyright 2019 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openupgradelib import openupgrade
+
+_model_renames = [
+    ('account.asset.category', 'account.asset.profile'),
+    ('account.asset.depreciation.line', 'account.asset.line'),
+    ('account.asset.asset', 'account.asset'),
+]
+
+_table_renames = [
+    (old.replace('.', '_'), new.replace('.', '_'))
+    for (old, new) in _model_renames
+]
+
+_column_copies = {
+    'account_asset': [
+        ('method_number', None, None),
+        ('method_time', None, None),
+    ],
+    'account_asset_profile': [
+        ('method_number', None, None),
+        ('method_time', None, None),
+    ],
+}
+
+_column_renames = {
+    'account_asset': [
+        ('method_period', None),
+    ],
+    'account_asset_profile': [
+        ('method_period', None),
+    ],
+}
+
+_field_renames = [
+    ('account.asset', 'account_asset', 'category_id', 'profile_id'),
+    ('account.asset', 'account_asset', 'currency_id', 'company_currency_id'),
+    ('account.asset', 'account_asset', 'date', 'date_start'),
+    ('account.asset', 'account_asset', 'value', 'purchase_value'),
+    ('account.asset.line', 'account_asset_line',
+     'depreciation_date', 'line_date'),
+    ('account.asset.profile', 'account_asset_profile',
+     'account_depreciation_expense_id', 'account_expense_depreciation_id'),
+    ('account.invoice.line', 'account_invoice_line',
+     'asset_category_id', 'asset_profile_id'),
+]
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    cr = env.cr
+    if openupgrade.table_exists(cr, 'account_asset_asset'):
+        # `account_asset` module was installed in v11
+        if openupgrade.table_exists(cr, 'account_asset'):
+            # `account_asset_management` module also installed in v11
+            # TODO: Merge in existing tables assets if both module installed
+            pass
+        else:
+            openupgrade.rename_models(cr, _model_renames)
+            openupgrade.rename_tables(cr, _table_renames)
+            openupgrade.copy_columns(cr, _column_copies)
+            openupgrade.rename_columns(cr, _column_renames)
+            openupgrade.rename_fields(env, _field_renames)
diff --git a/account_asset_management/migrations/12.0.1.2.0/post-migration.py b/account_asset_management/migrations/12.0.1.2.0/post-migration.py
deleted file mode 100644
index 6f11df513..000000000
--- a/account_asset_management/migrations/12.0.1.2.0/post-migration.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2019 Apps2GROW - Henrik Norlin
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openupgradelib import openupgrade
-import logging
-logger = logging.getLogger('OpenUpgrade')
-
-
-def create_asset_group(cr):
-    view_to_group = {}
-    cr.execute('''SELECT id, name, parent_id, company_id
-                  FROM account_asset WHERE type = 'view';''')
-    for view in cr.fetchall():
-        sql = '''INSERT INTO account_asset_group (name, parent_id, company_id)
-            VALUES ('%s', %s, %s) returning id;''' % \
-            (view[1], view[2] or 'NULL', view[3])
-        cr.execute(sql)
-        view_id = view[0]
-        group_id = cr.fetchone()[0]
-        view_to_group[view_id] = group_id
-    return view_to_group
-
-
-def update_asset_and_asset_profile(cr, view_to_group):
-    cr.execute('''UPDATE account_asset
-                  SET active = false
-                  WHERE type = 'view';''')
-
-    for view_id, group_id in view_to_group.items():
-        cr.execute('''UPDATE account_asset
-                      SET group_id = %s
-                      WHERE parent_id = %s;''' % (group_id, view_id))
-
-        cr.execute('''UPDATE account_asset_profile
-                      SET group_id = %s
-                      WHERE parent_id = %s;''' % (group_id, view_id))
-
-
-def update_asset(cr):
-    cr.execute('''SELECT a.id,
-                         a.openupgrade_legacy_12_0_method_number,
-                         a.openupgrade_legacy_12_0_method_period,
-                         p.account_analytic_id,
-                         a.company_id
-                    FROM account_asset a
-                    LEFT JOIN account_asset_profile p ON a.profile_id = p.id;
-               ''')
-    for asset in cr.fetchall():
-        no_of_entries = asset[1]
-        months_between_entries = asset[2]
-
-        values = {}
-        # Analytic account
-        values['account_analytic_id'] = asset[3] or 'NULL'
-        # Number of years
-        values['method_number'] = \
-            int(no_of_entries * months_between_entries / 12)
-        # Period: month / quarter / year (default: year)
-        if months_between_entries == 3:
-            values['method_period'] = "'quarter'"
-        elif months_between_entries == 1:
-            values['method_period'] = "'month'"
-
-        vals = ['%s = %s' % (key, value) for key, value in values.items()]
-        sql = "UPDATE account_asset SET %s WHERE id = %s" % \
-              (', '.join(vals), asset[0])
-        logger.debug('update_asset: %s' % sql)
-        cr.execute(sql)
-
-
-def update_asset_profile(cr):
-    cr.execute('''SELECT id,
-                         openupgrade_legacy_12_0_method_number,
-                         openupgrade_legacy_12_0_method_period,
-                         company_id FROM account_asset_profile;''')
-    for profile in cr.fetchall():
-
-        no_of_entries = profile[1]
-        months_between_entries = profile[2]
-
-        values = {}
-        # Number of years
-        values['method_number'] = \
-            int(no_of_entries * months_between_entries / 12)
-        # Period: month / quarter / year (default: year)
-        if months_between_entries == 3:
-            values['method_period'] = "'quarter'"
-        elif months_between_entries == 1:
-            values['method_period'] = "'month'"
-
-        vals = ['{} = {}'.format(key, value) for key, value in values.items()]
-        sql = """UPDATE account_asset_profile
-                 SET %s WHERE id = %s""" % (', '.join(vals), profile[0])
-        logger.debug('update_asset_profile: %s' % sql)
-        cr.execute(sql)
-
-
-def update_move_line(cr):
-    cr.execute("""SELECT l.move_id, l.asset_id, a.profile_id
-        FROM account_asset_line l
-        LEFT JOIN account_asset a ON l.asset_id = a.id
-        WHERE l.move_id IS NOT NULL;""")
-    for line in cr.fetchall():
-        sql = """UPDATE account_move_line
-                 SET asset_id = %s, asset_profile_id = %s
-                 WHERE move_id = %s""" % (line[1], line[2], line[0])
-        logger.debug('update_move_line: %s' % sql)
-        cr.execute(sql)
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    cr = env.cr
-    cr.execute('''SELECT column_name
-                  FROM information_schema.columns
-                  WHERE table_name = 'account_asset'
-                    AND column_name = 'type';''')
-    if cr.fetchone():
-        # migrate from account_asset_management
-        view_to_group = create_asset_group(cr)
-        update_asset_and_asset_profile(cr, view_to_group)
-    else:
-        # migrate from account_asset
-        update_asset(cr)
-        update_asset_profile(cr)
-        update_move_line(cr)
diff --git a/account_asset_management/migrations/12.0.1.2.0/pre-migration.py b/account_asset_management/migrations/12.0.1.2.0/pre-migration.py
deleted file mode 100644
index 56cf936b5..000000000
--- a/account_asset_management/migrations/12.0.1.2.0/pre-migration.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019 Apps2GROW - Henrik Norlin
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openupgradelib import openupgrade
-
-_model_renames1 = [
-    ('account.asset.category', 'account.asset.profile'),
-    ('account.asset.depreciation.line', 'account.asset.line'),
-]
-
-_table_renames1 = [
-    (old.replace('.', '_'), new.replace('.', '_'))
-    for (old, new) in _model_renames1
-]
-
-_model_renames2 = [
-    ('account.asset.asset', 'account.asset'),
-]
-
-_table_renames2 = [
-    (old.replace('.', '_'), new.replace('.', '_'))
-    for (old, new) in _model_renames2
-]
-
-_column_copies = {
-    'account_asset': [
-        ('method_number', None, None),
-        ('method_period', None, None),
-    ],
-    'account_asset_profile': [
-        ('method_number', None, None),
-        ('method_period', None, None),
-    ],
-}
-
-_field_renames = [
-    ('account.asset', 'account_asset', 'category_id', 'profile_id'),
-    ('account.asset', 'account_asset', 'currency_id', 'company_currency_id'),
-    ('account.asset', 'account_asset', 'date', 'date_start'),
-    ('account.asset', 'account_asset', 'value', 'purchase_value'),
-    ('account.asset.line', 'account_asset_line',
-        'depreciation_date', 'line_date'),
-    ('account.asset.profile', 'account_asset_profile',
-        'account_depreciation_expense_id', 'account_expense_depreciation_id'),
-    ('account.invoice.line', 'account_invoice_line',
-        'asset_category_id', 'asset_profile_id'),
-]
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    cr = env.cr
-    cr.execute('''SELECT column_name
-                  FROM information_schema.columns
-                  WHERE table_name = 'account_asset'
-                    AND column_name = 'type';''')
-    if cr.fetchone():
-        # migrate from account_asset_management
-        pass
-    else:
-        # migrate from account_asset
-        openupgrade.rename_models(cr, _model_renames1)
-        openupgrade.rename_tables(cr, _table_renames1)
-        openupgrade.rename_models(cr, _model_renames2)
-        openupgrade.rename_tables(cr, _table_renames2)
-        openupgrade.copy_columns(cr, _column_copies)
-        openupgrade.rename_fields(env, _field_renames)
diff --git a/account_asset_management/migrations/12.0.2.0.0/post-migration.py b/account_asset_management/migrations/12.0.2.0.0/post-migration.py
new file mode 100644
index 000000000..be01f6e8b
--- /dev/null
+++ b/account_asset_management/migrations/12.0.2.0.0/post-migration.py
@@ -0,0 +1,85 @@
+# Copyright 2019 Apps2GROW - Henrik Norlin
+# Copyright 2019 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openupgradelib import openupgrade
+from psycopg2 import sql
+
+
+def create_asset_groups(cr):
+    # Add a supporting column for indicating the source asset view
+    origin_column = sql.Identifier(
+        openupgrade.get_legacy_name('view_asset_id'))
+    openupgrade.logged_query(
+        cr, sql.SQL("ALTER TABLE account_asset_group ADD {} int4").format(
+            origin_column,
+        ),
+    )
+    # Now fill new table recursively attending parents
+    parent_column = sql.Identifier(openupgrade.get_legacy_name('parent_id'))
+    parent_group_ids = ('NULL', )
+    query_sql = sql.SQL("""
+        INSERT INTO account_asset_group (
+            name, code, company_id, parent_id, create_uid,
+            create_date, write_date, write_uid, {origin_column}
+        )
+        SELECT va.name, va.code, va.company_id, aag2.id, va.create_uid,
+            va.create_date, va.write_date, va.write_uid, va.id
+        FROM {table} va
+        LEFT JOIN account_asset_group aag2
+            ON aag2.{origin_column} = va.{parent_column}
+        WHERE {parent_column} {rest_sql}
+        RETURNING id
+    """)
+    isnull = sql.SQL("IS NULL")
+    inids = sql.SQL("IN %(ids)s")
+    while parent_group_ids:
+        query = query_sql.format(
+            origin_column=origin_column,
+            table=sql.Identifier(
+                openupgrade.get_legacy_name('account_asset_view')
+            ),
+            parent_column=parent_column,
+            rest_sql=isnull if parent_group_ids == ('NULL', ) else inids
+        )
+        openupgrade.logged_query(cr, query, {'ids': parent_group_ids})
+        parent_group_ids = tuple(x[0] for x in cr.fetchall())
+
+
+def update_asset_group_links(cr):
+    parent_column = sql.Identifier(openupgrade.get_legacy_name('parent_id'))
+    origin_column = sql.Identifier(
+        openupgrade.get_legacy_name('view_asset_id'))
+    openupgrade.logged_query(
+        cr, sql.SQL("""
+        INSERT INTO account_asset_profile_group_rel
+        (profile_id, group_id)
+        SELECT aap.id, aag.id
+        FROM account_asset_profile aap
+        JOIN account_asset_group aag
+            ON aag.{origin_column} = aap.{parent_column}""").format(
+            parent_column=parent_column,
+            origin_column=origin_column,
+        ),
+    )
+    openupgrade.logged_query(
+        cr, sql.SQL("""
+        INSERT INTO account_asset_group_rel
+        (asset_id, group_id)
+        SELECT aa.id, aag.id
+        FROM account_asset aa
+        JOIN account_asset_group aag
+            ON aag.{origin_column} = aa.{parent_column}""").format(
+            parent_column=parent_column,
+            origin_column=origin_column,
+        ),
+    )
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    column = openupgrade.get_legacy_name('parent_id')
+    if openupgrade.column_exists(env.cr, 'account_asset', column):
+        # if migrating directly from v11 `account_asset` module, there are no
+        # view assets nor parents
+        create_asset_groups(env.cr)
+        update_asset_group_links(env.cr)
diff --git a/account_asset_management/migrations/12.0.2.0.0/pre-migration.py b/account_asset_management/migrations/12.0.2.0.0/pre-migration.py
new file mode 100644
index 000000000..91cbb1593
--- /dev/null
+++ b/account_asset_management/migrations/12.0.2.0.0/pre-migration.py
@@ -0,0 +1,49 @@
+# Copyright 2019 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openupgradelib import openupgrade
+from psycopg2 import sql
+
+
+_column_renames = {
+    'account_asset_profile': [
+        ('parent_id', None),
+    ],
+    'account_asset': [
+        ('parent_id', None),
+    ],
+}
+
+
+def move_view_assets(cr):
+    """Copy view assets to other table for preserving them, but outside of the
+    main table, so remove them from there.
+    """
+    temp_table = sql.Identifier(
+        openupgrade.get_legacy_name('account_asset_view'))
+    openupgrade.logged_query(
+        cr, sql.SQL("""
+        CREATE TABLE {} AS (
+            SELECT * FROM account_asset
+            WHERE type='view'
+        )""").format(temp_table),
+    )
+    openupgrade.logged_query(cr, "DELETE FROM account_asset WHERE type='view'")
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    if openupgrade.column_exists(env.cr, 'account_asset', 'parent_id'):
+        # if migrating directly from v11 `account_asset` module, there are no
+        # view assets nor parents
+        openupgrade.rename_columns(env.cr, _column_renames)
+        openupgrade.logged_query(
+            env.cr, """
+            ALTER TABLE account_asset
+            DROP CONSTRAINT account_asset_parent_id_fkey""",
+        )
+        openupgrade.logged_query(
+            env.cr, """
+            ALTER TABLE account_asset_profile
+            DROP CONSTRAINT account_asset_profile_parent_id_fkey""",
+        )
+        move_view_assets(env.cr)
diff --git a/account_asset_management/models/account_asset.py b/account_asset_management/models/account_asset.py
index 3e15c7c8d..c2ef18192 100644
--- a/account_asset_management/models/account_asset.py
+++ b/account_asset_management/models/account_asset.py
@@ -80,9 +80,12 @@ class AccountAsset(models.Model):
         readonly=True,
         required=True,
         states={'draft': [('readonly', False)]})
-    group_id = fields.Many2one(
+    group_ids = fields.Many2many(
         comodel_name='account.asset.group',
-        string='Asset Group')
+        relation="account_asset_group_rel",
+        column1="asset_id",
+        column2="group_id",
+        string='Asset Groups')
     date_start = fields.Date(
         string='Asset Start Date',
         readonly=True,
@@ -276,6 +279,7 @@ class AccountAsset(models.Model):
                 'method_progress_factor': profile.method_progress_factor,
                 'prorata': profile.prorata,
                 'account_analytic_id': profile.account_analytic_id,
+                'group_ids': profile.group_ids,
             })
 
     @api.onchange('method_time')
diff --git a/account_asset_management/models/account_asset_group.py b/account_asset_management/models/account_asset_group.py
index c331ed919..d05870ce1 100644
--- a/account_asset_management/models/account_asset_group.py
+++ b/account_asset_management/models/account_asset_group.py
@@ -1,4 +1,5 @@
 # Copyright 2009-2018 Noviat
+# Copyright 2019 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
@@ -8,11 +9,15 @@ class AccountAssetGroup(models.Model):
     _name = 'account.asset.group'
     _description = 'Asset Group'
     _order = 'name'
+    _parent_store = True
 
     name = fields.Char(string='Name', size=64, required=True, index=True)
+    code = fields.Char(index=True)
+    parent_path = fields.Char(index=True)
     company_id = fields.Many2one(
         comodel_name='res.company',
-        string='Company', required=True,
+        string='Company',
+        required=True,
         default=lambda self: self._default_company_id())
     parent_id = fields.Many2one(
         comodel_name='account.asset.group',
diff --git a/account_asset_management/models/account_asset_profile.py b/account_asset_management/models/account_asset_profile.py
index 78ad71353..f2f03fa17 100644
--- a/account_asset_management/models/account_asset_profile.py
+++ b/account_asset_management/models/account_asset_profile.py
@@ -47,9 +47,12 @@ class AccountAssetProfile(models.Model):
         comodel_name='res.company',
         string='Company', required=True,
         default=lambda self: self._default_company_id())
-    group_id = fields.Many2one(
+    group_ids = fields.Many2many(
         comodel_name='account.asset.group',
-        string='Asset Group')
+        relation="account_asset_profile_group_rel",
+        column1="profile_id",
+        column2="group_id",
+        string='Asset Groups')
     method = fields.Selection(
         selection=lambda self: self._selection_method(),
         string='Computation Method',
diff --git a/account_asset_management/views/account_asset.xml b/account_asset_management/views/account_asset.xml
index d2566e87e..8c28fe939 100644
--- a/account_asset_management/views/account_asset.xml
+++ b/account_asset_management/views/account_asset.xml
@@ -53,7 +53,7 @@
               <separator string="Other Information" colspan="4"/>
               <group colspan="4" col="4">
                 <field name="profile_id"/>
-                <field name="group_id"/>
+                <field name="group_ids" widget="many2many_tags"/>
                 <field name="partner_id"/>
                 <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
               </group>
diff --git a/account_asset_management/views/account_asset_group.xml b/account_asset_management/views/account_asset_group.xml
index 8515fab14..27cb1e29f 100644
--- a/account_asset_management/views/account_asset_group.xml
+++ b/account_asset_management/views/account_asset_group.xml
@@ -10,6 +10,7 @@
           <group>
             <group>
               <field name="name"/>
+              <field name="code"/>
               <field name="parent_id"/>
               <field name="company_id" widget="selection" groups="base.group_multi_company"/>
             </group>
@@ -22,8 +23,9 @@
       <field name="name">account.asset.group.tree</field>
       <field name="model">account.asset.group</field>
       <field name="arch" type="xml">
-        <tree string="Asset Group">
+        <tree string="Asset Group" editable="bottom">
           <field name="name"/>
+          <field name="code"/>
           <field name="parent_id"/>
           <field name="company_id" groups="base.group_multi_company"/>
         </tree>
@@ -36,6 +38,7 @@
       <field name="arch" type="xml">
         <search string="Search Asset Group">
           <field name="name" string="Asset Group"/>
+          <field name="code" />
           <field name="parent_id"/>
         </search>
       </field>
diff --git a/account_asset_management/views/account_asset_profile.xml b/account_asset_management/views/account_asset_profile.xml
index 18acff623..b6053505b 100644
--- a/account_asset_management/views/account_asset_profile.xml
+++ b/account_asset_management/views/account_asset_profile.xml
@@ -10,7 +10,7 @@
           <group>
             <group>
               <field name="name"/>
-              <field name="group_id"/>
+              <field name="group_ids" widget="many2many_tags"/>
               <field name="asset_product_item"/>
               <field name="active"/>
               <field name="company_id" widget="selection" groups="base.group_multi_company"/>