From b8ec319bcc785056250acbc05919ac2f7206bb53 Mon Sep 17 00:00:00 2001
From: Thierry Ducrest <thierry.ducrest@camptocamp.com>
Date: Tue, 14 Nov 2023 15:55:00 +0100
Subject: [PATCH 01/16] shopfloor: checkout fix asking destination location

There could be multiple moves with different destination
The destination location could be of type `view`

For both cases, require the user to scan a new location.
---
 shopfloor/services/checkout.py        |  7 ++-----
 shopfloor/tests/test_checkout_done.py | 28 ++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/shopfloor/services/checkout.py b/shopfloor/services/checkout.py
index 01b8b6c81b..1aae3754b1 100644
--- a/shopfloor/services/checkout.py
+++ b/shopfloor/services/checkout.py
@@ -1404,11 +1404,8 @@ def done(self, picking_id, confirmation=False):
                     },
                 )
         lines_done = self._lines_checkout_done(picking)
-        dest_location = picking.location_dest_id
-        child_locations = self.env["stock.location"].search(
-            [("id", "child_of", dest_location.id), ("usage", "!=", "view")]
-        )
-        if len(child_locations) > 0 and child_locations != dest_location:
+        dest_location = lines_done.move_id.location_dest_id
+        if len(dest_location) != 1 or dest_location.usage == "view":
             return self._response_for_select_child_location(
                 picking,
             )
diff --git a/shopfloor/tests/test_checkout_done.py b/shopfloor/tests/test_checkout_done.py
index a9acce2032..1e6c93c3aa 100644
--- a/shopfloor/tests/test_checkout_done.py
+++ b/shopfloor/tests/test_checkout_done.py
@@ -65,8 +65,34 @@ def test_done_partial_confirm(self):
             "done", params={"picking_id": self.picking.id, "confirmation": True}
         )
 
-        self.assertRecordValues(self.picking, [{"state": "assigned"}])
+        self.assertRecordValues(self.picking, [{"state": "done"}])
+
+        self.assert_response(
+            response,
+            next_state="select_document",
+            message=self.service.msg_store.transfer_done_success(self.picking),
+            data={"restrict_scan_first": False},
+        )
 
