Merge PR #1257 into 14.0

Signed-off-by simahawk

setup/stock_vertical_lift_storage_type/odoo/addons/stock_vertical_lift_storage_type

@@ -0,0 +1 @@
+../../../../stock_vertical_lift_storage_type

setup/stock_vertical_lift_storage_type/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

stock_vertical_lift_storage_type/README.rst

@@ -0,0 +1,97 @@
+============================
+Vertical Lift - Storage Type
+============================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Alpha
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_vertical_lift_storage_type
+    :alt: OCA/stock-logistics-warehouse
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-stock_vertical_lift_storage_type
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
+    :target: https://runbot.odoo-community.org/runbot/153/14.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+Compatibility layer between Stock Vertical Lift and Putaway Storage Types (OCA/wms).
+
+In the vertical lift's Putaway screen, when a good is scanned for a putaway, the
+user has to scan the tray type of the corresponding size, so an empty place in a
+matching tray is found. When we use storage types, we should know what tray is
+compatible with the storage type.
+
+Changes with this module:
+
+* The storage types of trays cannot be selected in the locations form, they have
+  to be set in the Tray types.
+* In the lift put-away screen, when a package has a storage type, the user isn't
+  asked to scan a tray type, instead, the putaway of the Package Storage Type is
+  applied.
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_vertical_lift_storage_type%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Camptocamp
+
+Contributors
+~~~~~~~~~~~~
+
+* Guewen Baconnier <guewen.baconnier@camptocamp.com>
+* `Trobz <https://trobz.com>`_:
+
+Other credits
+~~~~~~~~~~~~~
+
+The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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.
+
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_vertical_lift_storage_type>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

stock_vertical_lift_storage_type/__init__.py

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

stock_vertical_lift_storage_type/__manifest__.py

@@ -0,0 +1,21 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+    "name": "Vertical Lift - Storage Type",
+    "summary": "Compatibility layer for storage types on vertical lifts",
+    "version": "14.0.1.0.0",
+    "category": "Stock",
+    "author": "Camptocamp, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "depends": [
+        "stock_vertical_lift",  # OCA/stock-logistics-warehouse
+        "stock_storage_type",  # OCA/wms
+    ],
+    "website": "https://github.com/OCA/stock-logistics-warehouse",
+    "data": [
+        "views/stock_location_tray_type_views.xml",
+        "views/stock_location_views.xml",
+    ],
+    "installable": True,
+    "development_status": "Alpha",
+}

stock_vertical_lift_storage_type/i18n/stock_vertical_lift_storage_type.pot

@@ -0,0 +1,68 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* stock_vertical_lift_storage_type
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: stock_vertical_lift_storage_type
+#: code:addons/stock_vertical_lift_storage_type/models/stock_location.py:0
+#, python-format
+msgid ""
+"Error creating '{}': Location storage type must be set on the tray type"
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: code:addons/stock_vertical_lift_storage_type/models/stock_location.py:0
+#, python-format
+msgid "Error updating {}: Location storage type must be set on the tray type"
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: model:ir.model,name:stock_vertical_lift_storage_type.model_stock_location
+msgid "Inventory Locations"
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: model:ir.model.fields,field_description:stock_vertical_lift_storage_type.field_stock_location_tray_type__location_storage_type_ids
+msgid "Location Storage Type"
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: model:ir.model.fields,help:stock_vertical_lift_storage_type.field_stock_location_tray_type__location_storage_type_ids
+msgid "Location storage types applied on the location using this tray type."
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: code:addons/stock_vertical_lift_storage_type/models/vertical_lift_operation_put.py:0
+#, python-format
+msgid "No free space found for storage type '{}' in shuttle '{}'"
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: model_terms:ir.ui.view,arch_db:stock_vertical_lift_storage_type.view_stock_location_tray_type_form
+msgid "Put-Away"
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: model:ir.model,name:stock_vertical_lift_storage_type.model_stock_quant
+msgid "Quants"
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: model:ir.model,name:stock_vertical_lift_storage_type.model_stock_location_tray_type
+msgid "Stock Location Tray Type"
+msgstr ""
+
+#. module: stock_vertical_lift_storage_type
+#: model:ir.model,name:stock_vertical_lift_storage_type.model_vertical_lift_operation_put
+msgid "Vertical Lift Operation Put"
+msgstr ""

