From 6df7195af5fa5535bf356779b7700c394fa9aace Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Thu, 9 Jun 2016 13:27:35 +0200 Subject: [PATCH 01/15] [ADD] account_asset_disposal addon --- account_asset_disposal/README.rst | 63 +++++++++ account_asset_disposal/__init__.py | 6 + account_asset_disposal/__openerp__.py | 23 ++++ account_asset_disposal/i18n/es.po | 116 ++++++++++++++++ account_asset_disposal/models/__init__.py | 8 ++ .../models/account_asset_asset.py | 111 +++++++++++++++ .../models/account_asset_category.py | 22 +++ .../models/account_asset_depreciation_line.py | 36 +++++ .../models/account_move_line.py | 21 +++ .../static/description/icon.png | Bin 0 -> 9455 bytes account_asset_disposal/tests/__init__.py | 5 + .../tests/test_account_asset_disposal.py | 128 ++++++++++++++++++ .../views/account_asset_asset_view.xml | 42 ++++++ account_asset_disposal/wizards/__init__.py | 5 + .../wizards/account_asset_disposal_wizard.py | 37 +++++ .../account_asset_disposal_wizard_view.xml | 32 +++++ 16 files changed, 655 insertions(+) create mode 100644 account_asset_disposal/README.rst create mode 100644 account_asset_disposal/__init__.py create mode 100644 account_asset_disposal/__openerp__.py create mode 100644 account_asset_disposal/i18n/es.po create mode 100644 account_asset_disposal/models/__init__.py create mode 100644 account_asset_disposal/models/account_asset_asset.py create mode 100644 account_asset_disposal/models/account_asset_category.py create mode 100644 account_asset_disposal/models/account_asset_depreciation_line.py create mode 100644 account_asset_disposal/models/account_move_line.py create mode 100644 account_asset_disposal/static/description/icon.png create mode 100644 account_asset_disposal/tests/__init__.py create mode 100644 account_asset_disposal/tests/test_account_asset_disposal.py create mode 100644 account_asset_disposal/views/account_asset_asset_view.xml create mode 100644 account_asset_disposal/wizards/__init__.py create mode 100644 account_asset_disposal/wizards/account_asset_disposal_wizard.py create mode 100644 account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml diff --git a/account_asset_disposal/README.rst b/account_asset_disposal/README.rst new file mode 100644 index 000000000..7d880001c --- /dev/null +++ b/account_asset_disposal/README.rst @@ -0,0 +1,63 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +====================== +Account asset disposal +====================== + +This module extends the functionality of account_asset and automatically +generates the asset close move + +Usage +===== + +When an asset is broken or is totally depreciated you can close it and Odoo +will generate automacally the asset close move (and compute the loss if a residual +value is pending) + +In asset you will find a 'Disposal' button (instead of standard 'Set to Close'). +After click, a wizard pops-up for asking disposal date and loss account to use +if any residual value is pending. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/92/8.0 + + +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. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Pedro M. Baeza +* Antonio Espinosa + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_asset_disposal/__init__.py b/account_asset_disposal/__init__.py new file mode 100644 index 000000000..c9b1d1fdd --- /dev/null +++ b/account_asset_disposal/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import models +from . import wizards diff --git a/account_asset_disposal/__openerp__.py b/account_asset_disposal/__openerp__.py new file mode 100644 index 000000000..0efce50d7 --- /dev/null +++ b/account_asset_disposal/__openerp__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Account asset disposal", + "summary": "Makes asset close account move automatically", + "version": "8.0.1.0.0", + "category": "Accounting & Finance", + "website": "http://www.tecnativa.com", + "author": "Tecnativa, " + "Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "account_asset", + ], + "data": [ + "views/account_asset_asset_view.xml", + "wizards/account_asset_disposal_wizard_view.xml", + ], +} diff --git a/account_asset_disposal/i18n/es.po b/account_asset_disposal/i18n/es.po new file mode 100644 index 000000000..aa215b18a --- /dev/null +++ b/account_asset_disposal/i18n/es.po @@ -0,0 +1,116 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_asset_disposal +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-06-09 11:20+0000\n" +"PO-Revision-Date: 2016-06-09 11:20+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_asset +msgid "Asset" +msgstr "Activo" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset_asset.py:32 +#, python-format +msgid "Asset depreciation" +msgstr "Depreciación del activo" + +#. module: account_asset_disposal +#: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form +#: code:addons/account_asset_disposal/models/account_asset_asset.py:19 +#, python-format +msgid "Asset disposal" +msgstr "Baja del activo" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset_asset.py:45 +#, python-format +msgid "Asset loss" +msgstr "Pérdida del activo" + +#. module: account_asset_disposal +#: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form +msgid "Close" +msgstr "Cerrar" + +#. module: account_asset_disposal +#: field:account.asset.disposal.wizard,create_uid:0 +msgid "Created by" +msgstr "Creado por" + +#. module: account_asset_disposal +#: field:account.asset.disposal.wizard,create_date:0 +msgid "Created on" +msgstr "Creado en" + +#. module: account_asset_disposal +#: field:account.asset.disposal.wizard,display_name:0 +msgid "Display Name" +msgstr "Nombre a mostrar" + +#. module: account_asset_disposal +#: view:account.asset.asset:account_asset_disposal.view_account_asset_asset_form +msgid "Disposal" +msgstr "Baja" + +#. module: account_asset_disposal +#: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form +msgid "Disposal asset" +msgstr "Baja del activo" + +#. module: account_asset_disposal +#: field:account.asset.asset,disposal_date:0 +#: field:account.asset.disposal.wizard,disposal_date:0 +msgid "Disposal date" +msgstr "Fecha de baja" + +#. module: account_asset_disposal +#: field:account.asset.asset,disposal_move_id:0 +msgid "Disposal move" +msgstr "Asiento de baja" + +#. module: account_asset_disposal +#: field:account.asset.disposal.wizard,id:0 +msgid "ID" +msgstr "ID" + +#. module: account_asset_disposal +#: field:account.asset.disposal.wizard,__last_update:0 +msgid "Last Modified on" +msgstr "Última modificación en" + +#. module: account_asset_disposal +#: field:account.asset.disposal.wizard,write_uid:0 +msgid "Last Updated by" +msgstr "Última modificación por" + +#. module: account_asset_disposal +#: field:account.asset.disposal.wizard,write_date:0 +msgid "Last Updated on" +msgstr "Última actualización en" + +#. module: account_asset_disposal +#: field:account.asset.disposal.wizard,loss_account_id:0 +msgid "Loss account" +msgstr "Cuenta de pérdidas" + +#. module: account_asset_disposal +#: view:account.asset.asset:account_asset_disposal.view_account_asset_asset_form +msgid "Undo disposal" +msgstr "Cancelar baja" + +#. module: account_asset_disposal +#: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form +msgid "or" +msgstr "o" diff --git a/account_asset_disposal/models/__init__.py b/account_asset_disposal/models/__init__.py new file mode 100644 index 000000000..07ee36c80 --- /dev/null +++ b/account_asset_disposal/models/__init__.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import account_asset_category +from . import account_asset_depreciation_line +from . import account_asset_asset +from . import account_move_line diff --git a/account_asset_disposal/models/account_asset_asset.py b/account_asset_disposal/models/account_asset_asset.py new file mode 100644 index 000000000..ea7022115 --- /dev/null +++ b/account_asset_disposal/models/account_asset_asset.py @@ -0,0 +1,111 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields, api, _ + + +class AccountAssetAsset(models.Model): + _inherit = "account.asset.asset" + + disposal_date = fields.Date(string="Disposal date") + disposal_move_id = fields.Many2one( + comodel_name='account.move', string="Disposal move") + + def _disposal_line_asset_prepare(self, date, period, journal): + return { + 'name': _('Asset disposal'), + 'journal_id': journal.id, + 'period_id': period.id, + 'account_id': self.category_id.account_asset_id.id, + 'asset_id': self.id, + 'date': date, + 'debit': 0.0, + 'credit': self.purchase_value, + } + + def _disposal_line_depreciation_prepare(self, date, period, journal, + depreciation_value): + return { + 'name': _('Asset depreciation'), + 'journal_id': journal.id, + 'period_id': period.id, + 'account_id': self.category_id.account_depreciation_id.id, + 'asset_id': self.id, + 'date': date, + 'debit': depreciation_value, + 'credit': 0.0, + } + + def _disposal_line_loss_prepare(self, date, period, journal, loss_account, + loss_value): + return { + 'name': _('Asset loss'), + 'journal_id': journal.id, + 'period_id': period.id, + 'account_id': loss_account.id, + 'analytic_account_id': self.category_id.account_analytic_id.id, + 'asset_id': self.id, + 'date': date, + 'debit': loss_value, + 'credit': 0.0, + } + + def _disposal_move_prepare(self, date, loss_account): + journal = self.category_id.journal_id + period = self.env['account.period'].find(date) + loss_value = self.salvage_value + self.value_residual + depreciation_value = self.purchase_value - loss_value + line_asset = self._disposal_line_asset_prepare(date, period, journal) + line_depreciation = self._disposal_line_depreciation_prepare( + date, period, journal, depreciation_value) + lines = [ + (0, False, line_asset), + (0, False, line_depreciation), + ] + if loss_value: + line_loss = self._disposal_line_loss_prepare( + date, period, journal, loss_account, loss_value) + lines.append((0, False, line_loss)) + return { + 'journal_id': journal.id, + 'period_id': period.id, + 'ref': self.name, + 'date': date, + 'line_id': lines, + } + + @api.multi + def disposal_move_create(self, date, loss_account): + for asset in self: + vals = self._disposal_move_prepare(date, loss_account) + asset.disposal_move_id = self.env['account.move'].create(vals) + if asset.disposal_move_id: + asset.disposal_move_id.post() + + @api.multi + def action_disposal(self): + wizard_view_id = self.env.ref( + 'account_asset_disposal.account_asset_disposal_wizard_form') + return { + 'name': 'Disposal asset', + 'res_model': 'account.asset.disposal.wizard', + 'type': 'ir.actions.act_window', + 'view_type': 'tree,form', + 'view_mode': 'form', + 'view_id': wizard_view_id.id, + 'target': 'new', + 'context': self.env.context, + } + + @api.multi + def action_disposal_undo(self): + for asset in self.with_context(asset_disposal_undo=True): + if asset.disposal_move_id: + asset.disposal_move_id.button_cancel() + asset.disposal_move_id.unlink() + return self.write({ + 'disposal_date': False, + 'disposal_move_id': False, + 'state': 'open', + }) diff --git a/account_asset_disposal/models/account_asset_category.py b/account_asset_disposal/models/account_asset_category.py new file mode 100644 index 000000000..01693769c --- /dev/null +++ b/account_asset_disposal/models/account_asset_category.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields + + +class AccountAssetCategory(models.Model): + _inherit = "account.asset.category" + + def _default_loss_account_id(self): + exp_type = self.env.ref('account.data_account_type_expense') + first_expense = self.env['account.account'].search([ + ('type', '=', 'other'), + ('user_type', '=', exp_type.id), + ], limit=1) + return first_expense + + loss_account_id = fields.Many2one( + comodel_name="account.account", string="Loss Account", required=True, + domain=[('type', '=', 'other')], + default=lambda self: self._default_loss_account_id()) diff --git a/account_asset_disposal/models/account_asset_depreciation_line.py b/account_asset_disposal/models/account_asset_depreciation_line.py new file mode 100644 index 000000000..bb81c3d26 --- /dev/null +++ b/account_asset_disposal/models/account_asset_depreciation_line.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields, api + + +class AccountAssetDepreciationLine(models.Model): + _inherit = "account.asset.depreciation.line" + + @api.multi + def create_move(self): + res = super(AccountAssetDepreciationLine, self).create_move() + for line in self: + asset = line.asset_id + if asset.state == 'close' and not asset.disposal_move_id: + # Asset is closed and no disposal move created, + # Create disposal move with date (using this priority): + # - Depreciation date via context + # - Last posted deprecition line + # - Current depreciated line + # - Today + last_posted_line = self.search([ + ('asset_id', '=', asset.id), + ('move_id', '!=', False), + ], order='depreciation_date DESC', limit=1) + depreciation_date = ( + self.env.context.get('depreciation_date') or + last_posted_line.depreciation_date or + line.depreciation_date or + fields.Date.context_today(line) + ) + asset.disposal_move_create( + depreciation_date, asset.category_id.loss_account_id) + asset.write({'disposal_date': depreciation_date}) + return res diff --git a/account_asset_disposal/models/account_move_line.py b/account_asset_disposal/models/account_move_line.py new file mode 100644 index 000000000..4582092ea --- /dev/null +++ b/account_asset_disposal/models/account_move_line.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, api, _ +from openerp.exceptions import Warning as UserError + + +class AccountMoveLine(models.Model): + _inherit = "account.move.line" + + @api.multi + def unlink(self): + for line in self: + if (line.asset_id.state == 'close' and + not self.env.context.get('asset_disposal_undo', False)): + name = '%s:%s' % (line.move_id.name, line.name) + raise UserError( + _("Move line '%s' is related with a closed asset '%s'") % + (name, line.asset_id.name)) + return super(AccountMoveLine, self).unlink() diff --git a/account_asset_disposal/static/description/icon.png b/account_asset_disposal/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_asset_disposal/tests/__init__.py b/account_asset_disposal/tests/__init__.py new file mode 100644 index 000000000..28c7ddd02 --- /dev/null +++ b/account_asset_disposal/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_account_asset_disposal diff --git a/account_asset_disposal/tests/test_account_asset_disposal.py b/account_asset_disposal/tests/test_account_asset_disposal.py new file mode 100644 index 000000000..8e1db7a69 --- /dev/null +++ b/account_asset_disposal/tests/test_account_asset_disposal.py @@ -0,0 +1,128 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp.tests.common import TransactionCase + + +class TestAccountAsset(TransactionCase): + def setUp(self): + super(TestAccountAsset, self).setUp() + # Create a payable account for suppliers + self.account_suppliers = self.env['account.account'].create({ + 'name': 'Suppliers', + 'code': '410000', + 'type': 'other', + 'user_type': self.env.ref('account.data_account_type_payable').id, + 'reconcile': True, + }) + # Create a supplier + self.supplier = self.env['res.partner'].create({ + 'name': 'Asset provider', + 'supplier': True, + 'customer': False, + }) + # Create a journal for purchases + self.journal_purchase = self.env['account.journal'].create({ + 'name': 'Purchase journal', + 'code': 'PRCH', + 'type': 'purchase', + }) + # Create a journal for assets + self.journal_asset = self.env['account.journal'].create({ + 'name': 'Asset journal', + 'code': 'JRNL', + 'type': 'general', + }) + # Create an account for assets + self.account_asset = self.env['account.account'].create({ + 'name': 'Asset', + 'code': '216000', + 'type': 'other', + 'user_type': self.env.ref('account.data_account_type_asset').id, + 'reconcile': False, + }) + # Create an account for assets dereciation + self.account_asset_depreciation = self.env['account.account'].create({ + 'name': 'Asset depreciation', + 'code': '281600', + 'type': 'other', + 'user_type': self.env.ref('account.data_account_type_asset').id, + 'reconcile': False, + }) + # Create an account for assets expense + self.account_asset_expense = self.env['account.account'].create({ + 'name': 'Asset expense', + 'code': '681000', + 'type': 'other', + 'user_type': self.env.ref('account.data_account_type_expense').id, + 'reconcile': False, + }) + # Create an account for assets loss + self.account_asset_loss = self.env['account.account'].create({ + 'name': 'Asset loss', + 'code': '671000', + 'type': 'other', + 'user_type': self.env.ref('account.data_account_type_expense').id, + 'reconcile': False, + }) + # Create an assset category, with analytic account A + self.asset_category = self.env['account.asset.category'].create({ + 'name': 'Asset category for testing', + 'journal_id': self.journal_asset.id, + 'account_asset_id': self.account_asset.id, + 'account_depreciation_id': self.account_asset_depreciation.id, + 'account_expense_depreciation_id': self.account_asset_expense.id, + }) + # Create an invoice + self.asset_name = 'Office table' + self.invoice = self.env['account.invoice'].create({ + 'partner_id': self.supplier.id, + 'account_id': self.account_suppliers.id, + 'journal_id': self.journal_purchase.id, + 'reference_type': 'none', + 'reference': 'PURCHASE/12345', + 'invoice_line': [ + (0, False, { + 'name': self.asset_name, + 'account_id': self.account_asset.id, + 'asset_category_id': self.asset_category.id, + 'quantity': 1.0, + 'price_unit': 100.00, + }), + ], + }) + # Validate invoice + self.invoice.signal_workflow('invoice_open') + # Last period opened + self.last_period = self.env['account.period'].search([ + ('state', '=', 'draft'), + ('special', '=', False), + ], limit=1, order='date_stop DESC') + + def test_asset_disposal(self): + # Search asset created + asset = self.env['account.asset.asset'].search([ + ('code', '=', self.invoice.number), + ]) + # Asset must be created with code == invoice number + self.assertTrue(asset) + # Depreciate the first line + line = asset.depreciation_line_ids.filtered( + lambda x: x.move_check is False)[0] + line.create_move() + # Disposal asset + disposal_date = self.last_period.date_stop + wizard = self.env['account.asset.disposal.wizard'].with_context( + active_ids=[asset.id]).create({ + 'disposal_date': disposal_date, + 'loss_account_id': self.account_asset_loss.id, + }) + wizard.action_disposal() + # Disposal date + self.assertEqual(disposal_date, asset.disposal_date) + # Disposal move exists and posted + self.assertTrue(asset.disposal_move_id) + self.assertEqual('posted', asset.disposal_move_id.state) + # Disposal move amount must be equal to asset purchase value + self.assertEqual(asset.purchase_value, asset.disposal_move_id.amount) diff --git a/account_asset_disposal/views/account_asset_asset_view.xml b/account_asset_disposal/views/account_asset_asset_view.xml new file mode 100644 index 000000000..ce7d8c40d --- /dev/null +++ b/account_asset_disposal/views/account_asset_asset_view.xml @@ -0,0 +1,42 @@ + + + + + + + Add disposal fields + account.asset.asset + + + + + + + + + + + + + Add loss account + account.asset.category + + + + + + + + + + diff --git a/account_asset_disposal/wizards/__init__.py b/account_asset_disposal/wizards/__init__.py new file mode 100644 index 000000000..b37077fcf --- /dev/null +++ b/account_asset_disposal/wizards/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import account_asset_disposal_wizard diff --git a/account_asset_disposal/wizards/account_asset_disposal_wizard.py b/account_asset_disposal/wizards/account_asset_disposal_wizard.py new file mode 100644 index 000000000..6c3d4f66c --- /dev/null +++ b/account_asset_disposal/wizards/account_asset_disposal_wizard.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# © 2016 Antonio Espinosa - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields, api + + +class AccountAssetDisposalWizard(models.TransientModel): + _name = 'account.asset.disposal.wizard' + + def _default_disposal_date(self): + return fields.Date.context_today(self) + + def _default_loss_account_id(self): + return self.env['account.asset.category']._default_loss_account_id() + + disposal_date = fields.Date( + string="Disposal date", require=True, + default=lambda self: self._default_disposal_date()) + loss_account_id = fields.Many2one( + comodel_name='account.account', string="Loss account", require=True, + domain=[('type', '=', 'other')], + default=lambda self: self._default_loss_account_id()) + + def _disposal_date_set(self, assets): + assets.write({'disposal_date': self.disposal_date}) + + @api.multi + def action_disposal(self): + self.ensure_one() + assets = self.env['account.asset.asset'].browse( + self.env.context.get('active_ids', False)) + for asset in assets: + asset.disposal_move_create( + self.disposal_date, self.loss_account_id) + self._disposal_date_set(assets) + return assets.set_to_close() diff --git a/account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml b/account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml new file mode 100644 index 000000000..9a149ad7c --- /dev/null +++ b/account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml @@ -0,0 +1,32 @@ + + + + + + + account.asset.disposal.wizard.form + account.asset.disposal.wizard + +
+ + + + + + + + +
+
+
+ + + + + From afdf215b2bb85bc2ae71a4c6bc5a893a497ce152 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 6 Feb 2017 19:27:13 +0100 Subject: [PATCH 02/15] [FIX] account_asset_disposal: Several fixes * Separate state * Don't close on last depreciation line * Refine interface * Full Spanish translation --- account_asset_disposal/i18n/es.po | 56 ++++++++++++++++--- account_asset_disposal/models/__init__.py | 2 - .../models/account_asset_asset.py | 8 ++- .../models/account_asset_depreciation_line.py | 36 ------------ .../models/account_move_line.py | 11 ++-- .../tests/test_account_asset_disposal.py | 10 ++-- .../views/account_asset_asset_view.xml | 26 ++++++--- .../wizards/account_asset_disposal_wizard.py | 2 +- 8 files changed, 87 insertions(+), 64 deletions(-) delete mode 100644 account_asset_disposal/models/account_asset_depreciation_line.py diff --git a/account_asset_disposal/i18n/es.po b/account_asset_disposal/i18n/es.po index aa215b18a..5fa313e11 100644 --- a/account_asset_disposal/i18n/es.po +++ b/account_asset_disposal/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-09 11:20+0000\n" -"PO-Revision-Date: 2016-06-09 11:20+0000\n" +"POT-Creation-Date: 2017-02-06 18:15+0000\n" +"PO-Revision-Date: 2017-02-06 18:15+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,26 +15,41 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_asset_disposal +#: field:account.asset.asset,annual_percentage:0 +msgid "Annual depreciation percentage" +msgstr "Porcentajes anuales de depreciación" + #. module: account_asset_disposal #: model:ir.model,name:account_asset_disposal.model_account_asset_asset msgid "Asset" msgstr "Activo" #. module: account_asset_disposal -#: code:addons/account_asset_disposal/models/account_asset_asset.py:32 +#: model:ir.model,name:account_asset_disposal.model_account_asset_category +msgid "Asset category" +msgstr "Categoría de activo" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset_asset.py:33 #, python-format msgid "Asset depreciation" msgstr "Depreciación del activo" +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "Línea de depreciación del activo" + #. module: account_asset_disposal #: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form -#: code:addons/account_asset_disposal/models/account_asset_asset.py:19 +#: code:addons/account_asset_disposal/models/account_asset_asset.py:20 #, python-format msgid "Asset disposal" msgstr "Baja del activo" #. module: account_asset_disposal -#: code:addons/account_asset_disposal/models/account_asset_asset.py:45 +#: code:addons/account_asset_disposal/models/account_asset_asset.py:46 #, python-format msgid "Asset loss" msgstr "Pérdida del activo" @@ -57,12 +72,12 @@ msgstr "Creado en" #. module: account_asset_disposal #: field:account.asset.disposal.wizard,display_name:0 msgid "Display Name" -msgstr "Nombre a mostrar" +msgstr "Nombre mostrado" #. module: account_asset_disposal #: view:account.asset.asset:account_asset_disposal.view_account_asset_asset_form msgid "Disposal" -msgstr "Baja" +msgstr "Dar de baja" #. module: account_asset_disposal #: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form @@ -80,11 +95,21 @@ msgstr "Fecha de baja" msgid "Disposal move" msgstr "Asiento de baja" +#. module: account_asset_disposal +#: selection:account.asset.asset,state:0 +msgid "Disposed" +msgstr "Dado de baja" + #. module: account_asset_disposal #: field:account.asset.disposal.wizard,id:0 msgid "ID" msgstr "ID" +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_move_line +msgid "Journal Items" +msgstr "Apuntes contables" + #. module: account_asset_disposal #: field:account.asset.disposal.wizard,__last_update:0 msgid "Last Modified on" @@ -100,11 +125,22 @@ msgstr "Última modificación por" msgid "Last Updated on" msgstr "Última actualización en" +#. module: account_asset_disposal +#: field:account.asset.category,loss_account_id:0 +msgid "Loss Account" +msgstr "Cuenta de pérdidas" + #. module: account_asset_disposal #: field:account.asset.disposal.wizard,loss_account_id:0 msgid "Loss account" msgstr "Cuenta de pérdidas" +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_move_line.py:20 +#, python-format +msgid "Move line '%s' is related with a disposed asset '%s'" +msgstr "El apunte '%s' está relacionado con el activo dado de baja '%s'" + #. module: account_asset_disposal #: view:account.asset.asset:account_asset_disposal.view_account_asset_asset_form msgid "Undo disposal" @@ -114,3 +150,9 @@ msgstr "Cancelar baja" #: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form msgid "or" msgstr "o" + +#. module: account_asset_disposal +#: view:account.asset.asset:account_asset_disposal.view_account_asset_asset_form +msgid "{'invisible':[('state', '!=', 'draft')]}" +msgstr "{'invisible':[('state', '!=', 'draft')]}" + diff --git a/account_asset_disposal/models/__init__.py b/account_asset_disposal/models/__init__.py index 07ee36c80..800089d02 100644 --- a/account_asset_disposal/models/__init__.py +++ b/account_asset_disposal/models/__init__.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import account_asset_category -from . import account_asset_depreciation_line from . import account_asset_asset from . import account_move_line diff --git a/account_asset_disposal/models/account_asset_asset.py b/account_asset_disposal/models/account_asset_asset.py index ea7022115..b8aef25f5 100644 --- a/account_asset_disposal/models/account_asset_asset.py +++ b/account_asset_disposal/models/account_asset_asset.py @@ -8,6 +8,9 @@ from openerp import models, fields, api, _ class AccountAssetAsset(models.Model): _inherit = "account.asset.asset" + state = fields.Selection( + selection_add=[('disposed', 'Disposed')], + ) disposal_date = fields.Date(string="Disposal date") disposal_move_id = fields.Many2one( comodel_name='account.move', string="Disposal move") @@ -104,8 +107,11 @@ class AccountAssetAsset(models.Model): if asset.disposal_move_id: asset.disposal_move_id.button_cancel() asset.disposal_move_id.unlink() + if asset.currency_id.is_zero(asset.value_residual): + asset.state = 'close' + else: + asset.state = 'open' return self.write({ 'disposal_date': False, 'disposal_move_id': False, - 'state': 'open', }) diff --git a/account_asset_disposal/models/account_asset_depreciation_line.py b/account_asset_disposal/models/account_asset_depreciation_line.py deleted file mode 100644 index bb81c3d26..000000000 --- a/account_asset_disposal/models/account_asset_depreciation_line.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openerp import models, fields, api - - -class AccountAssetDepreciationLine(models.Model): - _inherit = "account.asset.depreciation.line" - - @api.multi - def create_move(self): - res = super(AccountAssetDepreciationLine, self).create_move() - for line in self: - asset = line.asset_id - if asset.state == 'close' and not asset.disposal_move_id: - # Asset is closed and no disposal move created, - # Create disposal move with date (using this priority): - # - Depreciation date via context - # - Last posted deprecition line - # - Current depreciated line - # - Today - last_posted_line = self.search([ - ('asset_id', '=', asset.id), - ('move_id', '!=', False), - ], order='depreciation_date DESC', limit=1) - depreciation_date = ( - self.env.context.get('depreciation_date') or - last_posted_line.depreciation_date or - line.depreciation_date or - fields.Date.context_today(line) - ) - asset.disposal_move_create( - depreciation_date, asset.category_id.loss_account_id) - asset.write({'disposal_date': depreciation_date}) - return res diff --git a/account_asset_disposal/models/account_move_line.py b/account_asset_disposal/models/account_move_line.py index 4582092ea..535536e4a 100644 --- a/account_asset_disposal/models/account_move_line.py +++ b/account_asset_disposal/models/account_move_line.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - +# Copyright 2016 Antonio Espinosa +# Copyright 2017 Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import models, api, _ @@ -10,12 +11,12 @@ class AccountMoveLine(models.Model): _inherit = "account.move.line" @api.multi - def unlink(self): + def unlink(self, check=True): for line in self: - if (line.asset_id.state == 'close' and + if (line.asset_id.state == 'disposed' and not self.env.context.get('asset_disposal_undo', False)): name = '%s:%s' % (line.move_id.name, line.name) raise UserError( - _("Move line '%s' is related with a closed asset '%s'") % + _("Move line '%s' is related with a disposed asset '%s'") % (name, line.asset_id.name)) - return super(AccountMoveLine, self).unlink() + return super(AccountMoveLine, self).unlink(check=check) diff --git a/account_asset_disposal/tests/test_account_asset_disposal.py b/account_asset_disposal/tests/test_account_asset_disposal.py index 8e1db7a69..fe82b9eca 100644 --- a/account_asset_disposal/tests/test_account_asset_disposal.py +++ b/account_asset_disposal/tests/test_account_asset_disposal.py @@ -11,7 +11,7 @@ class TestAccountAsset(TransactionCase): # Create a payable account for suppliers self.account_suppliers = self.env['account.account'].create({ 'name': 'Suppliers', - 'code': '410000', + 'code': '410x', 'type': 'other', 'user_type': self.env.ref('account.data_account_type_payable').id, 'reconcile': True, @@ -37,7 +37,7 @@ class TestAccountAsset(TransactionCase): # Create an account for assets self.account_asset = self.env['account.account'].create({ 'name': 'Asset', - 'code': '216000', + 'code': '216x', 'type': 'other', 'user_type': self.env.ref('account.data_account_type_asset').id, 'reconcile': False, @@ -45,7 +45,7 @@ class TestAccountAsset(TransactionCase): # Create an account for assets dereciation self.account_asset_depreciation = self.env['account.account'].create({ 'name': 'Asset depreciation', - 'code': '281600', + 'code': '2816x', 'type': 'other', 'user_type': self.env.ref('account.data_account_type_asset').id, 'reconcile': False, @@ -53,7 +53,7 @@ class TestAccountAsset(TransactionCase): # Create an account for assets expense self.account_asset_expense = self.env['account.account'].create({ 'name': 'Asset expense', - 'code': '681000', + 'code': '681x', 'type': 'other', 'user_type': self.env.ref('account.data_account_type_expense').id, 'reconcile': False, @@ -61,7 +61,7 @@ class TestAccountAsset(TransactionCase): # Create an account for assets loss self.account_asset_loss = self.env['account.account'].create({ 'name': 'Asset loss', - 'code': '671000', + 'code': '671x', 'type': 'other', 'user_type': self.env.ref('account.data_account_type_expense').id, 'reconcile': False, diff --git a/account_asset_disposal/views/account_asset_asset_view.xml b/account_asset_disposal/views/account_asset_asset_view.xml index ce7d8c40d..c8f709d4b 100644 --- a/account_asset_disposal/views/account_asset_asset_view.xml +++ b/account_asset_disposal/views/account_asset_asset_view.xml @@ -1,5 +1,6 @@ - @@ -12,17 +13,28 @@ + + attrs="{'invisible': [('state', '!=', 'disposed')]}"/> + attrs="{'invisible': [('state', '!=', 'disposed')]}"/> diff --git a/account_asset_disposal/wizards/account_asset_disposal_wizard.py b/account_asset_disposal/wizards/account_asset_disposal_wizard.py index 6c3d4f66c..eb890e53c 100644 --- a/account_asset_disposal/wizards/account_asset_disposal_wizard.py +++ b/account_asset_disposal/wizards/account_asset_disposal_wizard.py @@ -34,4 +34,4 @@ class AccountAssetDisposalWizard(models.TransientModel): asset.disposal_move_create( self.disposal_date, self.loss_account_id) self._disposal_date_set(assets) - return assets.set_to_close() + return assets.write({'state': 'disposed'}) From ee8fe371c23d8dd72e1e5f598ca92c0b0061f7eb Mon Sep 17 00:00:00 2001 From: "Luis M. Ontalba" Date: Thu, 13 Jul 2017 20:36:16 +0200 Subject: [PATCH 03/15] [MIG] account_asset_disposal: Migrated to 10.0 --- account_asset_disposal/README.rst | 21 +-- account_asset_disposal/__init__.py | 2 - .../{__openerp__.py => __manifest__.py} | 9 +- .../migrations/10.0.1.0.0/pre-migration.py | 22 +++ account_asset_disposal/models/__init__.py | 2 - .../models/account_asset_asset.py | 114 +++-------- .../models/account_asset_category.py | 22 --- .../models/account_move_line.py | 22 --- account_asset_disposal/tests/__init__.py | 1 - .../tests/test_account_asset_disposal.py | 178 ++++++------------ .../views/account_asset_asset_view.xml | 78 +++----- account_asset_disposal/wizards/__init__.py | 5 - .../wizards/account_asset_disposal_wizard.py | 37 ---- .../account_asset_disposal_wizard_view.xml | 32 ---- 14 files changed, 154 insertions(+), 391 deletions(-) rename account_asset_disposal/{__openerp__.py => __manifest__.py} (68%) create mode 100644 account_asset_disposal/migrations/10.0.1.0.0/pre-migration.py delete mode 100644 account_asset_disposal/models/account_asset_category.py delete mode 100644 account_asset_disposal/models/account_move_line.py delete mode 100644 account_asset_disposal/wizards/__init__.py delete mode 100644 account_asset_disposal/wizards/account_asset_disposal_wizard.py delete mode 100644 account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml diff --git a/account_asset_disposal/README.rst b/account_asset_disposal/README.rst index 7d880001c..f23160d38 100644 --- a/account_asset_disposal/README.rst +++ b/account_asset_disposal/README.rst @@ -1,28 +1,24 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 + :target: http://www.gnu.org/licenses/agpl + :alt: License: AGPL-3 ====================== Account asset disposal ====================== -This module extends the functionality of account_asset and automatically -generates the asset close move +This module extends the functionality of account_asset adding a disposal +date, allowing reversion of disposal operation and adding the state +"Disposed" to the asset. Usage ===== -When an asset is broken or is totally depreciated you can close it and Odoo -will generate automacally the asset close move (and compute the loss if a residual -value is pending) - -In asset you will find a 'Disposal' button (instead of standard 'Set to Close'). -After click, a wizard pops-up for asking disposal date and loss account to use -if any residual value is pending. +In a disposed asset you will find an 'Undo disposal' button to revert +operation. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/92/8.0 + :target: https://runbot.odoo-community.org/runbot/92/10.0 Bug Tracker @@ -46,6 +42,7 @@ Contributors * Pedro M. Baeza * Antonio Espinosa +* Luis M. Ontalba Maintainer ---------- diff --git a/account_asset_disposal/__init__.py b/account_asset_disposal/__init__.py index c9b1d1fdd..a77a6fcbc 100644 --- a/account_asset_disposal/__init__.py +++ b/account_asset_disposal/__init__.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models -from . import wizards diff --git a/account_asset_disposal/__openerp__.py b/account_asset_disposal/__manifest__.py similarity index 68% rename from account_asset_disposal/__openerp__.py rename to account_asset_disposal/__manifest__.py index 0efce50d7..0ce2197b3 100644 --- a/account_asset_disposal/__openerp__.py +++ b/account_asset_disposal/__manifest__.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - +# Copyright 2016 Antonio Espinosa - +# Copyright 2017 Luis M. Ontalba - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Account asset disposal", "summary": "Makes asset close account move automatically", - "version": "8.0.1.0.0", + "version": "10.0.1.0.0", "category": "Accounting & Finance", - "website": "http://www.tecnativa.com", + "website": "https://www.tecnativa.com", "author": "Tecnativa, " "Odoo Community Association (OCA)", "license": "AGPL-3", @@ -15,9 +16,9 @@ "installable": True, "depends": [ "account_asset", + "account_cancel", ], "data": [ "views/account_asset_asset_view.xml", - "wizards/account_asset_disposal_wizard_view.xml", ], } diff --git a/account_asset_disposal/migrations/10.0.1.0.0/pre-migration.py b/account_asset_disposal/migrations/10.0.1.0.0/pre-migration.py new file mode 100644 index 000000000..dbedae995 --- /dev/null +++ b/account_asset_disposal/migrations/10.0.1.0.0/pre-migration.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright Stephane LE CORNEC +# Copyright 2017 Tecnativa - Pedro M. Baeza +# Copyright 2017 Tecnativa - Luis M. Ontalba +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openupgradelib import openupgrade + + +def cleanup_modules(cr): + """Don't report as missing these modules, as they are integrated in + other modules.""" + openupgrade.update_module_names( + cr, [ + ('account_asset_disposal_analytic', 'account_asset_analytic'), + ], merge_modules=True, + ) + + +@openupgrade.migrate() +def migrate(cr, version): + cleanup_modules(cr) diff --git a/account_asset_disposal/models/__init__.py b/account_asset_disposal/models/__init__.py index 800089d02..c70d53409 100644 --- a/account_asset_disposal/models/__init__.py +++ b/account_asset_disposal/models/__init__.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import account_asset_category from . import account_asset_asset -from . import account_move_line diff --git a/account_asset_disposal/models/account_asset_asset.py b/account_asset_disposal/models/account_asset_asset.py index b8aef25f5..33955486b 100644 --- a/account_asset_disposal/models/account_asset_asset.py +++ b/account_asset_disposal/models/account_asset_asset.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - +# Copyright 2016 Antonio Espinosa - +# Copyright 2017 Luis M. Ontalba - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields, api, _ +from odoo import api, fields, models class AccountAssetAsset(models.Model): @@ -15,91 +16,20 @@ class AccountAssetAsset(models.Model): disposal_move_id = fields.Many2one( comodel_name='account.move', string="Disposal move") - def _disposal_line_asset_prepare(self, date, period, journal): - return { - 'name': _('Asset disposal'), - 'journal_id': journal.id, - 'period_id': period.id, - 'account_id': self.category_id.account_asset_id.id, - 'asset_id': self.id, - 'date': date, - 'debit': 0.0, - 'credit': self.purchase_value, - } - - def _disposal_line_depreciation_prepare(self, date, period, journal, - depreciation_value): - return { - 'name': _('Asset depreciation'), - 'journal_id': journal.id, - 'period_id': period.id, - 'account_id': self.category_id.account_depreciation_id.id, - 'asset_id': self.id, - 'date': date, - 'debit': depreciation_value, - 'credit': 0.0, - } - - def _disposal_line_loss_prepare(self, date, period, journal, loss_account, - loss_value): - return { - 'name': _('Asset loss'), - 'journal_id': journal.id, - 'period_id': period.id, - 'account_id': loss_account.id, - 'analytic_account_id': self.category_id.account_analytic_id.id, - 'asset_id': self.id, - 'date': date, - 'debit': loss_value, - 'credit': 0.0, - } - - def _disposal_move_prepare(self, date, loss_account): - journal = self.category_id.journal_id - period = self.env['account.period'].find(date) - loss_value = self.salvage_value + self.value_residual - depreciation_value = self.purchase_value - loss_value - line_asset = self._disposal_line_asset_prepare(date, period, journal) - line_depreciation = self._disposal_line_depreciation_prepare( - date, period, journal, depreciation_value) - lines = [ - (0, False, line_asset), - (0, False, line_depreciation), - ] - if loss_value: - line_loss = self._disposal_line_loss_prepare( - date, period, journal, loss_account, loss_value) - lines.append((0, False, line_loss)) - return { - 'journal_id': journal.id, - 'period_id': period.id, - 'ref': self.name, - 'date': date, - 'line_id': lines, - } + def get_disposal_date(self): + return fields.Date.context_today(self) @api.multi - def disposal_move_create(self, date, loss_account): - for asset in self: - vals = self._disposal_move_prepare(date, loss_account) - asset.disposal_move_id = self.env['account.move'].create(vals) - if asset.disposal_move_id: - asset.disposal_move_id.post() - - @api.multi - def action_disposal(self): - wizard_view_id = self.env.ref( - 'account_asset_disposal.account_asset_disposal_wizard_form') - return { - 'name': 'Disposal asset', - 'res_model': 'account.asset.disposal.wizard', - 'type': 'ir.actions.act_window', - 'view_type': 'tree,form', - 'view_mode': 'form', - 'view_id': wizard_view_id.id, - 'target': 'new', - 'context': self.env.context, - } + def set_to_close(self): + res = super(AccountAssetAsset, self).set_to_close() + if res: + self.disposal_move_id = res['res_id'] + self.disposal_move_id.post() + self.write({ + 'state': 'disposed', + 'disposal_date': self.get_disposal_date(), + }) + return res @api.multi def action_disposal_undo(self): @@ -111,7 +41,21 @@ class AccountAssetAsset(models.Model): asset.state = 'close' else: asset.state = 'open' + asset.method_end = asset.category_id.method_end + asset.method_number = asset.category_id.method_number + asset.compute_depreciation_board() return self.write({ 'disposal_date': False, 'disposal_move_id': False, }) + + +class AccountAssetDepreciationLine(models.Model): + _inherit = 'account.asset.depreciation.line' + + @api.multi + def post_lines_and_close_asset(self): + disposed_lines = self.filtered(lambda r: r.asset_id.state == + 'disposed') + super(AccountAssetDepreciationLine, self).post_lines_and_close_asset() + disposed_lines.mapped('asset_id').write({'state': 'disposed'}) diff --git a/account_asset_disposal/models/account_asset_category.py b/account_asset_disposal/models/account_asset_category.py deleted file mode 100644 index 01693769c..000000000 --- a/account_asset_disposal/models/account_asset_category.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openerp import models, fields - - -class AccountAssetCategory(models.Model): - _inherit = "account.asset.category" - - def _default_loss_account_id(self): - exp_type = self.env.ref('account.data_account_type_expense') - first_expense = self.env['account.account'].search([ - ('type', '=', 'other'), - ('user_type', '=', exp_type.id), - ], limit=1) - return first_expense - - loss_account_id = fields.Many2one( - comodel_name="account.account", string="Loss Account", required=True, - domain=[('type', '=', 'other')], - default=lambda self: self._default_loss_account_id()) diff --git a/account_asset_disposal/models/account_move_line.py b/account_asset_disposal/models/account_move_line.py deleted file mode 100644 index 535536e4a..000000000 --- a/account_asset_disposal/models/account_move_line.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2016 Antonio Espinosa -# Copyright 2017 Pedro M. Baeza -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openerp import models, api, _ -from openerp.exceptions import Warning as UserError - - -class AccountMoveLine(models.Model): - _inherit = "account.move.line" - - @api.multi - def unlink(self, check=True): - for line in self: - if (line.asset_id.state == 'disposed' and - not self.env.context.get('asset_disposal_undo', False)): - name = '%s:%s' % (line.move_id.name, line.name) - raise UserError( - _("Move line '%s' is related with a disposed asset '%s'") % - (name, line.asset_id.name)) - return super(AccountMoveLine, self).unlink(check=check) diff --git a/account_asset_disposal/tests/__init__.py b/account_asset_disposal/tests/__init__.py index 28c7ddd02..c17e1a11b 100644 --- a/account_asset_disposal/tests/__init__.py +++ b/account_asset_disposal/tests/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_account_asset_disposal diff --git a/account_asset_disposal/tests/test_account_asset_disposal.py b/account_asset_disposal/tests/test_account_asset_disposal.py index fe82b9eca..5be4b8d52 100644 --- a/account_asset_disposal/tests/test_account_asset_disposal.py +++ b/account_asset_disposal/tests/test_account_asset_disposal.py @@ -1,128 +1,72 @@ # -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2017 Tecnativa - Luis M. Ontalba - +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 -from openerp.tests.common import TransactionCase +from odoo.tests import common +from odoo import fields +from datetime import datetime -class TestAccountAsset(TransactionCase): - def setUp(self): - super(TestAccountAsset, self).setUp() - # Create a payable account for suppliers - self.account_suppliers = self.env['account.account'].create({ - 'name': 'Suppliers', - 'code': '410x', - 'type': 'other', - 'user_type': self.env.ref('account.data_account_type_payable').id, - 'reconcile': True, - }) - # Create a supplier - self.supplier = self.env['res.partner'].create({ - 'name': 'Asset provider', - 'supplier': True, - 'customer': False, - }) - # Create a journal for purchases - self.journal_purchase = self.env['account.journal'].create({ - 'name': 'Purchase journal', - 'code': 'PRCH', - 'type': 'purchase', - }) - # Create a journal for assets - self.journal_asset = self.env['account.journal'].create({ - 'name': 'Asset journal', - 'code': 'JRNL', +class TestAccountAssetDisposal(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestAccountAssetDisposal, cls).setUpClass() + cls.journal = cls.env['account.journal'].create({ + 'name': 'Test Journal', 'type': 'general', + 'code': 'TJ', + 'update_posted': True, }) - # Create an account for assets - self.account_asset = self.env['account.account'].create({ - 'name': 'Asset', - 'code': '216x', - 'type': 'other', - 'user_type': self.env.ref('account.data_account_type_asset').id, - 'reconcile': False, + cls.account_type = cls.env['account.account.type'].create({ + 'name': 'Test Account Type', }) - # Create an account for assets dereciation - self.account_asset_depreciation = self.env['account.account'].create({ - 'name': 'Asset depreciation', - 'code': '2816x', - 'type': 'other', - 'user_type': self.env.ref('account.data_account_type_asset').id, - 'reconcile': False, + cls.asset_account = cls.env['account.account'].create({ + 'code': 'TAA', + 'name': 'Test Asset Account', + 'internal_type': 'other', + 'user_type_id': cls.account_type.id, }) - # Create an account for assets expense - self.account_asset_expense = self.env['account.account'].create({ - 'name': 'Asset expense', - 'code': '681x', - 'type': 'other', - 'user_type': self.env.ref('account.data_account_type_expense').id, - 'reconcile': False, + cls.asset_category_number = cls.env['account.asset.category'].create({ + 'name': 'Test Category Number', + 'journal_id': cls.journal.id, + 'account_asset_id': cls.asset_account.id, + 'account_depreciation_id': cls.asset_account.id, + 'account_depreciation_expense_id': cls.asset_account.id, + 'method_time': 'number', + 'method_number': 10, + 'method_period': 12, + 'method': 'linear', }) - # Create an account for assets loss - self.account_asset_loss = self.env['account.account'].create({ - 'name': 'Asset loss', - 'code': '671x', - 'type': 'other', - 'user_type': self.env.ref('account.data_account_type_expense').id, - 'reconcile': False, + cls.asset = cls.env['account.asset.asset'].create({ + 'name': 'Test Asset Number', + 'category_id': cls.asset_category_number.id, + 'value': 16000.0, + 'salvage_value': 1000.0, + 'method_number': 15, }) - # Create an assset category, with analytic account A - self.asset_category = self.env['account.asset.category'].create({ - 'name': 'Asset category for testing', - 'journal_id': self.journal_asset.id, - 'account_asset_id': self.account_asset.id, - 'account_depreciation_id': self.account_asset_depreciation.id, - 'account_expense_depreciation_id': self.account_asset_expense.id, - }) - # Create an invoice - self.asset_name = 'Office table' - self.invoice = self.env['account.invoice'].create({ - 'partner_id': self.supplier.id, - 'account_id': self.account_suppliers.id, - 'journal_id': self.journal_purchase.id, - 'reference_type': 'none', - 'reference': 'PURCHASE/12345', - 'invoice_line': [ - (0, False, { - 'name': self.asset_name, - 'account_id': self.account_asset.id, - 'asset_category_id': self.asset_category.id, - 'quantity': 1.0, - 'price_unit': 100.00, - }), - ], - }) - # Validate invoice - self.invoice.signal_workflow('invoice_open') - # Last period opened - self.last_period = self.env['account.period'].search([ - ('state', '=', 'draft'), - ('special', '=', False), - ], limit=1, order='date_stop DESC') + cls.asset.validate() + cls.date_time = fields.Date.to_string(datetime.now()) - def test_asset_disposal(self): - # Search asset created - asset = self.env['account.asset.asset'].search([ - ('code', '=', self.invoice.number), - ]) - # Asset must be created with code == invoice number - self.assertTrue(asset) - # Depreciate the first line - line = asset.depreciation_line_ids.filtered( - lambda x: x.move_check is False)[0] - line.create_move() - # Disposal asset - disposal_date = self.last_period.date_stop - wizard = self.env['account.asset.disposal.wizard'].with_context( - active_ids=[asset.id]).create({ - 'disposal_date': disposal_date, - 'loss_account_id': self.account_asset_loss.id, - }) - wizard.action_disposal() - # Disposal date - self.assertEqual(disposal_date, asset.disposal_date) - # Disposal move exists and posted - self.assertTrue(asset.disposal_move_id) - self.assertEqual('posted', asset.disposal_move_id.state) - # Disposal move amount must be equal to asset purchase value - self.assertEqual(asset.purchase_value, asset.disposal_move_id.amount) + def test_asset_depreciation_board(self): + self.assertEqual(len(self.asset.depreciation_line_ids), 15) + self.first_line = self.asset.depreciation_line_ids[0] + self.assertEqual(self.first_line.depreciated_value, 1000.0) + self.assertEqual(self.first_line.remaining_value, 14000.0) + + def test_asset_unamortized(self): + self.asset.set_to_close() + self.assertTrue(self.asset.disposal_move_id) + self.assertEqual(self.asset.disposal_date, self.date_time) + self.assertEqual(self.asset.state, 'disposed') + self.asset.action_disposal_undo() + self.assertEqual(self.asset.state, 'open') + self.assertEqual(self.asset.method_end, + self.asset.category_id.method_end) + self.assertEqual(self.asset.method_number, + self.asset.category_id.method_number) + + def test_asset_amortized(self): + self.asset.depreciation_line_ids.create_move() + self.asset.set_to_close() + self.asset.action_disposal_undo() + self.assertEqual(self.asset.state, 'close') diff --git a/account_asset_disposal/views/account_asset_asset_view.xml b/account_asset_disposal/views/account_asset_asset_view.xml index c8f709d4b..703d0b0a6 100644 --- a/account_asset_disposal/views/account_asset_asset_view.xml +++ b/account_asset_disposal/views/account_asset_asset_view.xml @@ -1,54 +1,32 @@ - - - - - Add disposal fields - account.asset.asset - - - - - - - - + + + + Add disposal fields + account.asset.asset + + + + + + + + - - + - - Add loss account - account.asset.category - - - - - - - - - - + diff --git a/account_asset_disposal/wizards/__init__.py b/account_asset_disposal/wizards/__init__.py deleted file mode 100644 index b37077fcf..000000000 --- a/account_asset_disposal/wizards/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from . import account_asset_disposal_wizard diff --git a/account_asset_disposal/wizards/account_asset_disposal_wizard.py b/account_asset_disposal/wizards/account_asset_disposal_wizard.py deleted file mode 100644 index eb890e53c..000000000 --- a/account_asset_disposal/wizards/account_asset_disposal_wizard.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2016 Antonio Espinosa - -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openerp import models, fields, api - - -class AccountAssetDisposalWizard(models.TransientModel): - _name = 'account.asset.disposal.wizard' - - def _default_disposal_date(self): - return fields.Date.context_today(self) - - def _default_loss_account_id(self): - return self.env['account.asset.category']._default_loss_account_id() - - disposal_date = fields.Date( - string="Disposal date", require=True, - default=lambda self: self._default_disposal_date()) - loss_account_id = fields.Many2one( - comodel_name='account.account', string="Loss account", require=True, - domain=[('type', '=', 'other')], - default=lambda self: self._default_loss_account_id()) - - def _disposal_date_set(self, assets): - assets.write({'disposal_date': self.disposal_date}) - - @api.multi - def action_disposal(self): - self.ensure_one() - assets = self.env['account.asset.asset'].browse( - self.env.context.get('active_ids', False)) - for asset in assets: - asset.disposal_move_create( - self.disposal_date, self.loss_account_id) - self._disposal_date_set(assets) - return assets.write({'state': 'disposed'}) diff --git a/account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml b/account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml deleted file mode 100644 index 9a149ad7c..000000000 --- a/account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - account.asset.disposal.wizard.form - account.asset.disposal.wizard - -
- - - - - - - - -
-
-
- - - - - From e2669e893fd84c3b8b7744c29ffda017c7af098c Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 1 Sep 2017 18:22:20 +0200 Subject: [PATCH 04/15] [FIX] account_asset_disposal: env instead of cr in migration script --- .../migrations/10.0.1.0.0/pre-migration.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/account_asset_disposal/migrations/10.0.1.0.0/pre-migration.py b/account_asset_disposal/migrations/10.0.1.0.0/pre-migration.py index dbedae995..d3b6f7e42 100644 --- a/account_asset_disposal/migrations/10.0.1.0.0/pre-migration.py +++ b/account_asset_disposal/migrations/10.0.1.0.0/pre-migration.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright Stephane LE CORNEC -# Copyright 2017 Tecnativa - Pedro M. Baeza # Copyright 2017 Tecnativa - Luis M. Ontalba # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -18,5 +16,5 @@ def cleanup_modules(cr): @openupgrade.migrate() -def migrate(cr, version): - cleanup_modules(cr) +def migrate(env, version): + cleanup_modules(env.cr) From 59950e1a2d3dbe9b7cc6987eb11dcfe48aea4bfc Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 13 Sep 2017 18:51:54 +0200 Subject: [PATCH 05/15] [IMP] account_asset_disposal: Spanish translation --- account_asset_disposal/i18n/es.po | 138 +++--------------------------- 1 file changed, 11 insertions(+), 127 deletions(-) diff --git a/account_asset_disposal/i18n/es.po b/account_asset_disposal/i18n/es.po index 5fa313e11..ed66f94c6 100644 --- a/account_asset_disposal/i18n/es.po +++ b/account_asset_disposal/i18n/es.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-06 18:15+0000\n" -"PO-Revision-Date: 2017-02-06 18:15+0000\n" +"POT-Creation-Date: 2017-09-13 16:50+0000\n" +"PO-Revision-Date: 2017-09-13 16:50+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,143 +16,27 @@ msgstr "" "Plural-Forms: \n" #. module: account_asset_disposal -#: field:account.asset.asset,annual_percentage:0 -msgid "Annual depreciation percentage" -msgstr "Porcentajes anuales de depreciación" +#: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "Línea de amortización del activo" #. module: account_asset_disposal #: model:ir.model,name:account_asset_disposal.model_account_asset_asset -msgid "Asset" -msgstr "Activo" +msgid "Asset/Revenue Recognition" +msgstr "Activo fijo" #. module: account_asset_disposal -#: model:ir.model,name:account_asset_disposal.model_account_asset_category -msgid "Asset category" -msgstr "Categoría de activo" - -#. module: account_asset_disposal -#: code:addons/account_asset_disposal/models/account_asset_asset.py:33 -#, python-format -msgid "Asset depreciation" -msgstr "Depreciación del activo" - -#. module: account_asset_disposal -#: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line -msgid "Asset depreciation line" -msgstr "Línea de depreciación del activo" - -#. module: account_asset_disposal -#: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form -#: code:addons/account_asset_disposal/models/account_asset_asset.py:20 -#, python-format -msgid "Asset disposal" -msgstr "Baja del activo" - -#. module: account_asset_disposal -#: code:addons/account_asset_disposal/models/account_asset_asset.py:46 -#, python-format -msgid "Asset loss" -msgstr "Pérdida del activo" - -#. module: account_asset_disposal -#: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form -msgid "Close" -msgstr "Cerrar" - -#. module: account_asset_disposal -#: field:account.asset.disposal.wizard,create_uid:0 -msgid "Created by" -msgstr "Creado por" - -#. module: account_asset_disposal -#: field:account.asset.disposal.wizard,create_date:0 -msgid "Created on" -msgstr "Creado en" - -#. module: account_asset_disposal -#: field:account.asset.disposal.wizard,display_name:0 -msgid "Display Name" -msgstr "Nombre mostrado" - -#. module: account_asset_disposal -#: view:account.asset.asset:account_asset_disposal.view_account_asset_asset_form -msgid "Disposal" -msgstr "Dar de baja" - -#. module: account_asset_disposal -#: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form -msgid "Disposal asset" -msgstr "Baja del activo" - -#. module: account_asset_disposal -#: field:account.asset.asset,disposal_date:0 -#: field:account.asset.disposal.wizard,disposal_date:0 +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_date msgid "Disposal date" msgstr "Fecha de baja" #. module: account_asset_disposal -#: field:account.asset.asset,disposal_move_id:0 +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_move_id msgid "Disposal move" msgstr "Asiento de baja" #. module: account_asset_disposal -#: selection:account.asset.asset,state:0 -msgid "Disposed" -msgstr "Dado de baja" - -#. module: account_asset_disposal -#: field:account.asset.disposal.wizard,id:0 -msgid "ID" -msgstr "ID" - -#. module: account_asset_disposal -#: model:ir.model,name:account_asset_disposal.model_account_move_line -msgid "Journal Items" -msgstr "Apuntes contables" - -#. module: account_asset_disposal -#: field:account.asset.disposal.wizard,__last_update:0 -msgid "Last Modified on" -msgstr "Última modificación en" - -#. module: account_asset_disposal -#: field:account.asset.disposal.wizard,write_uid:0 -msgid "Last Updated by" -msgstr "Última modificación por" - -#. module: account_asset_disposal -#: field:account.asset.disposal.wizard,write_date:0 -msgid "Last Updated on" -msgstr "Última actualización en" - -#. module: account_asset_disposal -#: field:account.asset.category,loss_account_id:0 -msgid "Loss Account" -msgstr "Cuenta de pérdidas" - -#. module: account_asset_disposal -#: field:account.asset.disposal.wizard,loss_account_id:0 -msgid "Loss account" -msgstr "Cuenta de pérdidas" - -#. module: account_asset_disposal -#: code:addons/account_asset_disposal/models/account_move_line.py:20 -#, python-format -msgid "Move line '%s' is related with a disposed asset '%s'" -msgstr "El apunte '%s' está relacionado con el activo dado de baja '%s'" - -#. module: account_asset_disposal -#: view:account.asset.asset:account_asset_disposal.view_account_asset_asset_form +#: model:ir.ui.view,arch_db:account_asset_disposal.view_account_asset_asset_form msgid "Undo disposal" msgstr "Cancelar baja" -#. module: account_asset_disposal -#: view:account.asset.disposal.wizard:account_asset_disposal.account_asset_disposal_wizard_form -msgid "or" -msgstr "o" - -#. module: account_asset_disposal -#: view:account.asset.asset:account_asset_disposal.view_account_asset_asset_form -msgid "{'invisible':[('state', '!=', 'draft')]}" -msgstr "{'invisible':[('state', '!=', 'draft')]}" - From 53241e432c205692aad5af30a00ff4cac1b7e111 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 2 Dec 2017 00:19:30 +0100 Subject: [PATCH 06/15] OCA Transbot updated translations from Transifex --- account_asset_disposal/i18n/de.po | 44 +++++++++++++++++++++++++++++++ account_asset_disposal/i18n/hr.po | 44 +++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 account_asset_disposal/i18n/de.po create mode 100644 account_asset_disposal/i18n/hr.po diff --git a/account_asset_disposal/i18n/de.po b/account_asset_disposal/i18n/de.po new file mode 100644 index 000000000..ed5179feb --- /dev/null +++ b/account_asset_disposal/i18n/de.po @@ -0,0 +1,44 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_asset_disposal +# +# Translators: +# Rudolf Schnapka , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-22 23:20+0000\n" +"PO-Revision-Date: 2017-12-22 23:20+0000\n" +"Last-Translator: Rudolf Schnapka , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "Abschreibungsposition" + +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_asset +msgid "Asset/Revenue Recognition" +msgstr "Anlage/Umsatz Anerkennung" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_date +msgid "Disposal date" +msgstr "Entsorgungsdatum" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_move_id +msgid "Disposal move" +msgstr "Entsorgungsbuchung" + +#. module: account_asset_disposal +#: model:ir.ui.view,arch_db:account_asset_disposal.view_account_asset_asset_form +msgid "Undo disposal" +msgstr "Entsorgung Rückgängig" diff --git a/account_asset_disposal/i18n/hr.po b/account_asset_disposal/i18n/hr.po new file mode 100644 index 000000000..b1b90faf5 --- /dev/null +++ b/account_asset_disposal/i18n/hr.po @@ -0,0 +1,44 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_asset_disposal +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-23 01:41+0000\n" +"PO-Revision-Date: 2018-02-23 01:41+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "Stavka amortizacije" + +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_asset +msgid "Asset/Revenue Recognition" +msgstr "Priznavanje troškova" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_date +msgid "Disposal date" +msgstr "Datum otpisa" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_move_id +msgid "Disposal move" +msgstr "Temeljnica otpisa" + +#. module: account_asset_disposal +#: model:ir.ui.view,arch_db:account_asset_disposal.view_account_asset_asset_form +msgid "Undo disposal" +msgstr "Vrati iz otpisa" From 8932f2b71d670317ee4d6007190de16b70c2f29c Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 22 Jun 2018 22:39:19 +0000 Subject: [PATCH 07/15] [UPD] Update account_asset_disposal.pot --- .../i18n/account_asset_disposal.pot | 40 +++++++++++++++++++ account_asset_disposal/i18n/de.po | 4 +- account_asset_disposal/i18n/es.po | 4 +- account_asset_disposal/i18n/hr.po | 7 ++-- 4 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 account_asset_disposal/i18n/account_asset_disposal.pot diff --git a/account_asset_disposal/i18n/account_asset_disposal.pot b/account_asset_disposal/i18n/account_asset_disposal.pot new file mode 100644 index 000000000..48fc84776 --- /dev/null +++ b/account_asset_disposal/i18n/account_asset_disposal.pot @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_asset_disposal +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "" + +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_asset +msgid "Asset/Revenue Recognition" +msgstr "" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_date +msgid "Disposal date" +msgstr "" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_move_id +msgid "Disposal move" +msgstr "" + +#. module: account_asset_disposal +#: model:ir.ui.view,arch_db:account_asset_disposal.view_account_asset_asset_form +msgid "Undo disposal" +msgstr "" + diff --git a/account_asset_disposal/i18n/de.po b/account_asset_disposal/i18n/de.po index ed5179feb..b349ee31b 100644 --- a/account_asset_disposal/i18n/de.po +++ b/account_asset_disposal/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_asset_disposal -# +# # Translators: # Rudolf Schnapka , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-12-22 23:20+0000\n" "Last-Translator: Rudolf Schnapka , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: account_asset_disposal diff --git a/account_asset_disposal/i18n/es.po b/account_asset_disposal/i18n/es.po index ed66f94c6..3053cb963 100644 --- a/account_asset_disposal/i18n/es.po +++ b/account_asset_disposal/i18n/es.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_asset_disposal +# * account_asset_disposal # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2017-09-13 16:50+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -39,4 +40,3 @@ msgstr "Asiento de baja" #: model:ir.ui.view,arch_db:account_asset_disposal.view_account_asset_asset_form msgid "Undo disposal" msgstr "Cancelar baja" - diff --git a/account_asset_disposal/i18n/hr.po b/account_asset_disposal/i18n/hr.po index b1b90faf5..7c7757a2d 100644 --- a/account_asset_disposal/i18n/hr.po +++ b/account_asset_disposal/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_asset_disposal -# +# # Translators: # Bole , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2018-02-23 01:41+0000\n" "Last-Translator: Bole , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: account_asset_disposal #: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line From 1379367e65462cadbc6052e27d5df527b5381ef2 Mon Sep 17 00:00:00 2001 From: "Luis M. Ontalba" Date: Thu, 23 Nov 2017 10:40:39 +0100 Subject: [PATCH 08/15] [10.0][add] account_asset_disposal: disposal move with expenses --- account_asset_disposal/README.rst | 2 + account_asset_disposal/__manifest__.py | 4 +- account_asset_disposal/i18n/es.po | 36 ++++- account_asset_disposal/models/__init__.py | 2 +- .../models/account_asset.py | 144 ++++++++++++++++++ .../models/account_asset_asset.py | 61 -------- .../tests/test_account_asset_disposal.py | 4 +- ..._asset_view.xml => account_asset_view.xml} | 15 ++ 8 files changed, 198 insertions(+), 70 deletions(-) create mode 100644 account_asset_disposal/models/account_asset.py delete mode 100644 account_asset_disposal/models/account_asset_asset.py rename account_asset_disposal/views/{account_asset_asset_view.xml => account_asset_view.xml} (67%) diff --git a/account_asset_disposal/README.rst b/account_asset_disposal/README.rst index f23160d38..4bae3a548 100644 --- a/account_asset_disposal/README.rst +++ b/account_asset_disposal/README.rst @@ -9,6 +9,8 @@ Account asset disposal This module extends the functionality of account_asset adding a disposal date, allowing reversion of disposal operation and adding the state "Disposed" to the asset. +It adds an expense account at asset category level to post expenses when +asset is disposed. Usage ===== diff --git a/account_asset_disposal/__manifest__.py b/account_asset_disposal/__manifest__.py index 0ce2197b3..1ee56933f 100644 --- a/account_asset_disposal/__manifest__.py +++ b/account_asset_disposal/__manifest__.py @@ -6,7 +6,7 @@ { "name": "Account asset disposal", "summary": "Makes asset close account move automatically", - "version": "10.0.1.0.0", + "version": "10.0.1.1.0", "category": "Accounting & Finance", "website": "https://www.tecnativa.com", "author": "Tecnativa, " @@ -19,6 +19,6 @@ "account_cancel", ], "data": [ - "views/account_asset_asset_view.xml", + "views/account_asset_view.xml", ], } diff --git a/account_asset_disposal/i18n/es.po b/account_asset_disposal/i18n/es.po index 3053cb963..e7c224558 100644 --- a/account_asset_disposal/i18n/es.po +++ b/account_asset_disposal/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-13 16:50+0000\n" -"PO-Revision-Date: 2017-09-13 16:50+0000\n" +"POT-Creation-Date: 2017-11-23 09:15+0000\n" +"PO-Revision-Date: 2017-11-23 09:15+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "Language: \n" @@ -16,15 +16,38 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_asset_category +msgid "Asset category" +msgstr "Categoría de activo" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset.py:88 +#, python-format +msgid "Asset depreciation" +msgstr "Depreciación de activo" + #. module: account_asset_disposal #: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line msgid "Asset depreciation line" -msgstr "Línea de amortización del activo" +msgstr "Línea de Depreciación de Activo" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset.py:77 +#, python-format +msgid "Asset disposal" +msgstr "Baja de activo" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset.py:99 +#, python-format +msgid "Asset loss" +msgstr "Pérdida valor de activo" #. module: account_asset_disposal #: model:ir.model,name:account_asset_disposal.model_account_asset_asset msgid "Asset/Revenue Recognition" -msgstr "Activo fijo" +msgstr "Aceptación de pagos/Ingresos" #. module: account_asset_disposal #: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_date @@ -36,6 +59,11 @@ msgstr "Fecha de baja" msgid "Disposal move" msgstr "Asiento de baja" +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_category_loss_account_id +msgid "Loss Account" +msgstr "Cuenta de pérdidas" + #. module: account_asset_disposal #: model:ir.ui.view,arch_db:account_asset_disposal.view_account_asset_asset_form msgid "Undo disposal" diff --git a/account_asset_disposal/models/__init__.py b/account_asset_disposal/models/__init__.py index c70d53409..9db1bd823 100644 --- a/account_asset_disposal/models/__init__.py +++ b/account_asset_disposal/models/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import account_asset_asset +from . import account_asset diff --git a/account_asset_disposal/models/account_asset.py b/account_asset_disposal/models/account_asset.py new file mode 100644 index 000000000..04b2bda70 --- /dev/null +++ b/account_asset_disposal/models/account_asset.py @@ -0,0 +1,144 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Antonio Espinosa - +# Copyright 2017 Luis M. Ontalba - +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import _, api, fields, models + + +class AccountAssetCategory(models.Model): + _inherit = "account.asset.category" + + def _default_loss_account_id(self): + exp_type = self.env.ref('account.data_account_type_expenses') + first_expense = self.env['account.account'].search([ + ('internal_type', '=', 'other'), + ('user_type_id', '=', exp_type.id), + ], limit=1) + return first_expense + + loss_account_id = fields.Many2one( + comodel_name="account.account", string="Loss Account", required=True, + domain=[('internal_type', '=', 'other')], + default=lambda self: self._default_loss_account_id()) + + +class AccountAssetAsset(models.Model): + _inherit = "account.asset.asset" + + state = fields.Selection( + selection_add=[('disposed', 'Disposed')], + ) + disposal_date = fields.Date(string="Disposal date") + disposal_move_id = fields.Many2one( + comodel_name='account.move', string="Disposal move") + + def get_disposal_date(self): + return fields.Date.context_today(self) + + @api.multi + def set_to_close(self): + value_residual_prev = self.value_residual + res = super(AccountAssetAsset, self).set_to_close() + if res: + date = self.get_disposal_date() + loss_account = self.category_id.loss_account_id + self.value_residual = value_residual_prev + move = self.disposal_move_create(date, loss_account) + res['res_id'] = move.id + self.disposal_move_id = res['res_id'] + self.disposal_move_id.post() + self.write({ + 'state': 'disposed', + 'disposal_date': self.get_disposal_date(), + }) + return res + + @api.multi + def action_disposal_undo(self): + for asset in self.with_context(asset_disposal_undo=True): + if asset.disposal_move_id: + asset.disposal_move_id.button_cancel() + asset.disposal_move_id.unlink() + last_line = self.depreciation_line_ids[-1] + last_line.move_id = False + last_line.unlink() + asset.state = 'open' + asset.method_end = asset.category_id.method_end + asset.method_number = asset.category_id.method_number + asset.compute_depreciation_board() + return self.write({ + 'disposal_date': False, + 'disposal_move_id': False, + }) + + def _disposal_line_asset_prepare(self, date, journal): + return { + 'name': _('Asset disposal'), + 'journal_id': journal.id, + 'account_id': self.category_id.account_asset_id.id, + 'date': date, + 'debit': 0.0, + 'credit': self.value, + } + + def _disposal_line_depreciation_prepare(self, date, journal, + depreciation_value): + return { + 'name': _('Asset depreciation'), + 'journal_id': journal.id, + 'account_id': self.category_id.account_depreciation_id.id, + 'date': date, + 'debit': depreciation_value, + 'credit': 0.0, + } + + def _disposal_line_loss_prepare(self, date, journal, loss_account, + loss_value): + return { + 'name': _('Asset loss'), + 'journal_id': journal.id, + 'account_id': loss_account.id, + 'analytic_account_id': self.category_id.account_analytic_id.id, + 'date': date, + 'debit': loss_value, + 'credit': 0.0, + } + + def _disposal_move_prepare(self, date, loss_account): + journal = self.category_id.journal_id + loss_value = self.salvage_value + self.value_residual + depreciation_value = self.value - loss_value + line_asset = self._disposal_line_asset_prepare(date, journal) + line_depreciation = self._disposal_line_depreciation_prepare( + date, journal, depreciation_value) + lines = [ + (0, False, line_asset), + (0, False, line_depreciation), + ] + if loss_value: + line_loss = self._disposal_line_loss_prepare( + date, journal, loss_account, loss_value) + lines.append((0, False, line_loss)) + return { + 'journal_id': journal.id, + 'ref': self.name, + 'date': date, + 'line_ids': lines, + } + + def disposal_move_create(self, date, loss_account): + vals = self._disposal_move_prepare(date, loss_account) + move = self.env['account.move'].create(vals) + return move + + +class AccountAssetDepreciationLine(models.Model): + _inherit = 'account.asset.depreciation.line' + + @api.multi + def post_lines_and_close_asset(self): + disposed_lines = self.filtered(lambda r: r.asset_id.state == + 'disposed') + super(AccountAssetDepreciationLine, self).post_lines_and_close_asset() + disposed_lines.mapped('asset_id').write({'state': 'disposed'}) diff --git a/account_asset_disposal/models/account_asset_asset.py b/account_asset_disposal/models/account_asset_asset.py deleted file mode 100644 index 33955486b..000000000 --- a/account_asset_disposal/models/account_asset_asset.py +++ /dev/null @@ -1,61 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Luis M. Ontalba - -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import api, fields, models - - -class AccountAssetAsset(models.Model): - _inherit = "account.asset.asset" - - state = fields.Selection( - selection_add=[('disposed', 'Disposed')], - ) - disposal_date = fields.Date(string="Disposal date") - disposal_move_id = fields.Many2one( - comodel_name='account.move', string="Disposal move") - - def get_disposal_date(self): - return fields.Date.context_today(self) - - @api.multi - def set_to_close(self): - res = super(AccountAssetAsset, self).set_to_close() - if res: - self.disposal_move_id = res['res_id'] - self.disposal_move_id.post() - self.write({ - 'state': 'disposed', - 'disposal_date': self.get_disposal_date(), - }) - return res - - @api.multi - def action_disposal_undo(self): - for asset in self.with_context(asset_disposal_undo=True): - if asset.disposal_move_id: - asset.disposal_move_id.button_cancel() - asset.disposal_move_id.unlink() - if asset.currency_id.is_zero(asset.value_residual): - asset.state = 'close' - else: - asset.state = 'open' - asset.method_end = asset.category_id.method_end - asset.method_number = asset.category_id.method_number - asset.compute_depreciation_board() - return self.write({ - 'disposal_date': False, - 'disposal_move_id': False, - }) - - -class AccountAssetDepreciationLine(models.Model): - _inherit = 'account.asset.depreciation.line' - - @api.multi - def post_lines_and_close_asset(self): - disposed_lines = self.filtered(lambda r: r.asset_id.state == - 'disposed') - super(AccountAssetDepreciationLine, self).post_lines_and_close_asset() - disposed_lines.mapped('asset_id').write({'state': 'disposed'}) diff --git a/account_asset_disposal/tests/test_account_asset_disposal.py b/account_asset_disposal/tests/test_account_asset_disposal.py index 5be4b8d52..d08723872 100644 --- a/account_asset_disposal/tests/test_account_asset_disposal.py +++ b/account_asset_disposal/tests/test_account_asset_disposal.py @@ -67,6 +67,6 @@ class TestAccountAssetDisposal(common.SavepointCase): def test_asset_amortized(self): self.asset.depreciation_line_ids.create_move() - self.asset.set_to_close() - self.asset.action_disposal_undo() + for line in self.asset.depreciation_line_ids: + line.move_id.post() self.assertEqual(self.asset.state, 'close') diff --git a/account_asset_disposal/views/account_asset_asset_view.xml b/account_asset_disposal/views/account_asset_view.xml similarity index 67% rename from account_asset_disposal/views/account_asset_asset_view.xml rename to account_asset_disposal/views/account_asset_view.xml index 703d0b0a6..1edf0e826 100644 --- a/account_asset_disposal/views/account_asset_asset_view.xml +++ b/account_asset_disposal/views/account_asset_view.xml @@ -2,6 +2,21 @@ + + Add loss account + account.asset.category + + + +
+
+ + + + + Add disposal fields account.asset.asset From 35272e8f73a00841831465aff1ae62ea36a512bf Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 25 Nov 2017 13:25:11 +0100 Subject: [PATCH 09/15] [FIX] account_asset_disposal: Restore full functionality --- account_asset_disposal/README.rst | 53 ++++-- account_asset_disposal/__init__.py | 1 + account_asset_disposal/__manifest__.py | 15 +- account_asset_disposal/i18n/es.po | 113 ++++++++++-- account_asset_disposal/models/__init__.py | 3 +- .../models/account_asset.py | 144 --------------- .../models/account_asset_asset.py | 166 ++++++++++++++++++ .../models/account_asset_category.py | 15 ++ .../tests/test_account_asset_disposal.py | 131 ++++++++------ ...view.xml => account_asset_asset_views.xml} | 33 ++-- .../views/account_asset_category_views.xml | 17 ++ account_asset_disposal/wizards/__init__.py | 4 + .../wizards/account_asset_disposal_wizard.py | 36 ++++ .../account_asset_disposal_wizard_view.xml | 27 +++ 14 files changed, 501 insertions(+), 257 deletions(-) delete mode 100644 account_asset_disposal/models/account_asset.py create mode 100644 account_asset_disposal/models/account_asset_asset.py create mode 100644 account_asset_disposal/models/account_asset_category.py rename account_asset_disposal/views/{account_asset_view.xml => account_asset_asset_views.xml} (55%) create mode 100644 account_asset_disposal/views/account_asset_category_views.xml create mode 100644 account_asset_disposal/wizards/__init__.py create mode 100644 account_asset_disposal/wizards/account_asset_disposal_wizard.py create mode 100644 account_asset_disposal/wizards/account_asset_disposal_wizard_view.xml diff --git a/account_asset_disposal/README.rst b/account_asset_disposal/README.rst index 4bae3a548..edff3e793 100644 --- a/account_asset_disposal/README.rst +++ b/account_asset_disposal/README.rst @@ -1,22 +1,43 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl - :alt: License: AGPL-3 +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 ====================== Account asset disposal ====================== -This module extends the functionality of account_asset adding a disposal -date, allowing reversion of disposal operation and adding the state -"Disposed" to the asset. -It adds an expense account at asset category level to post expenses when -asset is disposed. +This module enables a real asset disposal with the proper accounting entries. + +When an asset gets broken or is totally depreciated, you can close it and Odoo +will generate automatically the asset close move (and compute the loss if a +residual value is pending). + +You can also cancel this disposal for returning to the previous state. + +Configuration +============= + +#. Go to *Accounting > Configuration > Management > Asset Types*. +#. There's a new field called "Loss Account" for setting the default loss + account when disposing assets. Usage ===== -In a disposed asset you will find an 'Undo disposal' button to revert -operation. +#. Go to *Accounting > Adviser > Assets*. +#. There you will find a 'Dispose' button (instead of standard 'Set to Close'). +#. After clicking it, a wizard pops-up for asking disposal date and loss + account to use if any residual value is pending. +#. Click on "Dispose asset". +#. A new screen will appear with the disposal account entry. +#. On the asset, all remaining depreciation lines are removed, and a new one + appears for the disposal move. + +You can cancel afterwards the disposal: + +#. Click on "Undo disposal" on the asset. +#. The disposal entry is removed. +#. The depreciation board is restored with all the remaining depreciations. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot @@ -31,6 +52,11 @@ Bugs are tracked on `GitHub Issues 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. +Known issues / Roadmap +====================== + +* Include a specific message type for notifying the disposal. + Credits ======= @@ -42,9 +68,10 @@ Images Contributors ------------ -* Pedro M. Baeza -* Antonio Espinosa -* Luis M. Ontalba +* Tecnativa (https://www.tecnativa.com): + * Pedro M. Baeza + * Antonio Espinosa + * Luis M. Ontalba Maintainer ---------- diff --git a/account_asset_disposal/__init__.py b/account_asset_disposal/__init__.py index a77a6fcbc..ef2bd060e 100644 --- a/account_asset_disposal/__init__.py +++ b/account_asset_disposal/__init__.py @@ -2,3 +2,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models +from . import wizards diff --git a/account_asset_disposal/__manifest__.py b/account_asset_disposal/__manifest__.py index 1ee56933f..ad4581f85 100644 --- a/account_asset_disposal/__manifest__.py +++ b/account_asset_disposal/__manifest__.py @@ -1,24 +1,25 @@ # -*- coding: utf-8 -*- -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Luis M. Ontalba - +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Luis M. Ontalba +# Copyright 2017 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Account asset disposal", "summary": "Makes asset close account move automatically", - "version": "10.0.1.1.0", + "version": "10.0.2.0.0", "category": "Accounting & Finance", - "website": "https://www.tecnativa.com", + "website": "http://github.com/OCA/account-financial-tools", "author": "Tecnativa, " "Odoo Community Association (OCA)", "license": "AGPL-3", - "application": False, "installable": True, "depends": [ "account_asset", - "account_cancel", ], "data": [ - "views/account_asset_view.xml", + "views/account_asset_asset_views.xml", + "views/account_asset_category_views.xml", + "wizards/account_asset_disposal_wizard_view.xml", ], } diff --git a/account_asset_disposal/i18n/es.po b/account_asset_disposal/i18n/es.po index e7c224558..6c1a08a98 100644 --- a/account_asset_disposal/i18n/es.po +++ b/account_asset_disposal/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-23 09:15+0000\n" -"PO-Revision-Date: 2017-11-23 09:15+0000\n" +"POT-Creation-Date: 2017-11-25 12:17+0000\n" +"PO-Revision-Date: 2017-11-25 12:17+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "Language: \n" @@ -22,35 +22,76 @@ msgid "Asset category" msgstr "Categoría de activo" #. module: account_asset_disposal -#: code:addons/account_asset_disposal/models/account_asset.py:88 +#: code:addons/account_asset_disposal/models/account_asset_asset.py:35 #, python-format msgid "Asset depreciation" -msgstr "Depreciación de activo" +msgstr "Amortización del activo" #. module: account_asset_disposal -#: model:ir.model,name:account_asset_disposal.model_account_asset_depreciation_line -msgid "Asset depreciation line" -msgstr "Línea de Depreciación de Activo" - -#. module: account_asset_disposal -#: code:addons/account_asset_disposal/models/account_asset.py:77 +#: code:addons/account_asset_disposal/models/account_asset_asset.py:23 +#: model:ir.ui.view,arch_db:account_asset_disposal.account_asset_disposal_wizard_form #, python-format msgid "Asset disposal" -msgstr "Baja de activo" +msgstr "Baja del activo" #. module: account_asset_disposal -#: code:addons/account_asset_disposal/models/account_asset.py:99 +#: code:addons/account_asset_disposal/models/account_asset_asset.py:158 +#, python-format +msgid "Asset disposal cancelled." +msgstr "Baja del activo cancelada." + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset_asset.py:123 +#, python-format +msgid "Asset disposed." +msgstr "Activo dado de baja." + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset_asset.py:46 #, python-format msgid "Asset loss" -msgstr "Pérdida valor de activo" +msgstr "Pérdida del activo" #. module: account_asset_disposal #: model:ir.model,name:account_asset_disposal.model_account_asset_asset msgid "Asset/Revenue Recognition" -msgstr "Aceptación de pagos/Ingresos" +msgstr "Activo/Reconocimiento de beneficio" + +#. module: account_asset_disposal +#: model:ir.ui.view,arch_db:account_asset_disposal.account_asset_disposal_wizard_form +msgid "Close" +msgstr "Cerrar" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard_create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard_create_date +msgid "Created on" +msgstr "Creado el" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard_display_name +msgid "Display Name" +msgstr "Nombre a mostrar" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset_asset.py:130 +#, python-format +msgid "Disposal Move" +msgstr "Asiento de baja" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset_asset.py:133 +#, python-format +msgid "Disposal Moves" +msgstr "Asientos de baja" #. module: account_asset_disposal #: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_asset_disposal_date +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard_disposal_date msgid "Disposal date" msgstr "Fecha de baja" @@ -60,7 +101,49 @@ msgid "Disposal move" msgstr "Asiento de baja" #. module: account_asset_disposal -#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_category_loss_account_id +#: model:ir.ui.view,arch_db:account_asset_disposal.view_account_asset_asset_form +msgid "Dispose" +msgstr "Dar de baja" + +#. module: account_asset_disposal +#: code:addons/account_asset_disposal/models/account_asset_asset.py:78 +#, python-format +msgid "Dispose Asset" +msgstr "Dar de baja activo" + +#. module: account_asset_disposal +#: model:ir.ui.view,arch_db:account_asset_disposal.account_asset_disposal_wizard_form +msgid "Dispose asset" +msgstr "Dar de baja activo" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard_id +msgid "ID" +msgstr "ID" + +#. module: account_asset_disposal +#: model:ir.model,name:account_asset_disposal.model_account_move_line +msgid "Journal Item" +msgstr "Apunte contable" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard___last_update +msgid "Last Modified on" +msgstr "Última modificación en" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard_write_uid +msgid "Last Updated by" +msgstr "Última actualización por" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard_write_date +msgid "Last Updated on" +msgstr "Última actualización el" + +#. module: account_asset_disposal +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_category_account_loss_id +#: model:ir.model.fields,field_description:account_asset_disposal.field_account_asset_disposal_wizard_loss_account_id msgid "Loss Account" msgstr "Cuenta de pérdidas" diff --git a/account_asset_disposal/models/__init__.py b/account_asset_disposal/models/__init__.py index 9db1bd823..94ba97d2f 100644 --- a/account_asset_disposal/models/__init__.py +++ b/account_asset_disposal/models/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import account_asset +from . import account_asset_category +from . import account_asset_asset diff --git a/account_asset_disposal/models/account_asset.py b/account_asset_disposal/models/account_asset.py deleted file mode 100644 index 04b2bda70..000000000 --- a/account_asset_disposal/models/account_asset.py +++ /dev/null @@ -1,144 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2016 Antonio Espinosa - -# Copyright 2017 Luis M. Ontalba - -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import _, api, fields, models - - -class AccountAssetCategory(models.Model): - _inherit = "account.asset.category" - - def _default_loss_account_id(self): - exp_type = self.env.ref('account.data_account_type_expenses') - first_expense = self.env['account.account'].search([ - ('internal_type', '=', 'other'), - ('user_type_id', '=', exp_type.id), - ], limit=1) - return first_expense - - loss_account_id = fields.Many2one( - comodel_name="account.account", string="Loss Account", required=True, - domain=[('internal_type', '=', 'other')], - default=lambda self: self._default_loss_account_id()) - - -class AccountAssetAsset(models.Model): - _inherit = "account.asset.asset" - - state = fields.Selection( - selection_add=[('disposed', 'Disposed')], - ) - disposal_date = fields.Date(string="Disposal date") - disposal_move_id = fields.Many2one( - comodel_name='account.move', string="Disposal move") - - def get_disposal_date(self): - return fields.Date.context_today(self) - - @api.multi - def set_to_close(self): - value_residual_prev = self.value_residual - res = super(AccountAssetAsset, self).set_to_close() - if res: - date = self.get_disposal_date() - loss_account = self.category_id.loss_account_id - self.value_residual = value_residual_prev - move = self.disposal_move_create(date, loss_account) - res['res_id'] = move.id - self.disposal_move_id = res['res_id'] - self.disposal_move_id.post() - self.write({ - 'state': 'disposed', - 'disposal_date': self.get_disposal_date(), - }) - return res - - @api.multi - def action_disposal_undo(self): - for asset in self.with_context(asset_disposal_undo=True): - if asset.disposal_move_id: - asset.disposal_move_id.button_cancel() - asset.disposal_move_id.unlink() - last_line = self.depreciation_line_ids[-1] - last_line.move_id = False - last_line.unlink() - asset.state = 'open' - asset.method_end = asset.category_id.method_end - asset.method_number = asset.category_id.method_number - asset.compute_depreciation_board() - return self.write({ - 'disposal_date': False, - 'disposal_move_id': False, - }) - - def _disposal_line_asset_prepare(self, date, journal): - return { - 'name': _('Asset disposal'), - 'journal_id': journal.id, - 'account_id': self.category_id.account_asset_id.id, - 'date': date, - 'debit': 0.0, - 'credit': self.value, - } - - def _disposal_line_depreciation_prepare(self, date, journal, - depreciation_value): - return { - 'name': _('Asset depreciation'), - 'journal_id': journal.id, - 'account_id': self.category_id.account_depreciation_id.id, - 'date': date, - 'debit': depreciation_value, - 'credit': 0.0, - } - - def _disposal_line_loss_prepare(self, date, journal, loss_account, - loss_value): - return { - 'name': _('Asset loss'), - 'journal_id': journal.id, - 'account_id': loss_account.id, - 'analytic_account_id': self.category_id.account_analytic_id.id, - 'date': date, - 'debit': loss_value, - 'credit': 0.0, - } - - def _disposal_move_prepare(self, date, loss_account): - journal = self.category_id.journal_id - loss_value = self.salvage_value + self.value_residual - depreciation_value = self.value - loss_value - line_asset = self._disposal_line_asset_prepare(date, journal) - line_depreciation = self._disposal_line_depreciation_prepare( - date, journal, depreciation_value) - lines = [ - (0, False, line_asset), - (0, False, line_depreciation), - ] - if loss_value: - line_loss = self._disposal_line_loss_prepare( - date, journal, loss_account, loss_value) - lines.append((0, False, line_loss)) - return { - 'journal_id': journal.id, - 'ref': self.name, - 'date': date, - 'line_ids': lines, - } - - def disposal_move_create(self, date, loss_account): - vals = self._disposal_move_prepare(date, loss_account) - move = self.env['account.move'].create(vals) - return move - - -class AccountAssetDepreciationLine(models.Model): - _inherit = 'account.asset.depreciation.line' - - @api.multi - def post_lines_and_close_asset(self): - disposed_lines = self.filtered(lambda r: r.asset_id.state == - 'disposed') - super(AccountAssetDepreciationLine, self).post_lines_and_close_asset() - disposed_lines.mapped('asset_id').write({'state': 'disposed'}) diff --git a/account_asset_disposal/models/account_asset_asset.py b/account_asset_disposal/models/account_asset_asset.py new file mode 100644 index 000000000..03292370a --- /dev/null +++ b/account_asset_disposal/models/account_asset_asset.py @@ -0,0 +1,166 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Luis M. Ontalba +# Copyright 2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models, fields, api, _ + + +class AccountAssetAsset(models.Model): + _inherit = "account.asset.asset" + + state = fields.Selection( + selection_add=[('disposed', 'Disposed')], + ) + disposal_date = fields.Date(string="Disposal date") + disposal_move_id = fields.Many2one( + comodel_name='account.move', string="Disposal move", + ) + + def _disposal_line_asset_prepare(self, date): + self.ensure_one() + return { + 'name': _('Asset disposal'), + 'journal_id': self.category_id.journal_id.id, + 'account_id': self.category_id.account_asset_id.id, + 'date': date, + 'debit': 0.0, + 'credit': self.value, + } + + def _disposal_line_depreciation_prepare(self, date): + self.ensure_one() + loss_value = self.salvage_value + self.value_residual + depreciation_value = self.value - loss_value + return { + 'name': _('Asset depreciation'), + 'journal_id': self.category_id.journal_id.id, + 'account_id': self.category_id.account_depreciation_id.id, + 'date': date, + 'debit': depreciation_value, + 'credit': 0.0, + } + + def _disposal_line_loss_prepare(self, date, loss_account): + self.ensure_one() + loss_value = self.salvage_value + self.value_residual + return { + 'name': _('Asset loss'), + 'journal_id': self.category_id.journal_id.id, + 'account_id': loss_account.id, + 'analytic_account_id': self.category_id.account_analytic_id.id, + 'date': date, + 'debit': loss_value, + 'credit': 0.0, + } + + def _disposal_move_prepare(self, date, loss_account): + self.ensure_one() + journal = self.category_id.journal_id + lines = [ + (0, False, self._disposal_line_asset_prepare(date)), + (0, False, self._disposal_line_depreciation_prepare(date)), + ] + loss_value = self.salvage_value + self.value_residual + if loss_value: + lines.append(( + 0, False, self._disposal_line_loss_prepare(date, loss_account) + )) + return { + 'journal_id': journal.id, + 'ref': self.name, + 'date': date, + 'line_ids': lines, + } + + @api.multi + def action_disposal(self): + wizard_view_id = self.env.ref( + 'account_asset_disposal.account_asset_disposal_wizard_form') + return { + 'name': _('Dispose Asset'), + 'res_model': 'account.asset.disposal.wizard', + 'type': 'ir.actions.act_window', + 'view_type': 'tree,form', + 'view_mode': 'form', + 'view_id': wizard_view_id.id, + 'target': 'new', + 'context': self.env.context, + } + + @api.multi + def dispose(self, date, loss_account): + moves = self.env['account.move'] + for asset in self: + move = self.env['account.move'].create( + asset._disposal_move_prepare(date, loss_account) + ) + asset.disposal_move_id = move.id + move.post() + unposted_lines = asset.depreciation_line_ids.filtered( + lambda x: not x.move_check + ) + if unposted_lines: + # Remove all unposted depreciation lines + asset.write({ + 'depreciation_line_ids': [ + (2, line_id.id) for line_id in unposted_lines + ], + }) + # Create a new depr. line with the residual amount and post it + sequence = ( + len(asset.depreciation_line_ids) - len(unposted_lines) + 1 + ) + vals = { + 'amount': asset.value_residual, + 'asset_id': asset.id, + 'sequence': sequence, + 'name': (asset.code or '') + '/' + str(sequence), + 'remaining_value': 0, + # the asset is completely depreciated + 'depreciated_value': asset.value - asset.salvage_value, + 'depreciation_date': date, + 'move_id': move.id, + } + asset.depreciation_line_ids.create(vals) + asset.message_post(body=_('Asset disposed.')) + moves += move + self.write({ + 'disposal_date': date, + 'state': 'disposed', + }) + if moves: + name = _('Disposal Move') + view_mode = 'form' + if len(moves) > 1: + name = _('Disposal Moves') + view_mode = 'tree,form' + return { + 'name': name, + 'domain': [('id', 'in', moves.ids)], + 'view_type': 'form', + 'view_mode': view_mode, + 'res_model': 'account.move', + 'type': 'ir.actions.act_window', + 'target': 'current', + 'res_id': moves[:1].id, + } + + @api.multi + def action_disposal_undo(self): + for asset in self.with_context(asset_disposal_undo=True): + if asset.disposal_move_id: + asset.disposal_move_id.button_cancel() + asset.disposal_move_id.unlink() + asset.depreciation_line_ids[-1].unlink() + if asset.currency_id.is_zero(asset.value_residual): + asset.state = 'close' + else: + asset.state = 'open' + asset.compute_depreciation_board() + asset.message_post(body=_('Asset disposal cancelled.')) + return self.write({ + 'disposal_date': False, + 'disposal_move_id': False, + }) diff --git a/account_asset_disposal/models/account_asset_category.py b/account_asset_disposal/models/account_asset_category.py new file mode 100644 index 000000000..5bc2a3f3b --- /dev/null +++ b/account_asset_disposal/models/account_asset_category.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models, fields + + +class AccountAssetCategory(models.Model): + _inherit = "account.asset.category" + + account_loss_id = fields.Many2one( + comodel_name="account.account", string="Loss Account", + oldname='loss_account_id', + ) diff --git a/account_asset_disposal/tests/test_account_asset_disposal.py b/account_asset_disposal/tests/test_account_asset_disposal.py index d08723872..537f1b960 100644 --- a/account_asset_disposal/tests/test_account_asset_disposal.py +++ b/account_asset_disposal/tests/test_account_asset_disposal.py @@ -1,72 +1,91 @@ # -*- coding: utf-8 -*- -# Copyright 2017 Tecnativa - Luis M. Ontalba - -# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 +# Copyright 2016 Tecnativa - Antonio Espinosa +# Copyright 2017 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.tests import common from odoo import fields -from datetime import datetime +from odoo.tests import common -class TestAccountAssetDisposal(common.SavepointCase): - @classmethod - def setUpClass(cls): - super(TestAccountAssetDisposal, cls).setUpClass() - cls.journal = cls.env['account.journal'].create({ - 'name': 'Test Journal', +class TestAccountAsset(common.TransactionCase): + def setUp(self): + super(TestAccountAsset, self).setUp() + # Create a journal for assets + self.journal_asset = self.env['account.journal'].create({ + 'name': 'Asset journal', + 'code': 'JRNL', 'type': 'general', - 'code': 'TJ', 'update_posted': True, }) - cls.account_type = cls.env['account.account.type'].create({ - 'name': 'Test Account Type', + # Create an account for assets + self.account_asset = self.env['account.account'].create({ + 'name': 'Asset', + 'code': '216x', + 'user_type_id': ( + self.env.ref('account.data_account_type_fixed_assets').id + ), }) - cls.asset_account = cls.env['account.account'].create({ - 'code': 'TAA', - 'name': 'Test Asset Account', - 'internal_type': 'other', - 'user_type_id': cls.account_type.id, + # Create an account for assets depreciation + self.account_asset_depreciation = self.env['account.account'].create({ + 'name': 'Asset depreciation', + 'code': '2816x', + 'user_type_id': ( + self.env.ref('account.data_account_type_fixed_assets').id + ), }) - cls.asset_category_number = cls.env['account.asset.category'].create({ - 'name': 'Test Category Number', - 'journal_id': cls.journal.id, - 'account_asset_id': cls.asset_account.id, - 'account_depreciation_id': cls.asset_account.id, - 'account_depreciation_expense_id': cls.asset_account.id, - 'method_time': 'number', + # Create an account for assets expense + self.account_asset_expense = self.env['account.account'].create({ + 'name': 'Asset expense', + 'code': '681x', + 'user_type_id': ( + self.env.ref('account.data_account_type_expenses').id + ), + }) + # Create an account for assets loss + self.account_asset_loss = self.env['account.account'].create({ + 'name': 'Asset loss', + 'code': '671x', + 'user_type_id': ( + self.env.ref('account.data_account_type_expenses').id + ), + }) + # Create an asset category + self.asset_category = self.env['account.asset.category'].create({ + 'name': 'Asset category for testing', + 'journal_id': self.journal_asset.id, + 'account_asset_id': self.account_asset.id, + 'account_depreciation_id': self.account_asset_depreciation.id, + 'account_depreciation_expense_id': self.account_asset_expense.id, + 'account_loss_id': self.account_asset_loss.id, + }) + # Create an invoice + self.asset = self.env['account.asset.asset'].create({ + 'name': 'Test Asset', + 'value': 100.00, + 'category_id': self.asset_category.id, 'method_number': 10, - 'method_period': 12, - 'method': 'linear', }) - cls.asset = cls.env['account.asset.asset'].create({ - 'name': 'Test Asset Number', - 'category_id': cls.asset_category_number.id, - 'value': 16000.0, - 'salvage_value': 1000.0, - 'method_number': 15, + self.asset.validate() + + def test_asset_disposal(self): + self.assertEqual(len(self.asset.depreciation_line_ids), 10) + # Depreciate the first line + self.asset.depreciation_line_ids[0].create_move() + # Dispose asset + disposal_date = fields.Date.today() + wizard = self.env['account.asset.disposal.wizard'].with_context( + active_ids=self.asset.ids, active_id=self.asset.id, + ).create({ + 'disposal_date': disposal_date, }) - cls.asset.validate() - cls.date_time = fields.Date.to_string(datetime.now()) - - def test_asset_depreciation_board(self): - self.assertEqual(len(self.asset.depreciation_line_ids), 15) - self.first_line = self.asset.depreciation_line_ids[0] - self.assertEqual(self.first_line.depreciated_value, 1000.0) - self.assertEqual(self.first_line.remaining_value, 14000.0) - - def test_asset_unamortized(self): - self.asset.set_to_close() - self.assertTrue(self.asset.disposal_move_id) - self.assertEqual(self.asset.disposal_date, self.date_time) + self.assertEqual(wizard.loss_account_id, self.account_asset_loss) + wizard.action_dispose() + self.assertEqual(self.asset.disposal_date, disposal_date) self.assertEqual(self.asset.state, 'disposed') + self.assertEqual(len(self.asset.depreciation_line_ids), 2) + self.assertTrue(self.asset.disposal_move_id) + self.assertEqual('posted', self.asset.disposal_move_id.state) + self.assertEqual(self.asset.value, self.asset.disposal_move_id.amount) self.asset.action_disposal_undo() self.assertEqual(self.asset.state, 'open') - self.assertEqual(self.asset.method_end, - self.asset.category_id.method_end) - self.assertEqual(self.asset.method_number, - self.asset.category_id.method_number) - - def test_asset_amortized(self): - self.asset.depreciation_line_ids.create_move() - for line in self.asset.depreciation_line_ids: - line.move_id.post() - self.assertEqual(self.asset.state, 'close') + self.assertEqual(len(self.asset.depreciation_line_ids), 10) diff --git a/account_asset_disposal/views/account_asset_view.xml b/account_asset_disposal/views/account_asset_asset_views.xml similarity index 55% rename from account_asset_disposal/views/account_asset_view.xml rename to account_asset_disposal/views/account_asset_asset_views.xml index 1edf0e826..8d9319678 100644 --- a/account_asset_disposal/views/account_asset_view.xml +++ b/account_asset_disposal/views/account_asset_asset_views.xml @@ -1,33 +1,24 @@ - + - - Add loss account - account.asset.category - - - -
-
- - - - - Add disposal fields account.asset.asset - + -