+    def test_done_ask_destination_location(self):
+        """Check asking for destination location for view type location."""
+        view_location = (
+            self.env["stock.location"]
+            .sudo()
+            .create(
+                {
+                    "name": "Test Location Usage View",
+                    "location_id": self.picking.move_lines.location_dest_id.id,
+                    "usage": "view",
+                }
+            )
+        )
+        self.picking.move_lines.location_dest_id = view_location
+        response = self.service.dispatch(
+            "done", params={"picking_id": self.picking.id, "confirmation": True}
+        )
+
+        self.assertRecordValues(self.picking, [{"state": "assigned"}])
         self.assert_response(
             response,
             next_state="select_child_location",

From 3dddd879cbbff4a2f9934ec8b12a9cc6035db378 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Mon, 16 Oct 2023 16:16:03 +0200
Subject: [PATCH 02/16] shopfloor_mobile_base: fix searchbar focus

---
 .../static/wms/src/components/searchbar/searchbar.js   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/shopfloor_mobile_base/static/wms/src/components/searchbar/searchbar.js b/shopfloor_mobile_base/static/wms/src/components/searchbar/searchbar.js
index bed590947f..381f6cb851 100644
--- a/shopfloor_mobile_base/static/wms/src/components/searchbar/searchbar.js
+++ b/shopfloor_mobile_base/static/wms/src/components/searchbar/searchbar.js
@@ -115,7 +115,15 @@ export var Searchbar = Vue.component("searchbar", {
     },
     methods: {
         capture_focus: function () {
-            if (this.autofocus) this.$refs.searchbar.focus();
+            if (this.autofocus && this.$refs.searchbar) {
+                // We need to use both "focus" and "click" in combination
+                // to make sure that the searchbar is fully focused and ready for scanning
+                // without having to manually tap on it.
+                // Using simply one or the other is not enough
+                // to always be able to input any scanned text.
+                this.$refs.searchbar.focus();
+                this.$refs.searchbar.click();
+            }
         },
         show_virtual_keyboard: function (elem) {
             elem.inputMode = this.input_inputmode;

From c0392b7930e6a8666a0d5cdcc0c1db4a692faeb2 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Thu, 9 Nov 2023 14:53:36 +0100
Subject: [PATCH 03/16] shopfloor_mobile: ensure searchbar focus doesn't remove
 user popups

---
 .../static/wms/src/scenario/cluster_picking.js  |  3 +++
 .../src/scenario/location_content_transfer.js   |  3 +++
 .../wms/src/scenario/single_pack_transfer.js    | 17 +++++++++++++++--
 .../static/wms/src/scenario/zone_picking.js     |  3 +++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js b/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
index b85426a68a..b99d3b2c32 100644
--- a/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
+++ b/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
@@ -7,6 +7,8 @@
 import {ScenarioBaseMixin} from "/shopfloor_mobile_base/static/wms/src/scenario/mixins.js";
 import {process_registry} from "/shopfloor_mobile_base/static/wms/src/services/process_registry.js";
 
+// TODO: consider replacing the dynamic "autofocus" in the searchbar by an event.
+// At the moment, we need autofocus to be disabled if there's a user popup.
 const ClusterPicking = {
     mixins: [ScenarioBaseMixin],
     template: `
@@ -18,6 +20,7 @@ const ClusterPicking = {
                 v-if="state.on_scan"
                 v-on:found="on_scan"
                 :input_placeholder="search_input_placeholder"
+                :autofocus="!screen_info.user_popup"
                 />
             <get-work
                 v-if="state_is('start')"
diff --git a/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js b/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js
index 371d6152c0..123e0042c3 100644
--- a/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js
+++ b/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js
@@ -7,6 +7,8 @@
 import {ScenarioBaseMixin} from "/shopfloor_mobile_base/static/wms/src/scenario/mixins.js";
 import {process_registry} from "/shopfloor_mobile_base/static/wms/src/services/process_registry.js";
 
+// TODO: consider replacing the dynamic "autofocus" in the searchbar by an event.
+// At the moment, we need autofocus to be disabled if there's a user popup.
 const LocationContentTransfer = {
     mixins: [ScenarioBaseMixin],
     template: `
@@ -18,6 +20,7 @@ const LocationContentTransfer = {
                 v-if="state.on_scan"
                 v-on:found="on_scan"
                 :input_placeholder="search_input_placeholder"
+                :autofocus="!screen_info.user_popup"
                 />
             <template v-if="state_in(['scan_location']) && state.data.location">
                 <item-detail-card
diff --git a/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js b/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js
index 86117fea66..77c2c0116f 100644
--- a/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js
+++ b/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js
@@ -60,6 +60,8 @@ export var SinglePackStatesMixin = {
     },
 };
 
+// TODO: consider replacing the dynamic "autofocus" in the searchbar by an event.
+// At the moment, we need autofocus to be disabled if there's a user popup.
 const SinglePackTransfer = {
     mixins: [ScenarioBaseMixin, SinglePackStatesMixin],
     template: `
@@ -67,8 +69,19 @@ const SinglePackTransfer = {
             <template v-slot:header>
                 <state-display-info :info="state.display_info" v-if="state.display_info"/>
             </template>
-            <searchbar v-if="state_is(initial_state_key)" v-on:found="on_scan" :input_placeholder="search_input_placeholder"></searchbar>
-            <searchbar v-if="state_is('scan_location')" v-on:found="on_scan" :input_placeholder="search_input_placeholder" :input_data_type="'location'"></searchbar>
+            <searchbar
+                v-if="state_is(initial_state_key)"
+                v-on:found="on_scan"
+                :autofocus="!screen_info.user_popup"
+                :input_placeholder="search_input_placeholder"
+            ></searchbar>
+            <searchbar
+                v-if="state_is('scan_location')"
+                v-on:found="on_scan"
+                :autofocus="!screen_info.user_popup"
+                :input_placeholder="search_input_placeholder"
+                :input_data_type="'location'"
+            ></searchbar>
             <div v-if="state.key != 'show_completion_info' && _.result(state, 'data.picking')">
                 <item-detail-card
                     :key="make_state_component_key(['package', state.data.id])"
diff --git a/shopfloor_mobile/static/wms/src/scenario/zone_picking.js b/shopfloor_mobile/static/wms/src/scenario/zone_picking.js
index 9b6030c4a1..6cc71f5bdb 100644
--- a/shopfloor_mobile/static/wms/src/scenario/zone_picking.js
+++ b/shopfloor_mobile/static/wms/src/scenario/zone_picking.js
@@ -7,6 +7,8 @@
 import {ScenarioBaseMixin} from "/shopfloor_mobile_base/static/wms/src/scenario/mixins.js";
 import {process_registry} from "/shopfloor_mobile_base/static/wms/src/services/process_registry.js";
 
+// TODO: consider replacing the dynamic "autofocus" in the searchbar by an event.
+// At the moment, we need autofocus to be disabled if there's a user popup.
 const template_mobile = `
     <Screen :screen_info="screen_info">
         <template v-slot:header>
@@ -16,6 +18,7 @@ const template_mobile = `
             v-if="state.on_scan"
             v-on:found="on_scan"
             :input_placeholder="search_input_placeholder"
+            :autofocus="!screen_info.user_popup"
             />
 
         <div v-if="state_is('scan_location')">

From c96b55af1f51598163564d4cb12a8bf236d56cf7 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Tue, 24 Oct 2023 10:27:53 +0200
Subject: [PATCH 04/16] shopfloor: fix missing invisible key in
 shopfloor_menu.xml

---
 shopfloor/views/shopfloor_menu.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shopfloor/views/shopfloor_menu.xml b/shopfloor/views/shopfloor_menu.xml
index 868dc85c6c..5617de5f9e 100644
--- a/shopfloor/views/shopfloor_menu.xml
+++ b/shopfloor/views/shopfloor_menu.xml
@@ -112,6 +112,7 @@
                     name="scan_location_or_pack_first"
                     attrs="{'invisible': [('scan_location_or_pack_first_is_possible', '=', False)]}"
                 >
+                  <field name="scenario_key" invisible="1" />
                   <field name="scan_location_or_pack_first_is_possible" invisible="1" />
                   <field name="scan_location_or_pack_first" />
                   <div

From 65f35d8444907ff83f2c00c0c4fa060d353d3a45 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Wed, 22 Nov 2023 08:37:51 +0100
Subject: [PATCH 05/16] shopfloor: display pickings by priority in checkout

---
 shopfloor/actions/data.py                            | 5 +++--
 shopfloor/actions/schema.py                          | 1 +
 shopfloor/services/checkout.py                       | 2 +-
 shopfloor/tests/test_actions_data.py                 | 2 ++
 shopfloor_mobile/static/wms/src/scenario/checkout.js | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/shopfloor/actions/data.py b/shopfloor/actions/data.py
index aaefbc06dc..1fdfcc8851 100644
--- a/shopfloor/actions/data.py
+++ b/shopfloor/actions/data.py
@@ -13,7 +13,7 @@ class DataAction(Component):
     def location(self, record, **kw):
         parser = self._location_parser
         data = self._jsonify(record.with_context(location=record.id), parser, **kw)
-        if "with_operation_progress" in kw:
+        if kw.get("with_operation_progress"):
             lines_blacklist = (
                 kw.get("progress_lines_blacklist")
                 or self.env["stock.move.line"].browse()
@@ -46,7 +46,7 @@ def _get_picking_parser(self, record, **kw):
         # and it may reduce performance significatively
         # when dealing with a large number of pickings.
         # Thus, we make it optional.
-        if "with_progress" in kw:
+        if kw.get("with_progress"):
             parser.append("progress")
         return parser
 
@@ -72,6 +72,7 @@ def _picking_parser(self, **kw):
             "bulk_line_count",
             "total_weight:weight",
             "scheduled_date",
+            "priority",
         ]
 
     @ensure_model("stock.quant.package")
diff --git a/shopfloor/actions/schema.py b/shopfloor/actions/schema.py
index bfa0fdba4e..e474fe35de 100644
--- a/shopfloor/actions/schema.py
+++ b/shopfloor/actions/schema.py
@@ -27,6 +27,7 @@ def picking(self):
             "scheduled_date": {"type": "string", "nullable": False, "required": True},
             "progress": {"type": "float", "nullable": True},
             "location_dest": self._schema_dict_of(self.location(), required=False),
+            "priority": {"type": "string", "nullable": True, "required": False},
         }
 
     def move_line(self, with_packaging=False, with_picking=False):
diff --git a/shopfloor/services/checkout.py b/shopfloor/services/checkout.py
index 1aae3754b1..858230b7a2 100644
--- a/shopfloor/services/checkout.py
+++ b/shopfloor/services/checkout.py
@@ -360,7 +360,7 @@ def _domain_for_list_stock_picking(self):
         ]
 
     def _order_for_list_stock_picking(self):
-        return "scheduled_date asc, id asc"
+        return "priority desc, scheduled_date asc, id asc"
 
     def list_stock_picking(self):
         """List stock.picking records available
diff --git a/shopfloor/tests/test_actions_data.py b/shopfloor/tests/test_actions_data.py
index 0fbe90233e..de502b4f76 100644
--- a/shopfloor/tests/test_actions_data.py
+++ b/shopfloor/tests/test_actions_data.py
@@ -155,6 +155,7 @@ def test_data_picking(self):
             "partner": {"id": self.customer.id, "name": self.customer.name},
             "carrier": {"id": carrier.id, "name": carrier.name},
             "ship_carrier": None,
+            "priority": "0",
         }
         self.assertEqual(data.pop("scheduled_date").split("T")[0], "2020-08-03")
         self.assertDictEqual(data, expected)
@@ -179,6 +180,7 @@ def test_data_picking_with_progress(self):
             "carrier": {"id": carrier.id, "name": carrier.name},
             "ship_carrier": None,
             "progress": 0.0,
+            "priority": "0",
         }
         self.assertEqual(data.pop("scheduled_date").split("T")[0], "2020-08-03")
         self.assertDictEqual(data, expected)
diff --git a/shopfloor_mobile/static/wms/src/scenario/checkout.js b/shopfloor_mobile/static/wms/src/scenario/checkout.js
index d88c2fa524..b1f7d7da50 100644
--- a/shopfloor_mobile/static/wms/src/scenario/checkout.js
+++ b/shopfloor_mobile/static/wms/src/scenario/checkout.js
@@ -293,6 +293,7 @@ const Checkout = {
                         {path: "origin"},
                         {path: "carrier.name", label: "Carrier"},
                         {path: "move_line_count", label: "Lines"},
+                        {path: "priority", label: "Priority"},
                     ],
                 },
             };

From 4ef28e4ac6cf4caa7acb8c98b351b7909143ee46 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Fri, 17 Nov 2023 10:55:50 +0100
Subject: [PATCH 06/16] shopfloor_mobile: use stars to display picking priority

---
 .../static/wms/src/scenario/checkout.js           | 15 ++++++++++++++-
 .../static/wms/src/components/priority-widget.js  |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/shopfloor_mobile/static/wms/src/scenario/checkout.js b/shopfloor_mobile/static/wms/src/scenario/checkout.js
index b1f7d7da50..479ee3c52b 100644
--- a/shopfloor_mobile/static/wms/src/scenario/checkout.js
+++ b/shopfloor_mobile/static/wms/src/scenario/checkout.js
@@ -293,7 +293,20 @@ const Checkout = {
                         {path: "origin"},
                         {path: "carrier.name", label: "Carrier"},
                         {path: "move_line_count", label: "Lines"},
-                        {path: "priority", label: "Priority"},
+                        {
+                            path: "priority",
+                            render_component: "priority-widget",
+                            render_options: function (record) {
+                                const priority = parseInt(record.priority);
+                                // We need to pass the label to the component as an option instead of using "display_no_value"
+                                // because pickings with no priority will still have a string value of "0"
+                                // and the label would always be displayed.
+                                return {
+                                    priority,
+                                    label: priority ? "Priority: " : null,
+                                };
+                            },
+                        },
                     ],
                 },
             };
diff --git a/shopfloor_mobile_base/static/wms/src/components/priority-widget.js b/shopfloor_mobile_base/static/wms/src/components/priority-widget.js
index 9e8427cc9e..4f0da6d3fa 100644
--- a/shopfloor_mobile_base/static/wms/src/components/priority-widget.js
+++ b/shopfloor_mobile_base/static/wms/src/components/priority-widget.js
@@ -18,6 +18,7 @@ export var PriorityWidget = Vue.component("priority-widget", {
     },
     template: `
 <div :class="[$options._componentTag, opts.mode ? 'mode-' + opts.mode: '', 'd-inline']">
+    <span v-if="opts.label">{{ opts.label }}</span>
     <span v-for="n in _.range(1, opts.priority + 1)" v-if="opts.priority" :class="['priority-' + n]">
         <v-icon color="amber accent-2">mdi-star</v-icon>
     </span>

From 0f9d3e8ad62a319d057cb95717c20d9c996e2c25 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Wed, 6 Dec 2023 11:55:15 +0100
Subject: [PATCH 07/16] shopfloor_mobile_base: force nav item counter update

---
 shopfloor_mobile_base/static/wms/src/main.js | 21 +++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/shopfloor_mobile_base/static/wms/src/main.js b/shopfloor_mobile_base/static/wms/src/main.js
index 76379add59..78a7ddac25 100644
--- a/shopfloor_mobile_base/static/wms/src/main.js
+++ b/shopfloor_mobile_base/static/wms/src/main.js
@@ -77,6 +77,7 @@ new Vue({
             global_state_key: "",
             loading: false,
             loading_msg_custom: "",
+            loadingMenu: false,
             appconfig: null,
         };
         _.merge(data, config_registry.generare_data_keys());
@@ -122,6 +123,9 @@ new Vue({
         });
         event_hub.$emit("app:mounted", self, false);
     },
+    beforeUpdate: function () {
+        this.loadMenu(true);
+    },
     computed: {
         ...config_registry.generate_computed_properties(),
         app_info: function () {
@@ -231,9 +235,20 @@ new Vue({
                     "SERVICE-CTX-PROFILE-ID": this.profile.id,
                 },
             });
-            return odoo.call("menu").then(function (result) {
-                self.appmenu = result.data;
-            });
+            if (!this.loadingMenu) {
+                // TODO: this is added to make sure to always have
+                // up-to-date counter in the navigation drawer items.
+                // It is not an ideal solution though, as it will be called
+                // whenever the component is updated (there's no easy way
+                // to refresh the counters only when needed,
+                // as each scenario has a different implementation).
+                // That being said, this call is very small so it's not that costly.
+                this.loadingMenu = true;
+                return odoo.call("menu").then((result) => {
+                    self.appmenu = result.data;
+                    this.loadingMenu = false;
+                });
+            }
         },
         login: function (evt, data) {
             evt.preventDefault();

From b55e34ec082b1c1d09da98c5fcb46b3283accf83 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Mon, 18 Dec 2023 16:15:46 +0100
Subject: [PATCH 08/16] shopfloor_mobile_base: improve nav item counter update

---
 shopfloor_mobile_base/static/wms/src/main.js  | 24 +++++--------------
 .../static/wms/src/scenario/mixins.js         |  3 +++
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/shopfloor_mobile_base/static/wms/src/main.js b/shopfloor_mobile_base/static/wms/src/main.js
index 78a7ddac25..be38599f9c 100644
--- a/shopfloor_mobile_base/static/wms/src/main.js
+++ b/shopfloor_mobile_base/static/wms/src/main.js
@@ -77,7 +77,6 @@ new Vue({
             global_state_key: "",
             loading: false,
             loading_msg_custom: "",
-            loadingMenu: false,
             appconfig: null,
         };
         _.merge(data, config_registry.generare_data_keys());
@@ -121,11 +120,11 @@ new Vue({
             self.profile = profile;
             self.loadMenu(true);
         });
+        event_hub.$on("menu_drawer:update", function () {
+            self.loadMenu(true);
+        });
         event_hub.$emit("app:mounted", self, false);
     },
-    beforeUpdate: function () {
-        this.loadMenu(true);
-    },
     computed: {
         ...config_registry.generate_computed_properties(),
         app_info: function () {
@@ -235,20 +234,9 @@ new Vue({
                     "SERVICE-CTX-PROFILE-ID": this.profile.id,
                 },
             });
-            if (!this.loadingMenu) {
-                // TODO: this is added to make sure to always have
-                // up-to-date counter in the navigation drawer items.
-                // It is not an ideal solution though, as it will be called
-                // whenever the component is updated (there's no easy way
-                // to refresh the counters only when needed,
-                // as each scenario has a different implementation).
-                // That being said, this call is very small so it's not that costly.
-                this.loadingMenu = true;
-                return odoo.call("menu").then((result) => {
-                    self.appmenu = result.data;
-                    this.loadingMenu = false;
-                });
-            }
+            return odoo.call("menu").then(function (result) {
+                self.appmenu = result.data;
+            });
         },
         login: function (evt, data) {
             evt.preventDefault();
diff --git a/shopfloor_mobile_base/static/wms/src/scenario/mixins.js b/shopfloor_mobile_base/static/wms/src/scenario/mixins.js
index b3b68f6850..d342446db4 100644
--- a/shopfloor_mobile_base/static/wms/src/scenario/mixins.js
+++ b/shopfloor_mobile_base/static/wms/src/scenario/mixins.js
@@ -357,6 +357,9 @@ export var ScenarioBaseMixin = {
                 // Move to new state, data will be refreshed right after.
                 this.state_to(state_key);
             }
+            // Make sure the counters and all the data from the navigation drawer menu
+            // is up to date after new data from the backend is received.
+            event_hub.$emit("menu_drawer:update");
         },
         on_call_error: function (result) {
             alert(result.status + " " + result.error);

From 4bad97a00220d1af20663ccb79fcde6d55cb1203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Alix?= <sebastien.alix@camptocamp.com>
Date: Wed, 20 Dec 2023 18:41:58 +0100
Subject: [PATCH 09/16] [FIX] stock_dynamic_routing: routing moves has to be
 MTO

This is causing trouble by merging back moves in the
`stock_available_to_promise_release_dynamic_routing` glue module which
were split on purpose by the dynamic routing rules.
---
 stock_dynamic_routing/models/stock_move.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/stock_dynamic_routing/models/stock_move.py b/stock_dynamic_routing/models/stock_move.py
index e7ebbe8fb0..23af4adf59 100644
--- a/stock_dynamic_routing/models/stock_move.py
+++ b/stock_dynamic_routing/models/stock_move.py
@@ -532,4 +532,6 @@ def _prepare_routing_move_values(self, picking_type, source, destination):
             # https://github.com/odoo/odoo/commit/ecf726ae
             # to be on the safe side, force it to False
             "package_level_id": False,
+            # A routing move is always in MTO
+            "procure_method": "make_to_order",
         }

From f642141c7206d8d8897fe10177c5a0a8023d51c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Alix?= <sebastien.alix@camptocamp.com>
Date: Mon, 8 Jan 2024 11:30:18 +0100
Subject: [PATCH 10/16] shopfloor, zone_picking: get right qty when pack/lot is
 changed

---
 shopfloor/services/zone_picking.py               | 16 +++++++++++-----
 .../tests/test_zone_picking_change_pack_lot.py   |  2 ++
 shopfloor/tests/test_zone_picking_select_line.py |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/shopfloor/services/zone_picking.py b/shopfloor/services/zone_picking.py
index d73283f13b..b0679cf8b1 100644
--- a/shopfloor/services/zone_picking.py
+++ b/shopfloor/services/zone_picking.py
@@ -667,12 +667,15 @@ def _scan_source_package(
                 )
             else:
                 change_package_lot = self._actions_for("change.package.lot")
+                move_line = first(move_lines)
                 response = change_package_lot.change_package(
-                    first(move_lines),
+                    move_line,
                     package,
-                    # FIXME we may need to pass the quantity being done
-                    self._response_for_set_line_destination,
-                    self._response_for_change_pack_lot,
+                    response_ok_func=functools.partial(
+                        self._response_for_set_line_destination,
+                        qty_done=self._get_prefill_qty(move_line, qty=0),
+                    ),
+                    response_error_func=self._response_for_change_pack_lot,
                 )
         else:
             response = self._list_move_lines(sublocation or self.zone_location)
@@ -1434,7 +1437,10 @@ def change_pack_lot(self, move_line_id, barcode):
         # pre-configured callable used to generate the response as the
         # change.package.lot component is not aware of the needed response type
         # and related parameters for zone picking scenario
-        response_ok_func = functools.partial(self._response_for_set_line_destination)
+        response_ok_func = functools.partial(
+            self._response_for_set_line_destination,
+            qty_done=self._get_prefill_qty(move_line),
+        )
         response_error_func = functools.partial(self._response_for_change_pack_lot)
         response = None
         change_package_lot = self._actions_for("change.package.lot")
diff --git a/shopfloor/tests/test_zone_picking_change_pack_lot.py b/shopfloor/tests/test_zone_picking_change_pack_lot.py
index 7e080c90e2..282f0398fa 100644
--- a/shopfloor/tests/test_zone_picking_change_pack_lot.py
+++ b/shopfloor/tests/test_zone_picking_change_pack_lot.py
@@ -87,6 +87,7 @@ def test_change_pack_lot_change_pack_ok(self):
             message=self.service.msg_store.package_replaced_by_package(
                 previous_package, self.free_package
             ),
+            qty_done=self.service._get_prefill_qty(move_line),
         )
 
     def test_change_pack_lot_change_lot_ok(self):
@@ -137,4 +138,5 @@ def test_change_pack_lot_change_lot_ok(self):
             message=self.service.msg_store.lot_replaced_by_lot(
                 previous_lot, self.free_lot
             ),
+            qty_done=self.service._get_prefill_qty(move_line),
         )
diff --git a/shopfloor/tests/test_zone_picking_select_line.py b/shopfloor/tests/test_zone_picking_select_line.py
index b673d59510..d6b486c134 100644
--- a/shopfloor/tests/test_zone_picking_select_line.py
+++ b/shopfloor/tests/test_zone_picking_select_line.py
@@ -348,6 +348,7 @@ def test_scan_source_barcode_package_can_replace_in_line(self):
             message=self.service.msg_store.package_replaced_by_package(
                 package1, package1b
             ),
+            qty_done=self.service._get_prefill_qty(move_lines[0]),
         )
         # Check the package has been changed on the move line
         self.assertEqual(self.picking1.package_level_ids[0].package_id, package1b)

From ab1548c6b02b31e9fc28c137f6cbcb626626043d Mon Sep 17 00:00:00 2001
From: Thierry Ducrest <thierry.ducrest@camptocamp.com>
Date: Tue, 16 Jan 2024 09:38:53 +0100
Subject: [PATCH 11/16] sf: add index on result_package_id

---
 shopfloor/models/stock_move_line.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shopfloor/models/stock_move_line.py b/shopfloor/models/stock_move_line.py
index e70ae50307..b70d90f4c7 100644
--- a/shopfloor/models/stock_move_line.py
+++ b/shopfloor/models/stock_move_line.py
@@ -24,6 +24,7 @@ class StockMoveLine(models.Model):
     # we search lines based on their location in some workflows
     location_id = fields.Many2one(index=True)
     package_id = fields.Many2one(index=True)
+    result_package_id = fields.Many2one(index=True)
 
     # allow domain on picking_id.xxx without too much perf penalty
     picking_id = fields.Many2one(auto_join=True)

From 021183ee76265d428ed5f493f0046944e93389aa Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Thu, 22 Feb 2024 11:32:27 +0100
Subject: [PATCH 12/16] shopfloor: mark lines as sf_checkout_done when handled
 in backend

---
 shopfloor/models/stock_picking.py             | 11 ++++++++
 .../test_checkout_scan_package_action.py      | 25 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/shopfloor/models/stock_picking.py b/shopfloor/models/stock_picking.py
index bb11e54c2b..3bff487489 100644
--- a/shopfloor/models/stock_picking.py
+++ b/shopfloor/models/stock_picking.py
@@ -116,3 +116,14 @@ def split_assigned_move_lines(self, move_lines=None):
         )
         assigned_moves._action_assign()
         return new_picking.id
+
+    def _put_in_pack(self, move_line_ids, create_package_level=True):
+        """
+        Marks the corresponding move lines as 'shopfloor_checkout_done'
+        when the package is created in the backend.
+
+        """
+        new_package = super()._put_in_pack(move_line_ids, create_package_level)
+        lines = move_line_ids.filtered(lambda p: p.result_package_id == new_package)
+        lines.write({"shopfloor_checkout_done": True})
+        return new_package
diff --git a/shopfloor/tests/test_checkout_scan_package_action.py b/shopfloor/tests/test_checkout_scan_package_action.py
index 446f50debd..0b1981705a 100644
--- a/shopfloor/tests/test_checkout_scan_package_action.py
+++ b/shopfloor/tests/test_checkout_scan_package_action.py
@@ -455,3 +455,28 @@ def test_scan_package_action_scan_not_found(self):
             selected_line,
             message={"message_type": "error", "body": "Barcode not found"},
         )
+
+    def test_put_in_pack(self):
+        picking = self._create_picking(
+            lines=[(self.product_a, 10), (self.product_b, 20)]
+        )
+        self._fill_stock_for_moves(picking.move_lines)
+        picking.action_assign()
+
+        # Test that the move lines are marked as 'shopfloor_checkout_done'
+        # when putting them in a pack in the backend.
+        picking._put_in_pack(picking.move_line_ids)
+        self.assertTrue(
+            all(line.shopfloor_checkout_done for line in picking.move_line_ids)
+        )
+
+        # Check that we return those lines to the frontend.
+        res = self.service.dispatch(
+            "summary",
+            params={
+                "picking_id": picking.id,
+            },
+        )
+        returned_lines = res["data"]["summary"]["picking"]["move_lines"]
+        expected_line_ids = [line["id"] for line in returned_lines]
+        self.assertEqual(expected_line_ids, picking.move_line_ids.ids)

From 955ed8bb1479cc31c0d60376a940a3ab75a2fcfa Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Mon, 26 Feb 2024 12:37:37 +0100
Subject: [PATCH 13/16] sf_manual_prod_transfer_mobile: fix wrong qty done

---
 .../static/wms/src/scenario/manual_product_transfer.js         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shopfloor_manual_product_transfer_mobile/static/wms/src/scenario/manual_product_transfer.js b/shopfloor_manual_product_transfer_mobile/static/wms/src/scenario/manual_product_transfer.js
index a7c504dea8..0354aa5145 100644
--- a/shopfloor_manual_product_transfer_mobile/static/wms/src/scenario/manual_product_transfer.js
+++ b/shopfloor_manual_product_transfer_mobile/static/wms/src/scenario/manual_product_transfer.js
@@ -163,6 +163,9 @@ const ManualProductTransfer = {
             }
             if ("qty_done" in data) return data.qty_done;
             if ("quantity" in data) return data.quantity;
+            if ("move_lines" in data) {
+                return data.move_lines.reduce((total, val) => total + val.qty_done, 0);
+            }
             return 0;
         },
         lot: function () {

From 804275217591d0470b19294b3cf1ddfa9cb9a284 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Fri, 23 Feb 2024 15:07:25 +0100
Subject: [PATCH 14/16] shopfloor: apply zero_check only if product is not a
 consumable

---
 shopfloor/services/cluster_picking.py |  7 +++++--
 shopfloor/services/zone_picking.py    | 12 ++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/shopfloor/services/cluster_picking.py b/shopfloor/services/cluster_picking.py
index 721f835c72..f5fec4b87d 100644
--- a/shopfloor/services/cluster_picking.py
+++ b/shopfloor/services/cluster_picking.py
@@ -776,8 +776,11 @@ def scan_destination_pack(self, picking_batch_id, move_line_id, barcode, quantit
                 qty_done=quantity,
             )
         move_line.write({"qty_done": quantity, "result_package_id": bin_package.id})
-
-        zero_check = move_line.picking_id.picking_type_id.shopfloor_zero_check
+        # Only apply zero check if the product is of type "product".
+        zero_check = (
+            move_line.product_id.type == "product"
+            and move_line.picking_id.picking_type_id.shopfloor_zero_check
+        )
         if zero_check and move_line.location_id.planned_qty_in_location_is_empty():
             return self._response_for_zero_check(batch, move_line)
 
diff --git a/shopfloor/services/zone_picking.py b/shopfloor/services/zone_picking.py
index b0679cf8b1..fad89f3671 100644
--- a/shopfloor/services/zone_picking.py
+++ b/shopfloor/services/zone_picking.py
@@ -962,7 +962,11 @@ def _set_destination_location(
 
         location_changed = True
         # Zero check
-        zero_check = self.picking_type.shopfloor_zero_check
+        # Only apply zero check if the product is of type "product".
+        zero_check = (
+            move_line.product_id.type == "product"
+            and self.picking_type.shopfloor_zero_check
+        )
         if zero_check and move_line.location_id.planned_qty_in_location_is_empty():
             response = self._response_for_zero_check(move_line)
         return (location_changed, response)
@@ -1045,7 +1049,11 @@ def _set_destination_package(self, move_line, quantity, package):
             return (package_changed, response)
         package_changed = True
         # Zero check
-        zero_check = self.picking_type.shopfloor_zero_check
+        # Only apply zero check if the product is of type "product".
+        zero_check = (
+            move_line.product_id.type == "product"
+            and self.picking_type.shopfloor_zero_check
+        )
         if zero_check and move_line.location_id.planned_qty_in_location_is_empty():
             response = self._response_for_zero_check(move_line)
         return (package_changed, response)

From 54c7763910dbe3ef9813f6299a1f99aa0051426c Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Fri, 15 Mar 2024 11:49:46 +0100
Subject: [PATCH 15/16] shopfloor_packing_info: deprecate

---
 shopfloor/services/checkout.py                |  9 ---
 shopfloor/tests/test_checkout_base.py         |  1 -
 .../test_checkout_list_delivery_packaging.py  |  1 -
 .../test_checkout_scan_package_action.py      |  1 -
 .../test_checkout_select_package_base.py      |  1 -
 shopfloor_packing_info/__manifest__.py        |  4 +-
 .../migrations/14.0.1.2.0/post-migrate.py     | 56 +++++++++++++++++++
 shopfloor_packing_info/readme/DESCRIPTION.rst |  4 ++
 8 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 shopfloor_packing_info/migrations/14.0.1.2.0/post-migrate.py

diff --git a/shopfloor/services/checkout.py b/shopfloor/services/checkout.py
index 858230b7a2..147bd00a26 100644
--- a/shopfloor/services/checkout.py
+++ b/shopfloor/services/checkout.py
@@ -100,7 +100,6 @@ def _response_for_select_package(self, picking, lines, message=None):
             data={
                 "selected_move_lines": self._data_for_move_lines(lines.sorted()),
                 "picking": self.data.picking(picking),
-                "packing_info": self._data_for_packing_info(picking),
                 "no_package_enabled": not self.options.get(
                     "checkout__disable_no_package"
                 ),
@@ -108,14 +107,6 @@ def _response_for_select_package(self, picking, lines, message=None):
             message=message,
         )
 
-    def _data_for_packing_info(self, picking):
-        """Return the packing information
-
-        Intended to be extended.
-        """
-        # TODO: This could be avoided if included in the picking parser.
-        return ""
-
     def _response_for_select_dest_package(self, picking, move_lines, message=None):
         packages = picking.mapped("move_line_ids.result_package_id").filtered(
             "packaging_id"
diff --git a/shopfloor/tests/test_checkout_base.py b/shopfloor/tests/test_checkout_base.py
index 120e1e71af..876b4bda0c 100644
--- a/shopfloor/tests/test_checkout_base.py
+++ b/shopfloor/tests/test_checkout_base.py
@@ -67,7 +67,6 @@ def _assert_select_package_qty_above(self, response, picking):
                     self._move_line_data(ml) for ml in picking.move_line_ids.sorted()
                 ],
                 "picking": self._picking_summary_data(picking),
-                "packing_info": "",
                 "no_package_enabled": True,
             },
             message={
diff --git a/shopfloor/tests/test_checkout_list_delivery_packaging.py b/shopfloor/tests/test_checkout_list_delivery_packaging.py
index 48fc87c446..2e702a83a5 100644
--- a/shopfloor/tests/test_checkout_list_delivery_packaging.py
+++ b/shopfloor/tests/test_checkout_list_delivery_packaging.py
@@ -111,7 +111,6 @@ def test_list_delivery_packaging_not_available(self):
                 "selected_move_lines": [
                     self._move_line_data(ml) for ml in selected_lines.sorted()
                 ],
-                "packing_info": self.service._data_for_packing_info(self.picking),
                 "no_package_enabled": not self.service.options.get(
                     "checkout__disable_no_package"
                 ),
diff --git a/shopfloor/tests/test_checkout_scan_package_action.py b/shopfloor/tests/test_checkout_scan_package_action.py
index 0b1981705a..a2609d3f8e 100644
--- a/shopfloor/tests/test_checkout_scan_package_action.py
+++ b/shopfloor/tests/test_checkout_scan_package_action.py
@@ -172,7 +172,6 @@ def test_scan_package_action_scan_package_keep_source_package_error(self):
             data={
                 "picking": self.data.picking(picking),
                 "selected_move_lines": self.data.move_lines(selected_lines),
-                "packing_info": self.service._data_for_packing_info(picking),
                 "no_package_enabled": not self.service.options.get(
                     "checkout__disable_no_package"
                 ),
diff --git a/shopfloor/tests/test_checkout_select_package_base.py b/shopfloor/tests/test_checkout_select_package_base.py
index 5f4ffe42ce..b3be128eab 100644
--- a/shopfloor/tests/test_checkout_select_package_base.py
+++ b/shopfloor/tests/test_checkout_select_package_base.py
@@ -20,7 +20,6 @@ def _assert_selected_response(
                     self._move_line_data(ml) for ml in selected_lines.sorted()
                 ],
                 "picking": self._picking_summary_data(picking),
-                "packing_info": packing_info,
                 "no_package_enabled": no_package_enabled,
             },
             message=message,
diff --git a/shopfloor_packing_info/__manifest__.py b/shopfloor_packing_info/__manifest__.py
index 194d818bc2..2ae1506e2f 100644
--- a/shopfloor_packing_info/__manifest__.py
+++ b/shopfloor_packing_info/__manifest__.py
@@ -3,14 +3,14 @@
 {
     "name": "Shopfloor Packing Info",
     "summary": "Allows to predefine packing information messages per partner.",
-    "version": "14.0.1.1.0",
+    "version": "14.0.1.2.0",
     "development_status": "Alpha",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "application": False,
-    "depends": ["shopfloor", "sales_team"],
+    "depends": ["shopfloor", "sales_team", "stock_picking_partner_note"],
     "data": [
         "security/ir.model.access.csv",
         "views/res_partner_views.xml",
diff --git a/shopfloor_packing_info/migrations/14.0.1.2.0/post-migrate.py b/shopfloor_packing_info/migrations/14.0.1.2.0/post-migrate.py
new file mode 100644
index 0000000000..913549805c
--- /dev/null
+++ b/shopfloor_packing_info/migrations/14.0.1.2.0/post-migrate.py
@@ -0,0 +1,56 @@
+# Copyright 2024 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+import logging
+
+from odoo import SUPERUSER_ID, api
+
+_logger = logging.getLogger(__name__)
+
+# NOTE: This module is deprecated in favor of stock_picking_partner_note.
+# Here, we migrate the data from shopfloor.packing.info to stock.picking.note.
+
+
+def setup_stock_picking_note__packing(env):
+    """Create a new packing note type named 'packing'."""
+
+    _logger.info("Create a new picking note type named 'packing'")
+    packing_note_type = env["stock.picking.note.type"].search(
+        [("name", "=", "packing")], limit=1
+    )
+    if not packing_note_type:
+        packing_note_type = env["stock.picking.note.type"].create({"name": "packing"})
+    return packing_note_type
+
+
+def populate_stock_picking_note__packing(env):
+    """Migrate data from shopfloor.packing.info to stock.picking.note of type 'packing'.
+
+    We also update the stock_picking_note_ids of the partners
+    based on their existing shopfloor_packing_info_id values."""
+
+    _logger.info(
+        "Migrate data from shopfloor.packing.info to stock.picking.note of type 'packing'"
+    )
+    packing_note_type = setup_stock_picking_note__packing(env)
+    existing_packing_infos = env["shopfloor.packing.info"].search([])
+    for packing_info in existing_packing_infos:
+        note = env["stock.picking.note"].create(
+            {
+                "name": packing_info.text,
+                "note_type_id": packing_note_type.id,
+            }
+        )
+        partner = env["res.partner"].search(
+            [("shopfloor_packing_info_id", "=", packing_info.id)], limit=1
+        )
+        if partner:
+            partner.stock_picking_note_ids |= note
+
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    populate_stock_picking_note__packing(env)
diff --git a/shopfloor_packing_info/readme/DESCRIPTION.rst b/shopfloor_packing_info/readme/DESCRIPTION.rst
index 14deabd5ed..430d7d6bf7 100644
--- a/shopfloor_packing_info/readme/DESCRIPTION.rst
+++ b/shopfloor_packing_info/readme/DESCRIPTION.rst
@@ -1,3 +1,7 @@
+DEPRECATED: This module is deprecated in favor of stock_picking_partner_note,
+which is now used in shopfloor to display notes in the app.
+
+
 Adds the option to choose predefined messages for the
 parameter "Checkout Packing Info", that is set on Customers
 and reused in other places, mainly pickings. These new messages

From 2e230a143e68cc5038f0a7a6611f0e6cfd2e56d8 Mon Sep 17 00:00:00 2001
From: JuMiSanAr <jumisan134@gmail.com>
Date: Fri, 15 Mar 2024 11:50:13 +0100
Subject: [PATCH 16/16] shopfloor_mobile: display picking partner note in
 frontend

---
 shopfloor_mobile/static/wms/src/scenario/checkout.js        | 4 ++--
 shopfloor_mobile/static/wms/src/scenario/cluster_picking.js | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/shopfloor_mobile/static/wms/src/scenario/checkout.js b/shopfloor_mobile/static/wms/src/scenario/checkout.js
index 479ee3c52b..8eb4c7115e 100644
--- a/shopfloor_mobile/static/wms/src/scenario/checkout.js
+++ b/shopfloor_mobile/static/wms/src/scenario/checkout.js
@@ -76,8 +76,8 @@ const Checkout = {
             </div>
 
             <div v-if="state_is('select_package')">
-                <v-alert type="info" tile v-if="state.data.packing_info" class="packing-info">
-                    <p v-text="state.data.packing_info" />
+                <v-alert type="info" tile v-if="state.data.picking.note" class="packing-info">
+                    <p v-text="state.data.picking.note" />
                 </v-alert>
                 <item-detail-card
                     v-if="state.data.picking.carrier"
diff --git a/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js b/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
index b99d3b2c32..af2cdb5b63 100644
--- a/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
+++ b/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js
@@ -33,6 +33,9 @@ const ClusterPicking = {
                 v-on:confirm="state.on_confirm"
                 v-on:cancel="state.on_cancel"
                 />
+            <v-alert type="info" tile v-if="state_is('start_line') && state.data.picking.note" class="packing-info">
+                <p v-text="state.data.picking.note" />
+            </v-alert>
             <batch-picking-line-detail
                 v-if="state_in(['start_line', 'scan_destination', 'change_pack_lot', 'stock_issue'])"
                 :line="state.data"