stock_vertical_lift_storage_type/models/__init__.py

@@ -0,0 +1,4 @@
+from . import stock_location
+from . import stock_location_tray_type
+from . import stock_quant
+from . import vertical_lift_operation_put

stock_vertical_lift_storage_type/models/stock_location.py

@@ -0,0 +1,50 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, exceptions, models
+
+
+class StockLocation(models.Model):
+    _inherit = "stock.location"
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        if not self.env.context.get("_sync_tray_type"):
+            for vals in vals_list:
+                if vals.get("tray_type_id") and vals.get("location_storage_type_ids"):
+                    raise exceptions.UserError(
+                        _(
+                            "Error creating '{}': Location storage"
+                            " type must be set on the tray type"
+                        ).format(vals.get("name"))
+                    )
+
+        records = super().create(vals_list)
+        records._sync_tray_type_storage_types()
+        return records
+
+    def write(self, values):
+        if not self.env.context.get("_sync_tray_type"):
+            if values.get("location_storage_type_ids"):
+                if values.get("tray_type_id"):
+                    has_tray_type = self
+                else:
+                    has_tray_type = self.filtered("tray_type_id")
+                if has_tray_type:
+                    raise exceptions.UserError(
+                        _(
+                            "Error updating {}: Location storage"
+                            " type must be set on the tray type"
+                        ).format(", ".join(has_tray_type.mapped("name")))
+                    )
+        res = super().write(values)
+        if values.get("tray_type_id"):
+            self._sync_tray_type_storage_types()
+        return res
+
+    def _sync_tray_type_storage_types(self):
+        for location in self.with_context(_sync_tray_type=True):
+            if not location.tray_type_id:
+                continue
+            storage_types = location.tray_type_id.location_storage_type_ids
+            location.write({"location_storage_type_ids": [(6, 0, storage_types.ids)]})

stock_vertical_lift_storage_type/models/stock_location_tray_type.py

@@ -0,0 +1,29 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockLocationTrayType(models.Model):
+    _inherit = "stock.location.tray.type"
+
+    location_storage_type_ids = fields.Many2many(
+        comodel_name="stock.location.storage.type",
+        help="Location storage types applied on the location using " "this tray type.",
+    )
+
+    def write(self, values):
+        res = super().write(values)
+        if values.get("location_storage_type_ids"):
+            self._sync_location_storage_type_ids()
+        return res
+
+    def _sync_location_storage_type_ids(self):
+        for tray_type in self:
+            tray_type.location_ids.with_context(_sync_tray_type=True).write(
+                {
+                    "location_storage_type_ids": [
+                        (6, 0, tray_type.location_storage_type_ids.ids)
+                    ]
+                }
+            )

stock_vertical_lift_storage_type/models/stock_quant.py

@@ -0,0 +1,18 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
+from odoo import models
+
+
+class StockQuant(models.Model):
+
+    _inherit = "stock.quant"
+
+    def _check_storage_type(self):
+        # disable the checks when placing goods in vertical lift cells:
+        # we still want to benefit of the storage type rules to select
+        # a destination, but we want to allow selecting a different tray
+        # type
+        self = self.filtered(
+            lambda quant: quant.location_id.vertical_lift_kind != "cell"
+        )
+        super()._check_storage_type()

stock_vertical_lift_storage_type/models/vertical_lift_operation_put.py

