From a62778ad24c21def3c465e84294ef946a26e1404 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Fri, 1 May 2020 12:32:20 +0200 Subject: [PATCH 1/2] Add compatibility module for stock_picking_type_shipping_policy and... ... stock_picking_group_by_partner_by_carrier (of OCA/stock-logistics-workflow). In stock_picking_group_by_partner_by_carrier, the override of the method _search_picking_for_assignation adds a domain on: ("move_type", "=", self.group_id.move_type) (self is the move to assign in a picking). When the move_type of the procurement group is "direct", the transfer is normally created with the move_type "direct": when a first move is assigned to a picking and none is found, it creates one with type "direct", the second move should find the same and be assigned to it. This is not what happens, with stock_picking_type_shipping_policy configured to "force_all_product_ready", as it changes the way the first stock.picking is created: def _get_new_picking_values(self): res = super()._get_new_picking_values() picking_type = self.mapped("picking_type_id") if picking_type.shipping_policy == "force_as_soon_as_possible": res["move_type"] = "direct" elif picking_type.shipping_policy == "force_all_products_ready": res["move_type"] = "one" return res The first stock.picking is created with a move_type of "one", so when the second move search a stock.picking, it can't find it as it looks for a "direct" one. This glue module changes the domain of the grouping to take into account the picking type's shipping policy when both modules are installed. --- ...tock_picking_type_shipping_policy_group_by | 1 + .../setup.py | 6 +++ .../models/stock_move.py | 14 +++-- .../__init__.py | 1 + .../__manifest__.py | 21 ++++++++ .../models/__init__.py | 1 + .../models/stock_move.py | 14 +++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 4 ++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 2 + ...test_stock_picking_type_shipping_policy.py | 48 ++++++++++++++++++ 12 files changed, 109 insertions(+), 4 deletions(-) create mode 120000 setup/stock_picking_type_shipping_policy_group_by/odoo/addons/stock_picking_type_shipping_policy_group_by create mode 100644 setup/stock_picking_type_shipping_policy_group_by/setup.py create mode 100644 stock_picking_type_shipping_policy_group_by/__init__.py create mode 100644 stock_picking_type_shipping_policy_group_by/__manifest__.py create mode 100644 stock_picking_type_shipping_policy_group_by/models/__init__.py create mode 100644 stock_picking_type_shipping_policy_group_by/models/stock_move.py create mode 100644 stock_picking_type_shipping_policy_group_by/readme/CONTRIBUTORS.rst create mode 100644 stock_picking_type_shipping_policy_group_by/readme/DESCRIPTION.rst create mode 100644 stock_picking_type_shipping_policy_group_by/static/description/icon.png create mode 100644 stock_picking_type_shipping_policy_group_by/tests/__init__.py create mode 100644 stock_picking_type_shipping_policy_group_by/tests/test_stock_picking_type_shipping_policy.py diff --git a/setup/stock_picking_type_shipping_policy_group_by/odoo/addons/stock_picking_type_shipping_policy_group_by b/setup/stock_picking_type_shipping_policy_group_by/odoo/addons/stock_picking_type_shipping_policy_group_by new file mode 120000 index 00000000000..29376692591 --- /dev/null +++ b/setup/stock_picking_type_shipping_policy_group_by/odoo/addons/stock_picking_type_shipping_policy_group_by @@ -0,0 +1 @@ +../../../../stock_picking_type_shipping_policy_group_by \ No newline at end of file diff --git a/setup/stock_picking_type_shipping_policy_group_by/setup.py b/setup/stock_picking_type_shipping_policy_group_by/setup.py new file mode 100644 index 00000000000..28c57bb6403 --- /dev/null +++ b/setup/stock_picking_type_shipping_policy_group_by/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_picking_type_shipping_policy/models/stock_move.py b/stock_picking_type_shipping_policy/models/stock_move.py index 8e249eb8bac..f5eaadb85d1 100644 --- a/stock_picking_type_shipping_policy/models/stock_move.py +++ b/stock_picking_type_shipping_policy/models/stock_move.py @@ -7,11 +7,17 @@ class StockMove(models.Model): _inherit = "stock.move" - def _get_new_picking_values(self): - res = super()._get_new_picking_values() + def _shipping_policy_from_picking_type(self): picking_type = self.mapped("picking_type_id") if picking_type.shipping_policy == "force_as_soon_as_possible": - res["move_type"] = "direct" + return "direct" elif picking_type.shipping_policy == "force_all_products_ready": - res["move_type"] = "one" + return "one" + return None + + def _get_new_picking_values(self): + res = super()._get_new_picking_values() + picking_type_move_type = self._shipping_policy_from_picking_type() + if picking_type_move_type: + res["move_type"] = picking_type_move_type return res diff --git a/stock_picking_type_shipping_policy_group_by/__init__.py b/stock_picking_type_shipping_policy_group_by/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/stock_picking_type_shipping_policy_group_by/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/stock_picking_type_shipping_policy_group_by/__manifest__.py b/stock_picking_type_shipping_policy_group_by/__manifest__.py new file mode 100644 index 00000000000..5cebcb088a7 --- /dev/null +++ b/stock_picking_type_shipping_policy_group_by/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +{ + "name": "Stock Picking Type Shipping Policy -" " Group By Partner and Carrier", + "summary": "Glue module for Picking Type Shipping Policy" + " and Group Transfers by Partner and Carrier", + "version": "13.0.1.0.0", + "category": "Hidden", + "website": "https://github.com/OCA/wms", + "author": "Camptocamp, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "auto_install": True, + "depends": [ + "stock_picking_type_shipping_policy", + # in stock-logistics-workflow + "stock_picking_group_by_partner_by_carrier", + ], + "data": [], +} diff --git a/stock_picking_type_shipping_policy_group_by/models/__init__.py b/stock_picking_type_shipping_policy_group_by/models/__init__.py new file mode 100644 index 00000000000..6bda2d2428e --- /dev/null +++ b/stock_picking_type_shipping_policy_group_by/models/__init__.py @@ -0,0 +1 @@ +from . import stock_move diff --git a/stock_picking_type_shipping_policy_group_by/models/stock_move.py b/stock_picking_type_shipping_policy_group_by/models/stock_move.py new file mode 100644 index 00000000000..16f4c2bf4cb --- /dev/null +++ b/stock_picking_type_shipping_policy_group_by/models/stock_move.py @@ -0,0 +1,14 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import models + + +class StockMove(models.Model): + _inherit = "stock.move" + + def _domain_search_picking_handle_move_type(self): + picking_type_move_type = self._shipping_policy_from_picking_type() + if picking_type_move_type: + return [("move_type", "=", picking_type_move_type)] + else: + return super()._domain_search_picking_handle_move_type() diff --git a/stock_picking_type_shipping_policy_group_by/readme/CONTRIBUTORS.rst b/stock_picking_type_shipping_policy_group_by/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..48286263cd3 --- /dev/null +++ b/stock_picking_type_shipping_policy_group_by/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Guewen Baconnier diff --git a/stock_picking_type_shipping_policy_group_by/readme/DESCRIPTION.rst b/stock_picking_type_shipping_policy_group_by/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..e59704c660c --- /dev/null +++ b/stock_picking_type_shipping_policy_group_by/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +Technical module to make the following addons work properly together: + +* ``stock_picking_type_shipping_policy`` +* ``stock_picking_group_by_partner_by_carrier`` diff --git a/stock_picking_type_shipping_policy_group_by/static/description/icon.png b/stock_picking_type_shipping_policy_group_by/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/stock_picking_type_shipping_policy_group_by/tests/__init__.py b/stock_picking_type_shipping_policy_group_by/tests/__init__.py new file mode 100644 index 00000000000..5437c31a2e9 --- /dev/null +++ b/stock_picking_type_shipping_policy_group_by/tests/__init__.py @@ -0,0 +1,2 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) diff --git a/stock_picking_type_shipping_policy_group_by/tests/test_stock_picking_type_shipping_policy.py b/stock_picking_type_shipping_policy_group_by/tests/test_stock_picking_type_shipping_policy.py new file mode 100644 index 00000000000..79e1f1a1c8b --- /dev/null +++ b/stock_picking_type_shipping_policy_group_by/tests/test_stock_picking_type_shipping_policy.py @@ -0,0 +1,48 @@ +# Copyright 2020 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo.tests import SavepointCase + + +class TestPickingTypeShippingPolicyGroupBy(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + cls.warehouse = cls.env.ref("stock.warehouse0") + cls.pick_type = cls.warehouse.pick_type_id + cls.pick_type.group_pickings = True + cls.product = cls.env.ref("product.product_product_9") + cls.group = cls.env["procurement.group"].create( + {"name": "Test 1", "move_type": "direct"} + ) + + def _create_single_move(self, picking_type, group, product): + move_vals = { + "name": product.name, + "picking_type_id": picking_type.id, + "product_id": product.id, + "product_uom_qty": 1.0, + "product_uom": product.uom_id.id, + "location_id": picking_type.default_location_src_id.id, + "location_dest_id": picking_type.default_location_dest_id.id, + "state": "confirmed", + "procure_method": "make_to_stock", + "group_id": group.id, + } + return self.env["stock.move"].create(move_vals) + + def test_shipping_policy_force_picking_type_one(self): + """When the picking type changes move_type to 'one' + + If the picking type creates a stock.picking for move1 with move_type + 'one', ensure that the method that assign move2 to a new picking search + using the same move_type. + """ + self.group.move_type = "direct" + self.pick_type.shipping_policy = "force_all_products_ready" + move1 = self._create_single_move(self.pick_type, self.group, self.product) + move1._assign_picking() + move2 = self._create_single_move(self.pick_type, self.group, self.product) + move2._assign_picking() + self.assertEqual(move1.picking_id, move2.picking_id) + self.assertEqual(move1.picking_id.move_type, "one") From 4419902491e52457cb80c7e649133966003002bc Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Fri, 1 May 2020 15:34:33 +0200 Subject: [PATCH 2/2] Update stock_picking_type_shipping_policy_group_by/__manifest__.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sébastien Alix --- stock_picking_type_shipping_policy_group_by/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_picking_type_shipping_policy_group_by/__manifest__.py b/stock_picking_type_shipping_policy_group_by/__manifest__.py index 5cebcb088a7..49722f9dae9 100644 --- a/stock_picking_type_shipping_policy_group_by/__manifest__.py +++ b/stock_picking_type_shipping_policy_group_by/__manifest__.py @@ -1,7 +1,7 @@ # Copyright 2020 Camptocamp SA # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) { - "name": "Stock Picking Type Shipping Policy -" " Group By Partner and Carrier", + "name": "Stock Picking Type Shipping Policy - Group By Partner and Carrier", "summary": "Glue module for Picking Type Shipping Policy" " and Group Transfers by Partner and Carrier", "version": "13.0.1.0.0",