Merge PR #27 into 13.0

Signed-off-by jgrandguillaume

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

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,
+)

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

stock_picking_type_shipping_policy_group_by/__init__.py

@@ -0,0 +1 @@
+from . import models

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": [],
+}

stock_picking_type_shipping_policy_group_by/models/__init__.py

@@ -0,0 +1 @@
+from . import stock_move

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()

stock_picking_type_shipping_policy_group_by/readme/CONTRIBUTORS.rst

@@ -0,0 +1 @@
+* Guewen Baconnier <[email protected]>

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``

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)

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")