@@ -0,0 +1,123 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, models
+
+
+class VerticalLiftOperationPut(models.Model):
+    _inherit = "vertical.lift.operation.put"
+
+    # In the base module, when a good is scanned for a put-away, the user must
+    # then scan a tray type, which will be used to find an available cell of
+    # this type. When we use storage types (OCA/wms::stock_storage_type), we
+    # shouldn't need to scan a tray type if we already have a storage type,
+    # that could be used to find an available cell location for this type
+    # (applying all the possible restrictions from storage type).
+
+    def _transitions(self):
+        transitions = super()._transitions()
+        updated_transitions = []
+        for transition in transitions:
+            states = (transition.current_state, transition.next_state)
+            if states == ("scan_tray_type", "save"):
+                # insert new transitions just before the normal transition
+                # scanning the tray type, that will bypass it when we have
+                # a storage type
+                updated_transitions.append(
+                    self.Transition(
+                        "scan_tray_type",
+                        "save",
+                        lambda self: self._has_storage_type()
+                        and self._putaway_with_storage_type(),
+                        # this is the trick that makes the transition applies
+                        # its function and directly jumps to save
+                        direct_eval=True,
+                    )
+                )
+                updated_transitions.append(
+                    self.Transition(
+                        "scan_tray_type",
+                        "scan_source",
+                        # the transition above returned False because it could
+                        # not find a free space, in that case, abort the
+                        # put-away for this line in this shuttle
+                        lambda self: self._has_storage_type()
+                        and self._put_away_with_storage_type_failed()
+                        and self.clear_current_move_line(),
+                        # this is the trick that makes the transition applies
+                        # its function and directly jumps to save
+                        direct_eval=True,
+                    )
+                )
+                # if none of the 2 transitions above is applied (because
+                # self._has_storage_type() is False), the state remains
+                # `scan_tray_type`, for the base transition doesn't have
+                # `direct_eval=True`
+            updated_transitions.append(transition)
+
+        return tuple(updated_transitions)
+
+    def _has_storage_type_domain(self):
+        move_line = self.current_move_line_id
+        package_storage_type = move_line.package_id.package_storage_type_id
+        # When a put-away is done based on the package's storage type and no
+        # destination is found, we can have 2 reasons:
+        #
+        # 1. No location is available according to the storage types rules,
+        #    for instance because they are full
+        # 2. The storage type of the package doesn't have any location
+        #    configured in the shuttle's locations
+        #
+        # We want to differentiate the 2 cases and handle them differently.
+        # For 2. we consider the storage type is not meant to be in any
+        # shuttle's tray but the user still tries: act the same way as if we
+        # had no storage type at all, the user has to scan the tray type.
+        # For 1. we try to find a destination location and if none is found,
+        # a notification indicates that the shuttle is full.
+        # In any case, the user should always be able to scan a different
+        # tray type.
+        return [
+            ("id", "!=", self.location_id.id),
+            ("id", "child_of", self.location_id.id),
+            (
+                "allowed_location_storage_type_ids",
+                "in",
+                package_storage_type.location_storage_type_ids.ids,
+            ),
+        ]
+
+    def _has_storage_type(self):
+        domain = self._has_storage_type_domain()
+        # we don't care about order and count, only if we have at least one
+        # configured location for the storage type: sorting by id and limit by
+        # 1 will give the best explain plan
+        compatible_locations = self.env["stock.location"].search(
+            domain, limit=1, order="id"
+        )
+        return bool(compatible_locations)
+
+    def _putaway_with_storage_type(self):
+        move_line = self.current_move_line_id
+        # Trigger the put-away application to place it somewhere inside
+        # the current shuttle's location.
+        new_destination = move_line.location_dest_id._get_pack_putaway_strategy(
+            self.location_id, move_line.package_id.quant_ids, move_line.product_id
+        )
+        if new_destination and new_destination.vertical_lift_kind == "cell":
+            move_line.location_dest_id = new_destination
+            move_line.package_level_id.location_dest_id = new_destination
+            self.fetch_tray()
+            return True
+        # no destination found: all the trays for this tray type are full, or rejected
+        # by the location storage type rules
+        return False
+
+    def _put_away_with_storage_type_failed(self):
+        move_line = self.current_move_line_id
+        storage_type = move_line.package_id.package_storage_type_id
+        self.env.user.notify_warning(
+            _("No free space found for storage type '{}' in shuttle '{}'").format(
+                storage_type.name, self.name
+            )
+        )
+        return True

stock_vertical_lift_storage_type/readme/CONTRIBUTORS.rst

@@ -0,0 +1,2 @@
+* Guewen Baconnier <guewen.baconnier@camptocamp.com>
+* `Trobz <https://trobz.com>`_:

stock_vertical_lift_storage_type/readme/CREDITS.rst

@@ -0,0 +1 @@
+The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp

