diff --git a/addons/account_asset/__manifest__.py b/addons/account_asset/__manifest__.py index 4af77a7d..70620d12 100644 --- a/addons/account_asset/__manifest__.py +++ b/addons/account_asset/__manifest__.py @@ -25,7 +25,6 @@ Keeps track of depreciations, and creates corresponding journal entries. 'data/account_asset_data.xml', 'wizard/asset_modify_views.xml', 'wizard/sale_asset_wizard_view.xml', - 'wizard/scrap_asset_wizard_view.xml', 'wizard/asset_depreciation_summary_wizard_view.xml', 'views/account_asset_views.xml', 'views/account_invoice_views.xml', diff --git a/addons/account_asset/static/description/account_asset_sc_10.png b/addons/account_asset/static/description/account_asset_sc_10.png deleted file mode 100644 index 9cbcf346..00000000 Binary files a/addons/account_asset/static/description/account_asset_sc_10.png and /dev/null differ diff --git a/addons/account_asset/static/description/account_asset_sc_11.png b/addons/account_asset/static/description/account_asset_sc_11.png deleted file mode 100644 index f89efffb..00000000 Binary files a/addons/account_asset/static/description/account_asset_sc_11.png and /dev/null differ diff --git a/addons/account_asset/static/description/index.html b/addons/account_asset/static/description/index.html index d9219e17..6da4babb 100644 --- a/addons/account_asset/static/description/index.html +++ b/addons/account_asset/static/description/index.html @@ -240,48 +240,6 @@ -
-
-

Scrap Asset

-
-
- -
-
-
-
- -
-
-
-

- If your products that are damaged or that are unusable then you can use Scrap. -

-
-
-
- -
-
-

Scrap Details

-
-
- -
-
-
-
- -
-
-
-

- Just define the details related to Scrap Product. Once product is scrap it become Inactive. -

-
-
-
-

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, }"/> -