odoo-addon-shopfloor-mobile 16.0.1.0.0.7__py3-none-any.whl → 16.0.1.1.0__py3-none-any.whl

odoo/addons/shopfloor_mobile/README.rst

@@ -7,7 +7,7 @@ Shopfloor mobile
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:cd664d31e2a374f629474683de47781fd6a0463a2939ab5d86ad0ab5b8f4e0d5
+   !! source digest: sha256:ec3d467f63cb02754093fc0b29a29951595f4f681dc519eea793cd8fa8fcae84
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/shopfloor_mobile/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "Shopfloor mobile",
     "summary": "Mobile frontend for WMS Shopfloor app",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.1.0",
     "depends": ["shopfloor", "shopfloor_mobile_base"],
     "author": "Camptocamp, BCIM, Akretion, Odoo Community Association (OCA)",
     "maintainers": ["simahawk"],

odoo/addons/shopfloor_mobile/i18n/it.po

@@ -0,0 +1,15 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+

odoo/addons/shopfloor_mobile/static/description/index.html

@@ -8,11 +8,10 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +274,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@ span.option {
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -367,7 +366,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:cd664d31e2a374f629474683de47781fd6a0463a2939ab5d86ad0ab5b8f4e0d5
+!! source digest: sha256:ec3d467f63cb02754093fc0b29a29951595f4f681dc519eea793cd8fa8fcae84
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/wms/tree/16.0/shopfloor_mobile"><img alt="OCA/wms" src="https://img.shields.io/badge/github-OCA%2Fwms-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/wms-16-0/wms-16-0-shopfloor_mobile"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/wms&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Frontend for Shopfloor app.</p>
@@ -539,9 +538,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <div class="section" id="maintainers">
 <h1>Maintainers</h1>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org">
-<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
-</a>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>

odoo/addons/shopfloor_mobile/static/wms/src/components/detail/detail_transfer.js

@@ -60,12 +60,12 @@ Vue.component("detail-transfer", {
                 },
                 {path: "lot.name", label: "Lot", action_val_path: "lot.name"},
                 {
-                    path: "product.qty_reserved",
+                    path: "quantity",
                     label: "Qty reserved",
                     render_component: "packaging-qty-picker-display",
                     render_props: function (record) {
                         return self.utils.wms.move_line_qty_picker_props(record, {
-                            qtyInit: record.product.qty_reserved,
+                            qtyInit: record.quantity,
                         });
                     },
                 },

odoo/addons/shopfloor_mobile/static/wms/src/i18n/fr.json

@@ -20,7 +20,6 @@
   "location_content_transfer.start_single.scan_placeholder": "Scannez une boite / un produit / un lot",
   "misc.btn_get_work": "Obtenir du travail",
   "misc.btn_manual_selection": "Sélection manuelle",
-  "misc.lines_count": "Nombre de lignes",
   "misc.stock_zero_check.confirm_stock_not_zero": "Confirmer le stock",
   "misc.stock_zero_check.confirm_stock_zero": "Rupture de stock",
   "scan_placeholder_translation": "Scannez un emplacement"

odoo/addons/shopfloor_mobile/static/wms/src/scenario/checkout.js

@@ -92,7 +92,7 @@ const Checkout = {
                     :key="make_state_component_key(['detail-picking-select'])"
                     />
                 <div class="button-list button-vertical-list full">
-                    <v-row align="center">
+                    <v-row align="center" v-if="state.data.package_allowed">
                         <v-col class="text-center" cols="12">
                             <btn-action
                                    @click="state.on_existing_pack"
@@ -100,7 +100,7 @@ const Checkout = {
                                    >Existing pack</btn-action>
                         </v-col>
                     </v-row>
-                    <v-row align="center">
+                    <v-row align="center" v-if="state.data.package_allowed">
                         <v-col class="text-center" cols="12">
                             <btn-action
                                    @click="state.on_new_pack"
@@ -234,6 +234,21 @@ const Checkout = {
                     </v-row>
                 </div>
             </div>
+            <div v-if="state_is('select_child_location')">
+                <item-detail-card
+                    :key="make_state_component_key(['picking'])"
+                    :record="state.data.picking"
+                    :options="{key_title: 'location_dest.name'}"
+                    :card_color="utils.colors.color_for('screen_step_todo')"
+                />
+                <div class="button-list button-vertical-list full">
+                    <v-row align="center">
+                        <v-col class="text-center" cols="12">
+                            <btn-back />
+                        </v-col>
+                    </v-row>
+                </div>
+            </div>
         </Screen>
         `,
     computed: {
@@ -278,6 +293,20 @@ const Checkout = {
                         {path: "origin"},
                         {path: "carrier.name", label: "Carrier"},
                         {path: "move_line_count", label: "Lines"},
+                        {
+                            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,
+                                };
+                            },
+                        },
                     ],
                 },
             };

odoo/addons/shopfloor_mobile/static/wms/src/scenario/checkout_states.js

@@ -63,7 +63,8 @@ export const checkout_states = function ($instance) {
                     $instance.odoo.call("scan_line", {
                         picking_id: $instance.state.data.picking.id,
                         barcode: scanned.text,
-                        confirm_pack_all: $instance.state.data.need_confirm_pack_all,
+                        confirm_pack_all:
+                            $instance.state.data.need_confirm_pack_all || "",
                     })
                 );
             },
@@ -376,5 +377,26 @@ export const checkout_states = function ($instance) {
                 $instance.reset_notification();
             },
         },
+        select_child_location: {
+            display_info: {
+                title: "Set destination location",
+                scan_placeholder: "Scan location",
+            },
+            events: {
+                go_back: "on_back",
+            },
+            on_scan: (scanned) => {
+                $instance.wait_call(
+                    $instance.odoo.call("scan_dest_location", {
+                        picking_id: $instance.state.data.picking.id,
+                        barcode: scanned.text,
+                    })
+                );
+            },
+            on_back: () => {
+                $instance.state_to("summary");
+                $instance.reset_notification();
+            },
+        },
     };
 };

odoo/addons/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: `
@@ -20,6 +22,7 @@ const ClusterPicking = {
                 :input_placeholder="search_input_placeholder"
                 :input_type="searchbar_input_type"
                 :input_model="searchbar_input_type"
+                :autofocus="!screen_info.user_popup"
                 />
             <get-work
                 v-if="state_is('start')"
@@ -351,7 +354,7 @@ const ClusterPicking = {
                         title: this.$t("cluster_picking.unload_all.title"),
                         scan_placeholder: this.$t("scan_placeholder_translation"),
                     },
-                    on_scan: (scanned, confirmation = false) => {
+                    on_scan: (scanned, confirmation = "") => {
                         this.state_set_data({location_barcode: scanned.text});
                         this.wait_call(
                             this.odoo.call("set_destination_all", {
@@ -367,23 +370,12 @@ const ClusterPicking = {
                         title: this.$t("cluster_picking.confirm_unload_all.title"),
                         scan_placeholder: this.$t("scan_placeholder_translation"),
                     },
-                    on_user_confirm: (answer) => {
-                        // TODO: check if this used
-                        // -> no flag is set to enable the confirmation dialog,
-                        // we only display a message, unlike `confirm_start`
-                        if (answer == "yes") {
-                            // Reuse data from unload_all
-                            const scan_data = this.state_get_data("unload_all");
-                            this.state.on_scan(scan_data.location_barcode, true);
-                        } else {
-                            this.state_to("scan_destination");
-                        }
-                    },
                     on_scan: (scanned, confirmation = true) => {
                         this.on_state_exit();
                         // FIXME: use state_load or traverse the state
                         // this.current_state_key = "unload_all";
                         // this.state.on_scan(scanned, confirmation);
+                        confirmation = this.state.data.confirmation || "";
                         this.states.unload_all.on_scan(scanned, confirmation);
                     },
                 },
@@ -432,7 +424,7 @@ const ClusterPicking = {
                                 picking_batch_id: this.current_batch().id,
                                 package_id: null, // FIXME: where does it come from? backend data?
                                 barcode: scanned.text,
-                                confirmation: true,
+                                confirmation: this.state.data.confirmation || "",
                             })
                         );
                     },

odoo/addons/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
@@ -271,7 +274,7 @@ const LocationContentTransfer = {
                             this.odoo.call("set_destination_all", {
                                 location_id: data.location.id,
                                 barcode: scanned.text,
-                                confirmation: data.confirmation_required,
+                                confirmation: data.confirmation_required || "",
                             })
                         );
                     },
@@ -334,7 +337,7 @@ const LocationContentTransfer = {
                                 package_level_id: data.package_level.id,
                                 location_id: data.package_level.location_src.id,
                                 barcode: scanned.text,
-                                confirmation: data.confirmation_required,
+                                confirmation: data.confirmation_required || "",
                             };
                         } else {
                             endpoint = "set_destination_line";
@@ -342,7 +345,7 @@ const LocationContentTransfer = {
                                 move_line_id: data.move_line.id,
                                 location_id: data.move_line.location_src.id,
                                 barcode: scanned.text,
-                                confirmation: data.confirmation_required,
+                                confirmation: data.confirmation_required || "",
                                 quantity: this.scan_destination_qty,
                             };
                         }

odoo/addons/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js

@@ -24,7 +24,7 @@ export var SinglePackStatesMixin = {
                         this.wait_call(
                             this.odoo.call("start", {
                                 barcode: scanned.text,
-                                confirmation: data.confirmation_required,
+                                confirmation: data.confirmation_required || "",
                             })
                         );
                     },
@@ -43,7 +43,7 @@ export var SinglePackStatesMixin = {
                                 package_level_id: data.id,
                                 location_barcode: scanned.text,
                                 confirmation:
-                                    confirmation || data.confirmation_required,
+                                    confirmation || data.confirmation_required || "",
                             })
                         );
                     },
@@ -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])"

