odoo-addon-shopfloor 16.0.2.12.0.1__py3-none-any.whl → 18.0.0.1.0.15__py3-none-any.whl

odoo/addons/shopfloor/services/zone_picking.py

@@ -701,7 +701,7 @@ class ZonePicking(Component):
         """
         if self.work.menu.no_prefill_qty:
             return qty
-        return move_line.reserved_uom_qty
+        return move_line.quantity
 
     def _scan_source_product(
         self,
@@ -952,7 +952,7 @@ class ZonePicking(Component):
             for _move_line in package.move_line_ids:
                 if _move_line.state not in ("assigned", "partially_available"):
                     continue
-                _move_line.qty_done = move_line.reserved_uom_qty
+                _move_line.qty_done = move_line.quantity
                 move_lines |= _move_line
         self._write_destination_on_lines(move_lines, location)
 
@@ -991,15 +991,11 @@ class ZonePicking(Component):
 
     def _move_line_compare_qty(self, move_line, qty):
         rounding = move_line.product_uom_id.rounding
-        return float_compare(
-            qty, move_line.reserved_uom_qty, precision_rounding=rounding
-        )
+        return float_compare(qty, move_line.quantity, precision_rounding=rounding)
 
     def _move_line_full_qty(self, move_line, qty):
         rounding = move_line.product_uom_id.rounding
-        return float_is_zero(
-            move_line.reserved_uom_qty - qty, precision_rounding=rounding
-        )
+        return float_is_zero(move_line.quantity - qty, precision_rounding=rounding)
 
     def _is_package_not_valid(self, package):
         message = False
@@ -1038,7 +1034,7 @@ class ZonePicking(Component):
         if qty_greater:
             response = self._response_for_set_line_destination(
                 move_line,
-                message=self.msg_store.unable_to_pick_more(move_line.reserved_uom_qty),
+                message=self.msg_store.unable_to_pick_more(move_line.quantity),
                 qty_done=quantity,
             )
             return (package_changed, response)

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

@@ -372,10 +372,11 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:c418f1851f7591fa3b9cde9ce01a2a3507baf0066f7453d93cfea051273d85fc
+!! source digest: sha256:f606f7cc780de1cd3fdafa4a5de793b9705110e5067af79704c8c5529fa80090
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/wms/tree/16.0/shopfloor"><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"><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>Shopfloor is a barcode scanner application for internal warehouse operations.</p>
+<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/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/stock-logistics-shopfloor/tree/18.0/shopfloor"><img alt="OCA/stock-logistics-shopfloor" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--shopfloor-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-shopfloor-18-0/stock-logistics-shopfloor-18-0-shopfloor"><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/stock-logistics-shopfloor&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>Shopfloor is a barcode scanner application for internal warehouse
+operations.</p>
 <p>The application supports scenarios, to relate to Operation Types:</p>
 <ul class="simple">
 <li>Cluster Picking</li>
@@ -385,13 +386,30 @@ ul.auto-toc {
 <li>Location Content Transfer</li>
 <li>Single Pack Transfer</li>
 </ul>
-<p>This module provides REST APIs to support the scenarios. It needs a frontend
-to consume the backend APIs and provide screens for users on barcode devices.
-A default front-end application is provided by <tt class="docutils literal">shopfloor_mobile</tt>.</p>
+<p>This module provides REST APIs to support the scenarios. It needs a
+frontend to consume the backend APIs and provide screens for users on
+barcode devices. A default front-end application is provided by
+<tt class="docutils literal">shopfloor_mobile</tt>.</p>
 <div class="line-block">
-<div class="line">Note: if you want to enable a new scenario on an existing application, you must trigger the registry sync on the shopfloor.app in a post_init_hook or a post-migrate script.</div>
-<div class="line">See an example <a class="reference external" href="https://github.com/OCA/wms/pull/520/commits/bccdfd445a9bc943998c4848f183a076e8459a98">here</a>.</div>
+<div class="line">Note: if you want to enable a new scenario on an existing application,
+you must trigger the registry sync on the shopfloor.app in a
+post_init_hook or a post-migrate script.</div>
+<div class="line">See an example
+<a class="reference external" href="https://github.com/OCA/wms/pull/520/commits/bccdfd445a9bc943998c4848f183a076e8459a98">here</a>.</div>
 </div>
+<p><strong>WARNING v18</strong></p>
+<p>Scenario will be migrated one by one.</p>
+<p>Current availability status:</p>
+<ul class="simple">
+<li>☐ checkout</li>
+<li>☐ cluster picking</li>
+<li>☐ zone picking</li>
+<li>☐ delivery</li>
+<li>☐ location content transfer</li>
+<li>☐ single pack transfer (to be discarded in favor of
+shopfloor_single_product_transfer)</li>
+<li>☐ zone picking</li>
+</ul>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -404,8 +422,10 @@ A default front-end application is provided by <tt class="docutils literal">shop
 <li><a class="reference internal" href="#bug-tracker" id="toc-entry-5">Bug Tracker</a></li>
 <li><a class="reference internal" href="#credits" id="toc-entry-6">Credits</a><ul>
 <li><a class="reference internal" href="#authors" id="toc-entry-7">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-8">Contributors</a><ul>
 <li><a class="reference internal" href="#design" id="toc-entry-9">Design</a></li>
+</ul>
+</li>
 <li><a class="reference internal" href="#other-credits" id="toc-entry-10">Other credits</a></li>
 <li><a class="reference internal" href="#maintainers" id="toc-entry-11">Maintainers</a></li>
 </ul>
@@ -414,8 +434,8 @@ A default front-end application is provided by <tt class="docutils literal">shop
 </div>
 <div class="section" id="usage">
 <h2><a class="toc-backref" href="#toc-entry-1">Usage</a></h2>
-<p>An API key is created in the Demo data (for development), using
-the Demo user. The key to use in the HTTP header <tt class="docutils literal"><span class="pre">API-KEY</span></tt> is: 72B044F7AC780DAC</p>
+<p>An API key is created in the Demo data (for development), using the Demo
+user. The key to use in the HTTP header <tt class="docutils literal"><span class="pre">API-KEY</span></tt> is: 72B044F7AC780DAC</p>
 <p>Curl example:</p>
 <pre class="literal-block">
 curl -X POST &quot;http://localhost:8069/shopfloor/user/menu&quot; -H  &quot;accept: */*&quot; -H  &quot;Content-Type: application/json&quot; -H &quot;API-KEY: 72B044F7AC780DAC&quot;
@@ -426,9 +446,12 @@ curl -X POST &quot;http://localhost:8069/shopfloor/user/menu&quot; -H  &quot;acc
 <ul class="simple">
 <li>improve documentation</li>
 <li>split out scenario components to their own modules</li>
-<li>maybe split common stock features to <cite>shopfloor_stock_base</cite>
-and move scenario to <cite>shopfloor_wms</cite>?</li>
+<li>maybe split common stock features to shopfloor_stock_base and move
+scenario to shopfloor_wms?</li>
 </ul>
+<p><strong>WARNING v18</strong></p>
+<p>We don’t want to split now the scenario to keep it as much as possible
+in line w/ v16. We’ll do it later.</p>
 </div>
 <div class="section" id="changelog">
 <h2><a class="toc-backref" href="#toc-entry-3">Changelog</a></h2>
@@ -439,10 +462,10 @@ and move scenario to <cite>shopfloor_wms</cite>?</li>
 </div>
 <div class="section" id="bug-tracker">
 <h2><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h2>
-<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/wms/issues">GitHub Issues</a>.
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-shopfloor/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/wms/issues/new?body=module:%20shopfloor%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-shopfloor/issues/new?body=module:%20shopfloor%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -471,14 +494,14 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Souheil Bejaoui &lt;<a class="reference external" href="mailto:souheil.bejaoui&#64;acsone.eu">souheil.bejaoui&#64;acsone.eu</a>&gt;</li>
 <li>Laurent Mignon &lt;<a class="reference external" href="mailto:laurent.mignon&#64;acsone.eu">laurent.mignon&#64;acsone.eu</a>&gt;</li>
 </ul>
-</div>
 <div class="section" id="design">
-<h3><a class="toc-backref" href="#toc-entry-9">Design</a></h3>
+<h4><a class="toc-backref" href="#toc-entry-9">Design</a></h4>
 <ul class="simple">
 <li>Joël Grand-Guillaume &lt;<a class="reference external" href="mailto:joel.grandguillaume&#64;camptocamp.com">joel.grandguillaume&#64;camptocamp.com</a>&gt;</li>
 <li>Jacques-Etienne Baudoux &lt;<a class="reference external" href="mailto:je&#64;bcim.be">je&#64;bcim.be</a>&gt;</li>
 </ul>
 </div>
+</div>
 <div class="section" id="other-credits">
 <h3><a class="toc-backref" href="#toc-entry-10">Other credits</a></h3>
 <p><strong>Financial support</strong></p>
@@ -499,7 +522,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/guewen"><img alt="guewen" src="https://github.com/guewen.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/simahawk"><img alt="simahawk" src="https://github.com/simahawk.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/sebalix"><img alt="sebalix" src="https://github.com/sebalix.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/wms/tree/16.0/shopfloor">OCA/wms</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-shopfloor/tree/18.0/shopfloor">OCA/stock-logistics-shopfloor</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

odoo/addons/shopfloor/tests/__init__.py

@@ -7,79 +7,80 @@ from . import test_actions_data_detail
 from . import test_actions_search_move_line
 from . import test_actions_search
 from . import test_actions_stock
-from . import test_single_pack_transfer
-from . import test_single_pack_transfer_putaway
-from . import test_cluster_picking_base
-from . import test_cluster_picking_batch
-from . import test_cluster_picking_select
-from . import test_cluster_picking_scan_line
-from . import test_cluster_picking_scan_line_location_or_pack_first
-from . import test_cluster_picking_scan_line_no_prefill_qty
-from . import test_cluster_picking_scan_destination
-from . import test_cluster_picking_scan_destination_no_prefill_qty
-from . import test_cluster_picking_is_zero
-from . import test_cluster_picking_skip
-from . import test_cluster_picking_stock_issue
-from . import test_cluster_picking_change_pack_lot
-from . import test_cluster_picking_unload
-from . import test_checkout_base
-from . import test_checkout_scan
-from . import test_checkout_select
-from . import test_checkout_scan_line
-from . import test_checkout_scan_line_no_prefill_qty
-from . import test_checkout_scan_line_base
-from . import test_checkout_scan_dest_location
-from . import test_checkout_select_line
-from . import test_checkout_select_package_base
-from . import test_checkout_set_qty
-from . import test_checkout_scan_package_action
-from . import test_checkout_scan_package_action_no_prefill_qty
-from . import test_checkout_new_package
-from . import test_checkout_no_package
-from . import test_checkout_auto_post
-from . import test_checkout_list_delivery_packaging
-from . import test_checkout_list_package
-from . import test_checkout_summary
-from . import test_checkout_change_packaging
-from . import test_checkout_cancel_line
-from . import test_checkout_done
-from . import test_delivery_base
-from . import test_delivery_done
-from . import test_delivery_scan_deliver
-from . import test_delivery_reset_qty_done_line
-from . import test_delivery_reset_qty_done_pack
-from . import test_delivery_set_qty_done_pack
-from . import test_delivery_set_qty_done_line
-from . import test_delivery_sublocation
-from . import test_delivery_list_stock_picking
-from . import test_delivery_select
-from . import test_location_content_transfer_base
-from . import test_location_content_transfer_start
-from . import test_location_content_transfer_get_work
-from . import test_location_content_transfer_set_destination_all
-from . import test_location_content_transfer_scan_location
-from . import test_location_content_transfer_single
-from . import test_location_content_transfer_set_destination_package_or_line
-from . import test_location_content_transfer_putaway
-from . import test_location_content_transfer_mix
-from . import test_zone_picking_base
-from . import test_zone_picking_complete_mix_pack_flux
-from . import test_zone_picking_start
-from . import test_zone_picking_select_picking_type
-from . import test_zone_picking_select_line
-from . import test_zone_picking_select_line_no_prefill_qty
-from . import test_zone_picking_select_line_first_scan_location
-from . import test_zone_picking_set_line_destination
-from . import test_zone_picking_set_line_destination_no_prefill_qty
-from . import test_zone_picking_set_line_destination_pick_pack
-from . import test_zone_picking_zero_check
-from . import test_zone_picking_stock_issue
-from . import test_zone_picking_change_pack_lot
-from . import test_zone_picking_unload_buffer_lines
-from . import test_zone_picking_unload_single
-from . import test_zone_picking_unload_all
-from . import test_zone_picking_unload_set_destination
-from . import test_zone_picking_require_destination_package
+
+# from . import test_single_pack_transfer
+# from . import test_single_pack_transfer_putaway
+# from . import test_cluster_picking_base
+# from . import test_cluster_picking_batch
+# from . import test_cluster_picking_select
+# from . import test_cluster_picking_scan_line
+# from . import test_cluster_picking_scan_line_location_or_pack_first
+# from . import test_cluster_picking_scan_line_no_prefill_qty
+# from . import test_cluster_picking_scan_destination
+# from . import test_cluster_picking_scan_destination_no_prefill_qty
+# from . import test_cluster_picking_is_zero
+# from . import test_cluster_picking_skip
+# from . import test_cluster_picking_stock_issue
+# from . import test_cluster_picking_change_pack_lot
+# from . import test_cluster_picking_unload
+# from . import test_checkout_base
+# from . import test_checkout_scan
+# from . import test_checkout_select
+# from . import test_checkout_scan_line
+# from . import test_checkout_scan_line_no_prefill_qty
+# from . import test_checkout_scan_line_base
+# from . import test_checkout_scan_dest_location
+# from . import test_checkout_select_line
+# from . import test_checkout_select_package_base
+# from . import test_checkout_set_qty
+# from . import test_checkout_scan_package_action
+# from . import test_checkout_scan_package_action_no_prefill_qty
+# from . import test_checkout_new_package
+# from . import test_checkout_no_package
+# from . import test_checkout_auto_post
+# from . import test_checkout_list_delivery_packaging
+# from . import test_checkout_list_package
+# from . import test_checkout_summary
+# from . import test_checkout_change_packaging
+# from . import test_checkout_cancel_line
+# from . import test_checkout_done
+# from . import test_delivery_base
+# from . import test_delivery_done
+# from . import test_delivery_scan_deliver
+# from . import test_delivery_reset_qty_done_line
+# from . import test_delivery_reset_qty_done_pack
+# from . import test_delivery_set_qty_done_pack
+# from . import test_delivery_set_qty_done_line
+# from . import test_delivery_sublocation
+# from . import test_delivery_list_stock_picking
+# from . import test_delivery_select
+# from . import test_location_content_transfer_base
+# from . import test_location_content_transfer_start
+# from . import test_location_content_transfer_get_work
+# from . import test_location_content_transfer_set_destination_all
+# from . import test_location_content_transfer_scan_location
+# from . import test_location_content_transfer_single
+# from . import test_location_content_transfer_set_destination_package_or_line
+# from . import test_location_content_transfer_putaway
+# from . import test_location_content_transfer_mix
+# from . import test_zone_picking_base
+# from . import test_zone_picking_complete_mix_pack_flux
+# from . import test_zone_picking_start
+# from . import test_zone_picking_select_picking_type
+# from . import test_zone_picking_select_line
+# from . import test_zone_picking_select_line_no_prefill_qty
+# from . import test_zone_picking_select_line_first_scan_location
+# from . import test_zone_picking_set_line_destination
+# from . import test_zone_picking_set_line_destination_no_prefill_qty
+# from . import test_zone_picking_set_line_destination_pick_pack
+# from . import test_zone_picking_zero_check
+# from . import test_zone_picking_stock_issue
+# from . import test_zone_picking_change_pack_lot
+# from . import test_zone_picking_unload_buffer_lines
+# from . import test_zone_picking_unload_single
+# from . import test_zone_picking_unload_all
+# from . import test_zone_picking_unload_set_destination
+# from . import test_zone_picking_require_destination_package
 from . import test_misc
 from . import test_move_action_assign
 from . import test_scan_anything

odoo/addons/shopfloor/tests/common.py

@@ -3,7 +3,7 @@
 from collections import namedtuple
 
 from odoo import models
-from odoo.tests.common import Form
+from odoo.tests import Form
 
 from odoo.addons.shopfloor_base.tests.common import CommonCase as BaseCommonCase
 
@@ -62,8 +62,8 @@ class CommonCase(BaseCommonCase):
             .create(
                 {
                     "name": "Product A",
-                    "type": "product",
-                    "default_code": "A",
+                    "is_storable": True,
+                    "default_code": "SF#A",
                     "barcode": "A",
                     "weight": 2,
                 }
@@ -87,8 +87,8 @@ class CommonCase(BaseCommonCase):
             .create(
                 {
                     "name": "Product B",
-                    "type": "product",
-                    "default_code": "B",
+                    "is_storable": True,
+                    "default_code": "SF#B",
                     "barcode": "B",
                     "weight": 3,
                 }
@@ -111,8 +111,8 @@ class CommonCase(BaseCommonCase):
             .create(
                 {
                     "name": "Product C",
-                    "type": "product",
-                    "default_code": "C",
+                    "is_storable": True,
+                    "default_code": "SF#C",
                     "barcode": "C",
                     "weight": 3,
                 }
@@ -136,8 +136,8 @@ class CommonCase(BaseCommonCase):
             .create(
                 {
                     "name": "Product D",
-                    "type": "product",
-                    "default_code": "D",
+                    "is_storable": True,
+                    "default_code": "SF#D",
                     "barcode": "D",
                     "weight": 3,
                 }