From 321c93e9614a61c1f814e23f6ba187fb2f904705 Mon Sep 17 00:00:00 2001 From: Abraham Anes Date: Thu, 28 Jul 2022 12:31:59 +0200 Subject: [PATCH 1/2] [14.0][IMP] stock_move_location: packages support --- stock_move_location/readme/CONTRIBUTORS.rst | 1 + stock_move_location/tests/test_common.py | 34 +++++++++++++++---- .../tests/test_move_location.py | 14 +++++--- .../wizard/stock_move_location.py | 8 +++-- .../wizard/stock_move_location.xml | 5 +++ .../wizard/stock_move_location_line.py | 15 ++++++++ 6 files changed, 65 insertions(+), 12 deletions(-) diff --git a/stock_move_location/readme/CONTRIBUTORS.rst b/stock_move_location/readme/CONTRIBUTORS.rst index 24f9bbc22..767d29138 100644 --- a/stock_move_location/readme/CONTRIBUTORS.rst +++ b/stock_move_location/readme/CONTRIBUTORS.rst @@ -10,3 +10,4 @@ * João Marques * Jacques-Etienne Baudoux * Iryna Vyshnevska +* Abraham Anes diff --git a/stock_move_location/tests/test_common.py b/stock_move_location/tests/test_common.py index ade0658c8..4814f69c0 100644 --- a/stock_move_location/tests/test_common.py +++ b/stock_move_location/tests/test_common.py @@ -48,6 +48,9 @@ class TestsCommon(common.SavepointCase): cls.product_lots = product_obj.create( {"name": "Apple", "type": "product", "tracking": "lot"} ) + cls.product_package = product_obj.create( + {"name": "Orange", "type": "product", "tracking": "lot"} + ) cls.lot1 = cls.env["stock.production.lot"].create( { "name": "lot1", @@ -69,6 +72,14 @@ class TestsCommon(common.SavepointCase): "company_id": cls.company.id, } ) + cls.lot4 = cls.env["stock.production.lot"].create( + { + "name": "lot4", + "product_id": cls.product_package.id, + "company_id": cls.company.id, + } + ) + cls.package = cls.env["stock.quant.package"].create({}) def setup_product_amounts(self): self.set_product_amount(self.product_no_lots, self.internal_loc_1, 123) @@ -81,16 +92,27 @@ class TestsCommon(common.SavepointCase): self.set_product_amount( self.product_lots, self.internal_loc_1, 1.0, lot_id=self.lot3 ) - - def set_product_amount(self, product, location, amount, lot_id=None): - self.env["stock.quant"]._update_available_quantity( - product, location, amount, lot_id=lot_id + self.set_product_amount( + self.product_package, + self.internal_loc_1, + 1.0, + lot_id=self.lot4, + package_id=self.package, ) - def check_product_amount(self, product, location, amount, lot_id=None): + def set_product_amount( + self, product, location, amount, lot_id=None, package_id=None + ): + self.env["stock.quant"]._update_available_quantity( + product, location, amount, lot_id=lot_id, package_id=package_id + ) + + def check_product_amount( + self, product, location, amount, lot_id=None, package_id=None + ): self.assertEqual( self.env["stock.quant"]._get_available_quantity( - product, location, lot_id=lot_id + product, location, lot_id=lot_id, package_id=package_id ), amount, ) diff --git a/stock_move_location/tests/test_move_location.py b/stock_move_location/tests/test_move_location.py index fc180e3ba..c04401d90 100644 --- a/stock_move_location/tests/test_move_location.py +++ b/stock_move_location/tests/test_move_location.py @@ -21,10 +21,16 @@ class TestMoveLocation(TestsCommon): self.check_product_amount(self.product_lots, self.internal_loc_1, 0, self.lot1) self.check_product_amount(self.product_lots, self.internal_loc_1, 0, self.lot2) self.check_product_amount(self.product_lots, self.internal_loc_1, 0, self.lot3) + self.check_product_amount( + self.product_package, self.internal_loc_1, 0, self.lot4, self.package + ) self.check_product_amount(self.product_no_lots, self.internal_loc_2, 123) self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot1) self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot2) self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot3) + self.check_product_amount( + self.product_package, self.internal_loc_2, 1, self.lot4, self.package + ) def test_move_location_wizard_amount(self): """Can't move more than exists.""" @@ -54,9 +60,9 @@ class TestMoveLocation(TestsCommon): """Test lines getting cleared properly.""" wizard = self._create_wizard(self.internal_loc_1, self.internal_loc_2) wizard.onchange_origin_location() - self.assertEqual(len(wizard.stock_move_location_line_ids), 4) + self.assertEqual(len(wizard.stock_move_location_line_ids), 5) wizard._onchange_destination_location_id() - self.assertEqual(len(wizard.stock_move_location_line_ids), 4) + self.assertEqual(len(wizard.stock_move_location_line_ids), 5) dest_location_line = wizard.stock_move_location_line_ids.mapped( "destination_location_id" ) @@ -72,9 +78,9 @@ class TestMoveLocation(TestsCommon): wizard.action_move_location() picking = wizard.picking_id self.assertEqual(picking.state, "assigned") - self.assertEqual(len(picking.move_line_ids), 4) + self.assertEqual(len(picking.move_line_ids), 5) self.assertEqual( - sorted(picking.move_line_ids.mapped("product_uom_qty")), [1, 1, 1, 123] + sorted(picking.move_line_ids.mapped("product_uom_qty")), [1, 1, 1, 1, 123] ) def test_quant_transfer(self): diff --git a/stock_move_location/wizard/stock_move_location.py b/stock_move_location/wizard/stock_move_location.py index 4fdffe9f4..2b392cd08 100644 --- a/stock_move_location/wizard/stock_move_location.py +++ b/stock_move_location/wizard/stock_move_location.py @@ -104,6 +104,7 @@ class StockMoveLocationWizard(models.TransientModel): "reserved_quantity": quant.reserved_quantity, "origin_location_id": quant.location_id.id, "lot_id": quant.lot_id.id, + "package_id": quant.package_id.id, "product_uom_id": quant.product_uom_id.id, "custom": False, }, @@ -131,6 +132,7 @@ class StockMoveLocationWizard(models.TransientModel): "reserved_quantity": quant.reserved_quantity, "origin_location_id": quant.location_id.id, "lot_id": quant.lot_id.id, + "package_id": quant.package_id.id, "product_uom_id": quant.product_uom_id.id, "custom": False, }, @@ -239,6 +241,7 @@ class StockMoveLocationWizard(models.TransientModel): ("product_id", "=", line.product_id.id), ("location_id", "=", line.origin_location_id.id), ("lot_id", "=", line.lot_id.id), + ("package_id", "=", line.package_id.id), ("product_uom_qty", ">", 0.0), ] ) @@ -280,11 +283,11 @@ class StockMoveLocationWizard(models.TransientModel): # Using sql as search_group doesn't support aggregation functions # leading to overhead in queries to DB query = """ - SELECT product_id, lot_id, SUM(quantity) AS quantity, + SELECT product_id, lot_id, package_id, SUM(quantity) AS quantity, SUM(reserved_quantity) AS reserved_quantity FROM stock_quant WHERE location_id = %s - GROUP BY product_id, lot_id + GROUP BY product_id, lot_id, package_id """ self.env.cr.execute(query, (location_id.id,)) return self.env.cr.dictfetchall() @@ -310,6 +313,7 @@ class StockMoveLocationWizard(models.TransientModel): "destination_location_id": location_dest_id, # cursor returns None instead of False "lot_id": group.get("lot_id") or False, + "package_id": group.get("package_id") or False, "product_uom_id": product.uom_id.id, "custom": False, } diff --git a/stock_move_location/wizard/stock_move_location.xml b/stock_move_location/wizard/stock_move_location.xml index 4c022a469..d3731d43d 100644 --- a/stock_move_location/wizard/stock_move_location.xml +++ b/stock_move_location/wizard/stock_move_location.xml @@ -77,6 +77,11 @@ groups="stock.group_production_lot" options="{'no_create': True}" /> + Date: Thu, 3 Nov 2022 16:57:02 +0100 Subject: [PATCH 2/2] [14.0][IMP] stock_move_location: owner support --- stock_move_location/tests/test_common.py | 38 ++++++++++++++++--- .../tests/test_move_location.py | 29 +++++++++++--- .../wizard/stock_move_location.py | 8 +++- .../wizard/stock_move_location.xml | 1 + .../wizard/stock_move_location_line.py | 10 +++++ 5 files changed, 72 insertions(+), 14 deletions(-) diff --git a/stock_move_location/tests/test_common.py b/stock_move_location/tests/test_common.py index 4814f69c0..a72e5c9f3 100644 --- a/stock_move_location/tests/test_common.py +++ b/stock_move_location/tests/test_common.py @@ -15,6 +15,7 @@ class TestsCommon(common.SavepointCase): cls.wizard_obj = cls.env["wiz.stock.move.location"] cls.quant_obj = cls.env["stock.quant"] cls.company = cls.env.ref("base.main_company") + cls.partner = cls.env.ref("base.res_partner_category_0") cls.internal_loc_1 = cls.location_obj.create( { @@ -79,7 +80,15 @@ class TestsCommon(common.SavepointCase): "company_id": cls.company.id, } ) - cls.package = cls.env["stock.quant.package"].create({}) + cls.lot5 = cls.env["stock.production.lot"].create( + { + "name": "lot5", + "product_id": cls.product_package.id, + "company_id": cls.company.id, + } + ) + cls.package1 = cls.env["stock.quant.package"].create({}) + cls.package2 = cls.env["stock.quant.package"].create({}) def setup_product_amounts(self): self.set_product_amount(self.product_no_lots, self.internal_loc_1, 123) @@ -97,22 +106,39 @@ class TestsCommon(common.SavepointCase): self.internal_loc_1, 1.0, lot_id=self.lot4, - package_id=self.package, + package_id=self.package1, + ) + self.set_product_amount( + self.product_package, + self.internal_loc_1, + 1.0, + lot_id=self.lot5, + package_id=self.package2, + owner_id=self.partner, ) def set_product_amount( - self, product, location, amount, lot_id=None, package_id=None + self, product, location, amount, lot_id=None, package_id=None, owner_id=None ): self.env["stock.quant"]._update_available_quantity( - product, location, amount, lot_id=lot_id, package_id=package_id + product, + location, + amount, + lot_id=lot_id, + package_id=package_id, + owner_id=owner_id, ) def check_product_amount( - self, product, location, amount, lot_id=None, package_id=None + self, product, location, amount, lot_id=None, package_id=None, owner_id=None ): self.assertEqual( self.env["stock.quant"]._get_available_quantity( - product, location, lot_id=lot_id, package_id=package_id + product, + location, + lot_id=lot_id, + package_id=package_id, + owner_id=owner_id, ), amount, ) diff --git a/stock_move_location/tests/test_move_location.py b/stock_move_location/tests/test_move_location.py index c04401d90..9042be42f 100644 --- a/stock_move_location/tests/test_move_location.py +++ b/stock_move_location/tests/test_move_location.py @@ -22,14 +22,30 @@ class TestMoveLocation(TestsCommon): self.check_product_amount(self.product_lots, self.internal_loc_1, 0, self.lot2) self.check_product_amount(self.product_lots, self.internal_loc_1, 0, self.lot3) self.check_product_amount( - self.product_package, self.internal_loc_1, 0, self.lot4, self.package + self.product_package, self.internal_loc_1, 0, self.lot4, self.package1 + ) + self.check_product_amount( + self.product_package, + self.internal_loc_1, + 0, + self.lot5, + self.package2, + self.partner, ) self.check_product_amount(self.product_no_lots, self.internal_loc_2, 123) self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot1) self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot2) self.check_product_amount(self.product_lots, self.internal_loc_2, 1, self.lot3) self.check_product_amount( - self.product_package, self.internal_loc_2, 1, self.lot4, self.package + self.product_package, self.internal_loc_2, 1, self.lot4, self.package1 + ) + self.check_product_amount( + self.product_package, + self.internal_loc_2, + 1, + self.lot5, + self.package2, + self.partner, ) def test_move_location_wizard_amount(self): @@ -60,9 +76,9 @@ class TestMoveLocation(TestsCommon): """Test lines getting cleared properly.""" wizard = self._create_wizard(self.internal_loc_1, self.internal_loc_2) wizard.onchange_origin_location() - self.assertEqual(len(wizard.stock_move_location_line_ids), 5) + self.assertEqual(len(wizard.stock_move_location_line_ids), 6) wizard._onchange_destination_location_id() - self.assertEqual(len(wizard.stock_move_location_line_ids), 5) + self.assertEqual(len(wizard.stock_move_location_line_ids), 6) dest_location_line = wizard.stock_move_location_line_ids.mapped( "destination_location_id" ) @@ -78,9 +94,10 @@ class TestMoveLocation(TestsCommon): wizard.action_move_location() picking = wizard.picking_id self.assertEqual(picking.state, "assigned") - self.assertEqual(len(picking.move_line_ids), 5) + self.assertEqual(len(picking.move_line_ids), 6) self.assertEqual( - sorted(picking.move_line_ids.mapped("product_uom_qty")), [1, 1, 1, 1, 123] + sorted(picking.move_line_ids.mapped("product_uom_qty")), + [1, 1, 1, 1, 1, 123], ) def test_quant_transfer(self): diff --git a/stock_move_location/wizard/stock_move_location.py b/stock_move_location/wizard/stock_move_location.py index 2b392cd08..129747138 100644 --- a/stock_move_location/wizard/stock_move_location.py +++ b/stock_move_location/wizard/stock_move_location.py @@ -105,6 +105,7 @@ class StockMoveLocationWizard(models.TransientModel): "origin_location_id": quant.location_id.id, "lot_id": quant.lot_id.id, "package_id": quant.package_id.id, + "owner_id": quant.owner_id.id, "product_uom_id": quant.product_uom_id.id, "custom": False, }, @@ -133,6 +134,7 @@ class StockMoveLocationWizard(models.TransientModel): "origin_location_id": quant.location_id.id, "lot_id": quant.lot_id.id, "package_id": quant.package_id.id, + "owner_id": quant.owner_id.id, "product_uom_id": quant.product_uom_id.id, "custom": False, }, @@ -242,6 +244,7 @@ class StockMoveLocationWizard(models.TransientModel): ("location_id", "=", line.origin_location_id.id), ("lot_id", "=", line.lot_id.id), ("package_id", "=", line.package_id.id), + ("owner_id", "=", line.owner_id.id), ("product_uom_qty", ">", 0.0), ] ) @@ -283,11 +286,11 @@ class StockMoveLocationWizard(models.TransientModel): # Using sql as search_group doesn't support aggregation functions # leading to overhead in queries to DB query = """ - SELECT product_id, lot_id, package_id, SUM(quantity) AS quantity, + SELECT product_id, lot_id, package_id, owner_id, SUM(quantity) AS quantity, SUM(reserved_quantity) AS reserved_quantity FROM stock_quant WHERE location_id = %s - GROUP BY product_id, lot_id, package_id + GROUP BY product_id, lot_id, package_id, owner_id """ self.env.cr.execute(query, (location_id.id,)) return self.env.cr.dictfetchall() @@ -314,6 +317,7 @@ class StockMoveLocationWizard(models.TransientModel): # cursor returns None instead of False "lot_id": group.get("lot_id") or False, "package_id": group.get("package_id") or False, + "owner_id": group.get("owner_id") or False, "product_uom_id": product.uom_id.id, "custom": False, } diff --git a/stock_move_location/wizard/stock_move_location.xml b/stock_move_location/wizard/stock_move_location.xml index d3731d43d..f98a63284 100644 --- a/stock_move_location/wizard/stock_move_location.xml +++ b/stock_move_location/wizard/stock_move_location.xml @@ -82,6 +82,7 @@ domain="[('location_id', '=', origin_location_id)]" options="{'no_create': True}" /> +