From 509ddb0051a9fc7fe5247de832fa8acdda29df69 Mon Sep 17 00:00:00 2001 From: PauBForgeFlow Date: Wed, 6 Sep 2023 11:35:34 +0200 Subject: [PATCH] [MIG] mrp_unbuild_subcontracting: Migration to 16.0 --- mrp_unbuild_subcontracting/__manifest__.py | 2 +- .../models/mrp_unbuild.py | 2 +- .../models/stock_picking.py | 4 ++-- .../tests/test_mrp_unbuild_subcontracting.py | 22 +++++++++---------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/mrp_unbuild_subcontracting/__manifest__.py b/mrp_unbuild_subcontracting/__manifest__.py index e4ee49dec..dfb10e612 100644 --- a/mrp_unbuild_subcontracting/__manifest__.py +++ b/mrp_unbuild_subcontracting/__manifest__.py @@ -2,7 +2,7 @@ # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). { "name": "Unbuild orders with return subcontracting", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "license": "LGPL-3", "category": "Manufacture", "summary": "Unbuild orders are created automatically " diff --git a/mrp_unbuild_subcontracting/models/mrp_unbuild.py b/mrp_unbuild_subcontracting/models/mrp_unbuild.py index 042cbe742..2872538fc 100644 --- a/mrp_unbuild_subcontracting/models/mrp_unbuild.py +++ b/mrp_unbuild_subcontracting/models/mrp_unbuild.py @@ -5,4 +5,4 @@ class MrpUnbuild(models.Model): _inherit = "mrp.unbuild" picking_id = fields.Many2one("stock.picking", "Transfer", readonly=True) - is_subcontracted = fields.Boolean("Is Subcontracted", readonly=True) + is_subcontracted = fields.Boolean("Is Subcontracted?", readonly=True) diff --git a/mrp_unbuild_subcontracting/models/stock_picking.py b/mrp_unbuild_subcontracting/models/stock_picking.py index 22c9dbcc0..e387ad09e 100644 --- a/mrp_unbuild_subcontracting/models/stock_picking.py +++ b/mrp_unbuild_subcontracting/models/stock_picking.py @@ -8,7 +8,7 @@ class StockPicking(models.Model): _inherit = "stock.picking" subcontracted_unbuild_ids = fields.One2many( - "mrp.unbuild", "picking_id", readonly=True, string="Suncontracted unbuilds" + "mrp.unbuild", "picking_id", readonly=True, string="Subcontracted unbuilds" ) def _prepare_subcontract_unbuild_vals(self, subcontract_move, bom): @@ -59,7 +59,7 @@ class StockPicking(models.Model): unbuilds_to_done.with_context( subcontract_move_id=True, mo_ids_to_backorder=unbuild_ids_backorder ).action_validate() - move = self.move_lines.filtered(lambda move: move.is_subcontract) + move = self.move_ids.filtered(lambda move: move.is_subcontract) finished_move = unbuilds_to_done.produce_line_ids.filtered( lambda m: m.product_id == move.product_id ) diff --git a/mrp_unbuild_subcontracting/tests/test_mrp_unbuild_subcontracting.py b/mrp_unbuild_subcontracting/tests/test_mrp_unbuild_subcontracting.py index 0aeeb6319..e23d20b58 100644 --- a/mrp_unbuild_subcontracting/tests/test_mrp_unbuild_subcontracting.py +++ b/mrp_unbuild_subcontracting/tests/test_mrp_unbuild_subcontracting.py @@ -70,7 +70,7 @@ class TestSubcontractingPurchaseFlows(TransactionCase): self.assertTrue(mo) receipt = po.picking_ids - receipt.move_lines.quantity_done = 10 + receipt.move_ids.quantity_done = 10 receipt.button_validate() return_form = Form( @@ -80,12 +80,11 @@ class TestSubcontractingPurchaseFlows(TransactionCase): ) with return_form.product_return_moves.edit(0) as line: line.quantity = 3 - line.to_refund = True return_wizard = return_form.save() return_id, _ = return_wizard._create_returns() return_picking = self.env["stock.picking"].browse(return_id) - return_picking.move_lines.quantity_done = 3 + return_picking.move_ids.quantity_done = 3 subcontractor_location = self.subcontractor.property_stock_subcontractor unbuild = self.env["mrp.unbuild"].search([("bom_id", "=", self.bom.id)]) @@ -117,7 +116,7 @@ class TestSubcontractingPurchaseFlows(TransactionCase): unbuild.state, "done", "The state of the unbuild should be done" ) - move = return_picking.move_lines + move = return_picking.move_ids self.assertEqual( move.location_id, receipt.location_dest_id, @@ -134,7 +133,7 @@ class TestSubcontractingPurchaseFlows(TransactionCase): # Call the action to view the layers associated to the pickings result1 = return_picking.action_view_stock_valuation_layers() result2 = receipt.action_view_stock_valuation_layers() - layers1 = result1["domain"][2][2] + layers1 = result1["domain"][4][2] layers2 = result2["domain"][2][2] self.assertTrue( layers1, @@ -240,16 +239,16 @@ class TestSubcontractingTracking(TransactionCase): self.env["procurement.group"].run_scheduler() picking = self.env["stock.picking"].search([("group_id", "=", pg1.id)]) self.assertEqual(len(picking), 1) - self.assertEqual(picking.picking_type_id, wh.out_type_id) + self.assertEqual(picking.picking_type_id, wh.subcontracting_resupply_type_id) - lot_id = self.env["stock.production.lot"].create( + lot_id = self.env["stock.lot"].create( { "name": "lot1", "product_id": self.finished_product.id, "company_id": self.env.company.id, } ) - serial_id = self.env["stock.production.lot"].create( + serial_id = self.env["stock.lot"].create( { "name": "lot1", "product_id": self.comp1_sn.id, @@ -268,7 +267,7 @@ class TestSubcontractingTracking(TransactionCase): mo.subcontracting_record_component() # We should not be able to call the 'record_components' button - self.assertFalse(picking_receipt.display_action_record_components) + self.assertEqual(picking_receipt.display_action_record_components, "hide") picking_receipt.button_validate() self.assertEqual(mo.state, "done") @@ -280,12 +279,11 @@ class TestSubcontractingTracking(TransactionCase): ) with return_form.product_return_moves.edit(0) as line: line.quantity = 1 - line.to_refund = True return_wizard = return_form.save() return_id, _ = return_wizard._create_returns() return_picking = self.env["stock.picking"].browse(return_id) - return_picking.move_lines.quantity_done = 1 + return_picking.move_ids.quantity_done = 1 subcontractor_location = ( self.subcontractor_partner1.property_stock_subcontractor ) @@ -317,7 +315,7 @@ class TestSubcontractingTracking(TransactionCase): unbuild.state, "done", "The state of the unbuild should be done" ) - move = return_picking.move_lines + move = return_picking.move_ids self.assertEqual( move.location_id, picking_receipt.location_dest_id,