Report
diff --git a/addons/account_asset/tests/test_account_asset.py b/addons/account_asset/tests/test_account_asset.py
index 1c066945..422e3022 100644
--- a/addons/account_asset/tests/test_account_asset.py
+++ b/addons/account_asset/tests/test_account_asset.py
@@ -118,23 +118,6 @@ class TestAccountAsset(common.TransactionCase):
else:
logging.info("Asset Sale Function successfully executed")
- scrap_asset_id = self.env['scrap.asset.wizard'].create({
- 'partner_id': self.asset_id_1.partner_id.id,
- 'asset_id': self.asset_id_1.id,
- 'product_id': self.asset_id_1.product_id.id,
- 'asset_category_id': self.asset_id_1.category_id.id,
- 'depreciated_amount': self.asset_id_1.remaining_asset_value,
- 'sale_date': date.today(),
- })
-
- scrap_asset_id.with_context(
- {'active_id': self.asset_id_1.id}).do_scrap()
-
- if self.asset_id_1.state != 'close':
- raise AssertionError("Asset is not moved to scrap location")
- else:
- logging.info("Asset scrap function successfully executed")
-
# Check Fiscal Year
account_config = self.env['res.config.settings'].create({
'fiscalyear_last_month': 3,
diff --git a/addons/account_asset/views/account_asset_views.xml b/addons/account_asset/views/account_asset_views.xml
index abd7c748..0bc69000 100644
--- a/addons/account_asset/views/account_asset_views.xml
+++ b/addons/account_asset/views/account_asset_views.xml
@@ -148,17 +148,6 @@
'default_depreciated_amount': remaining_asset_value,
'default_sale_value': remaining_asset_value,
}"/>
-
diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py
index 9500e491..ecc85b9a 100644
--- a/addons/account_asset/wizard/__init__.py
+++ b/addons/account_asset/wizard/__init__.py
@@ -4,5 +4,4 @@
from . import asset_depreciation_confirmation_wizard
from . import asset_modify
from . import sale_asset_wizard
-from . import scrap_asset_wizard
from . import asset_depreciation_summary
\ No newline at end of file
diff --git a/addons/account_asset/wizard/scrap_asset_wizard.py b/addons/account_asset/wizard/scrap_asset_wizard.py
deleted file mode 100644
index 1d12e130..00000000
--- a/addons/account_asset/wizard/scrap_asset_wizard.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Part of Flectra. See LICENSE file for full copyright and licensing
-# details.
-
-from flectra import fields, models, api
-from datetime import datetime
-
-
-class ScrapAssetWizard(models.TransientModel):
- _name = "scrap.asset.wizard"
-
- partner_id = fields.Many2one('res.partner', 'Partner', required=True)
- asset_id = fields.Many2one("account.asset.asset", string="Asset")
- asset_category_id = fields.Many2one("account.asset.category",
- string="Asset Category", required=True)
- product_id = fields.Many2one("product.product", string="Product",
- required=True)
- depreciated_amount = fields.Float(string="Depreciated Amount",
- required=True)
- sale_date = fields.Date(
- string="Date", default=lambda self: datetime.today(),
- required=True)
-
- financial_move = fields.Boolean(string="Create Financial Move")
- journal_id = fields.Many2one("account.journal", string="Payment Journal",
- domain=[('type', 'in', ('bank', 'cash'))])
- amount = fields.Float(string="Payment Amount")
-
- @api.multi
- def do_scrap(self):
- asset_id = self.env['account.asset.asset'].browse(
- self._context['active_id'])
-
- if asset_id:
- asset_id.write({
- 'active': False,
- 'state': 'close'
- })
- depreciation_line_ids = self.env[
- 'account.asset.depreciation.line'].search(
- [('asset_id', '=', asset_id.id), ('move_check', '=', False)])
-
- if depreciation_line_ids:
- depreciation_line_ids.unlink()
- return True
diff --git a/addons/account_asset/wizard/scrap_asset_wizard_view.xml b/addons/account_asset/wizard/scrap_asset_wizard_view.xml
deleted file mode 100644
index 3bd0f409..00000000
--- a/addons/account_asset/wizard/scrap_asset_wizard_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
- scrap.asset.wizard
- scrap.asset.wizard
-
-
-
-
-
-
- Scrap Asset
- ir.actions.act_window
- scrap.asset.wizard
- form
- form
- new
-
-
-