[IMP] Chaneg dependency, .pot file, screenshot, last line posted in sell and Depreciation Summary Report

addons/account_asset/__manifest__.py

@@ -4,7 +4,7 @@
 {
     'name': 'Assets Management',
     'author': 'Odoo S.A',
-    'depends': ['account'],
+    'depends': ['account_invoicing'],
     'description': """
 Assets management
 =================

addons/account_asset/i18n/account_asset.pot

@@ -1,13 +1,13 @@
-# Translation of Odoo Server.
+# Translation of Flectra Server.
 # This file contains the translation of the following modules:
 #	* account_asset
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Flectra Server 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 13:11+0000\n"
+"POT-Creation-Date: 2018-08-02 07:12+0000\n"
-"PO-Revision-Date: 2017-11-30 13:11+0000\n"
+"PO-Revision-Date: 2018-08-02 07:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:404
+#: code:addons/account_asset/models/account_asset.py:496
 #, python-format
 msgid " (copy)"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:540
+#: code:addons/account_asset/models/account_asset.py:651
 #, python-format
 msgid " (grouped)"
 msgstr ""
@@ -42,6 +42,16 @@ msgstr ""
 msgid "# of Installment Lines"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
+msgid "<strong>End Date:</strong>"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
+msgid "<strong>Start Date:</strong>"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.actions.server,name:account_asset.account_asset_cron_ir_actions_server
 #: model:ir.cron,cron_name:account_asset.account_asset_cron
@@ -75,7 +85,7 @@ msgid "Account used to record the purchase of the asset at its original price."
 msgstr ""
 
 #. module: account_asset
-#. openerp-web
+#. flectra-web
 #: code:addons/account_asset/static/src/js/account_asset.js:52
 #, python-format
 msgid "Accounting entries waiting for manual verification"
@@ -87,13 +97,18 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
+msgid "Additional"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
 msgid "Additional Options"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:597
+#: code:addons/account_asset/models/account_asset.py:708
 #, python-format
 msgid "Amount"
 msgstr ""
@@ -115,7 +130,14 @@ msgstr ""
 
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_asset_id
+#: model:ir.model.fields,field_description:account_asset.field_account_invoice_asset_bool
+#: model:ir.model.fields,field_description:account_asset.field_account_invoice_asset_id
+#: model:ir.model.fields,field_description:account_asset.field_account_invoice_line_asset_bool
+#: model:ir.model.fields,field_description:account_asset.field_account_invoice_line_asset_id
+#: model:ir.model.fields,field_description:account_asset.field_account_move_asset_id
+#: model:ir.model.fields,field_description:account_asset.field_account_move_line_asset_id
 #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_asset_id
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_asset_id
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
 #: model:ir.ui.view,arch_db:account_asset.view_asset_asset_report_search
@@ -129,12 +151,45 @@ msgid "Asset Account"
 msgstr ""
 
 #. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal_purchase
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal_purchase
+#: model:ir.ui.view,arch_db:account_asset.res_config_settings_view_form
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
+msgid "Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_name
 #: model:ir.model.fields,field_description:account_asset.field_account_invoice_line_asset_category_id
+#: model:ir.model.fields,field_description:account_asset.field_product_product_asset_category_id
+#: model:ir.model.fields,field_description:account_asset.field_product_template_asset_category_id
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_asset_category_id
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
 #: model:ir.ui.view,arch_db:account_asset.view_asset_asset_report_search
 #: model:ir.ui.view,arch_db:account_asset.view_invoice_asset_category
 msgid "Asset Category"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
+msgid "Asset Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.report,name:account_asset.asset_depreciation_report
+msgid "Asset Depreciation Report"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.ui.menu,name:account_asset.asset_depreciation_summary_report_menu
+msgid "Asset Depreciation Summary"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.asset_depreciation_summary_report_action
+msgid "Asset Depreciation Summary Report"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.ui.view,arch_db:account_asset.asset_modify_form
 msgid "Asset Durations to Modify"
@@ -145,6 +200,11 @@ msgstr ""
 msgid "Asset End Date"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_asset_ids
+msgid "Asset Line"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_asset_method_time
 msgid "Asset Method Time"
@@ -152,6 +212,7 @@ msgstr ""
 
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_name
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
 msgid "Asset Name"
 msgstr ""
 
@@ -160,21 +221,6 @@ msgstr ""
 msgid "Asset Start Date"
 msgstr ""
 
-#. module: account_asset
-#: model:ir.model.fields,field_description:account_asset.field_account_asset_category_name
-#: model:ir.model.fields,field_description:account_asset.field_product_product_asset_category_id
-#: model:ir.model.fields,field_description:account_asset.field_product_template_asset_category_id
-#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
-msgid "Asset Type"
-msgstr ""
-
-#. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal_purchase
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal_purchase
-#: model:ir.ui.view,arch_db:account_asset.res_config_settings_view_form
-msgid "Asset Types"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_category
 #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_asset_category_id
@@ -184,7 +230,7 @@ msgid "Asset category"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:286
+#: code:addons/account_asset/models/account_asset.py:378
 #, python-format
 msgid "Asset created"
 msgstr ""
@@ -195,7 +241,7 @@ msgid "Asset depreciation line"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:318
+#: code:addons/account_asset/models/account_asset.py:410
 #, python-format
 msgid "Asset sold or disposed. Accounting entry awaiting for validation."
 msgstr ""
@@ -209,6 +255,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
 #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_purchase_tree
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_search
 msgid "Assets"
@@ -259,15 +306,27 @@ msgid "Auto-confirm Assets"
 msgstr ""
 
 #. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_begin_value
+msgid "Beginning Value"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_summary_report_form_view
 #: model:ir.ui.view,arch_db:account_asset.asset_modify_form
+#: model:ir.ui.view,arch_db:account_asset.asset_sale_form_view
 #: model:ir.ui.view,arch_db:account_asset.view_asset_depreciation_confirmation_wizard
 msgid "Cancel"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
+msgid "Cancel Entry"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_category_id
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_search
-#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
 msgid "Category"
 msgstr ""
 
@@ -296,6 +355,12 @@ msgstr ""
 
 #. module: account_asset
 #: model:ir.model.fields,help:account_asset.field_account_asset_asset_method_time
+msgid "Choose the method to use to compute the dates and number of depreciation lines.\n"
+"  * Number of Depreciation lines: Fix the number of depreciation lines and the time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
 #: model:ir.model.fields,help:account_asset.field_account_asset_category_method_time
 msgid "Choose the method to use to compute the dates and number of entries.\n"
 "  * Number of Entries: Fix the number of entries and the time between 2 depreciations.\n"
@@ -318,6 +383,11 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
+msgid "Closing Balance"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_company_id
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_company_id
@@ -343,6 +413,7 @@ msgid "Compute Depreciation"
 msgstr ""
 
 #. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_sale_form_view
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
 msgid "Confirm"
 msgstr ""
@@ -364,7 +435,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_create_uid
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_create_uid
 #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_create_uid
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard_create_uid
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_create_uid
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_create_uid
 msgid "Created by"
 msgstr ""
 
@@ -373,7 +446,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_create_date
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_create_date
 #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_create_date
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard_create_date
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_create_date
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_create_date
 msgid "Created on"
 msgstr ""
 
@@ -383,7 +458,7 @@ msgid "Cumulative Depreciation"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:597
+#: code:addons/account_asset/models/account_asset.py:708
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_currency_id
 #, python-format
 msgid "Currency"
@@ -399,9 +474,20 @@ msgstr ""
 msgid "Current Depreciation"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_partner_id
+msgid "Customer"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
+msgid "Customer Invoice"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_date
 #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_date
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_sale_date
 msgid "Date"
 msgstr ""
 
@@ -451,6 +537,17 @@ msgstr ""
 
 #. module: account_asset
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
+msgid "Dep. Entries"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_depreciated_amount
+msgid "Depreciated Amount"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
 msgid "Depreciation"
 msgstr ""
 
@@ -513,7 +610,7 @@ msgid "Depreciation board modified"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:600
+#: code:addons/account_asset/models/account_asset.py:711
 #, python-format
 msgid "Depreciation line posted."
 msgstr ""
@@ -524,24 +621,27 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_display_name
 #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_display_name
 #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_display_name
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard_display_name
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_display_name
+#: model:ir.model.fields,field_description:account_asset.field_report_account_asset_asset_depreciation_template_display_name
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:327
+#: code:addons/account_asset/models/account_asset.py:419
 #, python-format
 msgid "Disposal Move"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:330
+#: code:addons/account_asset/models/account_asset.py:422
 #, python-format
 msgid "Disposal Moves"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:579
+#: code:addons/account_asset/models/account_asset.py:690
 #, python-format
 msgid "Document closed."
 msgstr ""
@@ -553,6 +653,11 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard_end_date
+msgid "End Date"
+msgstr ""
+
 #. module: account_asset
 #: selection:account.asset.asset,method_time:0
 #: selection:account.asset.category,method_time:0
@@ -571,6 +676,24 @@ msgstr ""
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: account_asset
+#: selection:account.asset.asset,prorata:0
+#: selection:account.asset.category,prorata:0
+msgid "First of January"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,prorata:0
+#: selection:account.asset.category,prorata:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,prorata:0
+#: selection:account.asset.category,prorata:0
+msgid "From the Purchase Date"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
 msgid "From this report, you can have an overview on all depreciations. The\n"
@@ -624,22 +747,28 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_id
 #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_id
 #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_id
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard_id
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_id
+#: model:ir.model.fields,field_description:account_asset.field_report_account_asset_asset_depreciation_template_id
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_id
 msgid "ID"
 msgstr ""
 
 #. module: account_asset
-#: model:ir.model.fields,help:account_asset.field_account_asset_asset_prorata
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
-msgid "Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first January / Start date of fiscal year"
+msgid "Inactive"
 msgstr ""
 
 #. module: account_asset
+#: model:ir.model.fields,help:account_asset.field_account_asset_asset_prorata
 #: model:ir.model.fields,help:account_asset.field_account_asset_category_prorata
-msgid "Indicates that the first depreciation entry for this asset have to be done from the purchase date instead of the first of January"
+msgid "Indicates that the first depreciation entry for this asset have to be done from the purchase date or first of January or fiscal year"
 msgstr ""
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_customer_invoice_count
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_invoice_count
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_invoice_id
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
 msgid "Invoice"
@@ -650,35 +779,45 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: account_asset
+#: code:addons/account_asset/wizard/sale_asset_wizard.py:178
+#, python-format
+msgid "Invoices"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,help:account_asset.field_account_asset_asset_salvage_value
 msgid "It is the amount you plan to have that you cannot depreciate."
 msgstr ""
 
-#. module: account_asset
-#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
-msgid "Items"
-msgstr ""
-
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_journal_id
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
 msgid "Journal"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:438
+#: code:addons/account_asset/models/account_asset.py:530
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
 #, python-format
 msgid "Journal Entries"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset___last_update
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category___last_update
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line___last_update
 #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report___last_update
 #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard___last_update
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard___last_update
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify___last_update
+#: model:ir.model.fields,field_description:account_asset.field_report_account_asset_asset_depreciation_template___last_update
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard___last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -687,7 +826,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_write_uid
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_write_uid
 #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_write_uid
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard_write_uid
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_write_uid
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_write_uid
 msgid "Last Updated by"
 msgstr ""
 
@@ -696,7 +837,9 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_write_date
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_write_date
 #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_write_date
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard_write_date
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_write_date
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -743,12 +886,19 @@ msgstr ""
 msgid "Next Period Depreciation"
 msgstr ""
 
+#. module: account_asset
+#: code:addons/account_asset/report/asset_depreciation_report.py:30
+#, python-format
+msgid "No Depreciation Lines in this fiscal year.."
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_note
 msgid "Note"
 msgstr ""
 
 #. module: account_asset
+#: selection:account.asset.category,method_time:0
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_method_number
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_method_number
 #: model:ir.model.fields,field_description:account_asset.field_asset_modify_method_number
@@ -757,8 +907,6 @@ msgstr ""
 
 #. module: account_asset
 #: selection:account.asset.asset,method_time:0
-#: selection:account.asset.category,method_time:0
-#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
 msgid "Number of Entries"
 msgstr ""
 
@@ -773,9 +921,20 @@ msgid "One Entry Every"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:599
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
+msgid "Opening"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
+msgid "Other Information"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/models/account_asset.py:710
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_partner_id
 #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_partner_id
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
 #, python-format
 msgid "Partner"
 msgstr ""
@@ -797,7 +956,7 @@ msgid "Post Depreciation Lines"
 msgstr ""
 
 #. module: account_asset
-#. openerp-web
+#. flectra-web
 #: code:addons/account_asset/static/src/js/account_asset.js:49
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_posted_check
 #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_move_check
@@ -816,6 +975,18 @@ msgstr ""
 msgid "Posted depreciation lines"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_summary_report_form_view
+msgid "Print"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_product_id
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_product_id
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
+msgid "Product"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_product_template
 msgid "Product Template"
@@ -824,11 +995,11 @@ msgstr ""
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_prorata
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_prorata
-msgid "Prorata Temporis"
+msgid "Prorata"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:370
+#: code:addons/account_asset/models/account_asset.py:462
 #, python-format
 msgid "Prorata temporis can be applied only for time method \"number of depreciations\"."
 msgstr ""
@@ -868,6 +1039,11 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_remaining_asset_value
+msgid "Remaining Asset Value"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
 msgid "Residual"
@@ -885,6 +1061,38 @@ msgstr ""
 msgid "Running"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_product_id
+msgid "SID"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.asset_sale_action
+msgid "Sale"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_sale_date
+msgid "Sale Date"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_sale_asset_wizard_sale_value
+msgid "Sale Value"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/sale_asset_wizard.py:71
+#, python-format
+msgid "Sale date must be greater than Date of Asset!"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/sale_asset_wizard.py:68
+#, python-format
+msgid "Sale date must be greater than last Depreciated date!"
+msgstr ""
+
 #. module: account_asset
 #: selection:account.asset.category,type:0
 msgid "Sale: Revenue Recognition"
@@ -920,6 +1128,16 @@ msgstr ""
 msgid "Set to Draft"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_wizard_start_date
+msgid "Start Date"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_search
+msgid "State"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,help:account_asset.field_account_asset_category_method_period
 msgid "State here the time between 2 depreciations, in months"
@@ -948,17 +1166,11 @@ msgid "The number of depreciations needed to depreciate your asset"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_invoice.py:62
+#: code:addons/account_asset/models/account_invoice.py:68
 #, python-format
 msgid "The number of depreciations or the period length of your asset category cannot be null."
 msgstr ""
 
-#. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:482
-#, python-format
-msgid "This depreciation is already linked to a journal entry! Please post or delete it."
-msgstr ""
-
 #. module: account_asset
 #: model:ir.ui.view,arch_db:account_asset.view_asset_depreciation_confirmation_wizard
 msgid "This wizard will post installment/depreciation lines for the selected month.<br/>\n"
@@ -977,6 +1189,11 @@ msgstr ""
 msgid "Time Method Based On"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.asset_depreciation_template
+msgid "Total"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_type
 #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_type
@@ -985,7 +1202,7 @@ msgid "Type"
 msgstr ""
 
 #. module: account_asset
-#. openerp-web
+#. flectra-web
 #: code:addons/account_asset/static/src/js/account_asset.js:55
 #, python-format
 msgid "Unposted"
@@ -1002,6 +1219,11 @@ msgstr ""
 msgid "Vendor"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form
+msgid "Vendor Invoice"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.model.fields,help:account_asset.field_account_asset_asset_state
 #: model:ir.model.fields,help:account_asset.field_account_asset_depreciation_line_parent_state
@@ -1016,25 +1238,25 @@ msgid "Year"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:111
+#: code:addons/account_asset/models/account_asset.py:185
 #, python-format
 msgid "You cannot delete a document is in %s state."
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:114
+#: code:addons/account_asset/models/account_asset.py:188
 #, python-format
 msgid "You cannot delete a document that contains posted entries."
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:608
+#: code:addons/account_asset/models/account_asset.py:719
 #, python-format
 msgid "You cannot delete posted depreciation lines."
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/models/account_asset.py:610
+#: code:addons/account_asset/models/account_asset.py:721
 #, python-format
 msgid "You cannot delete posted installment lines."
 msgstr ""
@@ -1044,6 +1266,11 @@ msgstr ""
 msgid "asset.depreciation.confirmation.wizard"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_wizard
+msgid "asset.depreciation.wizard"
+msgstr ""
+
 #. module: account_asset
 #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form
 msgid "e.g. Computers"
@@ -1060,3 +1287,13 @@ msgstr ""
 msgid "months"
 msgstr ""
 
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_report_account_asset_asset_depreciation_template
+msgid "report.account_asset.asset_depreciation_template"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_sale_asset_wizard
+msgid "sale.asset.wizard"
+msgstr ""
+

addons/account_asset/models/account_asset.py

@@ -16,7 +16,7 @@ class AccountAssetCategory(models.Model):
     _description = 'Asset category'
 
     active = fields.Boolean(default=True)
-    name = fields.Char(required=True, index=True, string="Asset Type")
+    name = fields.Char(required=True, index=True, string="Asset Category")
     account_analytic_id = fields.Many2one('account.analytic.account', string='Analytic Account')
     account_asset_id = fields.Many2one('account.account', string='Asset Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)], help="Account used to record the purchase of the asset at its original price.")
     account_depreciation_id = fields.Many2one('account.account', string='Depreciation Entries: Asset Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)], help="Account used in the depreciation entries, to decrease the asset value.")

addons/account_asset/models/product.py

@@ -7,7 +7,7 @@ from flectra import api, fields, models
 class ProductTemplate(models.Model):
     _inherit = 'product.template'
 
-    asset_category_id = fields.Many2one('account.asset.category', string='Asset Type', company_dependent=True, ondelete="restrict")
+    asset_category_id = fields.Many2one('account.asset.category', string='Asset Category', company_dependent=True, ondelete="restrict")
     deferred_revenue_category_id = fields.Many2one('account.asset.category', string='Deferred Revenue Type', company_dependent=True, ondelete="restrict")
 
     @api.multi

addons/account_asset/report/asset_depreciation_report.py

@@ -40,9 +40,9 @@ class AssetDepreciation(models.AbstractModel):
                         or line_id.sequence == 1:
                     open_asset = 0.0
                     open_dep = 0.0
-                    add_asset = line_id.asset_id.value_residual
+                    add_asset = line_id.begin_value
                 else:
-                    open_asset = line_id.asset_id.value_residual
+                    open_asset = line_id.begin_value
                     add_asset = 0.00
                     open_dep = line_id.depreciated_value - line_id.amount
                 add_dep = line_id.amount
@@ -67,10 +67,10 @@ class AssetDepreciation(models.AbstractModel):
                 if depre_date.year == purchase_date.year \
                         or line_id.sequence == 1:
                     open_asset = 0.0
-                    add_asset = line_id.asset_id.value_residual
+                    add_asset = line_id.begin_value
                     open_dep = 0.0
                 else:
-                    open_asset = line_id.asset_id.value_residual
+                    open_asset = line_id.begin_value
                     add_asset = 0.00
                     open_dep = line_id.depreciated_value - line_id.amount
                 if line_id.asset_id.sale_date \

addons/account_asset/static/description/index.html

@@ -1,6 +1,6 @@
 <section class="container">
     <div class="row oe_spaced">
-        <h3 class="oe_slogan">Asset Type Configuration</h3>
+        <h3 class="oe_slogan">Asset Categories Configuration</h3>
         <div class="oe_span12">
             <div class="oe_demo oe_picture oe_screenshot">
                 <img src="account_asset_sc_01.png">
@@ -11,7 +11,7 @@
 
 <section class="container">
     <div class="row oe_spaced">
-        <h3 class="oe_slogan">Asset Type Configuration</h3>
+        <h3 class="oe_slogan">Asset Categories Configuration</h3>
         <div class="oe_span12">
             <p class="mt32 text-justify">
                 <ul>
@@ -47,7 +47,7 @@
 
 <section class="container">
     <div class="row oe_spaced">
-        <h3 class="oe_slogan">Asset Type Configuration</h3>
+        <h3 class="oe_slogan">Asset Categories Configuration</h3>
         <div class="oe_span12">
             <p class="mt32 text-justify">
                 <ul>
@@ -75,7 +75,7 @@
 
 <section class="container">
     <div class="row oe_spaced">
-        <h3 class="oe_slogan">Asset Type Configuration</h3>
+        <h3 class="oe_slogan">Asset Categories Configuration</h3>
         <div class="oe_span12">
             <p class="mt32 text-justify">
                 <ul>

addons/account_asset/views/account_asset_views.xml

@@ -13,16 +13,14 @@
                 <sheet>
                     <group>
                         <div class="oe_title">
-                            <label for="name" string="Asset Type" class="oe_edit_only" attrs="{'invisible': [('type','!=','purchase')]}"/>
+                            <label for="name" string="Asset Category" class="oe_edit_only" attrs="{'invisible': [('type','!=','purchase')]}"/>
                             <label for="name" string="Deferred Revenue Type" class="oe_edit_only" attrs="{'invisible': [('type','==','purchase')]}"/>
                             <h1>
                                 <field name="name" placeholder="e.g. Computers"/>
                             </h1>
                         </div>
-                        <group>
+                    </group>
-                            <field name="type" invisible="1"/>
+                    <group>
-                            <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
-                        </group>
                         <group string="Journal Entries">
                             <div>
                                 <label for="journal_id" style="font-weight: bold;" string="Journal"/>
@@ -68,6 +66,10 @@
                                     <field name="open_asset"/>
                                     <field name="group_entries"/>
                                 </group>
+                                <group string="Company" groups="base.group_multi_company">
+                                    <field name="type" invisible="1"/>
+                                    <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -356,7 +358,7 @@
     <menuitem id="menu_finance_config_assets" name="Assets and Revenues" parent="account.menu_finance_configuration" sequence="25"/>
 
     <record model="ir.actions.act_window" id="action_account_asset_asset_list_normal_purchase">
-        <field name="name">Asset Types</field>
+        <field name="name">Asset Categories</field>
         <field name="res_model">account.asset.category</field>
         <field name="domain">[('type', '=', 'purchase')]</field>
         <field name="view_type">form</field>

addons/account_asset/views/res_config_settings_views.xml

@@ -9,7 +9,7 @@
             <div id="msg_account_asset" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_account_asset', '=', False)]}">
                     <div class="mt16">
-                        <button name="%(account_asset.action_account_asset_asset_list_normal_purchase)d" icon="fa-arrow-right" type="action" string="Asset Types" class="btn-link"/>
+                        <button name="%(account_asset.action_account_asset_asset_list_normal_purchase)d" icon="fa-arrow-right" type="action" string="Asset Categories" class="btn-link"/>
                     </div>
                 </div>
             </div>

addons/account_asset/wizard/asset_depreciation_summary.py

@@ -15,12 +15,11 @@ class AssetDepreciationWizard(models.TransientModel):
             last_day = self.env.user.company_id.fiscalyear_last_day
             last_month = self.env.user.company_id.fiscalyear_last_month
             date = datetime.strptime(self.start_date, DF).date()
-            if date.month <= 3 and date.day < 31:
+            year = date.year
-                year = date.year
+            fiscal_date = date.replace(month=last_month, day=last_day, year=year)
-            else:
+            if fiscal_date < date:
-                year = date.year + 1
+                fiscal_date = date.replace(month=last_month, day=last_day, year=year + 1)
-            date = date.replace(month=last_month, day=last_day, year=year)
+            self.end_date = datetime.strftime(fiscal_date, '%Y-%m-%d')
-            self.end_date = datetime.strftime(date, '%Y-%m-%d')
 
     start_date = fields.Date(string="Start Date", required=True)
     end_date = fields.Date(compute='_compute_get_end_date', store=True)

addons/account_asset/wizard/sale_asset_wizard.py

@@ -125,6 +125,8 @@ class SaleAssetWizard(models.TransientModel):
                         last_line.begin_value - depreciated_value,
                     })
                 last_line.create_move(post_move=True)
+                if last_line.move_id.state == 'draft':
+                    last_line.move_id.post()
             for line in self.asset_id.depreciation_line_ids:
                 if not line.move_check:
                     line.unlink()