From 6df7195af5fa5535bf356779b7700c394fa9aace Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Thu, 9 Jun 2016 13:27:35 +0200 Subject: [PATCH] [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 + +
+ + + + + + + + + +
+
+
+ +
+