odoo/addons/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')">
@@ -58,7 +61,7 @@ const template_mobile = `
         <div v-if="state_is('select_line')">
             <item-detail-card
                 v-if="device_mode == 'mobile'"
-                v-for="line in state.data.move_lines"
+                v-for="line in select_line_detail_card_items()"
                 :key="make_state_component_key(['line', line.id])"
                 :record="line"
                 :options="select_line_move_line_detail_options()"
@@ -118,12 +121,23 @@ const template_mobile = `
             :card_color="utils.colors.color_for('screen_step_done')"
             />
         <item-detail-card
-            v-if="state_in(['set_line_destination', 'stock_issue', 'change_pack_lot'])"
+            v-if="state_in(['set_line_destination', 'stock_issue', 'change_pack_lot']) && !hide_qty_picker()"
             :key="make_state_component_key(['detail-move-line-product', state.data.move_line.id])"
             :record="state.data.move_line"
             :options="utils.wms.move_line_product_detail_options(state.data.move_line, {fields_blacklist: ['quantity']})"
             :card_color="utils.colors.color_for(state_in(['set_line_destination']) ? 'screen_step_done': 'screen_step_todo')"
             />
+
+
+        <item-detail-card
+            v-if="hide_qty_picker()"
+            :key="make_state_component_key(['detail-move-line-dest-pack', state.data.move_line.id])"
+            :record="state.data.move_line"
+            :options="{main: true, key_title: 'package_src.name', title_action_field: {action_val_path: 'package_src.name'}}"
+            :card_color="utils.colors.color_for(state_in(['set_line_destination']) ? 'screen_step_done': 'screen_step_todo')"
+            />
+
+
         <item-detail-card
             v-if="state_in(['set_line_destination'])"
             :key="make_state_component_key(['detail-move-line-loc-dest', state.data.move_line.id])"
