diff --git a/account_asset_management/README.rst b/account_asset_management/README.rst
index 2a3f303c..51da1743 100644
--- a/account_asset_management/README.rst
+++ b/account_asset_management/README.rst
@@ -14,13 +14,13 @@ Assets Management
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github
- :target: https://github.com/OCA/account-financial-tools/tree/11.0/account_asset_management
+ :target: https://github.com/OCA/account-financial-tools/tree/12.0/account_asset_management
:alt: OCA/account-financial-tools
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
- :target: https://translation.odoo-community.org/projects/account-financial-tools-11-0/account-financial-tools-11-0-account_asset_management
+ :target: https://translation.odoo-community.org/projects/account-financial-tools-12-0/account-financial-tools-12-0-account_asset_management
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
- :target: https://runbot.odoo-community.org/runbot/92/11.0
+ :target: https://runbot.odoo-community.org/runbot/92/12.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -55,13 +55,22 @@ Usage
The module in NOT compatible with the standard account_asset module.
+Changelog
+=========
+
+12.0.1.0.0 (2019-01-13)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [BREAKING] account.asset: parent_path has replaced parent_left & parent_right (TODO: migration script)
+* [BREAKING] account.asset.recompute.trigger: depends on date_range.py (TODO: re-implement in account_fiscal_year.py)
+
Bug Tracker
===========
Bugs are tracked on `GitHub Issues `_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback `_.
+`feedback `_.
Do not contact contributors directly about support or help with technical issues.
@@ -83,6 +92,8 @@ Contributors
- Stéphane Bidoul (Acsone)
- Adrien Peiffer (Acsone)
- Akim Juillerat
+- Henrik Norlin (Apps2GROW)
+- Maxence Groine
Maintainers
~~~~~~~~~~~
@@ -97,6 +108,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
-This module is part of the `OCA/account-financial-tools `_ project on GitHub.
+This module is part of the `OCA/account-financial-tools `_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_asset_management/i18n/account_asset_management.pot b/account_asset_management/i18n/account_asset_management.pot
index 7ffe6ba3..b662b129 100644
--- a/account_asset_management/i18n/account_asset_management.pot
+++ b/account_asset_management/i18n/account_asset_management.pot
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: <>\n"
"Language-Team: \n"
@@ -14,7 +14,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1082
+#: code:addons/account_asset_management/models/account_asset.py:1076
#, python-format
msgid "\n"
"Error while processing asset '%s': %s"
@@ -26,99 +26,94 @@ msgid "Account"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Account Asset"
msgstr ""
#. module: account_asset_management
-#: model:ir.model,name:account_asset_management.model_account_move
-msgid "Account Entry"
-msgstr ""
-
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_active
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_active
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__active
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__active
msgid "Active"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Add an internal note here..."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_compute_date_end
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_compute__date_end
msgid "All depreciation lines prior to this date will be automatically posted"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_amount
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__amount
msgid "Amount"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_depreciated_value
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__depreciated_value
msgid "Amount Already Depreciated"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
msgid "Analytic Information"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_account_analytic_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_account_analytic_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__account_analytic_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__account_analytic_id
msgid "Analytic account"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Are you sure ?"
msgstr ""
#. module: account_asset_management
#: model:ir.model,name:account_asset_management.model_account_asset
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_asset_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_invoice_line_asset_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_move_line_asset_id
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__asset_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_invoice_line__asset_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_move_line__asset_id
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Asset"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/wizard/account_asset_remove.py:193
+#: code:addons/account_asset_management/wizard/account_asset_remove.py:192
#, python-format
msgid "Asset '%s' Removal Journal Entry"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_account_asset_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__account_asset_id
msgid "Asset Account"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Asset Line"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Asset Lines"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__name
msgid "Asset Name"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_account_asset_profile_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_invoice_line_asset_profile_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_move_line_asset_profile_id
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
+#: model:ir.model.fields,field_description:account_asset_management.field_account_account__asset_profile_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_invoice_line__asset_profile_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_move_line__asset_profile_id
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
msgid "Asset Profile"
msgstr ""
@@ -134,18 +129,18 @@ msgid "Asset Removal"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_date_remove
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_date_remove
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__date_remove
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__date_remove
msgid "Asset Removal Date"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_account_sale_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__account_sale_id
msgid "Asset Sale Account"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_date_start
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__date_start
msgid "Asset Start Date"
msgstr ""
@@ -156,13 +151,13 @@ msgstr ""
#. module: account_asset_management
#: model:ir.model,name:account_asset_management.model_account_asset_profile
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_tree
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_tree
msgid "Asset profile"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Asset removal."
msgstr ""
@@ -176,69 +171,69 @@ msgstr ""
#: model:ir.ui.menu,name:account_asset_management.account_asset_menu
#: model:ir.ui.menu,name:account_asset_management.menu_finance_assets
#: model:ir.ui.menu,name:account_asset_management.menu_finance_config_assets
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_tree
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_tree
msgid "Assets"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Assets in Close State"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Assets in Running State"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_res_config_settings_module_account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_res_config_settings__module_account_asset_management
msgid "Assets management (OCA)"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Assets which have been removed"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile_asset_product_item
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile__asset_product_item
msgid "By default during the validation of an invoice, an asset is created by invoice line as long as an accounting entry is created by invoice line. With this setting, an accounting entry will be created by product item. So, there will be an asset by product item."
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_remove_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_remove_view_form
msgid "Cancel"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile_open_asset
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile__open_asset
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
+#: 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
+#: 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"
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
" * Degressive: Calculated on basis of: Residual Value * Degressive Factor * Degressive-Linear (only for Time Method = Year): Degressive becomes linear when the annual linear depreciation exceeds the annual degressive depreciation"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_method_time
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile_method_time
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__method_time
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile__method_time
msgid "Choose the method to use to compute the dates and number of depreciation lines.\n"
" * Number of Years: Specify the number of years for the depreciation.\n"
""
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile_method
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile__method
msgid "Choose the method to use to compute the depreciation lines.\n"
" * Linear: Calculated on basis of: Depreciation Base / Number of Depreciations. Depreciation Base = Purchase Value - Salvage Value.\n"
" * Linear-Limit: Linear up to Salvage Value. Depreciation Base = Purchase Value.\n"
@@ -249,46 +244,46 @@ msgstr ""
#. module: account_asset_management
#: selection:account.asset,state:0
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Close"
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_profile_company_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger_company_id
+#: 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_profile__company_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__company_id
msgid "Company"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_company_currency_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__company_currency_id
msgid "Company Currency"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_invoice_line_asset_id
+#: model:ir.model.fields,help:account_asset_management.field_account_invoice_line__asset_id
msgid "Complete this field when selling an asset in order to facilitate the creation of the asset removal accounting entries via the asset 'Removal' button"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger_date_completed
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__date_completed
msgid "Completion Date"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_method
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_method
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method
msgid "Computation Method"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Compute"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form
msgid "Compute Asset"
msgstr ""
@@ -312,22 +307,27 @@ msgid "Compute Assets result"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
msgid "Compute Assets results"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model:ir.model,name:account_asset_management.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: account_asset_management
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Confirm Asset"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Create Move"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_asset_product_item
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__asset_product_item
msgid "Create an asset by product item"
msgstr ""
@@ -339,43 +339,38 @@ msgid "Created Asset Moves"
msgstr ""
#. module: account_asset_management
-#: 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_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
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_create_uid
+#: 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_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
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__create_uid
msgid "Created by"
msgstr ""
#. module: account_asset_management
-#: 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_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
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_create_date
+#: 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_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
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__create_date
msgid "Created on"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute_date_end
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_line_date
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute__date_end
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__line_date
msgid "Date"
msgstr ""
#. module: account_asset_management
-#: model:ir.model,name:account_asset_management.model_date_range
-msgid "Date Range"
-msgstr ""
-
-#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_recompute_trigger_date_trigger
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_recompute_trigger__date_trigger
msgid "Date of the event triggering the need to recompute the Asset Tables."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_account_asset_profile_id
+#: model:ir.model.fields,help:account_asset_management.field_account_account__asset_profile_id
msgid "Default Asset Profile when creating invoice lines with this account."
msgstr ""
@@ -392,8 +387,8 @@ msgid "Degressive up to Salvage Value"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_method_progress_factor
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_method_progress_factor
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_progress_factor
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_progress_factor
msgid "Degressive Factor"
msgstr ""
@@ -404,24 +399,24 @@ msgid "Degressive-Linear"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:264
+#: code:addons/account_asset_management/models/account_asset.py:261
#: code:addons/account_asset_management/models/account_asset_profile.py:148
#, python-format
msgid "Degressive-Linear is only supported for Time Method = Year."
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Delete Move"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_account_expense_depreciation_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__account_expense_depreciation_id
msgid "Depr. Expense Account"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_value_depreciated
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__value_depreciated
msgid "Depreciated Value"
msgstr ""
@@ -431,56 +426,56 @@ msgid "Depreciation"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_account_depreciation_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__account_depreciation_id
msgid "Depreciation Account"
msgstr ""
#. module: account_asset_management
#: selection:account.asset.line,type:0
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_depreciation_base
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_depreciation_base
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__depreciation_base
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__depreciation_base
msgid "Depreciation Base"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Depreciation Board"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Depreciation Dates"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_move_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__move_id
msgid "Depreciation Entry"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_depreciation_line_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__depreciation_line_ids
msgid "Depreciation Lines"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Depreciation Method"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__name
msgid "Depreciation Name"
msgstr ""
#. module: account_asset_management
-#: 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_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
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_display_name
+#: 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_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
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__display_name
msgid "Display Name"
msgstr ""
@@ -491,33 +486,33 @@ msgstr ""
#. module: account_asset_management
#: selection:account.asset,state:0
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Draft"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Draft Assets"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_method_end
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_end
msgid "Ending Date"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_account_move_line_ids
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__account_move_line_ids
msgid "Entries"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:255
+#: code:addons/account_asset_management/models/account_asset.py:252
#, python-format
msgid "Error ! You can not create recursive assets."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:1085
+#: code:addons/account_asset_management/models/account_asset.py:1079
#, python-format
msgid "Error while processing asset '%s': \n"
"\n"
@@ -525,80 +520,85 @@ msgid "Error while processing asset '%s': \n"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_force_date
+#: model:ir.model,name:account_asset_management.model_account_fiscal_year
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_asset_management
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__force_date
msgid "Force accounting date"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/wizard/account_asset_remove.py:113
+#: code:addons/account_asset_management/wizard/account_asset_remove.py:112
#, python-format
msgid "Gain/Loss on Sale"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "General"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:446
+#: code:addons/account_asset_management/models/account_asset.py:443
#, python-format
msgid "Generate Asset Removal entries"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_remove_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_remove_view_form
msgid "Generate Removal entries"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Group By..."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_move_line_check
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__move_line_check
msgid "Has accounting entries"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "History"
msgstr ""
#. module: account_asset_management
-#: 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_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_5414
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_id
+#: 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_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
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__id
msgid "ID"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:780
+#: code:addons/account_asset_management/models/account_asset.py:770
#, python-format
msgid "Illegal value %s in asset.method."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile_prorata
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile__prorata
msgid "Indicates that the first depreciation entry for this asset has to be done from the depreciation start date instead of the first day of the fiscal year."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_prorata
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__prorata
msgid "Indicates that the first depreciation entry for this asset have to be done from the depreciation start date instead of the first day of the fiscal year."
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Init"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_init_entry
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__init_entry
msgid "Initial Balance Entry"
msgstr ""
@@ -613,62 +613,63 @@ msgid "Invoice Line"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_journal_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__journal_id
msgid "Journal"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:466
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: code:addons/account_asset_management/models/account_asset.py:463
+#: 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
msgid "Journal Entries"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_line.py:246
+#: code:addons/account_asset_management/models/account_asset_line.py:248
#, python-format
msgid "Journal Entry"
msgstr ""
#. module: account_asset_management
#: model:ir.model,name:account_asset_management.model_account_move_line
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Journal Item"
msgstr ""
#. module: account_asset_management
#: model:ir.actions.act_window,name:account_asset_management.act_entries_open
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Journal Items"
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_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
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove___last_update
+#: 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_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
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove____last_update
msgid "Last Modified on"
msgstr ""
#. module: account_asset_management
-#: 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_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
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_write_uid
-#: 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__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_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
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__write_uid
msgid "Last Updated by"
msgstr ""
#. module: account_asset_management
-#: 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_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
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_write_date
-#: 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__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_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
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__write_date
msgid "Last Updated on"
msgstr ""
@@ -685,8 +686,8 @@ msgid "Linear up to Salvage Value"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_account_min_value_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_account_min_value_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__account_min_value_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__account_min_value_id
msgid "Min-Value Account"
msgstr ""
@@ -697,17 +698,17 @@ msgid "Month"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_name
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__name
msgid "Name"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_remaining_value
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__remaining_value
msgid "Next Period Depreciation"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:932
+#: code:addons/account_asset_management/models/account_asset.py:924
#, python-format
msgid "No Fiscal Year defined."
msgstr ""
@@ -718,24 +719,24 @@ msgid "Normal"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_compute_note
-#: 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_profile_note
+#: 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
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__note
msgid "Note"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_note
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_remove_view_form
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__note
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_remove_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Notes"
msgstr ""
#. module: account_asset_management
#: code:addons/account_asset_management/models/account_asset_profile.py:138
-#: 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
+#: 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
msgid "Number of Years"
msgstr ""
@@ -746,72 +747,67 @@ msgid "Open"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
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
+#: 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"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_parent_left
-msgid "Parent Left"
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__parent_path
+msgid "Parent Path"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_parent_right
-msgid "Parent Right"
-msgstr ""
-
-#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_partner_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__partner_id
msgid "Partner"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_method_period
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_method_period
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_period
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_period
msgid "Period Length"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_method_period
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile_method_period
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__method_period
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile__method_period
msgid "Period length for the depreciation accounting entries"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_account_plus_value_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_account_plus_value_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__account_plus_value_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__account_plus_value_id
msgid "Plus-Value Account"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_move_check
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__move_check
msgid "Posted"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_previous_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__previous_id
msgid "Previous Depreciation Line"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Profile"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_prorata
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_prorata
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__prorata
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__prorata
msgid "Prorata Temporis"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_purchase_value
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__purchase_value
msgid "Purchase Value"
msgstr ""
@@ -822,120 +818,120 @@ msgid "Quarter"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger_reason
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__reason
msgid "Reason"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_code
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__code
msgid "Reference"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_posting_regime
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__posting_regime
msgid "Removal Entry Policy"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_remove_posting_regime
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_remove__posting_regime
msgid "Removal Entry Policy \n"
" * Residual Value: The non-depreciated value will be posted on the 'Residual Value Account' \n"
" * Gain/Loss on Sale: The Gain or Loss will be posted on the 'Plus-Value Account' or 'Min-Value Account' "
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_remove_date_remove
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_remove__date_remove
msgid "Removal date must be after the last posted entry in case of early removal"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Remove"
msgstr ""
#. module: account_asset_management
#: model:ir.model,name:account_asset_management.model_account_asset_remove
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_remove_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_remove_view_form
msgid "Remove Asset"
msgstr ""
#. module: account_asset_management
#: selection:account.asset,state:0
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Removed"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/wizard/account_asset_remove.py:112
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_value_residual
+#: code:addons/account_asset_management/wizard/account_asset_remove.py:111
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__value_residual
#, python-format
msgid "Residual Value"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_account_residual_value_id
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_account_residual_value_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__account_residual_value_id
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__account_residual_value_id
msgid "Residual Value Account"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
msgid "Results :"
msgstr ""
#. module: account_asset_management
#: selection:account.asset,state:0
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
msgid "Running"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove_sale_value
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_remove__sale_value
msgid "Sale Value"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_salvage_value
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__salvage_value
msgid "Salvage Value"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_profile_view_search
msgid "Search Asset Profile"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_line_init_entry
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_line__init_entry
msgid "Set this flag for entries of previous fiscal years for which Odoo has not generated accounting entries."
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Set to Draft"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_open_asset
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__open_asset
msgid "Skip Draft State"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger_state
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__state
msgid "State"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_parent_state
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line__parent_state
msgid "State of Asset"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_state
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__state
msgid "Status"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:753
+#: code:addons/account_asset_management/models/account_asset.py:743
#, python-format
msgid "The '_compute_year_amount' method is only intended for Time Method 'Number of Years."
msgstr ""
@@ -947,43 +943,43 @@ msgid "The Asset Account defined in the Asset Profile must be equal to the accou
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/wizard/account_asset_remove.py:63
+#: code:addons/account_asset_management/wizard/account_asset_remove.py:62
#, python-format
msgid "The Sale Value must be positive!"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:274
+#: code:addons/account_asset_management/models/account_asset.py:271
#, 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:540
+#: code:addons/account_asset_management/models/account_asset.py:535
#, python-format
msgid "The duration of the asset conflicts with the posted depreciation table entry dates."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_salvage_value
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__salvage_value
msgid "The estimated value that an asset will realize upon its sale at the end of its useful life.\n"
"This value is used to determine the depreciation amounts."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_method_number
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile_method_number
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__method_number
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_profile__method_number
msgid "The number of years needed to depreciate your asset"
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/wizard/account_asset_remove.py:156
+#: code:addons/account_asset_management/wizard/account_asset_remove.py:155
#, python-format
msgid "The removal date must be after the last depreciation date."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_res_config_settings_module_account_asset_management
+#: model:ir.model.fields,help:account_asset_management.field_res_config_settings__module_account_asset_management
msgid "This allows you to manage the assets owned by a company\n"
" or a person. It keeps track of the depreciation occurred\n"
" on those assets, and creates account move for those\n"
@@ -992,49 +988,49 @@ msgid "This allows you to manage the assets owned by a company\n"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_depreciation_base
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_line_depreciation_base
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__depreciation_base
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_line__depreciation_base
msgid "This amount represent the depreciation base of the asset (Purchase Value - Salvage Value."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_purchase_value
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__purchase_value
msgid "This amount represent the initial value of the asset.\n"
"The Depreciation Base is calculated as follows:\n"
"Purchase Value - Salvage Value."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_move.py:135
+#: code:addons/account_asset_management/models/account_move.py:139
#, python-format
msgid "This option should only be used for a single id at a time."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_method_time
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile_method_time
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset__method_time
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_profile__method_time
msgid "Time Method"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Total Credit"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "Total Debit"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger_date_trigger
+#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_recompute_trigger__date_trigger
msgid "Trigger Date"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_line_type
-#: model:ir.model.fields,field_description:account_asset_management.field_account_asset_type
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_search
+#: 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 ""
@@ -1044,18 +1040,18 @@ msgid "View"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_compute_view_form_result
msgid "View Asset Moves"
msgstr ""
#. module: account_asset_management
-#: model:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
+#: model_terms:ir.ui.view,arch_db:account_asset_management.account_asset_view_form
msgid "View Move"
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_line_parent_state
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_state
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__state
+#: model:ir.model.fields,help:account_asset_management.field_account_asset_line__parent_state
msgid "When an asset is created, the status is 'Draft'.\n"
"If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted to the accounting.\n"
"If the last depreciation line is posted, the asset goes into the 'Close' status.\n"
@@ -1070,14 +1066,14 @@ msgstr ""
#. module: account_asset_management
#: code:addons/account_asset_management/models/account_move.py:69
-#: code:addons/account_asset_management/models/account_move.py:130
+#: code:addons/account_asset_management/models/account_move.py:134
#, python-format
msgid "You are not allowed to link an accounting entry to an asset.\n"
"You should generate such entries from the asset."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_line.py:116
+#: code:addons/account_asset_management/models/account_asset_line.py:117
#: code:addons/account_asset_management/models/account_move.py:32
#, python-format
msgid "You are not allowed to remove an accounting entry linked to an asset.\n"
@@ -1085,19 +1081,19 @@ 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:384
+#: code:addons/account_asset_management/models/account_asset.py:381
#, python-format
msgid "You can only delete assets in draft state."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/wizard/account_asset_remove.py:229
+#: code:addons/account_asset_management/wizard/account_asset_remove.py:228
#, python-format
msgid "You can't make an early removal if all the depreciation lines for previous periods are not posted."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_line.py:124
+#: code:addons/account_asset_management/models/account_asset_line.py:125
#, python-format
msgid "You cannot change a depreciation line with an associated accounting entry."
msgstr ""
@@ -1109,67 +1105,62 @@ msgid "You cannot change an accounting entry linked to an asset depreciation lin
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_move.py:126
+#: code:addons/account_asset_management/models/account_move.py:130
#, python-format
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:297
+#: code:addons/account_asset_management/models/account_asset.py:294
#, python-format
msgid "You cannot change the profile of an asset with accounting entries."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset.py:940
+#: code:addons/account_asset_management/models/account_asset.py:931
#, python-format
msgid "You cannot compute a depreciation table for an asset starting in an undefined future fiscal year.\n"
"Please correct the start date for asset '%s'."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_line.py:164
+#: code:addons/account_asset_management/models/account_asset_line.py:166
#, python-format
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:388
+#: code:addons/account_asset_management/models/account_asset.py:385
#, python-format
msgid "You cannot delete an asset that contains posted depreciation lines."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_line.py:160
+#: code:addons/account_asset_management/models/account_asset_line.py:162
#, python-format
msgid "You cannot remove an asset line of type 'Depreciation Base'."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_line.py:132
+#: code:addons/account_asset_management/models/account_asset_line.py:133
#, python-format
msgid "You cannot set the 'Initial Balance Entry' flag on a depreciation line with prior posted entries."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_line.py:144
+#: code:addons/account_asset_management/models/account_asset_line.py:145
#, python-format
msgid "You cannot set the Asset Start Date after already posted entries."
msgstr ""
#. module: account_asset_management
-#: code:addons/account_asset_management/models/account_asset_line.py:151
+#: code:addons/account_asset_management/models/account_asset_line.py:153
#, python-format
msgid "You cannot set the date on a depreciation line prior to already posted entries."
msgstr ""
#. module: account_asset_management
-#: model:ir.model.fields,help:account_asset_management.field_account_asset_date_start
+#: model:ir.model.fields,help:account_asset_management.field_account_asset__date_start
msgid "You should manually add depreciation lines with the depreciations of previous fiscal years if the Depreciation Start Date is different from the date for which accounting entries need to be generated."
msgstr ""
-#. module: account_asset_management
-#: model:ir.model,name:account_asset_management.model_res_config_settings
-msgid "res.config.settings"
-msgstr ""
-
diff --git a/account_asset_management/models/__init__.py b/account_asset_management/models/__init__.py
index 85eb8750..1c667445 100644
--- a/account_asset_management/models/__init__.py
+++ b/account_asset_management/models/__init__.py
@@ -3,7 +3,7 @@ from . import account_asset
from . import account_asset_profile
from . import account_asset_line
from . import account_asset_recompute_trigger
+from . import account_fiscal_year
from . import account_invoice
from . import account_move
-#from . import date_range
from . import res_config_settings
diff --git a/account_asset_management/models/account_asset.py b/account_asset_management/models/account_asset.py
index 65b73a19..f99eee2c 100644
--- a/account_asset_management/models/account_asset.py
+++ b/account_asset_management/models/account_asset.py
@@ -193,9 +193,7 @@ class AccountAsset(models.Model):
store=True, readonly=True)
account_analytic_id = fields.Many2one(
comodel_name='account.analytic.account',
- string='Analytic account',
- domain=[('type', '!=', 'view'),
- ('state', 'not in', ('close', 'cancelled'))])
+ string='Analytic account')
@api.model
def _default_company_id(self):
diff --git a/account_asset_management/models/account_fiscal_year.py b/account_asset_management/models/account_fiscal_year.py
new file mode 100644
index 00000000..764bf759
--- /dev/null
+++ b/account_asset_management/models/account_fiscal_year.py
@@ -0,0 +1,49 @@
+# Copyright 2009-2017 Noviat
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import logging
+import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+from odoo import api, models
+from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
+
+_logger = logging.getLogger(__name__)
+
+
+class AccountFiscalYear(models.Model):
+ _inherit = 'account.fiscal.year'
+
+ @api.model
+ def create(self, vals):
+ date_from = datetime.strptime(vals.get('date_from'), '%Y-%m-%d')
+ date_to = datetime.strptime(vals.get('date_to'), '%Y-%m-%d')
+ if not date_to == date_from + relativedelta(years=1, days=-1):
+ recompute_vals = {
+ 'reason': 'creation of fiscalyear %s' % vals.get('name'),
+ 'company_id':
+ vals.get('company_id') or
+ self.env.user.company_id.id,
+ 'date_trigger': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+ 'state': 'open',
+ }
+ self.env['account.asset.recompute.trigger'].sudo().create(
+ recompute_vals)
+ return super().create(vals)
+
+ @api.multi
+ def write(self, vals):
+ if vals.get('date_from') or vals.get('date_to'):
+ for fy in self:
+ recompute_vals = {
+ 'reason':
+ 'duration change of fiscalyear %s' % fy.name,
+ 'company_id': fy.company_id.id,
+ 'date_trigger':
+ time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+ 'state': 'open',
+ }
+ self.env['account.asset.recompute.trigger'].sudo().\
+ create(recompute_vals)
+ return super().write(vals)
diff --git a/account_asset_management/models/date_range.py b/account_asset_management/models/date_range.py
deleted file mode 100644
index faf21a31..00000000
--- a/account_asset_management/models/date_range.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2009-2017 Noviat
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-import time
-
-from odoo import api, models
-from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
-
-
-class DateRange(models.Model):
- _inherit = 'date.range'
-
- @api.model
- def create(self, vals):
- # TODO:
- # change logic to avoid table recompute overhead
- # when a regular (duration = 1 year) new FY is created
- fy_types = self.env['date.range.type'].search(
- [('fiscal_year', '=', True)])
- if vals.get('type_id') in fy_types._ids:
- recompute_vals = {
- 'reason': 'creation of fiscalyear %s' % vals.get('code'),
- 'company_id':
- vals.get('company_id') or
- self.env.user.company_id.id,
- 'date_trigger': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
- 'state': 'open',
- }
- self.env['account.asset.recompute.trigger'].sudo().create(
- recompute_vals)
- return super().create(vals)
-
- @api.multi
- def write(self, vals):
- fy_types = self.env['date.range.type'].search(
- [('fiscal_year', '=', True)])
- if vals.get('type_id') in fy_types.ids:
- if vals.get('date_start') or vals.get('date_end'):
- for fy in self:
- recompute_vals = {
- 'reason':
- 'duration change of fiscalyear %s' % fy.name,
- 'company_id': fy.company_id.id,
- 'date_trigger':
- time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
- 'state': 'open',
- }
- self.env['account.asset.recompute.trigger'].sudo().\
- create(recompute_vals)
- return super().write(vals)
diff --git a/account_asset_management/static/description/index.html b/account_asset_management/static/description/index.html
index b189e935..02e2eba1 100644
--- a/account_asset_management/static/description/index.html
+++ b/account_asset_management/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-
+
This Module manages the assets owned by a company. It will keep
track of depreciation’s occurred on those assets. And it allows to create
accounting entries from the depreciation lines.
@@ -380,44 +380,58 @@ the standard account_asset module from Odoo.
Table of contents
-
+
It is recommended to configure your Purchase Journal with “Group Invoice Lines” to avoid the
creation of separate assets per Supplier Invoice Line.
-
+
The module in NOT compatible with the standard account_asset module.
+
+
+
+
+
+- [BREAKING] account.asset: parent_path has replaced parent_left & parent_right (TODO: migration script)
+- [BREAKING] account.asset.recompute.trigger: depends on date_range.py (TODO: re-implement in account_fiscal_year.py)
+
+
+
-
+
Bugs are tracked on GitHub Issues.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
-feedback.
+
feedback.
Do not contact contributors directly about support or help with technical issues.
-
+
-
+
- OpenERP SA
- Luc De Meyer (Noviat)
@@ -426,16 +440,18 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
- Stéphane Bidoul (Acsone)
- Adrien Peiffer (Acsone)
- Akim Juillerat <akim.juillerat@camptocamp.com>
+- Henrik Norlin (Apps2GROW)
+- Maxence Groine <mgroine@fiefmanage.ch>
-
+
This module is maintained by the OCA.
OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
-
This module is part of the OCA/account-financial-tools project on GitHub.
+
This module is part of the OCA/account-financial-tools project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.