From eddc695ac35b01bc4414223a724937a60db2dda8 Mon Sep 17 00:00:00 2001 From: Arnaud Baes Date: Thu, 4 Jul 2019 14:13:26 +0000 Subject: [PATCH] [REM] stock: overprocessed quantity wizard. As this wizard only shows the first product overprocessed and does nothing else, we remove it completely for cleaning purposes. task-1938108 closes odoo/odoo#39161 Signed-off-by: Simon Lejeune (sle) --- .../tests/test_stockvaluation.py | 5 +---- addons/stock/__manifest__.py | 1 - addons/stock/models/stock_picking.py | 21 ------------------ addons/stock/tests/test_move.py | 13 ++--------- addons/stock/wizard/__init__.py | 1 - .../stock_overprocessed_transfer_views.xml | 22 ------------------- 6 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 addons/stock/wizard/stock_overprocessed_transfer_views.xml diff --git a/addons/purchase_stock/tests/test_stockvaluation.py b/addons/purchase_stock/tests/test_stockvaluation.py index 8daef8d6b0d..bbbb989dad0 100644 --- a/addons/purchase_stock/tests/test_stockvaluation.py +++ b/addons/purchase_stock/tests/test_stockvaluation.py @@ -233,10 +233,7 @@ class TestStockValuation(TransactionCase): picking1 = po1.picking_ids[0] move1 = picking1.move_lines[0] move1.quantity_done = 15 - res_dict = picking1.button_validate() - self.assertEqual(res_dict['res_model'], 'stock.overprocessed.transfer') - wizard = self.env[(res_dict.get('res_model'))].browse(res_dict.get('res_id')) - wizard.action_confirm() + picking1.button_validate() # there should be only one move self.assertEqual(len(picking1.move_lines), 1) diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py index f979fd5b05e..bce82d9daca 100644 --- a/addons/stock/__manifest__.py +++ b/addons/stock/__manifest__.py @@ -47,7 +47,6 @@ 'wizard/stock_scheduler_compute_views.xml', 'wizard/stock_immediate_transfer_views.xml', 'wizard/stock_backorder_confirmation_views.xml', - 'wizard/stock_overprocessed_transfer_views.xml', 'wizard/stock_quantity_history.xml', 'wizard/stock_rules_report_views.xml', 'wizard/stock_warn_insufficient_qty_views.xml', diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py index 127dce75e55..7d37fd119b7 100644 --- a/addons/stock/models/stock_picking.py +++ b/addons/stock/models/stock_picking.py @@ -851,20 +851,6 @@ class Picking(models.Model): 'context': self.env.context, } - if self._get_overprocessed_stock_moves() and not self._context.get('skip_overprocessed_check'): - view = self.env.ref('stock.view_overprocessed_transfer') - wiz = self.env['stock.overprocessed.transfer'].create({'picking_id': self.id}) - return { - 'type': 'ir.actions.act_window', - 'view_mode': 'form', - 'res_model': 'stock.overprocessed.transfer', - 'views': [(view.id, 'form')], - 'view_id': view.id, - 'target': 'new', - 'res_id': wiz.id, - 'context': self.env.context, - } - # Check backorder should check for other barcodes if self._check_backorder(): return self.action_generate_backorder_wizard() @@ -920,13 +906,6 @@ class Picking(models.Model): for picking in self.filtered(lambda picking: picking.immediate_transfer and picking.state not in ('done', 'cancel') and (picking.move_lines or picking.package_level_ids)): picking.action_confirm() - def _get_overprocessed_stock_moves(self): - self.ensure_one() - return self.move_lines.filtered( - lambda move: move.product_uom_qty != 0 and float_compare(move.quantity_done, move.product_uom_qty, - precision_rounding=move.product_uom.rounding) == 1 - ) - def _create_backorder(self): """ This method is called when the user chose to create a backorder. It will create a new diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py index 2777fdfff0b..e729bec21ea 100644 --- a/addons/stock/tests/test_move.py +++ b/addons/stock/tests/test_move.py @@ -1970,9 +1970,7 @@ class StockMove(SavepointCase): 'location_dest_id': backorder.location_dest_id.id, 'picking_id': backorder.id, })]}) - overprocessed_wizard_dict = backorder.button_validate() - overprocessed_wizard = self.env[overprocessed_wizard_dict['res_model']].browse(overprocessed_wizard_dict['res_id']) - overprocessed_wizard.action_confirm() + backorder.button_validate() backorder_move = backorder.move_lines self.assertEqual(backorder_move.state, 'done') self.assertEqual(backorder_move.quantity_done, 12.0) @@ -2136,9 +2134,7 @@ class StockMove(SavepointCase): 'move_id': backordered_move.id, })]}) - overprocessed_wizard = backorder.button_validate() - overprocessed_wizard = self.env['stock.overprocessed.transfer'].browse(overprocessed_wizard['res_id']) - overprocessed_wizard.action_confirm() + backorder.button_validate() self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product_serial, self.customer_location), 3) self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product_serial, self.pack_location), 0) @@ -3554,11 +3550,6 @@ class StockMove(SavepointCase): self.assertTrue(isinstance(action, dict), 'Should open backorder wizard') self.assertEqual(action.get('res_model'), 'stock.backorder.confirmation') - product3_move.move_line_ids[0].qty_done = 2 - action = picking.button_validate() # should request confirmation - self.assertTrue(isinstance(action, dict), 'Should open overprocessing wizard') - self.assertEqual(action.get('res_model'), 'stock.overprocessed.transfer') - def test_immediate_validate_7(self): """ In a picking with a single unavailable move, clicking on validate without filling any quantities should display an UserError telling the user he cannot process a picking without diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py index 785ecff3954..682b7fff5a7 100644 --- a/addons/stock/wizard/__init__.py +++ b/addons/stock/wizard/__init__.py @@ -7,7 +7,6 @@ from . import stock_change_product_qty from . import stock_scheduler_compute from . import stock_immediate_transfer from . import stock_backorder_confirmation -from . import stock_overprocessed_transfer from . import stock_quantity_history from . import stock_rules_report from . import stock_warn_insufficient_qty diff --git a/addons/stock/wizard/stock_overprocessed_transfer_views.xml b/addons/stock/wizard/stock_overprocessed_transfer_views.xml deleted file mode 100644 index 8de8b95fdcd..00000000000 --- a/addons/stock/wizard/stock_overprocessed_transfer_views.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - stock.overprocessed.transfer.view.form - stock.overprocessed.transfer - -
-

- You have processed more than what was initially - planned for the product . -

-

- Are you sure you want to validate this picking? -

- -
- - -