stock_vertical_lift_storage_type/readme/DESCRIPTION.rst

@@ -0,0 +1,14 @@
+Compatibility layer between Stock Vertical Lift and Putaway Storage Types (OCA/wms).
+
+In the vertical lift's Putaway screen, when a good is scanned for a putaway, the
+user has to scan the tray type of the corresponding size, so an empty place in a
+matching tray is found. When we use storage types, we should know what tray is
+compatible with the storage type.
+
+Changes with this module:
+
+* The storage types of trays cannot be selected in the locations form, they have
+  to be set in the Tray types.
+* In the lift put-away screen, when a package has a storage type, the user isn't
+  asked to scan a tray type, instead, the putaway of the Package Storage Type is
+  applied.

stock_vertical_lift_storage_type/static/description/index.html

@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
+<title>Vertical Lift - Storage Type</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+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 }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="vertical-lift-storage-type">
+<h1 class="title">Vertical Lift - Storage Type</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external" 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" href="https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_vertical_lift_storage_type"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-14-0/stock-logistics-warehouse-14-0-stock_vertical_lift_storage_type"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>Compatibility layer between Stock Vertical Lift and Putaway Storage Types (OCA/wms).</p>
+<p>In the vertical lift’s Putaway screen, when a good is scanned for a putaway, the
+user has to scan the tray type of the corresponding size, so an empty place in a
+matching tray is found. When we use storage types, we should know what tray is
+compatible with the storage type.</p>
+<p>Changes with this module:</p>
+<ul class="simple">
+<li>The storage types of trays cannot be selected in the locations form, they have
+to be set in the Tray types.</li>
+<li>In the lift put-away screen, when a package has a storage type, the user isn’t
+asked to scan a tray type, instead, the putaway of the Package Storage Type is
+applied.</li>
+</ul>
+<div class="admonition important">
+<p class="first admonition-title">Important</p>
+<p class="last">This is an alpha version, the data model and design can change at any time without warning.
+Only for development or testing purpose, do not use in production.
+<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
+</div>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
+<li><a class="reference internal" href="#other-credits" id="id5">Other credits</a></li>
+<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/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 smashing it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_vertical_lift_storage_type%0Aversion:%2014.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">
+<h1><a class="toc-backref" href="#id2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id3">Authors</a></h2>
+<ul class="simple">
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
+<ul class="simple">
+<li>Guewen Baconnier &lt;<a class="reference external" href="mailto:guewen.baconnier&#64;camptocamp.com">guewen.baconnier&#64;camptocamp.com</a>&gt;</li>
+<li><a class="reference external" href="https://trobz.com">Trobz</a>:</li>
+</ul>
+</div>
+<div class="section" id="other-credits">
+<h2><a class="toc-backref" href="#id5">Other credits</a></h2>
+<p>The migration of this module from 13.0 to 14.0 was financially supported by Camptocamp</p>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
+<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>
+<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>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/14.0/stock_vertical_lift_storage_type">OCA/stock-logistics-warehouse</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>
+</div>
+</body>
+</html>

stock_vertical_lift_storage_type/tests/__init__.py

@@ -0,0 +1,3 @@
+from . import test_put
+from . import test_stock_location
+from . import test_tray_type

stock_vertical_lift_storage_type/tests/common.py

