diff --git a/stock_warehouse_flow/README.rst b/stock_warehouse_flow/README.rst index 14d4777a5cd..395c4174187 100644 --- a/stock_warehouse_flow/README.rst +++ b/stock_warehouse_flow/README.rst @@ -121,6 +121,9 @@ Contributors - Sébastien Alix - Jacques-Etienne Baudoux - Michael Tietz (MT Software) +- `APSL-Nagarro `__: + + - Antoni Marroig Maintainers ----------- diff --git a/stock_warehouse_flow/__manifest__.py b/stock_warehouse_flow/__manifest__.py index babd3d2542a..3cee347c2cc 100644 --- a/stock_warehouse_flow/__manifest__.py +++ b/stock_warehouse_flow/__manifest__.py @@ -6,7 +6,7 @@ "author": "Camptocamp, BCIM, Odoo Community Association (OCA)", "website": "https://github.com/OCA/wms", "category": "Warehouse Management", - "version": "16.0.1.0.2", + "version": "17.0.1.0.0", "license": "AGPL-3", "depends": [ # core diff --git a/stock_warehouse_flow/models/stock_warehouse_flow.py b/stock_warehouse_flow/models/stock_warehouse_flow.py index 9ce50b2d5fe..60600459ca2 100644 --- a/stock_warehouse_flow/models/stock_warehouse_flow.py +++ b/stock_warehouse_flow/models/stock_warehouse_flow.py @@ -316,10 +316,11 @@ def _generate_delivery_route(self): self.pack_type_id.sequence_id.prefix += f"{self.sequence_prefix}/" # Create a dedicated 'Packing Zone/SUB' location if not self.pack_stock_loc_id: - self.pack_stock_loc_id = self.warehouse_id.wh_pack_stock_loc_id.copy( + warehouse = self.warehouse_id + self.pack_stock_loc_id = warehouse.wh_pack_stock_loc_id.copy( { "name": self.sequence_prefix, - "location_id": self.warehouse_id.wh_pack_stock_loc_id.id, + "location_id": warehouse.wh_pack_stock_loc_id.id, "active": True, } ) @@ -465,8 +466,10 @@ def _get_rule_from_delivery_route(self, html_exc=False): } if html_exc: args = { - "picking_type": f"{self.to_picking_type_id.display_name}", - "delivery_route": f"{self.delivery_route_id.display_name}", + "picking_type": "" + + "{self.to_picking_type_id.display_name}", + "delivery_route": "" + + "{self.delivery_route_id.display_name}", } raise UserError( _( diff --git a/stock_warehouse_flow/readme/CONTRIBUTORS.md b/stock_warehouse_flow/readme/CONTRIBUTORS.md index 5f987b68d6f..459f44a9bdf 100644 --- a/stock_warehouse_flow/readme/CONTRIBUTORS.md +++ b/stock_warehouse_flow/readme/CONTRIBUTORS.md @@ -1,3 +1,6 @@ - Sébastien Alix \<\> - Jacques-Etienne Baudoux \<\> - Michael Tietz (MT Software) \<\> +- [APSL-Nagarro](https://apsl.tech): + - Antoni Marroig \<\> + \ No newline at end of file diff --git a/stock_warehouse_flow/static/description/index.html b/stock_warehouse_flow/static/description/index.html index 6f358e6b888..d7bc9d5936a 100644 --- a/stock_warehouse_flow/static/description/index.html +++ b/stock_warehouse_flow/static/description/index.html @@ -459,6 +459,10 @@

Contributors

  • Sébastien Alix <sebastien.alix@camptocamp.com>
  • Jacques-Etienne Baudoux <je@bcim.be>
  • Michael Tietz (MT Software) <mtietz@mt-software.de>
    • +
  • APSL-Nagarro: +
    • diff --git a/stock_warehouse_flow/tests/common.py b/stock_warehouse_flow/tests/common.py index a804529ae8f..8bd02d6eb5a 100644 --- a/stock_warehouse_flow/tests/common.py +++ b/stock_warehouse_flow/tests/common.py @@ -67,7 +67,7 @@ def _run_procurement(self, product, qty, carrier=None): def _validate_picking(self, picking): for move_line in picking.move_line_ids: - move_line.qty_done = move_line.reserved_uom_qty + move_line.picked = True picking._action_done() def _prepare_split_test(self, qty=None): diff --git a/stock_warehouse_flow/tests/test_warehouse_flow.py b/stock_warehouse_flow/tests/test_warehouse_flow.py index 4f9f7edbfce..86be1b5337a 100644 --- a/stock_warehouse_flow/tests/test_warehouse_flow.py +++ b/stock_warehouse_flow/tests/test_warehouse_flow.py @@ -75,8 +75,10 @@ def test_no_rule_found_on_delivery_route(self): self.assertTrue(flow.warning) # Check that an error is raised when processing the move exception_msg = ( - f"No rule corresponding to .*{flow.to_picking_type_id.display_name}.* operation type " - f"has been found on delivery route .*{flow.delivery_route_id.display_name}.*.\n" + "No rule corresponding to ." + + "*{flow.to_picking_type_id.display_name}.* operation type " + "has been found on delivery route ." + + "*{flow.delivery_route_id.display_name}.*.\n" "Please check your configuration." ) with self.assertRaisesRegex(UserError, exception_msg): diff --git a/stock_warehouse_flow/views/delivery_carrier.xml b/stock_warehouse_flow/views/delivery_carrier.xml index 03d07955e56..0121bb1c8a7 100644 --- a/stock_warehouse_flow/views/delivery_carrier.xml +++ b/stock_warehouse_flow/views/delivery_carrier.xml @@ -16,7 +16,7 @@ icon="fa-refresh" class="oe_stat_button" type="object" - attrs="{'invisible': [('flow_ids', '=', [])]}" + invisible="not flow_ids" />
    diff --git a/stock_warehouse_flow/views/stock_warehouse_flow.xml b/stock_warehouse_flow/views/stock_warehouse_flow.xml index d54d53efc8b..6a374797a81 100644 --- a/stock_warehouse_flow/views/stock_warehouse_flow.xml +++ b/stock_warehouse_flow/views/stock_warehouse_flow.xml @@ -13,7 +13,7 @@ name="web_ribbon" title="Archived" bg_color="bg-danger" - attrs="{'invisible': [('active', '=', True)]}" + invisible="active" />