@@ -131,7 +145,7 @@ const template_mobile = `
             :options="{main: true, key_title: 'location_dest.name', title_action_field: {action_val_path: 'location_dest.barcode'}}"
             :card_color="utils.colors.color_for('screen_step_todo')"
             />
-        <v-card v-if="state_in(['set_line_destination', 'change_pack_lot'])"
+        <v-card v-if="state_in(['set_line_destination', 'change_pack_lot']) && !hide_qty_picker()"
                 class="pa-2" :color="utils.colors.color_for('screen_step_todo')">
             <packaging-qty-picker
                 :key="make_state_component_key(['packaging-qty-picker', state.data.move_line.id])"
@@ -384,33 +398,138 @@ const ZonePicking = {
         },
         select_line_table_items: function () {
             const self = this;
+            // For line with a complete mix package only show one line per package
+            // with the name of the package
+            var full_package_handeled = [];
             // Convert to v-data-table keys
             const items = _.map(this.state.data.move_lines, function (record) {
                 const item_data = {};
-                _.forEach(self.move_line_list_fields(true), function (field) {
-                    item_data[field.path] = _.result(record, field.path);
-                    if (field.renderer) {
-                        item_data[field.path] = field.renderer(record, field);
+                if (record.handle_complete_mix_pack) {
+                    if (full_package_handeled.includes(record.package_src.name)) {
+                        return {};
                     }
-                });
-                item_data._origin = record;
+                    full_package_handeled.push(record.package_src.name);
+                    _.forEach(self.package_list_fields(true), function (field) {
+                        item_data[field.path] = _.result(record, field.path);
+                        if (field.renderer) {
+                            item_data[field.path] = field.renderer(record, field);
+                        }
+                    });
+                    item_data._origin = record;
+                } else {
+                    _.forEach(self.move_line_list_fields(true), function (field) {
+                        item_data[field.path] = _.result(record, field.path);
+                        if (field.renderer) {
+                            item_data[field.path] = field.renderer(record, field);
+                        }
+                    });
+                    item_data._origin = record;
+                }
                 return item_data;
             });
+            return items.filter((value) => JSON.stringify(value) !== "{}");
+        },
+        select_line_detail_card_items: function () {
+            var items = [];
+            var full_package_handeled = [];
+
+            for (const line of this.state.data.move_lines) {
+                if (line.handle_complete_mix_pack) {
+                    if (full_package_handeled.includes(line.package_src.name)) {
+                        continue;
+                    }
+                    full_package_handeled.push(line.package_src.name);
+                }
+                items.push(line);
+            }
             return items;
         },
         select_line_move_line_detail_options: function () {
             const options = {
                 key_title: "location_src.name",
                 loud_labels: true,
-                title_action_field: {action_val_path: "product.barcode"},
+                title_action_field: {
+                    action_val_path: function (record, field) {
+                        return record.handle_complete_mix_pack
+                            ? "package_src.name"
+                            : "product.barcode";
+                    },
+                },
                 fields: this.move_line_list_fields(),
             };
             return options;
         },
+
+        package_list_fields: function (table_mode = false) {
+            const self = this;
+            const fields = [
+                {
+                    path: "product.display_name",
+                    label: table_mode ? "Product" : null,
+                    renderer: function (rec, field) {
+                        return "";
+                    },
+                },
+                {
+                    path: "package_src.name",
+                    label: "Pack / Lot",
+                    renderer: function (rec, field) {
+                        const pkg = _.result(rec, "package_src.name", "");
+                        const lot = _.result(rec, "lot.name", "");
+                        return lot ? pkg + "\n" + lot : pkg;
+                    },
+                },
+                {
+                    path: "quantity",
+                    label: "Qty",
+                    renderer: function (rec, field) {
+                        return rec.handle_complete_mix_pack
+                            ? rec.package_src.total_quantity
+                            : rec.quantity;
+                    },
+                },
+                {path: "package_src.weight", label: "Weight"},
+                {
+                    path: "picking.scheduled_date",
+                    label: "Date",
+                    renderer: function (rec, field) {
+                        return self.utils.display.render_field_date(rec, field);
+                    },
+                },
+                {
+                    path: "priority",
+                    label: table_mode ? "Priority" : null,
+                    render_component: "priority-widget",
+                    render_options: function (record) {
+                        return {priority: parseInt(record.priority || "0", 10)};
+                    },
+                },
+                {
+                    path: "location_will_be_empty",
+                    render_component: "empty-location-icon",
+                    display_no_value: true,
+                },
+            ];
+            if (table_mode) {
+                fields.unshift({path: "location_src.name", label: "Location"});
+            }
+            return fields;
+        },
+
         move_line_list_fields: function (table_mode = false) {
             const self = this;
             const fields = [
-                {path: "product.display_name", label: table_mode ? "Product" : null},
+                {
+                    path: "product.display_name",
+                    label: table_mode ? "Product" : null,
+                    renderer: function (rec, field) {
+                        if (rec.handle_complete_mix_pack) {
+                            return "";
+                        } else {
+                            return rec.product.display_name;
+                        }
+                    },
+                },
                 {
                     path: "package_src.name",
                     label: "Pack / Lot",
@@ -426,7 +545,9 @@ const ZonePicking = {
                     render_component: "packaging-qty-picker-display",
                     render_props: function (record) {
                         return self.utils.wms.move_line_qty_picker_props(record, {
-                            qtyInit: record.quantity,
+                            qtyInit: record.handle_complete_mix_pack
+                                ? record.package_src.total_quantity
+                                : record.quantity,
                         });
                     },
                 },
@@ -475,7 +596,7 @@ const ZonePicking = {
         scan_source(barcode) {
             let data = {
                 barcode: barcode,
-                confirmation: this.state.data.confirmation_required,
+                confirmation: this.state.data.confirmation_required || "",
             };
             if (this.state_is("select_line") && this.state.data.product) {
                 data.product_id = this.state.data.product.id;
@@ -516,6 +637,36 @@ const ZonePicking = {
         picking_summary_move_line_detail_fields: function () {
             return [{path: "package_src.name", klass: "loud"}];
         },
+        hide_qty_picker: function () {
+            if ("handle_complete_mix_pack" in this.state.data) {
+                return this.state.data.handle_complete_mix_pack;
+            }
+            return false;
+        },
+        all_lines_with_package: function () {
+            const move_lines = this.state.data.move_lines;
+            if (!move_lines) {
+                return false;
+            }
+            for (let line_id = 0; line_id < move_lines.length; line_id++) {
+                if (!move_lines[line_id].package_src) {
+                    return false;
+                }
+            }
+            return true;
+        },
+        any_line_with_lot: function () {
+            const move_lines = this.state.data.move_lines;
+            if (!move_lines) {
+                return false;
+            }
+            for (let line_id = 0; line_id < move_lines.length; line_id++) {
+                if (move_lines[line_id].lot) {
+                    return true;
+                }
+            }
+            return false;
+        },
     },
     computed: {
         sort_lines_by_btn_label() {
@@ -613,16 +764,36 @@ const ZonePicking = {
                         title: "Select move",
                         scan_placeholder: () => {
                             const sublocation = this.state.data.sublocation;
-                            if (
-                                this.state.data.scan_location_or_pack_first &&
-                                !sublocation
-                            ) {
-                                return "Scan location / pack";
+                            const pack = this.state.data.package;
+                            if (this.state.data.scan_location_or_pack_first) {
+                                if (!pack && this.all_lines_with_package()) {
+                                    return "Scan pack";
+                                }
+                                if (!sublocation && !pack) {
+                                    return "Scan location / pack";
+                                }
+                                if (this.any_line_with_lot()) {
+                                    return "Scan product / lot";
+                                }
+                                return "Scan product";
                             }
                             if (sublocation) {
-                                return "Scan product / lot / package";
+                                if (pack) {
+                                    if (this.any_line_with_lot()) {
+                                        return "Scan product / lot";
+                                    }
+                                    return "Scan product";
+                                } else {
+                                    if (this.any_line_with_lot()) {
+                                        return "Scan pack / product / lot";
+                                    }
+                                    return "Scan pack / product";
+                                }
+                            }
+                            if (this.any_line_with_lot()) {
+                                return "Scan location / pack / product / lot";
                             }
-                            return "Scan location / pack / product / lot";
+                            return "Scan location / pack / product";
                         },
                     },
                     events: {
@@ -658,33 +829,68 @@ const ZonePicking = {
                     },
                 },
                 set_line_destination: {
+                    enter: () => {
+                        // When entering this screen, we show a different message if:
+                        // - We only allow scanning locations.
+                        // - We allow scanning locations and packages.
+                        const is_scan_package_allowed =
+                            this.state.data.allow_alternative_destination_package;
+                        const placeholder = is_scan_package_allowed
+                            ? this.state.display_info.scan_placeholder_full
+                            : this.state.display_info.scan_placeholder_location;
+                        this.state.display_info.scan_placeholder = placeholder;
+                    },
                     display_info: {
                         title: "Set destination",
                         scan_placeholder: "Scan location or package",
                         scan_placeholder_full: "Scan location or package",
-                        scan_placeholder_partial: "Scan package",
+                        scan_placeholder_package: "Scan package",
+                        scan_placeholder_location: "Scan location",
                     },
                     events: {
                         qty_edit: "on_qty_update",
                     },
                     on_qty_update: (qty) => {
                         this.scan_destination_qty = parseInt(qty, 10);
-                        if (this.state.data.move_line.quantity != qty) {
-                            this.state.display_info.scan_placeholder =
-                                this.state.display_info.scan_placeholder_partial;
+
+                        // Display different placeholder messages (package / location / both).
+                        const is_scan_package_allowed =
+                            this.state.data.allow_alternative_destination_package;
+                        const full_qty = this.state.data.move_line.quantity === qty;
+
+                        const display_info = this.state.display_info;
+                        if (!is_scan_package_allowed) {
+                            // Only locations are allowed.
+                            display_info.scan_placeholder =
+                                display_info.scan_placeholder_location;
                         } else {
-                            this.state.display_info.scan_placeholder =
-                                this.state.display_info.scan_placeholder_full;
+                            if (!full_qty) {
+                                // Only packages are allowed.
+                                display_info.scan_placeholder =
+                                    display_info.scan_placeholder_package;
+                            } else {
+                                // Both are allowed.
+                                display_info.scan_placeholder =
+                                    display_info.scan_placeholder_full;
+                            }
                         }
                     },
                     on_scan: (scanned) => {
                         const data = this.state.data;
+                        // When handling a complete pack the quantity picker is hidden
+                        // because all move line of the package will be handled.
+                        // So for that case we pass a positive quantity
+                        const quantity = data.handle_complete_mix_pack
+                            ? data.move_line.quantity
+                            : this.scan_destination_qty;
                         this.wait_call(
                             this.odoo.call("set_destination", {
                                 move_line_id: data.move_line.id,
                                 barcode: scanned.text,
-                                quantity: this.scan_destination_qty,
-                                confirmation: data.confirmation_required,
+                                quantity: quantity,
+                                confirmation: data.confirmation_required || "",
+                                // package_id: data.is_complete_mix_pack ? data.move_line.package_src.id : null,
+                                handle_complete_mix_pack: data.handle_complete_mix_pack,
                             })
                         );
                     },
@@ -712,7 +918,8 @@ const ZonePicking = {
                         this.wait_call(
                             this.odoo.call("set_destination_all", {
                                 barcode: scanned.text,
-                                confirmation: this.state.data.confirmation_required,
+                                confirmation:
+                                    this.state.data.confirmation_required || "",
                             })
                         );
                     },
@@ -744,7 +951,8 @@ const ZonePicking = {
                             this.odoo.call("unload_set_destination", {
                                 package_id: this.state.data.move_line.package_dest.id,
                                 barcode: scanned.text,
-                                confirmation: this.state.data.confirmation_required,
+                                confirmation:
+                                    this.state.data.confirmation_required || "",
                             })
                         );
                     },

odoo/addons/shopfloor_mobile/static/wms/src/wms_utils.js

@@ -176,20 +176,38 @@ export class WMSUtils {
         });
         return res;
     }
-
+    /**
+     * Get only the 1st line for each package.
+     *
+     * @param {*} lines: list of move lines
+     * @returns 1 line per package.
+     *
+     * Other lines in the same package are attached to the single line
+     * with special attribute `_pack_lines`.
+     */
+    /**
+     * TODO: this func is used only in `checkout.select_line`
+     * to display only one line list item
+     * when you have multiple lines in the same pack.
+     * It's a bit of an hack and it works because
+     * the checkout endpoints will take care of selecting all the lines
+     * when you scan or tap on the line.
+     * We should probably consider to adopt the same approach of `checkout.summary`
+     * where the lines are explicitly grouped by package and show a dropdown.
+     * The dropdown could be optional.
+     */
     only_one_package(lines) {
+        const grouped = this.group_by_pack(lines);
         const res = [];
-        const pkg_seen = [];
-        lines.forEach(function (line) {
-            if (line.package_dest) {
-                if (!pkg_seen.includes(line.package_dest.id)) {
-                    // Got a pack
-                    res.push(line);
-                    pkg_seen.push(line.package_dest.id);
-                }
+        grouped.forEach(function (group) {
+            if (group.pack) {
+                let single_line = group.records[0];
+                single_line._grouped_by_pack = true;
+                single_line._pack_lines = group.records;
+                res.push(single_line);
             } else {
                 // No pack
-                res.push(line);
+                res.push(...group.records);
             }
         });
         return res;

{odoo_addon_shopfloor_mobile-16.0.1.0.0.7.dist-info → odoo_addon_shopfloor_mobile-16.0.1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shopfloor-mobile
-Version: 16.0.1.0.0.7
+Version: 16.0.1.1.0
 Summary: Mobile frontend for WMS Shopfloor app
 Home-page: https://github.com/OCA/wms
 Author: Camptocamp, BCIM, Akretion, Odoo Community Association (OCA)
@@ -25,7 +25,7 @@ Shopfloor mobile
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:cd664d31e2a374f629474683de47781fd6a0463a2939ab5d86ad0ab5b8f4e0d5
+   !! source digest: sha256:ec3d467f63cb02754093fc0b29a29951595f4f681dc519eea793cd8fa8fcae84
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_shopfloor_mobile-16.0.1.0.0.7.dist-info → odoo_addon_shopfloor_mobile-16.0.1.1.0.dist-info}/RECORD

@@ -1,7 +1,8 @@
-odoo/addons/shopfloor_mobile/README.rst,sha256=CGXjLN0CFKgQtUm4e3aULWoyuY6vSkN7WRlbLolbD3k,7148
+odoo/addons/shopfloor_mobile/README.rst,sha256=9gLVbzo0KE7b0RUGZT5f8OgDGGQGUQw2-7nIYE-U-uM,7148
 odoo/addons/shopfloor_mobile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-odoo/addons/shopfloor_mobile/__manifest__.py,sha256=VDgLbnVfY0aY7bGzj0mwDHDmPHJNAQIgNSJ_NBmTQPA,683
+odoo/addons/shopfloor_mobile/__manifest__.py,sha256=OWExu24J2Dg4rXHVVJ5clUcZhHQP6n4IbgDjLfbyrFI,683
 odoo/addons/shopfloor_mobile/i18n/es_AR.po,sha256=8mGWCcMew3na_BE6yzC9aGqTSHNwLq_fu1r-JnZnYGE,1149
+odoo/addons/shopfloor_mobile/i18n/it.po,sha256=Fuhk7nf_wDaq10_RJlCCe4xE6u8qKIml2r_4nUJ1O1w,412
 odoo/addons/shopfloor_mobile/i18n/pt_BR.po,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 odoo/addons/shopfloor_mobile/i18n/shopfloor_mobile.pot,sha256=leB6MlaWiU1sPOdcOTxNVY5KVORnHv0MfD14HgQJIIs,341
 odoo/addons/shopfloor_mobile/readme/CONTRIBUTORS.rst,sha256=AEECRuaiP1U4xBwIQOYsHFr-Tgx2-LqBQPmFejH6OIs,392
@@ -11,10 +12,10 @@ odoo/addons/shopfloor_mobile/readme/HISTORY.rst,sha256=Ibf54quZVYNg74R-oWzny0XeM
 odoo/addons/shopfloor_mobile/readme/ROADMAP.rst,sha256=Nm8uyGJvPQWMQtYwwxt8P4WBuLLpUZjZ_p8eqTrFRbM,1726
 odoo/addons/shopfloor_mobile/readme/USAGE.rst,sha256=5NNHChxhLwFVo4m6XhCaSlagf_bpNaZgsF8oSGSQ2WY,677
 odoo/addons/shopfloor_mobile/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/shopfloor_mobile/static/description/index.html,sha256=bHEvWLDRhH3ldVhIj0bu46qvDKBsPWPf4twk74wOqJY,18026
+odoo/addons/shopfloor_mobile/static/description/index.html,sha256=HYjGAEIdGWsmS0C6QzQPMmrIiVglsKBAIrLphwzgwiM,17943
 odoo/addons/shopfloor_mobile/static/wms/.gitignore,sha256=rQCFL3FQm3Lll35BRUETzj1HYlakdld--GvTGLPeHpE,214
 odoo/addons/shopfloor_mobile/static/wms/src/screen.js,sha256=77TQgYSfpnErCuhV9FjQujMFlrKU7EZ6OdeTJnZutV8,1461
-odoo/addons/shopfloor_mobile/static/wms/src/wms_utils.js,sha256=6fPt-64R5FEyvWLLzmJny1FoYJxOFW9Lwi9JOF094iY,11104
+odoo/addons/shopfloor_mobile/static/wms/src/wms_utils.js,sha256=-UWOXl0G7uRGa8WzpruGfc_Lzf3ZMctM10lHzWF3Gj8,11936
 odoo/addons/shopfloor_mobile/static/wms/src/components/batch_picking_detail.js,sha256=eyehbELMbEkDp0dREIDR3O7s8hsGh4QXoDcyhlQO8Ms,2175
 odoo/addons/shopfloor_mobile/static/wms/src/components/batch_picking_line_detail.js,sha256=4d32G1yQAlzmjOGr9ta4VC8olCLREN_U-xbkJGf8XSU,4772
 odoo/addons/shopfloor_mobile/static/wms/src/components/manual_select_color.js,sha256=O07YP4zYDSZk1edV8ogvNJCkKyDWIiX7L_g_JzHS5Es,932
@@ -26,7 +27,7 @@ odoo/addons/shopfloor_mobile/static/wms/src/components/detail/detail_operation.j
 odoo/addons/shopfloor_mobile/static/wms/src/components/detail/detail_package.js,sha256=FPT_WDXVDPg4m5wLrA9MunjLL9nsDe59qxW-yiLQpM4,2746
 odoo/addons/shopfloor_mobile/static/wms/src/components/detail/detail_picking.js,sha256=PeavOYvJjfkKNeA-TGU9UGugyPD1DjeW3A02Cr0LY1k,1123
 odoo/addons/shopfloor_mobile/static/wms/src/components/detail/detail_product.js,sha256=drMFbpcOsWOxyGlvscLEnu0yVMAy_ADaRMAQS4JaJZE,2546
-odoo/addons/shopfloor_mobile/static/wms/src/components/detail/detail_transfer.js,sha256=nH6AOAC_wADB4ogCYeQ1LZpfxLwQtxgTnjmh316e7G4,4705
+odoo/addons/shopfloor_mobile/static/wms/src/components/detail/detail_transfer.js,sha256=xUiKj-MAkJ4YIvE0o6wKK-iuoeslLfuh9e0rUyH3d_g,4681
 odoo/addons/shopfloor_mobile/static/wms/src/components/forms/form_edit_stock_picking.js,sha256=lgn_2rG50gbLH7h2K6iqZHeEFeWguemJPURAR1eWJeU,1153
 odoo/addons/shopfloor_mobile/static/wms/src/components/scenario_picking_detail/mixins.js,sha256=ExPE5POHn6PCe32Kt6S70wNwTZ8UJZg21uPKXO1xaEU,4119
 odoo/addons/shopfloor_mobile/static/wms/src/components/scenario_picking_detail/picking_select.js,sha256=k6hf4t4m0078_6m0XJtDTgoMlLV7CpLbaS62Ju5zXQo,4887
@@ -42,16 +43,16 @@ odoo/addons/shopfloor_mobile/static/wms/src/demo/demo.single_pack_transfer.js,sh
 odoo/addons/shopfloor_mobile/static/wms/src/demo/demo.zone_picking.js,sha256=BE8pzEGHq5j_Q49Oz-h4bRP89mJG-XSKNZsCRC9nVDQ,8467
 odoo/addons/shopfloor_mobile/static/wms/src/i18n/add_translations_to_registry.js,sha256=rcYYDwMWOrEpWi83WwsNz1C6IJfwIKFE-VDqqrSCcNE,280
 odoo/addons/shopfloor_mobile/static/wms/src/i18n/en.json,sha256=gn981MlQXNBYiVZHWOV4o0LzdrCqZ2Z9ptjPArF8C-Q,1944
-odoo/addons/shopfloor_mobile/static/wms/src/i18n/fr.json,sha256=HNBXPkTX3FTOX0BUkwdGN8VImAm7255oYl8YQUyy8Wc,1983
-odoo/addons/shopfloor_mobile/static/wms/src/scenario/checkout.js,sha256=NCcUI9o3ZupjnsPlhphw0ryjQCUdmpADzPFQ5vwRIfw,17816
-odoo/addons/shopfloor_mobile/static/wms/src/scenario/checkout_states.js,sha256=cre6oYeWtCyCZ77fUahc2sXyayadN_OD2gNyRP48Jp4,14140
-odoo/addons/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js,sha256=ey7_L4LS27CmFrbYFt4ppiFP52kCWOWdixyyyvodmtw,20875
+odoo/addons/shopfloor_mobile/static/wms/src/i18n/fr.json,sha256=-nRVyM2PsggBL1WjxYzyeRdC4kwx7HzSOXAN83TJehE,1941
+odoo/addons/shopfloor_mobile/static/wms/src/scenario/checkout.js,sha256=JTa7E7ZwLQXTBBq5CwpB_vPvqVRnbBNaXSHy3TIM13w,19412
+odoo/addons/shopfloor_mobile/static/wms/src/scenario/checkout_states.js,sha256=stvKy_qT-am-1N6IPDV0_4gAomOtY1wfJYMuBvo0u5k,14885
+odoo/addons/shopfloor_mobile/static/wms/src/scenario/cluster_picking.js,sha256=W-22xBhtdWDR_ZZvdrONYNFrXLxgrv4sa6jjUE0hON8,20515
 odoo/addons/shopfloor_mobile/static/wms/src/scenario/delivery.js,sha256=mYPBRAjRcI38BgdSVxbhaQnV_vXuD546ysz_0JUZ55Y,15001
-odoo/addons/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js,sha256=18wrorVv5Tv86pwibYgFt2B28XIbqulavbG1ISd1j4Y,17859
-odoo/addons/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js,sha256=x07S3aKRXLsZm9gobC837lt-84ilTIoUmn0f7Lq5Dl8,5700
-odoo/addons/shopfloor_mobile/static/wms/src/scenario/zone_picking.js,sha256=6BXzGcEijS1n5r2nobebZ6rY_X6qhrzTKhsRUC1Snq4,35375
+odoo/addons/shopfloor_mobile/static/wms/src/scenario/location_content_transfer.js,sha256=XtBc29PCjfR1H8J9iyBwvy0R2cVS_6piJsDmnINJv9g,18088
+odoo/addons/shopfloor_mobile/static/wms/src/scenario/single_pack_transfer.js,sha256=0Tpi9bVUamT0Ij1JCJHLo4IwyM7IAkXfAxHw87g-doM,6114
+odoo/addons/shopfloor_mobile/static/wms/src/scenario/zone_picking.js,sha256=ftcQ7tbSev66wFg09TQ3LCL-3lCzt7H_l1J3ftdc60U,44958
 odoo/addons/shopfloor_mobile/templates/assets.xml,sha256=QAiHXcCpybR9h4B3WuuDcFZ1DnJcGg2cQ63RCUw2niY,7873
-odoo_addon_shopfloor_mobile-16.0.1.0.0.7.dist-info/METADATA,sha256=O7qZl_O09B098Wjm0rGC7oG7fRwmeHhGByltGn7luAA,7828
-odoo_addon_shopfloor_mobile-16.0.1.0.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-odoo_addon_shopfloor_mobile-16.0.1.0.0.7.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_shopfloor_mobile-16.0.1.0.0.7.dist-info/RECORD,,
+odoo_addon_shopfloor_mobile-16.0.1.1.0.dist-info/METADATA,sha256=8nc5TokbYG-qhYjm6dkcwuT5ijiKfUGl0ZUq27hvnqo,7826
+odoo_addon_shopfloor_mobile-16.0.1.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+odoo_addon_shopfloor_mobile-16.0.1.1.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_shopfloor_mobile-16.0.1.1.0.dist-info/RECORD,,