@@ -0,0 +1,27 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.addons.stock_vertical_lift.tests.common import VerticalLiftCase
+
+
+class TrayTypeCommonCase(VerticalLiftCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.TrayType = cls.env["stock.location.tray.type"]
+        cls.location_2b = cls.env.ref(
+            "stock_vertical_lift." "stock_location_vertical_lift_demo_tray_2b"
+        )
+        cls.location_2d = cls.env.ref(
+            "stock_vertical_lift." "stock_location_vertical_lift_demo_tray_2d"
+        )
+        LocStorageType = cls.env["stock.location.storage.type"]
+        cls.location_storage_type_buffer = LocStorageType.create(
+            {"name": "VLift Buffer"}
+        )
+        cls.location_storage_type_small_8x = LocStorageType.create(
+            {"name": "Small 8x", "only_empty": True}
+        )
+        cls.storage_types = (
+            cls.location_storage_type_small_8x | cls.location_storage_type_buffer
+        )

stock_vertical_lift_storage_type/tests/test_put.py

@@ -0,0 +1,165 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.addons.stock_vertical_lift.tests.common import VerticalLiftCase
+
+
+class TestPut(VerticalLiftCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.wh = cls.env.ref("stock.warehouse0")
+        cls.wh.wh_input_stock_loc_id.active = True
+        cls.wh.int_type_id.active = True
+
+        # used on the vertical lift top level
+        LocStorageType = cls.env["stock.location.storage.type"]
+        cls.location_storage_type_buffer = LocStorageType.create(
+            {"name": "VLift Buffer"}
+        )
+        cls.location_storage_type_small_8x = LocStorageType.create(
+            {"name": "Small 8x", "only_empty": True}
+        )
+
+        PackageStorageType = cls.env["stock.package.storage.type"]
+        # package storage type used only to putaway a package temporarily in
+        # the vertical lift view location before being put in a shuttle, which
+        # will not be configured in any shuttle's locations, we'll use when
+        # the operator knows that a good has to go in a shuttle, but doesn't
+        # know yet in which tray type: when the first putaway is done, the good
+        # stays in the vertical lift view (above the shuttles), then, when the
+        # user scans the package in a shuttle, they have to scan a tray type.
+        cls.package_storage_type_buffer = PackageStorageType.create(
+            {
+                "name": "VLift Box",
+                "location_storage_type_ids": [
+                    (4, cls.location_storage_type_buffer.id),
+                ],
+            }
+        )
+        # storage type used for Tray 1A, user won't have to scan a tray type
+        # when this storage type is already set on the package
+        cls.package_storage_type_small_8x = PackageStorageType.create(
+            {
+                "name": "Small 8x",
+                "location_storage_type_ids": [
+                    (4, cls.location_storage_type_small_8x.id),
+                    (4, cls.location_storage_type_buffer.id),
+                ],
+            }
+        )
+
+        cls.location_shuttle1 = cls.shuttle.location_id
+        cls.vertical_lift_loc.location_storage_type_ids = (
+            cls.location_storage_type_buffer
+        )
+        cls.vertical_lift_loc.pack_putaway_strategy = "none"
+        cls.location_shuttle1.location_storage_type_ids = (
+            cls.location_storage_type_small_8x
+        )
+        cls.location_shuttle1.pack_putaway_strategy = "ordered_locations"
+
+        cls.env["stock.storage.location.sequence"].create(
+            {
+                "package_storage_type_id": cls.package_storage_type_small_8x.id,
+                "sequence": 1,
+                "location_id": cls.vertical_lift_loc.id,
+            }
+        )
+        cls.env["stock.storage.location.sequence"].create(
+            {
+                "package_storage_type_id": cls.package_storage_type_small_8x.id,
+                "sequence": 2,
+                "location_id": cls.location_shuttle1.id,
+            }
+        )
+
+        cls.package = cls.env["stock.quant.package"].create({})
+        cls._update_qty_in_location(
+            cls.wh.wh_input_stock_loc_id, cls.product_socks, 10, package=cls.package
+        )
+
+        cls.int_picking = cls._create_simple_picking_int(
+            cls.product_socks, 10, cls.vertical_lift_loc
+        )
+        cls.int_picking.action_confirm()
+        cls.int_picking.action_assign()
+
+    @classmethod
+    def _create_simple_picking_int(cls, product, quantity, dest_location):
+        return cls.env["stock.picking"].create(
+            {
+                "picking_type_id": cls.wh.int_type_id.id,
+                "location_id": cls.wh.wh_input_stock_loc_id.id,
+                "location_dest_id": dest_location.id,
+                "move_lines": [
+                    (
+                        0,
+                        0,
+                        {
+                            "name": product.name,
+                            "product_id": product.id,
+                            "product_uom": product.uom_id.id,
+                            "product_uom_qty": quantity,
+                            "picking_type_id": cls.wh.int_type_id.id,
+                            "location_id": cls.wh.wh_input_stock_loc_id.id,
+                            "location_dest_id": dest_location.id,
+                        },
+                    )
+                ],
+            }
+        )
+
+    def test_storage_type_put_away(self):
+        self.package.package_storage_type_id = self.package_storage_type_small_8x
+        move_line = self.int_picking.move_line_ids
+        self.assertEqual(move_line.location_dest_id, self.vertical_lift_loc)
+        self.assertEqual(
+            move_line.package_level_id.location_dest_id, self.vertical_lift_loc
+        )
+
+        operation = self._open_screen("put")
+        # we begin with an empty screen, user has to scan a package, product,
+        # or lot
+        self.assertEqual(operation.state, "scan_source")
+        operation.on_barcode_scanned(self.package.name)
+
+        self.assertEqual(operation.current_move_line_id, move_line)
+        # the dest location was Vertical Lift, it has been change to Vertical
+        # Lift/Shuttle 1, and the computation from there took the first cell
+        # available, we should be the pos x1 and y1 in the tray A.
+        self.assertEqual(move_line.location_dest_id, self.location_1a_x1y1)
+        self.assertEqual(
+            move_line.package_level_id.location_dest_id, self.location_1a_x1y1
+        )
+
+        # the state goes straight to "save", as we don't need to scan the tray type
+        # when a putaway is available
+        self.assertEqual(operation.state, "save")
+
+    def test_storage_type_not_configured(self):
+        # if we do have a storage type, but the storage type is not used in the
+        # shuttle (although it may be used on the lift view location, so we can have an
+        # initial putaway rule that puts the package in the lift view location first),
+        # we have to ask to scan a tray type
+        self.package.package_storage_type_id = self.package_storage_type_buffer
+        move_line = self.int_picking.move_line_ids
+        self.assertEqual(move_line.location_dest_id, self.vertical_lift_loc)
+        self.assertEqual(
+            move_line.package_level_id.location_dest_id, self.vertical_lift_loc
+        )
+
+        operation = self._open_screen("put")
+        # we begin with an empty screen, user has to scan a package, product,
+        # or lot
+        self.assertEqual(operation.state, "scan_source")
+        operation.on_barcode_scanned(self.package.name)
+
+        self.assertEqual(operation.current_move_line_id, move_line)
+        # it stays here, as the put-away has no rule to put the "buffer box" in
+        # any location
+        self.assertEqual(move_line.location_dest_id, self.vertical_lift_loc)
+
+        # and the user has to scan a tray type (so we are back to the normal
+        # flow, tested in stock_vertical_lift)
+        self.assertEqual(operation.state, "scan_tray_type")

stock_vertical_lift_storage_type/tests/test_stock_location.py

@@ -0,0 +1,90 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import exceptions
+
+from .common import TrayTypeCommonCase
+
+
+class TestTrayTypeLocation(TrayTypeCommonCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.tray_type = cls.env.ref(
+            "stock_location_tray.stock_location_tray_type_small_8x"
+        )
+        cls.tray_type.write(
+            {"location_storage_type_ids": [(6, 0, cls.storage_types.ids)]}
+        )
+        cls.locations = cls.location_2a | cls.location_2b
+
+    def test_location_create_sync(self):
+        locations = self.env["stock.location"].create(
+            [
+                {
+                    "name": "tray test 1",
+                    "location_id": self.shuttle.location_id.id,
+                    "usage": "internal",
+                    "tray_type_id": self.tray_type.id,
+                },
+                {
+                    "name": "tray test 2",
+                    "location_id": self.shuttle.location_id.id,
+                    "usage": "internal",
+                    "tray_type_id": self.tray_type.id,
+                },
+            ]
+        )
+        self.assertEqual(locations[0].location_storage_type_ids, self.storage_types)
+        self.assertEqual(locations[1].location_storage_type_ids, self.storage_types)
+
+    def test_location_write_sync(self):
+        self.locations.tray_type_id = self.tray_type
+        self.assertEqual(self.location_2a.location_storage_type_ids, self.storage_types)
+        self.assertEqual(self.location_2b.location_storage_type_ids, self.storage_types)
+
+    def test_location_create_error(self):
+        with self.assertRaisesRegex(exceptions.UserError, "Error creating.*"):
+            self.env["stock.location"].create(
+                [
+                    {
+                        "name": "tray test 1",
+                        "location_id": self.shuttle.location_id.id,
+                        "usage": "internal",
+                        "tray_type_id": self.tray_type.id,
+                        "location_storage_type_ids": [
+                            (6, 0, self.location_storage_type_buffer.ids)
+                        ],
+                    },
+                    {
+                        "name": "tray test 2",
+                        "location_id": self.shuttle.location_id.id,
+                        "usage": "internal",
+                        "tray_type_id": self.tray_type.id,
+                        "location_storage_type_ids": [
+                            (6, 0, self.location_storage_type_buffer.ids)
+                        ],
+                    },
+                ]
+            )
+
+    def test_location_write_both_fields_error(self):
+        with self.assertRaisesRegex(exceptions.UserError, "Error updating.*"):
+            self.locations.write(
+                {
+                    "tray_type_id": self.tray_type.id,
+                    "location_storage_type_ids": [
+                        (6, 0, self.location_storage_type_buffer.ids)
+                    ],
+                }
+            )
+
+    def test_location_write_storage_type_error(self):
+        with self.assertRaisesRegex(exceptions.UserError, "Error updating.*"):
+            self.locations.write(
+                {
+                    "location_storage_type_ids": [
+                        (6, 0, self.location_storage_type_buffer.ids)
+                    ],
+                }
+            )

stock_vertical_lift_storage_type/tests/test_tray_type.py

@@ -0,0 +1,38 @@
+# Copyright 2020 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from .common import TrayTypeCommonCase
+
+
+class TestTrayType(TrayTypeCommonCase):
+    def test_tray_type_write_sync(self):
+        # both tray 1A and tray 2D use stock_location_tray_type_small_8x
+        tray_type = self.env.ref(
+            "stock_location_tray.stock_location_tray_type_small_8x"
+        )
+
+        tray_type.write({"location_storage_type_ids": [(6, 0, self.storage_types.ids)]})
+
+        self.assertEqual(self.location_1a.location_storage_type_ids, self.storage_types)
+        self.assertEqual(self.location_2d.location_storage_type_ids, self.storage_types)
+
+    def test_location_create_sync(self):
+        # both tray 1A and tray 2D use stock_location_tray_type_small_8x
+        tray_type = self.env.ref(
+            "stock_location_tray.stock_location_tray_type_small_8x"
+        )
+        tray_type.write({"location_storage_type_ids": [(6, 0, self.storage_types.ids)]})
+
+        locations = self.location_2a | self.location_2b
+
+        self.assertNotEqual(
+            self.location_2a.location_storage_type_ids, self.storage_types
+        )
+        self.assertNotEqual(
+            self.location_2b.location_storage_type_ids, self.storage_types
+        )
+
+        locations.tray_type_id = tray_type
+
+        self.assertEqual(self.location_2a.location_storage_type_ids, self.storage_types)
+        self.assertEqual(self.location_2b.location_storage_type_ids, self.storage_types)

stock_vertical_lift_storage_type/views/stock_location_tray_type_views.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_stock_location_tray_type_form" model="ir.ui.view">
+        <field name="name">stock.location.tray.type.form</field>
+        <field name="model">stock.location.tray.type</field>
+        <field
+            name="inherit_id"
+            ref="stock_location_tray.view_stock_location_tray_type_form"
+        />
+        <field name="arch" type="xml">
+            <group name="size" position="after">
+                <group string="Put-Away" name="putaway">
+                    <field name="location_storage_type_ids" widget="many2many_tags" />
+                </group>
+            </group>
+        </field>
+    </record>
+</odoo>

stock_vertical_lift_storage_type/views/stock_location_views.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_location_form" model="ir.ui.view">
+        <field name="name">stock.location.form.vertical.lift.storage.type</field>
+        <field name="model">stock.location</field>
+        <field name="inherit_id" ref="stock_storage_type.view_location_form_inherit" />
+        <field name="arch" type="xml">
+            <field name="location_storage_type_ids" position="attributes">
+                <attribute
+                    name="attrs"
+                >{"readonly": [("vertical_lift_kind", "in", ("tray", "cell"))]}</attribute>
+            </field>
+        </field>
+    </record>
+</odoo>