From 7e4a750a657679b631264b1bca99c65125dd5b29 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 11 Jun 2019 16:50:48 +0200
Subject: [PATCH 01/50] Prototype for kardex UI

---
 stock_kardex/__init__.py                      |   1 +
 stock_kardex/__manifest__.py                  |  24 ++
 stock_kardex/models/__init__.py               |   3 +
 stock_kardex/models/stock_kardex.py           | 124 +++++++++
 stock_kardex/models/stock_move_line.py        |   0
 stock_kardex/models/stock_picking_type.py     |   0
 stock_kardex/security/ir.model.access.csv     |   3 +
 stock_kardex/static/src/js/kardex.js          | 221 ++++++++++++++++
 stock_kardex/static/src/scss/kardex_view.scss | 107 ++++++++
 stock_kardex/views/stock_kardex_templates.xml |  11 +
 stock_kardex/views/stock_kardex_views.xml     | 248 ++++++++++++++++++
 stock_kardex/views/stock_move_line_views.xml  |   4 +
 .../views/stock_picking_type_views.xml        |   4 +
 13 files changed, 750 insertions(+)
 create mode 100644 stock_kardex/__init__.py
 create mode 100644 stock_kardex/__manifest__.py
 create mode 100644 stock_kardex/models/__init__.py
 create mode 100644 stock_kardex/models/stock_kardex.py
 create mode 100644 stock_kardex/models/stock_move_line.py
 create mode 100644 stock_kardex/models/stock_picking_type.py
 create mode 100644 stock_kardex/security/ir.model.access.csv
 create mode 100644 stock_kardex/static/src/js/kardex.js
 create mode 100644 stock_kardex/static/src/scss/kardex_view.scss
 create mode 100644 stock_kardex/views/stock_kardex_templates.xml
 create mode 100644 stock_kardex/views/stock_kardex_views.xml
 create mode 100644 stock_kardex/views/stock_move_line_views.xml
 create mode 100644 stock_kardex/views/stock_picking_type_views.xml

diff --git a/stock_kardex/__init__.py b/stock_kardex/__init__.py
new file mode 100644
index 000000000000..0650744f6bc6
--- /dev/null
+++ b/stock_kardex/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
new file mode 100644
index 000000000000..e21161415049
--- /dev/null
+++ b/stock_kardex/__manifest__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+    'name': 'Kardex',
+    'summary': 'Provides interaction and GUI for Kardex',
+    'version': '12.0.1.0.0',
+    'category': 'Stock',
+    'author': 'Camptocamp',
+    'license': 'AGPL-3',
+    'depends': [
+        'stock',
+        'barcodes',
+    ],
+    'website': 'https://www.camptocamp.com',
+    'data': [
+        'views/stock_move_line_views.xml',
+        'views/stock_picking_type_views.xml',
+        'views/stock_kardex_views.xml',
+        'views/stock_kardex_templates.xml',
+        'security/ir.model.access.csv',
+    ],
+    'installable': True,
+}
diff --git a/stock_kardex/models/__init__.py b/stock_kardex/models/__init__.py
new file mode 100644
index 000000000000..28f321cfc68e
--- /dev/null
+++ b/stock_kardex/models/__init__.py
@@ -0,0 +1,3 @@
+from . import stock_kardex
+from . import stock_move_line
+from . import stock_picking_type
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
new file mode 100644
index 000000000000..38491a8e1cb2
--- /dev/null
+++ b/stock_kardex/models/stock_kardex.py
@@ -0,0 +1,124 @@
+from random import randint
+
+from odoo import _, api, exceptions, fields, models
+
+
+class StockKardex(models.Model):
+    _name = 'stock.kardex'
+    _inherit = 'barcodes.barcode_events_mixin'
+    _description = 'Stock Kardex'
+
+    name = fields.Char()
+    address = fields.Char()
+    mode = fields.Selection(
+        [('pick', 'Pick'), ('put', 'Put'), ('inventory', 'Inventory')],
+        default='pick',
+        required=True,
+    )
+    current_move_line = fields.Many2one(comodel_name='stock.move.line')
+
+    operation_descr = fields.Char(
+        string="Operation", default="Scan next PID", readonly=True
+    )
+
+    # tray information (will come from stock.location or a new tray model)
+    kardex_tray_x = fields.Integer(
+        string='X', compute='_compute_kardex_tray_matrix'
+    )
+    kardex_tray_y = fields.Integer(
+        string='Y', compute='_compute_kardex_tray_matrix'
+    )
+    kardex_tray_matrix = fields.Serialized(
+        compute='_compute_kardex_tray_matrix'
+    )
+
+    # current operation information
+    picking_id = fields.Many2one(
+        related='current_move_line.picking_id', readonly=True
+    )
+    product_id = fields.Many2one(
+        related='current_move_line.product_id', readonly=True
+    )
+    product_uom_id = fields.Many2one(
+        related='current_move_line.product_uom_id', readonly=True
+    )
+    product_uom_qty = fields.Float(
+        related='current_move_line.product_uom_qty', readonly=True
+    )
+    qty_done = fields.Float(
+        related='current_move_line.qty_done', readonly=True
+    )
+    lot_id = fields.Many2one(related='current_move_line.lot_id', readonly=True)
+
+    _barcode_scanned = fields.Char(
+        "Barcode Scanned",
+        help="Value of the last barcode scanned.",
+        store=False,
+    )
+
+    def on_barcode_scanned(self, barcode):
+        raise exceptions.UserError('Scanned barcode: {}'.format(barcode))
+
+    @api.depends()
+    def _compute_kardex_tray_matrix(self):
+        for record in self:
+            # prototype code, random matrix
+            cols = randint(4, 8)
+            rows = randint(1, 3)
+            selected = [randint(0, cols - 1), randint(0, rows - 1)]
+            cells = []
+            for __ in range(rows):
+                row = []
+                for __ in range(cols):
+                    row.append(randint(0, 1))
+                cells.append(row)
+
+            record.kardex_tray_x = selected[0] + 1
+            record.kardex_tray_y = selected[1] + 1
+            record.kardex_tray_matrix = {
+                # x, y: position of the selected cell
+                'selected': selected,
+                # 0 is empty, 1 is not
+                'cells': cells,
+            }
+
+    def action_open_screen(self):
+        self.ensure_one()
+        screen_xmlid = 'stock_kardex.stock_kardex_view_form_screen'
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'views': [[self.env.ref(screen_xmlid).id, 'form']],
+            'res_id': self.id,
+            'target': 'fullscreen',
+            'flags': {
+                'headless': True,
+                'form_view_initial_mode': 'edit',
+                'no_breadcrumbs': True,
+            },
+        }
+
+    def action_menu(self):
+        menu_xmlid = 'stock_kardex.stock_kardex_form_menu'
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'stock.kardex',
+            'views': [[self.env.ref(menu_xmlid).id, 'form']],
+            'name': _('Menu'),
+            'target': 'new',
+            'res_id': self.id,
+        }
+
+    def action_quit_screen(self):
+        action_xmlid = 'stock_kardex.stock_kardex_action'
+        return self.env.ref(action_xmlid).read()[0]
+
+    # TODO: should the mode be changed on all the kardex at the same time?
+    def switch_pick(self):
+        self.mode = 'pick'
+
+    def switch_put(self):
+        self.mode = 'put'
+
+    def switch_inventory(self):
+        self.mode = 'inventory'
diff --git a/stock_kardex/models/stock_move_line.py b/stock_kardex/models/stock_move_line.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/stock_kardex/models/stock_picking_type.py b/stock_kardex/models/stock_picking_type.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/stock_kardex/security/ir.model.access.csv b/stock_kardex/security/ir.model.access.csv
new file mode 100644
index 000000000000..bcc602b1e404
--- /dev/null
+++ b/stock_kardex/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_kardex_stock_user,access_stock_kardex stock user,model_stock_kardex,stock.group_stock_user,1,0,0,0
+access_stock_kardex_manager,access_stock_kardex stock manager,model_stock_kardex,stock.group_stock_manager,1,1,1,1
diff --git a/stock_kardex/static/src/js/kardex.js b/stock_kardex/static/src/js/kardex.js
new file mode 100644
index 000000000000..d9fafc25340a
--- /dev/null
+++ b/stock_kardex/static/src/js/kardex.js
@@ -0,0 +1,221 @@
+odoo.define('stock_kardex.kardex', function (require) {
+"use strict";
+
+
+var core = require('web.core');
+var KanbanRecord = require('web.KanbanRecord');
+var basicFields = require('web.basic_fields');
+var field_registry = require('web.field_registry');
+var DebouncedField = basicFields.DebouncedField;
+var FieldInteger = basicFields.FieldInteger;
+
+KanbanRecord.include({
+
+    _openRecord: function () {
+        if (this.modelName === 'stock.kardex'
+            && this.$el.hasClass("open_kardex_screen")) {
+            var self = this;
+            this._rpc({
+                method: 'action_open_screen',
+                model: self.modelName,
+                args: [self.id],
+            }).then(function (result) {
+                self.do_action(result);
+            });
+        } else {
+            this._super.apply(this, arguments);
+        }
+    },
+
+});
+
+var ExitButton = FieldInteger.extend({
+    tagName: 'button',
+    className: 'btn btn-danger btn-block btn-lg o_kardex_exit',
+    events: {
+        'click': '_onClick',
+    },
+    _render: function () {
+        this.$el.text(this.string);
+    },
+    _onClick: function () {
+        // the only reason to have this field widget is to be able
+        // to inject clear_breadcrumbs in the action:
+        // it will revert back to a normal - non-headless - view
+        this.do_action('stock_kardex.stock_kardex_action', {
+            clear_breadcrumbs: true,
+        });
+    },
+});
+
+var KardexTrayMatrixField = DebouncedField.extend({
+    className: 'o_field_kardex_tray_matrix',
+    tagName: 'canvas',
+    supportedFieldTypes: ['serialized'],
+
+    cellColorEmpty: '#ffffff',
+    cellColorNotEmpty: '#4e6bfd',
+    selectedColor: '#08f46b',
+    selectedLineWidth: 5,
+    globalAlpha: 0.8,
+    cellPadding: 2,
+
+    isSet: function () {
+        if (Object.keys(this.value).length === 0) {
+            return false;
+        }
+        if (this.value.cells.length === 0) {
+            return false;
+        }
+        return this._super.apply(this, arguments);
+    },
+
+    start: function () {
+        // Setup resize events to redraw the canvas
+        this._resizeDebounce = this._resizeDebounce.bind(this);
+        this._resizePromise = null;
+        $(window).on('resize', this._resizeDebounce);
+
+        var self = this;
+        return this._super.apply(this, arguments).then(function () {
+            // _super calls _render(), but the function
+            // resizeCanvasToDisplaySize would resize the canvas
+            // to 0 because the actual canvas would still be unknown.
+            // Call again _render() here but through a setTimeout to
+            // let the js renderer thread catch up.
+            self._ready = true;
+            return self._resizeDebounce();
+        });
+    },
+
+    /**
+     * Debounce the rendering on resize.
+     * It is useless to render on each resize event.
+     *
+     */
+    _resizeDebounce: function(){
+        clearTimeout(this._resizePromise);
+        var self = this;
+        this._resizePromise = setTimeout(function(){
+            self._render();
+        }, 20);
+    },
+
+    destroy: function () {
+        $(window).off('resize', this._resizeDebounce);
+        this._super.apply(this, arguments);
+    },
+
+    /**
+     * Render the widget only when it is in the DOM.
+     * We need the width and height of the widget to draw the canvas.
+     *
+     */
+    _render: function () {
+        if (this._ready) {
+            return this._renderInDOM();
+        }
+        return $.when();
+    },
+
+    /**
+     * Resize the canvas width and height to the actual size.
+     * If we don't do that, it will automatically scale to the
+     * CSS size with blurry squares.
+     *
+     */
+    resizeCanvasToDisplaySize: function(canvas) {
+        // look up the size the canvas is being displayed
+        const width = canvas.clientWidth;
+        const height = canvas.clientHeight;
+
+        // If it's resolution does not match change it
+        if (canvas.width !== width || canvas.height !== height) {
+            canvas.width = width;
+            canvas.height = height;
+            return true;
+        }
+
+        return false;
+    },
+
+    /**
+     * Resize the canvas, clear it and redraw the cells
+     * Should be called only if the canvas is already in DOM
+     *
+     */
+    _renderInDOM: function () {
+        this.canvas = this.$el.find('canvas').context;
+        var canvas = this.canvas;
+        var ctx = canvas.getContext('2d');
+        this.resizeCanvasToDisplaySize(ctx.canvas);
+        ctx.clearRect(0, 0, canvas.width, canvas.height);
+        ctx.save();
+        if (this.isSet()) {
+            var selected = this.value.selected || [];
+            var cells = this.value.cells;
+            this._drawMatrix(canvas, ctx, cells, selected);
+        }
+    },
+
+    /**
+     * Draw the cells in the canvas.
+     *
+     */
+    _drawMatrix: function (canvas, ctx, cells, selected) {
+        var colors = {
+          0: this.cellColorEmpty,
+          1: this.cellColorNotEmpty,
+        };
+
+        var cols = cells[0].length;
+        var rows = cells.length;
+        var selectedX, selectedY;
+        if (selected.length) {
+            selectedX = selected[0];
+            // we draw top to bottom, but the highlighted cell should
+            // be a coordinate from bottom to top: reverse the y axis
+            selectedY = Math.abs(selected[1] - rows + 1);
+        }
+
+        var padding = this.cellPadding;
+        var w = ((canvas.width - padding * cols) / cols);
+        var h = ((canvas.height - padding * rows) / rows);
+
+        ctx.globalAlpha = this.globalAlpha;
+        for (var y = 0; y < rows; y++) {
+            for (var x = 0; x < cols; x++) {
+                ctx.fillStyle = colors[cells[y][x]];
+                var fillWidth = w;
+                var fillHeight = h;
+                // cheat: remove the padding at bottom and right
+                // the cells will be a bit larger but not really noticeable
+                if (x === cols - 1) {fillWidth += padding;}
+                if (y === rows - 1) {fillHeight += padding;}
+                ctx.fillRect(
+                    x * (w + padding), y * (h + padding),
+                    fillWidth, fillHeight
+                );
+                if (selected && selectedX === x && selectedY === y) {
+                    ctx.globalAlpha = 1.0;
+                    ctx.strokeStyle = this.selectedColor;
+                    ctx.lineWidth = this.selectedLineWidth;
+                    ctx.strokeRect(x * (w + padding), y * (h + padding), w, h);
+                    ctx.globalAlpha = this.globalAlpha;
+                }
+            }
+        }
+        ctx.restore();
+    }
+});
+
+
+field_registry.add('exit_button', ExitButton);
+field_registry.add('kardex_tray_matrix', KardexTrayMatrixField);
+
+return {
+    ExitButton: ExitButton,
+    KardexTrayMatrixField: KardexTrayMatrixField
+};
+
+});
diff --git a/stock_kardex/static/src/scss/kardex_view.scss b/stock_kardex/static/src/scss/kardex_view.scss
new file mode 100644
index 000000000000..fd381a39128f
--- /dev/null
+++ b/stock_kardex/static/src/scss/kardex_view.scss
@@ -0,0 +1,107 @@
+.o_web_client.o_fullscreen {
+    $o-kardex-padding: $o-horizontal-padding;
+
+    .o_form_view.o_kardex {
+        display: flex;
+        flex-flow: column nowrap;
+        padding: 0;
+
+        font-size: 16px;
+
+        @include media-breakpoint-up(xl) {
+            font-size: 18px;
+        }
+
+        .btn {
+            font-size: 1em;
+            padding: 1em;
+            margin: 0 5px;
+        }
+
+        .o_kardex_header {
+            display: flex;
+            flex-flow: row wrap;
+            padding: $o-kardex-padding;
+        }
+
+        .o_kardex_header_content {
+            display: flex;
+            flex-flow: row nowrap;
+            font-size: 2.0em;
+            flex: 1 0 auto;
+            align-items: center;
+            width: 33%;
+
+            &.o_kardex_header_right {
+                justify-content: flex-end;
+            }
+        }
+
+        .o_kardex_actions {
+            display: flex;
+            flex-flow: row nowrap;
+            font-size: 1.2em;
+            padding: $o-kardex-padding * 0.5;
+        }
+
+        .o_kardex_operation {
+            font-size: 2.5em;
+            padding: 0.5em;
+            color: #ffffff;
+        }
+
+        .o_kardex_content {
+            display: flex;
+            flex-flow: row nowrap;
+            flex: 1 0 auto;
+            align-items: center;
+
+            &.o_kardex_content_right {
+                justify-content: flex-end;
+            }
+        }
+
+        .o_kardex_data {
+            display: flex;
+            flex-flow: row wrap;
+            padding: $o-kardex-padding * 0.5;
+
+            .o_kardex_data_content {
+                flex-flow: row nowrap;
+                font-size: 1.2em;
+                flex: 1 0 auto;
+                align-items: center;
+                width: 50%;
+
+                &.o_kardex_tray {
+                    display: flex;
+                    justify-content: flex-end;
+
+                    .o_group {
+                        display: block;
+                    }
+
+                    canvas {
+                        width: 450px;
+                        background-color: #ffffff;
+                        border: 2px #000000 solid;
+                    }
+                }
+            }
+        }
+
+    }
+
+    .o_kardex_menu {
+        .btn {
+            margin-bottom: $o-kardex-padding;
+            padding: 1em;
+            font-size: 2em;
+            text-transform: uppercase;
+        }
+
+        .o_kardex_exit {
+            text-align: center;
+        }
+    }
+}
diff --git a/stock_kardex/views/stock_kardex_templates.xml b/stock_kardex/views/stock_kardex_templates.xml
new file mode 100644
index 000000000000..340339fdef03
--- /dev/null
+++ b/stock_kardex/views/stock_kardex_templates.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <template id="stock_move_line_kardex_view_form_css" name="kardex.view.form.css" inherit_id="web.assets_backend">
+    <xpath expr="." position="inside">
+      <link rel="stylesheet" type="text/scss" href="/stock_kardex/static/src/scss/kardex_view.scss"/>
+      <script type="text/javascript" src="/stock_kardex/static/src/js/kardex.js"></script>
+    </xpath>
+  </template>
+
+</odoo>
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
new file mode 100644
index 000000000000..90e52c65a75b
--- /dev/null
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record id="stock_kardex_view_form_screen" model="ir.ui.view">
+    <field name="name">stock.kardex.view.form.screen</field>
+    <field name="model">stock.kardex</field>
+    <field name="priority">99</field>
+    <field name="arch" type="xml">
+      <form string="Operations" delete="0" create="0" class="o_kardex">
+        <!-- <field name="product_id" invisible="1"/> -->
+        <div class="o_kardex_header">
+          <div class="o_kardex_header_left o_kardex_header_content">
+          </div>
+          <div class="o_kardex_header_center o_kardex_header_content">
+            <label for="mode"/>
+            <field name="mode" readonly="1"/>
+          </div>
+          <div class="o_kardex_header_right o_kardex_header_content">
+          </div>
+        </div>
+        <div class="o_kardex_actions">
+          <div class="o_kardex_content">
+            <button name="action_menu" type="object"
+                    class="btn-secondary o_kardex_icon_btn"
+                    string="" icon="fa-bars"
+                    aria-label="Dropdown menu" title="Dropdown menu"/>
+          </div>
+          <div class="o_kardex_content o_kardex_content_right">
+            <div>
+              <button name="do_dummy"
+                      type="object"
+                      string="Save"
+                      icon="fa-check"
+                      class="btn-primary"
+                      barcode_trigger="save"/>
+              <button name="do_dummy"
+                      type="object"
+                      string="Release"
+                      class="btn-primary"
+                      barcode_trigger="release"/>
+            </div>
+          </div>
+        </div>
+        <div class="o_kardex_operation bg-primary jumbotron jumbotron-fluid">
+          <div class="container">
+            <field name="operation_descr"/>
+          </div>
+        </div>
+        <div class="o_kardex_data">
+          <!-- on the left of the screen -->
+          <div class="o_kardex_data_content o_kardex_move">
+            <div>
+              <label for="product_id"/>
+              <field name="product_id" readonly="1" options="{'no_open': True}"/>
+              <field name="qty_done" readonly="1" force_save="1"/> / 
+              <field name="product_uom_qty" readonly="1"/>
+              <label for="product_uom_id" string=" "/>
+              <field name="product_uom_id" options="{'no_open': True}" class="oe_inline"/>
+            </div>
+            <div>
+              <label for="lot_id"/>
+              <field name="lot_id"/>
+            </div>
+          </div>
+          <!-- on the right of the screen -->
+          <div class="o_kardex_data_content o_kardex_tray">
+            <group col="1">
+              <!-- These 2 fields must come from the location.
+                   Currently, the HTML mimics what Odoo generates for <field/>
+              -->
+              <tr>
+                <td class="o_td_label" style="min-width: 150px;">
+                  <span class="o_readonly_modifier" style="font-weight: bold; margin: 0 5px 0 0; font-size: 1.08333333rem; line-height: 1.5;">Tray</span>
+
+                </td>
+                <td>
+                  <span class="o_field_integer o_field_number o_field_widget o_readonly_modifier"
+                        name="kardex_tray_tray">
+                    SHU-1108
+                  </span>
+                </td>
+              </tr>
+              <tr>
+                <td class="o_td_label" style="min-width: 150px;">
+                  <span class="o_readonly_modifier" style="font-weight: bold; margin: 0 5px 0 0; font-size: 1.08333333rem; line-height: 1.5;">Box Type</span>
+                </td>
+                <td>
+                  <span class="o_field_integer o_field_number o_field_widget o_readonly_modifier"
+                        name="kardex_tray_box_type">
+                    B30401
+                  </span>
+                </td>
+              </tr>
+              <field name="kardex_tray_y"/>
+              <field name="kardex_tray_x"/>
+            </group>
+            <div>
+              <field name="kardex_tray_matrix"
+                     widget="kardex_tray_matrix"/>
+            </div>
+          </div>
+        </div>
+        <field name="_barcode_scanned" widget="barcode_handler"/>
+      </form>
+    </field>
+  </record>
+
+  <record id="stock_kardex_form_menu" model="ir.ui.view">
+    <field name="name">stock.kardex.view.form.menu</field>
+    <field name="model">stock.kardex</field>
+    <field name="priority">100</field>
+    <field name="arch" type="xml">
+      <form string="Kardex">
+        <div class="row o_kardex_menu">
+          <div class="col-6">
+            <button name="switch_pick"
+                    type="object"
+                    string="Pick"
+                    class="btn-primary btn-block btn btn-lg"/>
+            <button name="switch_put"
+                    type="object"
+                    string="Put"
+                    class="btn-primary btn-block btn btn-lg"/>
+            <button name="switch_inventory"
+                    type="object"
+                    string="Inventory"
+                    class="btn-primary btn-block btn btn-lg"/>
+          </div>
+          <div class="col-6">
+            <field name="id" string="Back to settings"
+                   widget="exit_button" readonly="1"/>
+          </div>
+        </div>
+        <footer></footer>
+      </form>
+    </field>
+  </record>
+
+  <record id="stock_kardex_view_form" model="ir.ui.view">
+    <field name="name">stock.kardex.view.form</field>
+    <field name="model">stock.kardex</field>
+    <field name="arch" type="xml">
+      <form string="Operations">
+        <group>
+          <field name="name"/>
+          <field name="address"/>
+          <field name="mode"/>
+          <!-- visible and editable for prototyping purposes -->
+          <field name="current_move_line"/>
+        </group>
+      </form>
+    </field>
+  </record>
+
+  <record model="ir.ui.view" id="stock_kardex_view_kanban">
+    <field name="name">stock.kardex.kanban</field>
+    <field name="model">stock.kardex</field>
+    <field name="arch" type="xml">
+      <kanban class="o_kanban_dashboard">
+        <field name="name"/>
+        <field name="address"/>
+        <field name="mode"/>
+        <templates>
+          <t t-name="kanban-box">
+            <div class="oe_kanban_global_click o_has_icon open_kardex_screen">
+              <div class="o_kardex_kanban_main">
+
+                <div class="o_kanban_card_content">
+                  <div class="o_kanban_primary_left">
+                    <div class="o_primary">
+                      <strong class="o_kanban_record_title">
+                        <span><t t-esc="record.name.value"/></span>
+                      </strong>
+                    </div>
+                    <span>Mode: <t t-esc="record.mode.value"/></span>
+                  </div>
+                </div>
+
+                <div class="o_kanban_card_manage_pane dropdown-menu" groups="stock.group_stock_manager" role="menu">
+                  <div class="o_kanban_card_manage_section o_kanban_manage_reports">
+                    <div role="menuitem">
+                      <a type="edit">Settings</a>
+                    </div>
+                  </div>
+                </div>
+                <a class="o_kanban_manage_toggle_button o_left" href="#" groups="stock.group_stock_manager"><i class="fa fa-ellipsis-v" role="img" aria-label="Manage" title="Manage"/></a>
+              </div>
+            </div>
+          </t>
+        </templates>
+      </kanban>
+    </field>
+  </record>
+
+  <record model="ir.ui.view" id="stock_kardex_view_tree">
+    <field name="name">stock.kardex.tree</field>
+    <field name="model">stock.kardex</field>
+    <field name="arch" type="xml">
+      <tree string="Kardex">
+        <field name="name"/>
+        <field name="address"/>
+      </tree>
+    </field>
+  </record>
+
+  <!-- TODO: use this in method action_open_screen? -->
+  <record model="ir.actions.act_window" id="stock_kardex_action_screen">
+    <field name="name">Kardex</field>
+    <field name="type">ir.actions.act_window</field>
+    <field name="res_model">stock.kardex</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">form</field>
+    <field name="view_ids"
+           eval="[(5, 0, 0),
+                  (0, 0, {'view_mode': 'form', 'view_id': ref('stock_kardex_view_form_screen')})]"/>
+    <field name="target">fullscreen</field>
+    <field name="domain">[]</field>
+    <field name="context">{'form_view_initial_mode': 'edit', 'no_breadcrumbs': True}</field>
+    <field name="help" type="html">
+      <p class="o_view_nocontent_smiling_face">
+        Open the Kardex Interface.
+      </p>
+    </field>
+  </record>
+
+  <record model="ir.actions.act_window" id="stock_kardex_action">
+    <field name="name">Kardex</field>
+    <field name="type">ir.actions.act_window</field>
+    <field name="res_model">stock.kardex</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">kanban,tree,form</field>
+    <field name="target">current</field>
+    <field name="domain">[]</field>
+    <field name="context">{}</field>
+    <field name="help" type="html">
+      <p class="o_view_nocontent_smiling_face">
+        Open the Kardex Interface.
+      </p>
+    </field>
+  </record>
+
+  <menuitem id="stock_kardex"
+            name="Kardex"
+            action="stock_kardex_action"
+            parent="stock.menu_stock_warehouse_mgmt"
+            sequence="15"/>
+
+</odoo>
diff --git a/stock_kardex/views/stock_move_line_views.xml b/stock_kardex/views/stock_move_line_views.xml
new file mode 100644
index 000000000000..1d77a6b31998
--- /dev/null
+++ b/stock_kardex/views/stock_move_line_views.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+</odoo>
diff --git a/stock_kardex/views/stock_picking_type_views.xml b/stock_kardex/views/stock_picking_type_views.xml
new file mode 100644
index 000000000000..1d77a6b31998
--- /dev/null
+++ b/stock_kardex/views/stock_picking_type_views.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+</odoo>

From bae9b34e22ddc6356b410ce4ee1fb2edf2be5e46 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Fri, 14 Jun 2019 15:08:51 +0200
Subject: [PATCH 02/50] Add tray types

---
 stock_kardex/__manifest__.py                  |  2 +
 stock_kardex/data/stock_kardex_tray_type.xml  | 74 +++++++++++++++++
 stock_kardex/models/__init__.py               |  2 +
 stock_kardex/models/stock_kardex.py           |  2 +
 stock_kardex/models/stock_kardex_tray_type.py | 30 +++++++
 stock_kardex/models/stock_location.py         | 20 +++++
 stock_kardex/security/ir.model.access.csv     |  2 +
 stock_kardex/static/src/scss/kardex_view.scss | 13 +--
 .../views/stock_kardex_tray_type_views.xml    | 80 +++++++++++++++++++
 9 files changed, 220 insertions(+), 5 deletions(-)
 create mode 100644 stock_kardex/data/stock_kardex_tray_type.xml
 create mode 100644 stock_kardex/models/stock_kardex_tray_type.py
 create mode 100644 stock_kardex/models/stock_location.py
 create mode 100644 stock_kardex/views/stock_kardex_tray_type_views.xml

diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
index e21161415049..f784e62ed00b 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_kardex/__manifest__.py
@@ -17,7 +17,9 @@
         'views/stock_move_line_views.xml',
         'views/stock_picking_type_views.xml',
         'views/stock_kardex_views.xml',
+        'views/stock_kardex_tray_type_views.xml',
         'views/stock_kardex_templates.xml',
+        'data/stock_kardex_tray_type.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
diff --git a/stock_kardex/data/stock_kardex_tray_type.xml b/stock_kardex/data/stock_kardex_tray_type.xml
new file mode 100644
index 000000000000..78497088cb9d
--- /dev/null
+++ b/stock_kardex/data/stock_kardex_tray_type.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_32x">
+    <field name="name">Klein 32x</field>
+    <field name="code">B10804</field>
+    <field name="rows">4</field>
+    <field name="cols">8</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_16x">
+    <field name="name">Klein 16x</field>
+    <field name="code">B20802</field>
+    <field name="rows">2</field>
+    <field name="cols">8</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_8x">
+    <field name="name">Klein 8x</field>
+    <field name="code">B20402</field>
+    <field name="rows">2</field>
+    <field name="cols">4</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_16x_2">
+    <field name="name">Klein 16x</field>
+    <field name="code">B40802</field>
+    <field name="rows">2</field>
+    <field name="cols">8</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_16x_3">
+    <field name="name">Klein 16x</field>
+    <field name="code">B30404</field>
+    <field name="rows">4</field>
+    <field name="cols">4</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_32x">
+    <field name="name">Gross 32x</field>
+    <field name="code">B20804</field>
+    <field name="rows">4</field>
+    <field name="cols">8</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_16x">
+    <field name="name">Gross 16x</field>
+    <field name="code">B30802</field>
+    <field name="rows">2</field>
+    <field name="cols">8</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_8x">
+    <field name="name">Gross 8x</field>
+    <field name="code">B30402</field>
+    <field name="rows">2</field>
+    <field name="cols">4</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_4x">
+    <field name="name">Gross 4x</field>
+    <field name="code">B30401</field>
+    <field name="rows">1</field>
+    <field name="cols">4</field>
+  </record>
+
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_16x_2">
+    <field name="name">Gross 16x</field>
+    <field name="code">B30404</field>
+    <field name="rows">4</field>
+    <field name="cols">4</field>
+  </record>
+
+</odoo>
diff --git a/stock_kardex/models/__init__.py b/stock_kardex/models/__init__.py
index 28f321cfc68e..72c066a96f7b 100644
--- a/stock_kardex/models/__init__.py
+++ b/stock_kardex/models/__init__.py
@@ -1,3 +1,5 @@
 from . import stock_kardex
+from . import stock_kardex_tray_type
 from . import stock_move_line
+from . import stock_location
 from . import stock_picking_type
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 38491a8e1cb2..4322aae778fc 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -1,3 +1,5 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from random import randint
 
 from odoo import _, api, exceptions, fields, models
diff --git a/stock_kardex/models/stock_kardex_tray_type.py b/stock_kardex/models/stock_kardex_tray_type.py
new file mode 100644
index 000000000000..41496f577db6
--- /dev/null
+++ b/stock_kardex/models/stock_kardex_tray_type.py
@@ -0,0 +1,30 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class StockKardexTrayType(models.Model):
+    _name = 'stock.kardex.tray.type'
+    _description = 'Stock Kardex Tray Type'
+
+    name = fields.Char(required=True)
+    code = fields.Char(required=True)
+    rows = fields.Integer(required=True)
+    cols = fields.Integer(required=True)
+    active = fields.Boolean(default=True)
+    tray_matrix = fields.Serialized(compute='_compute_tray_matrix')
+    # TODO do we want box size, or a many2one to 'product.packaging'?
+
+    @api.depends('rows', 'cols')
+    def _compute_tray_matrix(self):
+        for record in self:
+            # As we only want to show the disposition of
+            # the tray, we generate a "full" tray, we'll
+            # see all the boxes on the web widget.
+            # (0 means empty, 1 means used)
+            cells = [[1] * record.cols for __ in range(record.rows)]
+
+            record.tray_matrix = {'selected': None, 'cells': cells}
+
+    # TODO prevent to set active=False on a type used in a location
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
new file mode 100644
index 000000000000..0a7dcad3e755
--- /dev/null
+++ b/stock_kardex/models/stock_location.py
@@ -0,0 +1,20 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockLocation(models.Model):
+    _inherit = "stock.location"
+
+    kardey_tray = fields.Boolean()
+    kardex_tray_type_id = fields.Many2one(
+        comodel_name="stock.kardex.tray.type",
+        ondelete="restrict",
+        # TODO: later, we'll want a wizard to change the type,
+        # that will check if the sublocations are empty before
+        # changing. It will disable the sublocations and create
+        # new ones according to the tray disposition. This field
+        # will then be readonly.
+        # readonly=True,
+    )
diff --git a/stock_kardex/security/ir.model.access.csv b/stock_kardex/security/ir.model.access.csv
index bcc602b1e404..32b082c9579b 100644
--- a/stock_kardex/security/ir.model.access.csv
+++ b/stock_kardex/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_stock_kardex_stock_user,access_stock_kardex stock user,model_stock_kardex,stock.group_stock_user,1,0,0,0
 access_stock_kardex_manager,access_stock_kardex stock manager,model_stock_kardex,stock.group_stock_manager,1,1,1,1
+access_stock_kardex_tray_type_stock_user,access_stock_kardex_tray_type stock user,model_stock_kardex_tray_type,stock.group_stock_user,1,0,0,0
+access_stock_kardex_tray_type_manager,access_stock_kardex_tray_type stock manager,model_stock_kardex_tray_type,stock.group_stock_manager,1,1,1,1
diff --git a/stock_kardex/static/src/scss/kardex_view.scss b/stock_kardex/static/src/scss/kardex_view.scss
index fd381a39128f..c99642ca5045 100644
--- a/stock_kardex/static/src/scss/kardex_view.scss
+++ b/stock_kardex/static/src/scss/kardex_view.scss
@@ -1,3 +1,8 @@
+.o_field_kardex_tray_matrix {
+    background-color: #eeeeee;
+    border: 2px #000000 solid;
+}
+
 .o_web_client.o_fullscreen {
     $o-kardex-padding: $o-horizontal-padding;
 
@@ -80,12 +85,10 @@
                     .o_group {
                         display: block;
                     }
+                }
 
-                    canvas {
-                        width: 450px;
-                        background-color: #ffffff;
-                        border: 2px #000000 solid;
-                    }
+                .o_field_kardex_tray_matrix {
+                    width: 450px;
                 }
             }
         }
diff --git a/stock_kardex/views/stock_kardex_tray_type_views.xml b/stock_kardex/views/stock_kardex_tray_type_views.xml
new file mode 100644
index 000000000000..41afb453cfa9
--- /dev/null
+++ b/stock_kardex/views/stock_kardex_tray_type_views.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record id="view_stock_kardex_tray_type_form" model="ir.ui.view">
+    <field name="name">stock.kardex.tray.type.form</field>
+    <field name="model">stock.kardex.tray.type</field>
+    <field name="arch" type="xml">
+      <form string="Kardex Tray Type">
+        <div class="oe_button_box" name="button_box">
+          <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+            <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+          </button>
+        </div>
+        <label for="name" class="oe_edit_only"/>
+        <h1><field name="name"/></h1>
+        <group>
+          <group string="Tray Configuration" name="settings">
+            <field name="code"/>
+            <field name="rows"/>
+            <field name="cols"/>
+          </group>
+          <group string="Disposition" name="disposition">
+            <field name="tray_matrix"
+                   widget="kardex_tray_matrix"
+                   nolabel="1"/>
+          </group>
+        </group>
+      </form>
+    </field>
+  </record>
+
+  <record id="view_stock_kardex_tray_type_search" model="ir.ui.view">
+    <field name="name">stock.kardex.tray.type.search</field>
+    <field name="model">stock.kardex.tray.type</field>
+    <field name="arch" type="xml">
+      <search string="Kardex Tray Type">
+        <field name="name"/>
+        <field name="code"/>
+        <separator/>
+        <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+      </search>
+    </field>
+  </record>
+
+  <record id="view_stock_kardex_tray_type_tree" model="ir.ui.view">
+    <field name="name">stock.kardex.tray.type</field>
+    <field name="model">stock.kardex.tray.type</field>
+    <field name="arch" type="xml">
+      <tree string="Kardey Tray Type">
+        <field name="name"/>
+        <field name="code"/>
+        <field name="rows"/>
+        <field name="cols"/>
+      </tree>
+    </field>
+  </record>
+
+  <record id="action_stock_kardex_tray_type" model="ir.actions.act_window">
+    <field name="name">Kardex Tray Types</field>
+    <field name="res_model">stock.kardex.tray.type</field>
+    <field name="type">ir.actions.act_window</field>
+    <field name="view_type">form</field>
+    <field name="view_id" ref="view_stock_kardex_tray_type_tree"/>
+    <field name="search_view_id" ref="view_stock_kardex_tray_type_search"/>
+    <field name="context"></field>
+    <field name="help" type="html">
+      <p class="o_view_nocontent_smiling_face">
+        Add a Kardex Tray Type
+        </p><p>
+        Define the number of rows and cols on a tray, depending of the boxes
+size.
+      </p>
+    </field>
+  </record>
+
+  <menuitem action="action_stock_kardex_tray_type"
+            id="menu_stock_kardex_tray_type"
+            parent="stock.menu_warehouse_config" sequence="10"/>
+
+</odoo>

From 40961543ee2b0f3ad0c95eccd35268ac9250cf43 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Fri, 14 Jun 2019 15:57:13 +0200
Subject: [PATCH 03/50] Autogenerate tray sublocations

---
 stock_kardex/__manifest__.py                  |  1 +
 stock_kardex/models/stock_kardex_tray_type.py |  2 +
 stock_kardex/models/stock_location.py         | 67 ++++++++++++++++---
 stock_kardex/views/stock_location_views.xml   | 19 ++++++
 4 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 stock_kardex/views/stock_location_views.xml

diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
index f784e62ed00b..2e52c25717d4 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_kardex/__manifest__.py
@@ -14,6 +14,7 @@
     ],
     'website': 'https://www.camptocamp.com',
     'data': [
+        'views/stock_location_views.xml',
         'views/stock_move_line_views.xml',
         'views/stock_picking_type_views.xml',
         'views/stock_kardex_views.xml',
diff --git a/stock_kardex/models/stock_kardex_tray_type.py b/stock_kardex/models/stock_kardex_tray_type.py
index 41496f577db6..4e3a69ed28c4 100644
--- a/stock_kardex/models/stock_kardex_tray_type.py
+++ b/stock_kardex/models/stock_kardex_tray_type.py
@@ -28,3 +28,5 @@ def _compute_tray_matrix(self):
             record.tray_matrix = {'selected': None, 'cells': cells}
 
     # TODO prevent to set active=False on a type used in a location
+    # TODO we should not be able to change cells and rows for types used
+    # in locations
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index 0a7dcad3e755..c421700bbdce 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -1,20 +1,71 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import _, api, fields, models
 
 
 class StockLocation(models.Model):
     _inherit = "stock.location"
 
-    kardey_tray = fields.Boolean()
+    kardex_tray = fields.Boolean()
     kardex_tray_type_id = fields.Many2one(
+        comodel_name="stock.kardex.tray.type", ondelete="restrict"
+    )
+
+    # Only for trays cells (boxes).
+    # Children of 'kardey_tray' locations, they are automatically generated
+    generated_for_tray_type_id = fields.Many2one(
         comodel_name="stock.kardex.tray.type",
         ondelete="restrict",
-        # TODO: later, we'll want a wizard to change the type,
-        # that will check if the sublocations are empty before
-        # changing. It will disable the sublocations and create
-        # new ones according to the tray disposition. This field
-        # will then be readonly.
-        # readonly=True,
+        readonly=True,
     )
+
+    @api.model
+    def create(self, vals):
+        records = super().create(vals)
+        if vals.get('kardex_tray'):
+            records._update_tray_sublocations()
+        return records
+
+    @api.multi
+    def write(self, vals):
+        result = super().write(vals)
+        if vals.get('kardex_tray') or vals.get('kardex_tray_type_id'):
+            self._update_tray_sublocations()
+        return result
+
+    @api.multi
+    def _update_tray_sublocations(self):
+        # TODO: if any sublocation has stock, raise an error,
+        # we must be able to change the type of tray only when
+        # it is empty
+        values = []
+        for location in self:
+            if not location.kardex_tray:
+                sublocs = location.child_ids.filtered(
+                    lambda r: r.generated_for_tray_type_id
+                )
+                sublocs.write({'active': False})
+                continue
+
+            tray_type = location.kardex_tray_type_id
+            sublocs = location.child_ids.filtered(
+                lambda r: r.generated_for_tray_type_id != tray_type
+            )
+            sublocs.write({'active': False})
+
+            # create accepts several records now
+            for row in range(1, tray_type.rows + 1):
+                for col in range(1, tray_type.cols + 1):
+                    subloc_values = {
+                        'name': _('{} [x{} y{}]').format(
+                            location.name, col, row
+                        ),
+                        'posx': col,
+                        'posy': row,
+                        'location_id': location.id,
+                        'company_id': location.company_id.id,
+                        'generated_for_tray_type_id': tray_type.id,
+                    }
+                    values.append(subloc_values)
+            self.create(values)
diff --git a/stock_kardex/views/stock_location_views.xml b/stock_kardex/views/stock_location_views.xml
new file mode 100644
index 000000000000..d8e97a32eb07
--- /dev/null
+++ b/stock_kardex/views/stock_location_views.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record id="view_location_form_kardex" model="ir.ui.view">
+    <field name="name">stock.location.form.kardex</field>
+    <field name="model">stock.location</field>
+    <field name="inherit_id" ref="stock.view_location_form"/>
+    <field name="arch" type="xml">
+      <group name="localization" position="after">
+        <group string="Kardex" name="kardex">
+          <field name="kardex_tray"/>
+          <field name="kardex_tray_type_id"
+                 attrs="{'required': [('kardex_tray', '=', True)]}"/>
+        </group>
+      </group>
+    </field>
+  </record>
+
+</odoo>

From 97ba5a81ac3a68307ed327503553b646620bc01a Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 18 Jun 2019 16:42:25 +0200
Subject: [PATCH 04/50] Add kardex attribute on stock locations

The kardex_tray field indicates it is a tray, but we still needed
to identify a whole kardex shelf. On the 'stock.kardex' model, we
must select the corresponding location.
---
 stock_kardex/models/stock_kardex.py         |  9 +++++++++
 stock_kardex/models/stock_location.py       | 12 ++++++++++++
 stock_kardex/views/stock_kardex_views.xml   |  1 +
 stock_kardex/views/stock_location_views.xml |  8 ++++++--
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 4322aae778fc..3c82726f0ba4 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -17,6 +17,15 @@ class StockKardex(models.Model):
         default='pick',
         required=True,
     )
+    location_id = fields.Many2one(
+        comodel_name='stock.location',
+        required=True,
+        domain="[('kardex', '=', True)]",
+        context="{'default_kardex': True}",
+        ondelete='restrict',
+        help="The Kardex source location for Pick operations "
+        "and destination location for Put operations.",
+    )
     current_move_line = fields.Many2one(comodel_name='stock.move.line')
 
     operation_descr = fields.Char(
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index c421700bbdce..63ea1c17acf2 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -7,6 +7,8 @@
 class StockLocation(models.Model):
     _inherit = "stock.location"
 
+    kardex = fields.Boolean()
+    parent_is_kardex = fields.Boolean(compute='_compute_parent_is_kardex')
     kardex_tray = fields.Boolean()
     kardex_tray_type_id = fields.Many2one(
         comodel_name="stock.kardex.tray.type", ondelete="restrict"
@@ -20,6 +22,16 @@ class StockLocation(models.Model):
         readonly=True,
     )
 
+    @api.depends('location_id.parent_is_kardex')
+    def _compute_parent_is_kardex(self):
+        for location in self:
+            parent = location.location_id
+            while parent:
+                if parent.kardex:
+                    location.parent_is_kardex = True
+                    break
+                parent = parent.location_id
+
     @api.model
     def create(self, vals):
         records = super().create(vals)
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index 90e52c65a75b..2dd8a627e30d 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -145,6 +145,7 @@
           <field name="name"/>
           <field name="address"/>
           <field name="mode"/>
+          <field name="location_id"/>
           <!-- visible and editable for prototyping purposes -->
           <field name="current_move_line"/>
         </group>
diff --git a/stock_kardex/views/stock_location_views.xml b/stock_kardex/views/stock_location_views.xml
index d8e97a32eb07..dbc5e64dde4c 100644
--- a/stock_kardex/views/stock_location_views.xml
+++ b/stock_kardex/views/stock_location_views.xml
@@ -8,9 +8,13 @@
     <field name="arch" type="xml">
       <group name="localization" position="after">
         <group string="Kardex" name="kardex">
-          <field name="kardex_tray"/>
+          <field name="parent_is_kardex" invisible="1"/>
+          <field name="kardex"
+                 attrs="{'invisible': [('parent_is_kardex', '=', True)]}"/>
+          <field name="kardex_tray"
+                 attrs="{'invisible': [('parent_is_kardex', '=', False)]}"/>
           <field name="kardex_tray_type_id"
-                 attrs="{'required': [('kardex_tray', '=', True)]}"/>
+                 attrs="{'invisible': [('kardex_tray', '=', False)], 'required': [('kardex_tray', '=', True)]}"/>
         </group>
       </group>
     </field>

From b2beb624392deb7ccbdbf7aa7fe4c36bd265f495 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 18 Jun 2019 16:43:48 +0200
Subject: [PATCH 05/50] Add basic handling of Pick scenario

---
 stock_kardex/models/stock_kardex.py       | 105 +++++++++++++++++++++-
 stock_kardex/views/stock_kardex_views.xml |  24 ++++-
 2 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 3c82726f0ba4..2d8372e15c39 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -28,6 +28,14 @@ class StockKardex(models.Model):
     )
     current_move_line = fields.Many2one(comodel_name='stock.move.line')
 
+    number_of_ops = fields.Integer(
+        compute='_compute_number_of_ops', string='Number of Operations'
+    )
+    number_of_ops_all = fields.Integer(
+        compute='_compute_number_of_ops_all',
+        string='Number of Operations in all Kardex',
+    )
+
     operation_descr = fields.Char(
         string="Operation", default="Scan next PID", readonly=True
     )
@@ -70,6 +78,16 @@ class StockKardex(models.Model):
     def on_barcode_scanned(self, barcode):
         raise exceptions.UserError('Scanned barcode: {}'.format(barcode))
 
+    @api.depends()
+    def _compute_number_of_ops(self):
+        for record in self:
+            record.number_of_ops = record.count_move_lines_to_do()
+
+    @api.depends()
+    def _compute_number_of_ops_all(self):
+        for record in self:
+            record.number_of_ops_all = record.count_move_lines_to_do_all()
+
     @api.depends()
     def _compute_kardex_tray_matrix(self):
         for record in self:
@@ -93,7 +111,90 @@ def _compute_kardex_tray_matrix(self):
                 'cells': cells,
             }
 
+    def _domain_move_lines_to_do(self):
+        domain = [
+            # TODO check state
+            ('state', '=', 'assigned')
+        ]
+        domain_extensions = {
+            'pick': [('location_id', 'child_of', self.location_id.id)],
+            'put': [('location_dest_id', 'child_of', self.location_id.id)],
+            # TODO
+            'inventory': [('id', '=', 0)],
+        }
+        return domain + domain_extensions[self.mode]
+
+    def _domain_move_lines_to_do_all(self):
+        domain = [
+            # TODO check state
+            ('state', '=', 'assigned')
+        ]
+        kardex_locations = self.env['stock.location'].search(
+            [('kardex', '=', True)]
+        )
+        domain_extensions = {
+            'pick': [('location_id', 'child_of', kardex_locations.ids)],
+            'put': [('location_dest_id', 'child_of', kardex_locations.ids)],
+            # TODO
+            'inventory': [('id', '=', 0)],
+        }
+        return domain + domain_extensions[self.mode]
+
+    def count_move_lines_to_do(self):
+        self.ensure_one()
+        return self.env['stock.move.line'].search_count(
+            self._domain_move_lines_to_do()
+        )
+
+    def count_move_lines_to_do_all(self):
+        self.ensure_one()
+        return self.env['stock.move.line'].search_count(
+            self._domain_move_lines_to_do_all()
+        )
+
+    def button_release(self):
+        raise exceptions.UserError(_('what does this one do?'))
+
+    def process_current_pick(self):
+        # test code, TODO the smart one
+        # (scan of barcode increments qty, save calls action_done?)
+        line = self.current_move_line
+        line.qty_done = line.product_qty
+        line.move_id._action_done()
+
+    def process_current_put(self):
+        raise exceptions.UserError(_('Put workflow not implemented'))
+
+    def process_current_inventory(self):
+        raise exceptions.UserError(_('Inventory workflow not implemented'))
+
+    def button_save(self):
+        self.ensure_one()
+        method = 'process_current_{}'.format(self.mode)
+        getattr(self, method)()
+        self.select_next_move_line()
+        if not self.current_move_line:
+            # sorry not sorry
+            return {
+                'effect': {
+                    'fadeout': 'slow',
+                    'message': _('Congrats, you cleared the queue!'),
+                    'img_url': '/web/static/src/img/smile.svg',
+                    'type': 'rainbow_man',
+                }
+            }
+
+    # TODO call this each time we process a move line
+    def select_next_move_line(self):
+        self.ensure_one()
+        # TODO sort?
+        next_move_line = self.env['stock.move.line'].search(
+            self._domain_move_lines_to_do(), limit=1
+        )
+        self.current_move_line = next_move_line
+
     def action_open_screen(self):
+        self.select_next_move_line()
         self.ensure_one()
         screen_xmlid = 'stock_kardex.stock_kardex_view_form_screen'
         return {
@@ -120,10 +221,6 @@ def action_menu(self):
             'res_id': self.id,
         }
 
-    def action_quit_screen(self):
-        action_xmlid = 'stock_kardex.stock_kardex_action'
-        return self.env.ref(action_xmlid).read()[0]
-
     # TODO: should the mode be changed on all the kardex at the same time?
     def switch_pick(self):
         self.mode = 'pick'
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index 2dd8a627e30d..f5a1371467db 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -16,6 +16,9 @@
             <field name="mode" readonly="1"/>
           </div>
           <div class="o_kardex_header_right o_kardex_header_content">
+            <label for="number_of_ops"/>
+            <field name="number_of_ops" readonly="1"/> /
+            <field name="number_of_ops_all" readonly="1"/>
           </div>
         </div>
         <div class="o_kardex_actions">
@@ -27,13 +30,13 @@
           </div>
           <div class="o_kardex_content o_kardex_content_right">
             <div>
-              <button name="do_dummy"
+              <button name="button_save"
                       type="object"
                       string="Save"
                       icon="fa-check"
                       class="btn-primary"
                       barcode_trigger="save"/>
-              <button name="do_dummy"
+              <button name="button_release"
                       type="object"
                       string="Release"
                       class="btn-primary"
@@ -161,6 +164,8 @@
         <field name="name"/>
         <field name="address"/>
         <field name="mode"/>
+        <field name="number_of_ops"/>
+        <field name="number_of_ops_all"/>
         <templates>
           <t t-name="kanban-box">
             <div class="oe_kanban_global_click o_has_icon open_kardex_screen">
@@ -173,7 +178,20 @@
                         <span><t t-esc="record.name.value"/></span>
                       </strong>
                     </div>
-                    <span>Mode: <t t-esc="record.mode.value"/></span>
+                    <div class="row">
+                      <div class="col-8">
+                        Mode:
+                        <field name="mode"/>
+                      </div>
+                      <div class="col-8">
+                        Operations:
+                        <field name="number_of_ops"/>
+                      </div>
+                      <div class="col-8">
+                        All <t t-esc="record.mode.value"/> Operations: 
+                        <field name="number_of_ops_all"/>
+                      </div>
+                    </div>
                   </div>
                 </div>
 

From b053444fe453382681bcab94ac2f8976b2897f10 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 18 Jun 2019 17:04:34 +0200
Subject: [PATCH 06/50] Replace random matrix by actual location configuration

---
 stock_kardex/models/stock_kardex.py       | 45 +++++++++++++++++++----
 stock_kardex/views/stock_kardex_views.xml | 28 +-------------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 2d8372e15c39..32ae956988d3 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -1,6 +1,5 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-from random import randint
 
 from odoo import _, api, exceptions, fields, models
 
@@ -41,6 +40,22 @@ class StockKardex(models.Model):
     )
 
     # tray information (will come from stock.location or a new tray model)
+    kardex_tray_location_id = fields.Many2one(
+        comodel_name='stock.location',
+        compute='_compute_kardex_tray_matrix',
+        string='Tray Location',
+    )
+    kardex_tray_name = fields.Char(
+        compute='_compute_kardex_tray_matrix', string='Tray Name'
+    )
+    kardex_tray_type_id = fields.Many2one(
+        comodel_name='stock.kardex.tray.type',
+        compute='_compute_kardex_tray_matrix',
+        string='Tray Type',
+    )
+    kardex_tray_type_code = fields.Char(
+        compute='_compute_kardex_tray_matrix', string='Tray Type'
+    )
     kardex_tray_x = fields.Integer(
         string='X', compute='_compute_kardex_tray_matrix'
     )
@@ -91,19 +106,33 @@ def _compute_number_of_ops_all(self):
     @api.depends()
     def _compute_kardex_tray_matrix(self):
         for record in self:
-            # prototype code, random matrix
-            cols = randint(4, 8)
-            rows = randint(1, 3)
-            selected = [randint(0, cols - 1), randint(0, rows - 1)]
+            modes = {
+                'pick': 'location_id',
+                'put': 'location_dest_id',
+                # TODO what to do for inventory?
+                'inventory': 'location_id',
+            }
+            location = record.current_move_line[modes[record.mode]]
+            tray_type = location.generated_for_tray_type_id
+            cols = tray_type.cols
+            rows = tray_type.rows
+            selected = []
+            if location:
+                selected = [location.posx - 1, location.posy - 1]
             cells = []
             for __ in range(rows):
                 row = []
                 for __ in range(cols):
-                    row.append(randint(0, 1))
+                    # TODO set 1 if we have stock, else 0
+                    row.append(1)
                 cells.append(row)
 
-            record.kardex_tray_x = selected[0] + 1
-            record.kardex_tray_y = selected[1] + 1
+            record.kardex_tray_location_id = location.id
+            record.kardex_tray_name = location.name
+            record.kardex_tray_type_id = tray_type.id
+            record.kardex_tray_type_code = tray_type.code
+            record.kardex_tray_x = location.posx
+            record.kardex_tray_y = location.posy
             record.kardex_tray_matrix = {
                 # x, y: position of the selected cell
                 'selected': selected,
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index f5a1371467db..d5fd549514b5 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -68,32 +68,8 @@
           <!-- on the right of the screen -->
           <div class="o_kardex_data_content o_kardex_tray">
             <group col="1">
-              <!-- These 2 fields must come from the location.
-                   Currently, the HTML mimics what Odoo generates for <field/>
-              -->
-              <tr>
-                <td class="o_td_label" style="min-width: 150px;">
-                  <span class="o_readonly_modifier" style="font-weight: bold; margin: 0 5px 0 0; font-size: 1.08333333rem; line-height: 1.5;">Tray</span>
-
-                </td>
-                <td>
-                  <span class="o_field_integer o_field_number o_field_widget o_readonly_modifier"
-                        name="kardex_tray_tray">
-                    SHU-1108
-                  </span>
-                </td>
-              </tr>
-              <tr>
-                <td class="o_td_label" style="min-width: 150px;">
-                  <span class="o_readonly_modifier" style="font-weight: bold; margin: 0 5px 0 0; font-size: 1.08333333rem; line-height: 1.5;">Box Type</span>
-                </td>
-                <td>
-                  <span class="o_field_integer o_field_number o_field_widget o_readonly_modifier"
-                        name="kardex_tray_box_type">
-                    B30401
-                  </span>
-                </td>
-              </tr>
+              <field name="kardex_tray_name"/>
+              <field name="kardex_tray_type_code"/>
               <field name="kardex_tray_y"/>
               <field name="kardex_tray_x"/>
             </group>

From 404cf86a71ef62891835bca09575143ca1eb1ae6 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 19 Jun 2019 13:57:21 +0200
Subject: [PATCH 07/50] Color cells in blue when contains stock (remove random)

Add a tray_matrix widget on stock location form view for convenience:
easy to see which cells contain stock or not.
---
 stock_kardex/models/stock_kardex.py           | 13 ++---
 stock_kardex/models/stock_kardex_tray_type.py |  6 ++-
 stock_kardex/models/stock_location.py         | 51 +++++++++++++++++++
 stock_kardex/static/src/js/kardex.js          |  5 +-
 stock_kardex/views/stock_location_views.xml   |  3 ++
 5 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 32ae956988d3..dc64d90c0f8f 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -114,18 +114,11 @@ def _compute_kardex_tray_matrix(self):
             }
             location = record.current_move_line[modes[record.mode]]
             tray_type = location.generated_for_tray_type_id
-            cols = tray_type.cols
-            rows = tray_type.rows
             selected = []
-            if location:
-                selected = [location.posx - 1, location.posy - 1]
             cells = []
-            for __ in range(rows):
-                row = []
-                for __ in range(cols):
-                    # TODO set 1 if we have stock, else 0
-                    row.append(1)
-                cells.append(row)
+            if location:
+                selected = location._kardex_cell_coords()
+                cells = location._tray_cells_matrix()
 
             record.kardex_tray_location_id = location.id
             record.kardex_tray_name = location.name
diff --git a/stock_kardex/models/stock_kardex_tray_type.py b/stock_kardex/models/stock_kardex_tray_type.py
index 4e3a69ed28c4..9fbb05f637df 100644
--- a/stock_kardex/models/stock_kardex_tray_type.py
+++ b/stock_kardex/models/stock_kardex_tray_type.py
@@ -23,10 +23,12 @@ def _compute_tray_matrix(self):
             # the tray, we generate a "full" tray, we'll
             # see all the boxes on the web widget.
             # (0 means empty, 1 means used)
-            cells = [[1] * record.cols for __ in range(record.rows)]
-
+            cells = self._generate_cells_matrix(default_state=1)
             record.tray_matrix = {'selected': None, 'cells': cells}
 
+    def _generate_cells_matrix(self, default_state=0):
+        return [[default_state] * self.cols for __ in range(self.rows)]
+
     # TODO prevent to set active=False on a type used in a location
     # TODO we should not be able to change cells and rows for types used
     # in locations
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index 63ea1c17acf2..43d06e06898c 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -13,6 +13,11 @@ class StockLocation(models.Model):
     kardex_tray_type_id = fields.Many2one(
         comodel_name="stock.kardex.tray.type", ondelete="restrict"
     )
+    kardex_cell_contains_stock = fields.Boolean(
+        compute='_compute_kardex_cell_contains_stock',
+        help="Used to know if a Kardex location is empty.",
+    )
+    tray_matrix = fields.Serialized(compute='_compute_tray_matrix')
 
     # Only for trays cells (boxes).
     # Children of 'kardey_tray' locations, they are automatically generated
@@ -22,6 +27,33 @@ class StockLocation(models.Model):
         readonly=True,
     )
 
+    # TODO document hierarchy + replace "parent_is_kardex" and kardex_tray
+    # by an optional selection kardex_view, shuttle, tray, cell
+    # Kardex View
+    #   -> Shuttle
+    #     -> Tray
+    #       -> Cell
+
+    @api.depends('quant_ids.quantity')
+    def _compute_kardex_cell_contains_stock(self):
+        for location in self:
+            # TODO replace by check on 'cell' only
+            if not location.parent_is_kardex:
+                # we skip the others only for performance
+                continue
+            quants = location.quant_ids.filtered(lambda r: r.quantity > 0)
+            location.kardex_cell_contains_stock = bool(quants)
+
+    @api.depends('quant_ids.quantity', 'location_id.kardex_tray_type_id')
+    def _compute_tray_matrix(self):
+        for location in self:
+            if not location.parent_is_kardex:
+                continue
+            location.tray_matrix = {
+                'selected': location._kardex_cell_coords(),
+                'cells': location._tray_cells_matrix(),
+            }
+
     @api.depends('location_id.parent_is_kardex')
     def _compute_parent_is_kardex(self):
         for location in self:
@@ -46,6 +78,25 @@ def write(self, vals):
             self._update_tray_sublocations()
         return result
 
+    def _kardex_cell_coords(self):
+        # TODO check is a cell
+        if not self.generated_for_tray_type_id:  # is a cell
+            coords = []
+        coords = [self.posx - 1, self.posy - 1]
+        return coords
+
+    def _tray_cells_matrix(self):
+        assert self.parent_is_kardex
+        if self.kardex_tray:
+            location = self
+        else:
+            location = self.location_id
+        cells = location.kardex_tray_type_id._generate_cells_matrix()
+        for cell in location.child_ids:
+            if cell.kardex_cell_contains_stock:
+                cells[cell.posy - 1][cell.posx - 1] = 1
+        return cells
+
     @api.multi
     def _update_tray_sublocations(self):
         # TODO: if any sublocation has stock, raise an error,
diff --git a/stock_kardex/static/src/js/kardex.js b/stock_kardex/static/src/js/kardex.js
index d9fafc25340a..c314fe7870eb 100644
--- a/stock_kardex/static/src/js/kardex.js
+++ b/stock_kardex/static/src/js/kardex.js
@@ -183,9 +183,12 @@ var KardexTrayMatrixField = DebouncedField.extend({
         var h = ((canvas.height - padding * rows) / rows);
 
         ctx.globalAlpha = this.globalAlpha;
+        // again, our matrix is top to bottom (0 is the first line)
+        // but visually, we want them bottom to top
+        var reversed_cells = cells.slice().reverse();
         for (var y = 0; y < rows; y++) {
             for (var x = 0; x < cols; x++) {
-                ctx.fillStyle = colors[cells[y][x]];
+                ctx.fillStyle = colors[reversed_cells[y][x]];
                 var fillWidth = w;
                 var fillHeight = h;
                 // cheat: remove the padding at bottom and right
diff --git a/stock_kardex/views/stock_location_views.xml b/stock_kardex/views/stock_location_views.xml
index dbc5e64dde4c..e6592d071b3d 100644
--- a/stock_kardex/views/stock_location_views.xml
+++ b/stock_kardex/views/stock_location_views.xml
@@ -15,6 +15,9 @@
                  attrs="{'invisible': [('parent_is_kardex', '=', False)]}"/>
           <field name="kardex_tray_type_id"
                  attrs="{'invisible': [('kardex_tray', '=', False)], 'required': [('kardex_tray', '=', True)]}"/>
+          <field name="tray_matrix"
+                 widget="kardex_tray_matrix"
+                 />
         </group>
       </group>
     </field>

From 488b5c739dd6fbb49da492bf2ce2592ffb91c19e Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 19 Jun 2019 13:58:46 +0200
Subject: [PATCH 08/50] Fix UI issues in kardex screen

* Display "No operations" when we have cleared the queue
* Hide the information fields when there is no operation to do
*
---
 stock_kardex/models/stock_kardex.py       | 7 +++++--
 stock_kardex/views/stock_kardex_views.xml | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index dc64d90c0f8f..83ef1fc65c5a 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -25,6 +25,7 @@ class StockKardex(models.Model):
         help="The Kardex source location for Pick operations "
         "and destination location for Put operations.",
     )
+    # TODO add _id
     current_move_line = fields.Many2one(comodel_name='stock.move.line')
 
     number_of_ops = fields.Integer(
@@ -191,6 +192,8 @@ def process_current_inventory(self):
         raise exceptions.UserError(_('Inventory workflow not implemented'))
 
     def button_save(self):
+        if not self:
+            return
         self.ensure_one()
         method = 'process_current_{}'.format(self.mode)
         getattr(self, method)()
@@ -206,14 +209,14 @@ def button_save(self):
                 }
             }
 
-    # TODO call this each time we process a move line
     def select_next_move_line(self):
         self.ensure_one()
-        # TODO sort?
         next_move_line = self.env['stock.move.line'].search(
             self._domain_move_lines_to_do(), limit=1
         )
         self.current_move_line = next_move_line
+        descr = _('Scan next PID') if next_move_line else _('No operations')
+        self.operation_descr = descr
 
     def action_open_screen(self):
         self.select_next_move_line()
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index d5fd549514b5..427a0fd6f41a 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -49,10 +49,11 @@
             <field name="operation_descr"/>
           </div>
         </div>
-        <div class="o_kardex_data">
+        <div class="o_kardex_data" attrs="{'invisible': [('current_move_line', '=', False)]}">
           <!-- on the left of the screen -->
           <div class="o_kardex_data_content o_kardex_move">
             <div>
+              <field name="current_move_line" invisible="1"/>
               <label for="product_id"/>
               <field name="product_id" readonly="1" options="{'no_open': True}"/>
               <field name="qty_done" readonly="1" force_save="1"/> / 

From 50e97fe42803a037f71e03fb577ef559ca82cd18 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 19 Jun 2019 16:43:32 +0200
Subject: [PATCH 09/50] Rationalize stock location fields for kardex

Setup a hierarchy:

 * A View
   * contains Shuttles
     * contains Trays
       * contains Cells

A default view is created for all the Kardex.
---
 stock_kardex/__manifest__.py                |   1 +
 stock_kardex/data/stock_location.xml        |  17 +++
 stock_kardex/models/stock_kardex.py         |   7 +-
 stock_kardex/models/stock_location.py       | 109 +++++++++++---------
 stock_kardex/views/stock_location_views.xml |  17 +--
 5 files changed, 90 insertions(+), 61 deletions(-)
 create mode 100644 stock_kardex/data/stock_location.xml

diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
index 2e52c25717d4..f6b686668dd5 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_kardex/__manifest__.py
@@ -20,6 +20,7 @@
         'views/stock_kardex_views.xml',
         'views/stock_kardex_tray_type_views.xml',
         'views/stock_kardex_templates.xml',
+        'data/stock_location.xml',
         'data/stock_kardex_tray_type.xml',
         'security/ir.model.access.csv',
     ],
diff --git a/stock_kardex/data/stock_location.xml b/stock_kardex/data/stock_location.xml
new file mode 100644
index 000000000000..95d941ae6555
--- /dev/null
+++ b/stock_kardex/data/stock_location.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record id="stock_location_kardex" model="stock.location">
+    <field name="name">Kardex View</field>
+    <!-- Beware, must not be view, even if we should have stock here.
+         Because stock moves targetting views are not included in the
+         inventory at date, and we want to be able to use "Kardex View"
+         as destination (the final destination will be a "cell" in a kardex).
+    -->
+    <field name="location_id" ref="stock.stock_location_stock"/>
+    <field name="usage">internal</field>
+    <field name="kardex_location" eval="True"/>
+    <field name="company_id"></field>
+  </record>
+
+</odoo>
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 83ef1fc65c5a..89fc8dbe40a9 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -19,8 +19,7 @@ class StockKardex(models.Model):
     location_id = fields.Many2one(
         comodel_name='stock.location',
         required=True,
-        domain="[('kardex', '=', True)]",
-        context="{'default_kardex': True}",
+        domain="[('kardex_kind', '=', 'shuttle')]",
         ondelete='restrict',
         help="The Kardex source location for Pick operations "
         "and destination location for Put operations.",
@@ -114,7 +113,7 @@ def _compute_kardex_tray_matrix(self):
                 'inventory': 'location_id',
             }
             location = record.current_move_line[modes[record.mode]]
-            tray_type = location.generated_for_tray_type_id
+            tray_type = location.location_id.kardex_tray_type_id
             selected = []
             cells = []
             if location:
@@ -153,7 +152,7 @@ def _domain_move_lines_to_do_all(self):
             ('state', '=', 'assigned')
         ]
         kardex_locations = self.env['stock.location'].search(
-            [('kardex', '=', True)]
+            [('kardex_kind', '=', 'view')]
         )
         domain_extensions = {
             'pick': [('location_id', 'child_of', kardex_locations.ids)],
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index 43d06e06898c..c38b5feb68a4 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -7,9 +7,21 @@
 class StockLocation(models.Model):
     _inherit = "stock.location"
 
-    kardex = fields.Boolean()
-    parent_is_kardex = fields.Boolean(compute='_compute_parent_is_kardex')
-    kardex_tray = fields.Boolean()
+    kardex_location = fields.Boolean(
+        'Is a Kardex View Location?',
+        default=False,
+        help="Check this box to use it as the view for Kardex shuttles.",
+    )
+    kardex_kind = fields.Selection(
+        selection=[
+            ('view', 'View'),
+            ('shuttle', 'Shuttle'),
+            ('tray', 'Tray'),
+            ('cell', 'Cell'),
+        ],
+        compute='_compute_kardex_kind',
+        store=True,
+    )
     kardex_tray_type_id = fields.Many2one(
         comodel_name="stock.kardex.tray.type", ondelete="restrict"
     )
@@ -19,75 +31,76 @@ class StockLocation(models.Model):
     )
     tray_matrix = fields.Serialized(compute='_compute_tray_matrix')
 
-    # Only for trays cells (boxes).
-    # Children of 'kardey_tray' locations, they are automatically generated
-    generated_for_tray_type_id = fields.Many2one(
-        comodel_name="stock.kardex.tray.type",
-        ondelete="restrict",
-        readonly=True,
-    )
-
-    # TODO document hierarchy + replace "parent_is_kardex" and kardex_tray
+    # TODO document hierarchy
     # by an optional selection kardex_view, shuttle, tray, cell
     # Kardex View
     #   -> Shuttle
     #     -> Tray
     #       -> Cell
 
+    @api.depends('location_id', 'location_id.kardex_kind')
+    def _compute_kardex_kind(self):
+        tree = {'view': 'shuttle', 'shuttle': 'tray', 'tray': 'cell'}
+        for location in self:
+            if location.kardex_location:
+                location.kardex_kind = 'view'
+                continue
+            kind = tree.get(location.location_id.kardex_kind)
+            if kind:
+                location.kardex_kind = kind
+
     @api.depends('quant_ids.quantity')
     def _compute_kardex_cell_contains_stock(self):
         for location in self:
-            # TODO replace by check on 'cell' only
-            if not location.parent_is_kardex:
+            if not location.kardex_kind == 'cell':
                 # we skip the others only for performance
                 continue
             quants = location.quant_ids.filtered(lambda r: r.quantity > 0)
             location.kardex_cell_contains_stock = bool(quants)
 
-    @api.depends('quant_ids.quantity', 'location_id.kardex_tray_type_id')
+    @api.depends(
+        'quant_ids.quantity',
+        'kardex_tray_type_id',
+        'location_id.kardex_tray_type_id',
+    )
     def _compute_tray_matrix(self):
         for location in self:
-            if not location.parent_is_kardex:
+            if location.kardex_kind not in ('tray', 'cell'):
                 continue
             location.tray_matrix = {
                 'selected': location._kardex_cell_coords(),
                 'cells': location._tray_cells_matrix(),
             }
 
-    @api.depends('location_id.parent_is_kardex')
-    def _compute_parent_is_kardex(self):
-        for location in self:
-            parent = location.location_id
-            while parent:
-                if parent.kardex:
-                    location.parent_is_kardex = True
-                    break
-                parent = parent.location_id
-
-    @api.model
-    def create(self, vals):
-        records = super().create(vals)
-        if vals.get('kardex_tray'):
-            records._update_tray_sublocations()
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        records._update_tray_sublocations()
         return records
 
     @api.multi
     def write(self, vals):
-        result = super().write(vals)
-        if vals.get('kardex_tray') or vals.get('kardex_tray_type_id'):
-            self._update_tray_sublocations()
-        return result
+        for location in self:
+            trays_to_update = False
+            if 'kardex_tray_type_id' in vals:
+                new_tray_type_id = vals.get('kardex_tray_type_id')
+                trays_to_update = (
+                    location.kardex_tray_type_id.id != new_tray_type_id
+                )
+            super(StockLocation, location).write(vals)
+            if trays_to_update:
+                self._update_tray_sublocations()
+        return True
 
     def _kardex_cell_coords(self):
-        # TODO check is a cell
-        if not self.generated_for_tray_type_id:  # is a cell
+        if not self.kardex_kind == 'cell':
             coords = []
         coords = [self.posx - 1, self.posy - 1]
         return coords
 
     def _tray_cells_matrix(self):
-        assert self.parent_is_kardex
-        if self.kardex_tray:
+        assert self.kardex_kind in ('tray', 'cell')
+        if self.kardex_kind == 'tray':
             location = self
         else:
             location = self.location_id
@@ -104,18 +117,14 @@ def _update_tray_sublocations(self):
         # it is empty
         values = []
         for location in self:
-            if not location.kardex_tray:
-                sublocs = location.child_ids.filtered(
-                    lambda r: r.generated_for_tray_type_id
-                )
-                sublocs.write({'active': False})
+            if not location.kardex_kind == 'tray':
                 continue
-
             tray_type = location.kardex_tray_type_id
-            sublocs = location.child_ids.filtered(
-                lambda r: r.generated_for_tray_type_id != tray_type
-            )
-            sublocs.write({'active': False})
+
+            location.child_ids.write({'active': False})
+
+            if not tray_type:
+                continue
 
             # create accepts several records now
             for row in range(1, tray_type.rows + 1):
@@ -128,7 +137,7 @@ def _update_tray_sublocations(self):
                         'posy': row,
                         'location_id': location.id,
                         'company_id': location.company_id.id,
-                        'generated_for_tray_type_id': tray_type.id,
                     }
                     values.append(subloc_values)
+        if values:
             self.create(values)
diff --git a/stock_kardex/views/stock_location_views.xml b/stock_kardex/views/stock_location_views.xml
index e6592d071b3d..04ad4be93c65 100644
--- a/stock_kardex/views/stock_location_views.xml
+++ b/stock_kardex/views/stock_location_views.xml
@@ -6,17 +6,20 @@
     <field name="model">stock.location</field>
     <field name="inherit_id" ref="stock.view_location_form"/>
     <field name="arch" type="xml">
+      <field name="return_location" position="after">
+        <field name="kardex_location"
+               attrs="{'invisible': [('kardex_kind', '!=', False)]}"
+               />
+      </field>
       <group name="localization" position="after">
-        <group string="Kardex" name="kardex">
-          <field name="parent_is_kardex" invisible="1"/>
-          <field name="kardex"
-                 attrs="{'invisible': [('parent_is_kardex', '=', True)]}"/>
-          <field name="kardex_tray"
-                 attrs="{'invisible': [('parent_is_kardex', '=', False)]}"/>
+        <group string="Kardex" name="kardex"
+               attrs="{'invisible': [('kardex_kind', 'not in', ('shuttle', 'tray', 'cell'))]}">
+          <field name="kardex_kind"/>
           <field name="kardex_tray_type_id"
-                 attrs="{'invisible': [('kardex_tray', '=', False)], 'required': [('kardex_tray', '=', True)]}"/>
+                 attrs="{'invisible': [('kardex_kind', '!=', 'tray')], 'required': [('kardex_kind', '=', 'tray')]}"/>
           <field name="tray_matrix"
                  widget="kardex_tray_matrix"
+                 attrs="{'invisible': [('kardex_kind', 'not in', ('tray', 'cell'))]}"
                  />
         </group>
       </group>

From 9c1c28c5f1e4555f8568dbde8a4fb2280bda10e4 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 20 Jun 2019 10:17:41 +0200
Subject: [PATCH 10/50] Improve UX for locations management

* Prevent disabling locations or tray types in use
* Prevent changing tray type if any cell contain stock
* Add a button to show the locations using a tray type from the tray
  type form
* Prevent changing a tray type size when used
* Remove tray name in cell name: redundant in the display name
* Add filters on location search view to search by tray type and kind of
  kardex "object" (view, shuttle, tray, cell)
* Remove an unused action
---
 stock_kardex/data/stock_kardex_tray_type.xml  |  2 +-
 stock_kardex/data/stock_location.xml          |  2 +-
 stock_kardex/models/stock_kardex_tray_type.py | 48 ++++++++++++++++--
 stock_kardex/models/stock_location.py         | 49 +++++++++++++++----
 .../views/stock_kardex_tray_type_views.xml    |  5 ++
 stock_kardex/views/stock_kardex_views.xml     | 20 --------
 stock_kardex/views/stock_location_views.xml   | 20 ++++++++
 7 files changed, 110 insertions(+), 36 deletions(-)

diff --git a/stock_kardex/data/stock_kardex_tray_type.xml b/stock_kardex/data/stock_kardex_tray_type.xml
index 78497088cb9d..43a3e0988992 100644
--- a/stock_kardex/data/stock_kardex_tray_type.xml
+++ b/stock_kardex/data/stock_kardex_tray_type.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
 
   <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_32x">
     <field name="name">Klein 32x</field>
diff --git a/stock_kardex/data/stock_location.xml b/stock_kardex/data/stock_location.xml
index 95d941ae6555..c6fc59df3e12 100644
--- a/stock_kardex/data/stock_location.xml
+++ b/stock_kardex/data/stock_location.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
+<odoo noupdate="1">
 
   <record id="stock_location_kardex" model="stock.location">
     <field name="name">Kardex View</field>
diff --git a/stock_kardex/models/stock_kardex_tray_type.py b/stock_kardex/models/stock_kardex_tray_type.py
index 9fbb05f637df..86d10e9ccf9f 100644
--- a/stock_kardex/models/stock_kardex_tray_type.py
+++ b/stock_kardex/models/stock_kardex_tray_type.py
@@ -1,7 +1,7 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import _, api, exceptions, fields, models
 
 
 class StockKardexTrayType(models.Model):
@@ -14,7 +14,11 @@ class StockKardexTrayType(models.Model):
     cols = fields.Integer(required=True)
     active = fields.Boolean(default=True)
     tray_matrix = fields.Serialized(compute='_compute_tray_matrix')
+    location_ids = fields.One2many(
+        comodel_name='stock.location', inverse_name='kardex_tray_type_id'
+    )
     # TODO do we want box size, or a many2one to 'product.packaging'?
+    # TODO add the code in the name_search
 
     @api.depends('rows', 'cols')
     def _compute_tray_matrix(self):
@@ -29,6 +33,42 @@ def _compute_tray_matrix(self):
     def _generate_cells_matrix(self, default_state=0):
         return [[default_state] * self.cols for __ in range(self.rows)]
 
-    # TODO prevent to set active=False on a type used in a location
-    # TODO we should not be able to change cells and rows for types used
-    # in locations
+    @api.constrains('active')
+    def _stock_kardex_check_active(self):
+        for record in self:
+            if record.active:
+                continue
+            if record.location_ids:
+                location_bullets = [
+                    ' - {}'.format(location.display_name)
+                    for location in record.location_ids
+                ]
+                raise exceptions.ValidationError(
+                    _(
+                        "The tray type {} is used by the following locations "
+                        "and cannot be archived:\n\n{}"
+                    ).format(record.name, '\n'.join(location_bullets))
+                )
+
+    @api.constrains('rows', 'cols')
+    def _stock_kardex_check_rows_cols(self):
+        for record in self:
+            if record.location_ids:
+                location_bullets = [
+                    ' - {}'.format(location.display_name)
+                    for location in record.location_ids
+                ]
+                raise exceptions.ValidationError(
+                    _(
+                        "The tray type {} is used by the following locations, "
+                        "it's size cannot be changed:\n\n{}"
+                    ).format(record.name, '\n'.join(location_bullets))
+                )
+
+    @api.multi
+    def open_locations(self):
+        action = self.env.ref('stock.action_location_form').read()[0]
+        action['domain'] = [('kardex_tray_type_id', 'in', self.ids)]
+        if len(self.ids) == 1:
+            action['context'] = {'default_kardex_tray_type_id': self.id}
+        return action
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index c38b5feb68a4..43862924f33e 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -1,7 +1,7 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import _, api, exceptions, fields, models
 
 
 class StockLocation(models.Model):
@@ -92,6 +92,30 @@ def write(self, vals):
                 self._update_tray_sublocations()
         return True
 
+    @api.constrains('active')
+    def _stock_kardex_check_active(self):
+        for record in self:
+            if not record.kardex_kind:
+                continue
+            if record.active:
+                continue
+            # We cannot disable any cell of a tray (entire tray)
+            # if at least one of the cell contains stock.
+            # We cannot disable a tray, a shuffle or a view if
+            # at least one of their tray contain stock.
+            if record.kardex_kind == 'cell':
+                parent = record.location_id
+            else:
+                parent = record
+            locs = self.search([('id', 'child_of', parent.id)])
+            if any(loc.kardex_cell_contains_stock for loc in locs):
+                raise exceptions.ValidationError(
+                    _(
+                        "Kardex locations cannot be archived when "
+                        "they contain products."
+                    )
+                )
+
     def _kardex_cell_coords(self):
         if not self.kardex_kind == 'cell':
             coords = []
@@ -102,7 +126,7 @@ def _tray_cells_matrix(self):
         assert self.kardex_kind in ('tray', 'cell')
         if self.kardex_kind == 'tray':
             location = self
-        else:
+        else:  # cell
             location = self.location_id
         cells = location.kardex_tray_type_id._generate_cells_matrix()
         for cell in location.child_ids:
@@ -112,17 +136,24 @@ def _tray_cells_matrix(self):
 
     @api.multi
     def _update_tray_sublocations(self):
-        # TODO: if any sublocation has stock, raise an error,
-        # we must be able to change the type of tray only when
-        # it is empty
         values = []
         for location in self:
             if not location.kardex_kind == 'tray':
                 continue
-            tray_type = location.kardex_tray_type_id
 
-            location.child_ids.write({'active': False})
+            tray_type = location.kardex_tray_type_id
 
+            try:
+                location.child_ids.write({'active': False})
+            except exceptions.ValidationError:
+                # trap this check (_stock_kardex_check_active) to display a
+                # contextual error message
+                raise exceptions.ValidationError(
+                    _(
+                        "Kardex trays cannot be modified when "
+                        "they contain products."
+                    )
+                )
             if not tray_type:
                 continue
 
@@ -130,9 +161,7 @@ def _update_tray_sublocations(self):
             for row in range(1, tray_type.rows + 1):
                 for col in range(1, tray_type.cols + 1):
                     subloc_values = {
-                        'name': _('{} [x{} y{}]').format(
-                            location.name, col, row
-                        ),
+                        'name': _('x{}y{}').format(col, row),
                         'posx': col,
                         'posy': row,
                         'location_id': location.id,
diff --git a/stock_kardex/views/stock_kardex_tray_type_views.xml b/stock_kardex/views/stock_kardex_tray_type_views.xml
index 41afb453cfa9..326d1619629b 100644
--- a/stock_kardex/views/stock_kardex_tray_type_views.xml
+++ b/stock_kardex/views/stock_kardex_tray_type_views.xml
@@ -7,6 +7,11 @@
     <field name="arch" type="xml">
       <form string="Kardex Tray Type">
         <div class="oe_button_box" name="button_box">
+          <button string="Locations"
+                  class="oe_stat_button"
+                  icon="fa-filter" name="open_locations"
+                  type="object"
+                  />
           <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
             <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
           </button>
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index 427a0fd6f41a..3e22c45c7e8b 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -199,26 +199,6 @@
     </field>
   </record>
 
-  <!-- TODO: use this in method action_open_screen? -->
-  <record model="ir.actions.act_window" id="stock_kardex_action_screen">
-    <field name="name">Kardex</field>
-    <field name="type">ir.actions.act_window</field>
-    <field name="res_model">stock.kardex</field>
-    <field name="view_type">form</field>
-    <field name="view_mode">form</field>
-    <field name="view_ids"
-           eval="[(5, 0, 0),
-                  (0, 0, {'view_mode': 'form', 'view_id': ref('stock_kardex_view_form_screen')})]"/>
-    <field name="target">fullscreen</field>
-    <field name="domain">[]</field>
-    <field name="context">{'form_view_initial_mode': 'edit', 'no_breadcrumbs': True}</field>
-    <field name="help" type="html">
-      <p class="o_view_nocontent_smiling_face">
-        Open the Kardex Interface.
-      </p>
-    </field>
-  </record>
-
   <record model="ir.actions.act_window" id="stock_kardex_action">
     <field name="name">Kardex</field>
     <field name="type">ir.actions.act_window</field>
diff --git a/stock_kardex/views/stock_location_views.xml b/stock_kardex/views/stock_location_views.xml
index 04ad4be93c65..5c8f4d903c60 100644
--- a/stock_kardex/views/stock_location_views.xml
+++ b/stock_kardex/views/stock_location_views.xml
@@ -23,6 +23,26 @@
                  />
         </group>
       </group>
+
+      <field name="posx" position="attributes">
+        <attribute name="attrs">{'readonly': [('kardex_kind', '=', 'cell')]}</attribute>
+      </field>
+      <field name="posy" position="attributes">
+        <attribute name="attrs">{'readonly': [('kardex_kind', '=', 'cell')]}</attribute>
+      </field>
+    </field>
+  </record>
+
+  <record id="view_location_search_kardex" model="ir.ui.view">
+    <field name="name">stock.location.search.kardex</field>
+    <field name="model">stock.location</field>
+    <field name="inherit_id" ref="stock.view_location_search"/>
+    <field name="arch" type="xml">
+      <field name="location_id" position="after">
+        <separator/>
+        <field name="kardex_kind"/>
+        <field name="kardex_tray_type_id"/>
+      </field>
     </field>
   </record>
 

From 4b3254acb66294d7571b75b077ace4f3218ca895 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 20 Jun 2019 10:32:19 +0200
Subject: [PATCH 11/50] Make usage of Serialized field more robust

* Add missing dependency
* using the direct path to the Serialized class will work in every
scenario (eg. pytest) without having to add base_sparse_field in --load
---
 stock_kardex/__manifest__.py                  | 1 +
 stock_kardex/models/stock_kardex.py           | 5 ++---
 stock_kardex/models/stock_kardex_tray_type.py | 3 ++-
 stock_kardex/models/stock_location.py         | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
index f6b686668dd5..1b8bb19546c7 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_kardex/__manifest__.py
@@ -11,6 +11,7 @@
     'depends': [
         'stock',
         'barcodes',
+        'base_sparse_field',
     ],
     'website': 'https://www.camptocamp.com',
     'data': [
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 89fc8dbe40a9..5eee18a302fb 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, exceptions, fields, models
+from odoo.addons.base_sparse_field.models.fields import Serialized
 
 
 class StockKardex(models.Model):
@@ -62,9 +63,7 @@ class StockKardex(models.Model):
     kardex_tray_y = fields.Integer(
         string='Y', compute='_compute_kardex_tray_matrix'
     )
-    kardex_tray_matrix = fields.Serialized(
-        compute='_compute_kardex_tray_matrix'
-    )
+    kardex_tray_matrix = Serialized(compute='_compute_kardex_tray_matrix')
 
     # current operation information
     picking_id = fields.Many2one(
diff --git a/stock_kardex/models/stock_kardex_tray_type.py b/stock_kardex/models/stock_kardex_tray_type.py
index 86d10e9ccf9f..4de0d5829d68 100644
--- a/stock_kardex/models/stock_kardex_tray_type.py
+++ b/stock_kardex/models/stock_kardex_tray_type.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, exceptions, fields, models
+from odoo.addons.base_sparse_field.models.fields import Serialized
 
 
 class StockKardexTrayType(models.Model):
@@ -13,7 +14,7 @@ class StockKardexTrayType(models.Model):
     rows = fields.Integer(required=True)
     cols = fields.Integer(required=True)
     active = fields.Boolean(default=True)
-    tray_matrix = fields.Serialized(compute='_compute_tray_matrix')
+    tray_matrix = Serialized(compute='_compute_tray_matrix')
     location_ids = fields.One2many(
         comodel_name='stock.location', inverse_name='kardex_tray_type_id'
     )
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index 43862924f33e..98e298fe910c 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, exceptions, fields, models
+from odoo.addons.base_sparse_field.models.fields import Serialized
 
 
 class StockLocation(models.Model):
@@ -29,7 +30,7 @@ class StockLocation(models.Model):
         compute='_compute_kardex_cell_contains_stock',
         help="Used to know if a Kardex location is empty.",
     )
-    tray_matrix = fields.Serialized(compute='_compute_tray_matrix')
+    tray_matrix = Serialized(compute='_compute_tray_matrix')
 
     # TODO document hierarchy
     # by an optional selection kardex_view, shuttle, tray, cell

From a2000800e3e2a51020ab4fbc774f00882f672171 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 20 Jun 2019 14:16:18 +0200
Subject: [PATCH 12/50] Add demo data

---
 stock_kardex/__manifest__.py               |   7 ++
 stock_kardex/demo/product_demo.xml         |  18 ++++
 stock_kardex/demo/stock_inventory_demo.xml |  20 ++++
 stock_kardex/demo/stock_kardex_demo.xml    |  28 ++++++
 stock_kardex/demo/stock_location_demo.xml  | 102 +++++++++++++++++++++
 stock_kardex/demo/stock_picking_demo.xml   |  30 ++++++
 stock_kardex/models/stock_kardex.py        |   5 +-
 stock_kardex/models/stock_location.py      |  39 ++++++++
 stock_kardex/views/stock_kardex_views.xml  |   6 +-
 9 files changed, 252 insertions(+), 3 deletions(-)
 create mode 100644 stock_kardex/demo/product_demo.xml
 create mode 100644 stock_kardex/demo/stock_inventory_demo.xml
 create mode 100644 stock_kardex/demo/stock_kardex_demo.xml
 create mode 100644 stock_kardex/demo/stock_location_demo.xml
 create mode 100644 stock_kardex/demo/stock_picking_demo.xml

diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
index 1b8bb19546c7..d2f8d966afda 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_kardex/__manifest__.py
@@ -14,6 +14,13 @@
         'base_sparse_field',
     ],
     'website': 'https://www.camptocamp.com',
+    'demo': [
+        'demo/stock_location_demo.xml',
+        'demo/stock_kardex_demo.xml',
+        'demo/product_demo.xml',
+        'demo/stock_inventory_demo.xml',
+        'demo/stock_picking_demo.xml',
+    ],
     'data': [
         'views/stock_location_views.xml',
         'views/stock_move_line_views.xml',
diff --git a/stock_kardex/demo/product_demo.xml b/stock_kardex/demo/product_demo.xml
new file mode 100644
index 000000000000..dd1aead41680
--- /dev/null
+++ b/stock_kardex/demo/product_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+  <record id="product_running_socks" model="product.product">
+    <field name="default_code">RS200</field>
+    <field name="name">Running Socks</field>
+    <field name="type">product</field>
+    <field name="categ_id" ref="product.product_category_6"/>
+    <field name="lst_price">30.0</field>
+    <field name="standard_price">20.0</field>
+    <field name="weight">1.0</field>
+    <field name="tracking">none</field>
+    <field name="uom_id" ref="uom.product_uom_unit"/>
+    <field name="uom_po_id" ref="uom.product_uom_unit"/>
+    <field name="property_stock_inventory" ref="stock.location_inventory"/>
+  </record>
+
+</odoo>
diff --git a/stock_kardex/demo/stock_inventory_demo.xml b/stock_kardex/demo/stock_inventory_demo.xml
new file mode 100644
index 000000000000..4de41d398a04
--- /dev/null
+++ b/stock_kardex/demo/stock_inventory_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+  <record id="stock_inventory_kardex_0" model="stock.inventory">
+    <field name="name">Starting Kardex Inventory</field>
+  </record>
+
+  <record id="stock_inventory_kardex_line_1" model="stock.inventory.line">
+    <field name="product_id" ref="product_running_socks"/>
+    <field name="product_uom_id" ref="uom.product_uom_unit"/>
+    <field name="inventory_id" ref="stock_inventory_kardex_0"/>
+    <field name="product_qty">30.0</field>
+    <field name="location_id" ref="stock_location_kardex_demo_tray_1b_x3y2"/>
+  </record>
+
+  <function model="stock.inventory" name="action_validate">
+    <function eval="[[('state','=','draft'),('id', '=', ref('stock_kardex.stock_inventory_kardex_0'))]]" model="stock.inventory" name="search"/>
+  </function>
+
+</odoo>
diff --git a/stock_kardex/demo/stock_kardex_demo.xml b/stock_kardex/demo/stock_kardex_demo.xml
new file mode 100644
index 000000000000..9cd9c0fb05a8
--- /dev/null
+++ b/stock_kardex/demo/stock_kardex_demo.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+  <record id="stock_kardex_demo_shuttle_1" model="stock.kardex">
+    <field name="name">Shuttle 1</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
+    <field name="address">10.0.30.1</field>
+    <field name="simulate" eval="True"/>
+    <field name="mode">pick</field>
+  </record>
+
+  <record id="stock_kardex_demo_shuttle_2" model="stock.kardex">
+    <field name="name">Shuttle 2</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
+    <field name="address">10.0.30.2</field>
+    <field name="simulate" eval="True"/>
+    <field name="mode">pick</field>
+  </record>
+
+  <record id="stock_kardex_demo_shuttle_3" model="stock.kardex">
+    <field name="name">Shuttle 3</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_3"/>
+    <field name="address">10.0.30.3</field>
+    <field name="simulate" eval="True"/>
+    <field name="mode">pick</field>
+  </record>
+
+</odoo>
diff --git a/stock_kardex/demo/stock_location_demo.xml b/stock_kardex/demo/stock_location_demo.xml
new file mode 100644
index 000000000000..1919232052fd
--- /dev/null
+++ b/stock_kardex/demo/stock_location_demo.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+  <record id="stock_location_kardex_demo_shuttle_1" model="stock.location">
+    <field name="name">Shuttle 1</field>
+    <field name="location_id" ref="stock_location_kardex"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_1a" model="stock.location">
+    <field name="name">Tray 1A</field>
+    <field name="barcode">T1A</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_klein_8x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_1b" model="stock.location">
+    <field name="name">Tray 1B</field>
+    <field name="barcode">T1B</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_16x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_1c" model="stock.location">
+    <field name="name">Tray 1C</field>
+    <field name="barcode">T1C</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_32x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_shuttle_2" model="stock.location">
+    <field name="name">Shuttle 2</field>
+    <field name="location_id" ref="stock_location_kardex"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_2a" model="stock.location">
+    <field name="name">Tray 2A</field>
+    <field name="barcode">T2A</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_8x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_2b" model="stock.location">
+    <field name="name">Tray 2B</field>
+    <field name="barcode">T2B</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_4x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_2c" model="stock.location">
+    <field name="name">Tray 2C</field>
+    <field name="barcode">T2C</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_16x_2"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_2d" model="stock.location">
+    <field name="name">Tray 2D</field>
+    <field name="barcode">T2D</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_klein_8x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_shuttle_3" model="stock.location">
+    <field name="name">Shuttle 3</field>
+    <field name="location_id" ref="stock_location_kardex"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_3a" model="stock.location">
+    <field name="name">Tray 3A</field>
+    <field name="barcode">T3A</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_3"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_klein_32x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_kardex_demo_tray_3b" model="stock.location">
+    <field name="name">Tray 3B</field>
+    <field name="barcode">T3B</field>
+    <field name="location_id" ref="stock_location_kardex_demo_shuttle_3"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_32x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <!-- When the trays are created, they will create their 'cell' locations.
+       This method will add xmlids on them to be able to reference them in
+       other demo data and tests.
+  -->
+  <function model="stock.location" name="_create_tray_xmlids">
+    <function eval="[[('kardex_kind', '=', 'cell')]]" model="stock.location" name="search"/>
+  </function>
+
+</odoo>
diff --git a/stock_kardex/demo/stock_picking_demo.xml b/stock_kardex/demo/stock_picking_demo.xml
new file mode 100644
index 000000000000..af59b358865b
--- /dev/null
+++ b/stock_kardex/demo/stock_picking_demo.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+  <record id="stock_picking_out_demo_kardex_1" model="stock.picking">
+    <field name="picking_type_id" ref="stock.picking_type_out"/>
+    <field name="origin">outgoing shipment from kardex</field>
+    <field name="partner_id" ref="base.res_partner_1"/>
+    <field name="date" eval="DateTime.today()"/>
+    <field name="location_id" ref="stock.stock_location_stock"/>
+    <field name="location_dest_id" ref="stock.stock_location_customers"/>
+    <field name="move_lines" model="stock.move" eval="[(0, 0, {
+                                                      'name': obj().env.ref('stock_kardex.product_running_socks').name,
+                                                      'product_id': ref('stock_kardex.product_running_socks'),
+                                                      'product_uom': ref('uom.product_uom_unit'),
+                                                      'product_uom_qty': 15.0,
+                                                      'picking_type_id': ref('stock.picking_type_out'),
+                                                      'location_id': ref('stock.stock_location_stock'),
+                                                      'location_dest_id': ref('stock.stock_location_customers'),
+                                                      })]"/>
+  </record>
+
+  <function model="stock.picking" name="action_confirm">
+    <value model="stock.picking" eval="[obj().env.ref('stock_kardex.stock_picking_out_demo_kardex_1').id]"/>
+  </function>
+
+  <function model="stock.picking" name="action_assign">
+    <value model="stock.picking" eval="[obj().env.ref('stock_kardex.stock_picking_out_demo_kardex_1').id]"/>
+  </function>
+
+</odoo>
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 5eee18a302fb..3892e040c4ea 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -25,6 +25,9 @@ class StockKardex(models.Model):
         help="The Kardex source location for Pick operations "
         "and destination location for Put operations.",
     )
+    simulate = fields.Boolean(
+        help="When ticked, commands will not be sent to the Shuttle."
+    )
     # TODO add _id
     current_move_line = fields.Many2one(comodel_name='stock.move.line')
 
@@ -55,7 +58,7 @@ class StockKardex(models.Model):
         string='Tray Type',
     )
     kardex_tray_type_code = fields.Char(
-        compute='_compute_kardex_tray_matrix', string='Tray Type'
+        compute='_compute_kardex_tray_matrix', string='Tray Code'
     )
     kardex_tray_x = fields.Integer(
         string='X', compute='_compute_kardex_tray_matrix'
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index 98e298fe910c..ef45d2ecfb21 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -171,3 +171,42 @@ def _update_tray_sublocations(self):
                     values.append(subloc_values)
         if values:
             self.create(values)
+
+    @api.multi
+    def _create_tray_xmlids(self):
+        """Create external IDs for generated cells
+
+        Called from stock/kardex/demo/stock_location_demo.xml.
+
+        If the tray has one. Used for the demo/test data. It will not handle
+        properly changing the tray format as the former cells will keep the
+        original xmlid built on x and y, the new ones will not be able to used
+        them. As these xmlids are meant for the demo data and the tests, it is
+        not a problem and should not be used for other purposes.
+        """
+        for location in self:
+            if location.kardex_kind != 'cell':
+                continue
+            tray = location.location_id
+            tray_external_id = tray.get_external_id().get(tray.id)
+            if not tray_external_id:
+                continue
+            if '.' not in tray_external_id:
+                continue
+            module, tray_name = tray_external_id.split('.')
+            tray_external = self.env['ir.model.data'].browse(
+                self.env['ir.model.data']._get_id(module, tray_name)
+            )
+            cell_external_id = "{}_x{}y{}".format(
+                tray_name, location.posx, location.posy
+            )
+            if not self.env.ref(cell_external_id, raise_if_not_found=False):
+                self.env['ir.model.data'].create(
+                    {
+                        'name': cell_external_id,
+                        'module': module,
+                        'model': self._name,
+                        'res_id': location.id,
+                        'noupdate': tray_external.noupdate,
+                    }
+                )
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index 3e22c45c7e8b..3307f2cd4a2a 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -126,8 +126,10 @@
           <field name="address"/>
           <field name="mode"/>
           <field name="location_id"/>
-          <!-- visible and editable for prototyping purposes -->
-          <field name="current_move_line"/>
+          <field name="simulate" groups="base.group_no_one"/>
+          <!-- move line visible and editable for prototyping purposes, to
+remove later -->
+          <field name="current_move_line" groups="base.group_no_one"/>
         </group>
       </form>
     </field>

From da836e6b32bb73f2b30db400f631f3653a7f7764 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 20 Jun 2019 17:04:30 +0200
Subject: [PATCH 13/50] Add test coverage

---
 stock_kardex/data/stock_kardex_tray_type.xml  |   1 +
 stock_kardex/models/__init__.py               |   2 -
 stock_kardex/models/stock_kardex.py           |   1 +
 stock_kardex/models/stock_kardex_tray_type.py |   2 +-
 stock_kardex/models/stock_location.py         |  15 +-
 stock_kardex/models/stock_move_line.py        |   0
 stock_kardex/models/stock_picking_type.py     |   0
 stock_kardex/tests/__init__.py                |   3 +
 stock_kardex/tests/common.py                  |  35 +++
 stock_kardex/tests/test_kardex.py             |  92 ++++++++
 stock_kardex/tests/test_kardex_location.py    | 209 ++++++++++++++++++
 stock_kardex/tests/test_kardex_tray_type.py   |  70 ++++++
 12 files changed, 420 insertions(+), 10 deletions(-)
 delete mode 100644 stock_kardex/models/stock_move_line.py
 delete mode 100644 stock_kardex/models/stock_picking_type.py
 create mode 100644 stock_kardex/tests/__init__.py
 create mode 100644 stock_kardex/tests/common.py
 create mode 100644 stock_kardex/tests/test_kardex.py
 create mode 100644 stock_kardex/tests/test_kardex_location.py
 create mode 100644 stock_kardex/tests/test_kardex_tray_type.py

diff --git a/stock_kardex/data/stock_kardex_tray_type.xml b/stock_kardex/data/stock_kardex_tray_type.xml
index 43a3e0988992..e847731eb5cb 100644
--- a/stock_kardex/data/stock_kardex_tray_type.xml
+++ b/stock_kardex/data/stock_kardex_tray_type.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
+  <!-- TODO rename xmlids in english  -->
   <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_32x">
     <field name="name">Klein 32x</field>
     <field name="code">B10804</field>
diff --git a/stock_kardex/models/__init__.py b/stock_kardex/models/__init__.py
index 72c066a96f7b..1b2819b65308 100644
--- a/stock_kardex/models/__init__.py
+++ b/stock_kardex/models/__init__.py
@@ -1,5 +1,3 @@
 from . import stock_kardex
 from . import stock_kardex_tray_type
-from . import stock_move_line
 from . import stock_location
-from . import stock_picking_type
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 3892e040c4ea..5dbacd98f913 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -153,6 +153,7 @@ def _domain_move_lines_to_do_all(self):
             # TODO check state
             ('state', '=', 'assigned')
         ]
+        # TODO search only in the view being a parent of kardex's location
         kardex_locations = self.env['stock.location'].search(
             [('kardex_kind', '=', 'view')]
         )
diff --git a/stock_kardex/models/stock_kardex_tray_type.py b/stock_kardex/models/stock_kardex_tray_type.py
index 4de0d5829d68..b3ee4810110c 100644
--- a/stock_kardex/models/stock_kardex_tray_type.py
+++ b/stock_kardex/models/stock_kardex_tray_type.py
@@ -29,7 +29,7 @@ def _compute_tray_matrix(self):
             # see all the boxes on the web widget.
             # (0 means empty, 1 means used)
             cells = self._generate_cells_matrix(default_state=1)
-            record.tray_matrix = {'selected': None, 'cells': cells}
+            record.tray_matrix = {'selected': [], 'cells': cells}
 
     def _generate_cells_matrix(self, default_state=0):
         return [[default_state] * self.cols for __ in range(self.rows)]
diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index ef45d2ecfb21..23938d3a6372 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -39,7 +39,7 @@ class StockLocation(models.Model):
     #     -> Tray
     #       -> Cell
 
-    @api.depends('location_id', 'location_id.kardex_kind')
+    @api.depends('location_id', 'location_id.kardex_kind', 'kardex_location')
     def _compute_kardex_kind(self):
         tree = {'view': 'shuttle', 'shuttle': 'tray', 'tray': 'cell'}
         for location in self:
@@ -108,7 +108,9 @@ def _stock_kardex_check_active(self):
                 parent = record.location_id
             else:
                 parent = record
-            locs = self.search([('id', 'child_of', parent.id)])
+            # Add the record to the search: as it has set inactive, it will not
+            # be found by the search.
+            locs = self.search([('id', 'child_of', parent.id)]) | record
             if any(loc.kardex_cell_contains_stock for loc in locs):
                 raise exceptions.ValidationError(
                     _(
@@ -118,10 +120,9 @@ def _stock_kardex_check_active(self):
                 )
 
     def _kardex_cell_coords(self):
-        if not self.kardex_kind == 'cell':
-            coords = []
-        coords = [self.posx - 1, self.posy - 1]
-        return coords
+        if self.kardex_kind != 'cell':
+            return []
+        return [self.posx - 1, self.posy - 1]
 
     def _tray_cells_matrix(self):
         assert self.kardex_kind in ('tray', 'cell')
@@ -149,7 +150,7 @@ def _update_tray_sublocations(self):
             except exceptions.ValidationError:
                 # trap this check (_stock_kardex_check_active) to display a
                 # contextual error message
-                raise exceptions.ValidationError(
+                raise exceptions.UserError(
                     _(
                         "Kardex trays cannot be modified when "
                         "they contain products."
diff --git a/stock_kardex/models/stock_move_line.py b/stock_kardex/models/stock_move_line.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/stock_kardex/models/stock_picking_type.py b/stock_kardex/models/stock_picking_type.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/stock_kardex/tests/__init__.py b/stock_kardex/tests/__init__.py
new file mode 100644
index 000000000000..1907d4cb7b32
--- /dev/null
+++ b/stock_kardex/tests/__init__.py
@@ -0,0 +1,3 @@
+from . import test_kardex_location
+from . import test_kardex_tray_type
+from . import test_kardex
diff --git a/stock_kardex/tests/common.py b/stock_kardex/tests/common.py
new file mode 100644
index 000000000000..3db31a0ee648
--- /dev/null
+++ b/stock_kardex/tests/common.py
@@ -0,0 +1,35 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests import common
+
+
+class KardexCase(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.kardex = cls.env.ref('stock_kardex.stock_kardex_demo_shuttle_1')
+        cls.product_socks = cls.env.ref('stock_kardex.product_running_socks')
+        cls.kardex_view = cls.env.ref('stock_kardex.stock_location_kardex')
+        cls.tray_type_klein_8x = cls.env.ref(
+            'stock_kardex.kardex_tray_type_klein_8x'
+        )
+        cls.tray_type_klein_32x = cls.env.ref(
+            'stock_kardex.kardex_tray_type_klein_32x'
+        )
+
+    def _cell_for(self, tray, x=1, y=1):
+        cell = self.env['stock.location'].search(
+            [('location_id', '=', tray.id), ('posx', '=', x), ('posy', '=', y)]
+        )
+        self.assertEqual(
+            len(cell),
+            1,
+            "Cell x{}y{} not found for {}".format(x, y, tray.name),
+        )
+        return cell
+
+    def _update_quantity_in_cell(self, cell, product, quantity):
+        self.env['stock.quant']._update_available_quantity(
+            product, cell, quantity
+        )
diff --git a/stock_kardex/tests/test_kardex.py b/stock_kardex/tests/test_kardex.py
new file mode 100644
index 000000000000..9e46209a3a37
--- /dev/null
+++ b/stock_kardex/tests/test_kardex.py
@@ -0,0 +1,92 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, exceptions
+
+from .common import KardexCase
+
+
+class TestKardexTrayType(KardexCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.picking_out = cls.env.ref(
+            'stock_kardex.stock_picking_out_demo_kardex_1'
+        )
+        # we have a move line to pick created by demo picking
+        # stock_picking_out_demo_kardex_1
+        cls.out_move_line = cls.picking_out.move_line_ids
+
+    def test_switch_pick(self):
+        self.kardex.switch_pick()
+        self.assertEqual(self.kardex.mode, 'pick')
+
+    def test_switch_put(self):
+        self.kardex.switch_put()
+        self.assertEqual(self.kardex.mode, 'put')
+
+    def test_switch_inventory(self):
+        self.kardex.switch_inventory()
+        self.assertEqual(self.kardex.mode, 'inventory')
+
+    def test_pick_action_open_screen(self):
+        self.kardex.switch_pick()
+        action = self.kardex.action_open_screen()
+        self.assertTrue(self.kardex.current_move_line)
+        self.assertEqual(action['type'], 'ir.actions.act_window')
+        self.assertEqual(action['res_model'], 'stock.kardex')
+        self.assertEqual(action['res_id'], self.kardex.id)
+
+    def test_pick_select_next_move_line(self):
+        self.kardex.switch_pick()
+        self.kardex.select_next_move_line()
+        self.assertEqual(self.kardex.current_move_line, self.out_move_line)
+        self.assertEqual(self.kardex.operation_descr, _('Scan next PID'))
+
+    def test_pick_save(self):
+        self.kardex.switch_pick()
+        self.kardex.current_move_line = self.out_move_line
+        result = self.kardex.button_save()
+        self.assertFalse(self.kardex.current_move_line)
+        self.assertEqual(self.kardex.operation_descr, _('No operations'))
+        expected_result = {
+            'effect': {
+                'fadeout': 'slow',
+                'message': _('Congrats, you cleared the queue!'),
+                'img_url': '/web/static/src/img/smile.svg',
+                'type': 'rainbow_man',
+            }
+        }
+        self.assertEqual(result, expected_result)
+
+    def test_on_barcode_scanned(self):
+        # test to implement when the code is implemented
+        with self.assertRaises(exceptions.UserError):
+            self.kardex.on_barcode_scanned('foo')
+
+    def test_button_release(self):
+        # test to implement when the code is implemented
+        with self.assertRaises(exceptions.UserError):
+            self.kardex.button_release()
+
+    def test_process_current_pick(self):
+        self.kardex.switch_pick()
+        self.kardex.current_move_line = self.out_move_line
+        qty_to_process = self.out_move_line.product_qty
+        self.kardex.process_current_pick()
+        self.assertEqual(self.out_move_line.state, 'done')
+        self.assertEqual(self.out_move_line.qty_done, qty_to_process)
+
+    def test_process_current_put(self):
+        # test to implement when the code is implemented
+        with self.assertRaises(exceptions.UserError):
+            self.kardex.process_current_put()
+
+    def test_process_current_inventory(self):
+        # test to implement when the code is implemented
+        with self.assertRaises(exceptions.UserError):
+            self.kardex.process_current_inventory()
+
+    # TODO count move lines (need to create a few in different shuttles)
+    # TODO test matrix
+    # TODO test related fields
diff --git a/stock_kardex/tests/test_kardex_location.py b/stock_kardex/tests/test_kardex_location.py
new file mode 100644
index 000000000000..e5ea3bcab1ec
--- /dev/null
+++ b/stock_kardex/tests/test_kardex_location.py
@@ -0,0 +1,209 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import exceptions
+
+from .common import KardexCase
+
+
+class TestKardexLocation(KardexCase):
+    def test_kardex_kind(self):
+        # this boolean is what defines a "Kardex View", the upper level
+        # of the tree (View -> Shuttles -> Trays -> Cells)
+        self.assertTrue(self.kardex_view.kardex_location)
+        self.assertEqual(self.kardex_view.kardex_kind, 'view')
+
+        # check types accross the hierarchy
+        shuttles = self.kardex_view.child_ids
+        self.assertTrue(
+            all(location.kardex_kind == 'shuttle' for location in shuttles)
+        )
+        trays = shuttles.mapped('child_ids')
+        self.assertTrue(
+            all(location.kardex_kind == 'tray' for location in trays)
+        )
+        cells = trays.mapped('child_ids')
+        self.assertTrue(
+            all(location.kardex_kind == 'cell' for location in cells)
+        )
+
+    def test_kardex_create_shuttle(self):
+        # any location created directly under the view is a shuttle
+        shuttle_loc = self.env['stock.location'].create(
+            {
+                'name': 'Shuttle 42',
+                'location_id': self.kardex_view.id,
+                'usage': 'internal',
+            }
+        )
+        self.assertEqual(shuttle_loc.kardex_kind, 'shuttle')
+
+    def test_kardex_create_tray(self):
+        # any location created directly under a shuttle is a tray
+        shuttle_loc = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_shuttle_1'
+        )
+        tray_type = self.tray_type_klein_8x
+        tray_loc = self.env['stock.location'].create(
+            {
+                'name': 'Tray Z',
+                'location_id': shuttle_loc.id,
+                'usage': 'internal',
+                'kardex_tray_type_id': tray_type.id,
+            }
+        )
+
+        self.assertEqual(tray_loc.kardex_kind, 'tray')
+        self.assertEqual(
+            len(tray_loc.child_ids), tray_type.cols * tray_type.rows  # 8
+        )
+
+    def test_kardex_tray_has_stock(self):
+        cell = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+        )
+        self.assertFalse(cell.quant_ids)
+        self.assertFalse(cell.kardex_cell_contains_stock)
+        self._update_quantity_in_cell(cell, self.product_socks, 1)
+        self.assertTrue(cell.quant_ids)
+        self.assertTrue(cell.kardex_cell_contains_stock)
+        self._update_quantity_in_cell(cell, self.product_socks, -1)
+        self.assertTrue(cell.quant_ids)
+        self.assertFalse(cell.kardex_cell_contains_stock)
+
+    def test_matrix_empty_tray(self):
+        tray_loc = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_1a'
+        )
+        self.assertEqual(tray_loc.kardex_tray_type_id.cols, 4)
+        self.assertEqual(tray_loc.kardex_tray_type_id.rows, 2)
+        self.assertEqual(
+            tray_loc.tray_matrix,
+            {
+                # we show the entire tray, not a cell
+                'selected': [],
+                # we have no stock in this location
+                # fmt: off
+                'cells': [
+                    [0, 0, 0, 0],
+                    [0, 0, 0, 0],
+                ]
+                # fmt: on
+            },
+        )
+
+    def test_matrix_stock_tray(self):
+        tray_loc = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_1a'
+        )
+        self._update_quantity_in_cell(
+            self._cell_for(tray_loc, x=1, y=1), self.product_socks, 100
+        )
+        self._update_quantity_in_cell(
+            self._cell_for(tray_loc, x=2, y=1), self.product_socks, 100
+        )
+        self._update_quantity_in_cell(
+            self._cell_for(tray_loc, x=4, y=2), self.product_socks, 100
+        )
+        self.assertEqual(tray_loc.kardex_tray_type_id.cols, 4)
+        self.assertEqual(tray_loc.kardex_tray_type_id.rows, 2)
+        self.assertEqual(
+            tray_loc.tray_matrix,
+            {
+                # We show the entire tray, not a cell.
+                'selected': [],
+                # Note: the coords are stored according to their index in the
+                # arrays so it is easier to manipulate them. However, we
+                # display them with the Y axis inverted in the UI to represent
+                # the view of the operator.
+                #
+                #   [0, 0, 0, 1],
+                #   [1, 1, 0, 0],
+                #
+                # fmt: off
+                'cells': [
+                    [1, 1, 0, 0],
+                    [0, 0, 0, 1],
+                ]
+                # fmt: on
+            },
+        )
+
+    def test_matrix_stock_cell(self):
+        tray_loc = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_1c'
+        )
+        cell = self._cell_for(tray_loc, x=7, y=3)
+        self._update_quantity_in_cell(cell, self.product_socks, 100)
+        self._update_quantity_in_cell(
+            self._cell_for(tray_loc, x=1, y=1), self.product_socks, 100
+        )
+        self._update_quantity_in_cell(
+            self._cell_for(tray_loc, x=3, y=2), self.product_socks, 100
+        )
+        self.assertEqual(tray_loc.kardex_tray_type_id.cols, 8)
+        self.assertEqual(tray_loc.kardex_tray_type_id.rows, 4)
+        self.assertEqual(
+            cell.tray_matrix,
+            {
+                # When called on a cell, we expect to have its coords. Worth to
+                # note: the cell's coordinate are 7 and 3 in the posx and posy
+                # fields as they make sense for humans. Here, they are offset
+                # by -1 to have the indexes in the matrix.
+                'selected': [6, 2],
+                # fmt: off
+                'cells': [
+                    [1, 0, 0, 0, 0, 0, 0, 0],
+                    [0, 0, 1, 0, 0, 0, 0, 0],
+                    [0, 0, 0, 0, 0, 0, 1, 0],
+                    [0, 0, 0, 0, 0, 0, 0, 0],
+                ]
+                # fmt: on
+            },
+        )
+
+    def test_check_active_empty(self):
+        # this type used by tray T1B, we should not be able to disable it
+        cell = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+        )
+        self.assertFalse(cell.kardex_cell_contains_stock)
+        # allowed to archive empty cell
+        cell.active = False
+
+    def test_check_active_not_empty(self):
+        cell = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+        )
+        self._update_quantity_in_cell(cell, self.product_socks, 1)
+        self.assertTrue(cell.kardex_cell_contains_stock)
+
+        # we cannot archive an empty cell or any parent
+        location = cell
+        message = 'cannot be archived'
+        while location:
+            with self.assertRaisesRegex(exceptions.ValidationError, message):
+                location.active = False
+
+            # restore state for the next test loop
+            location.active = True
+            parent = location.location_id
+            location = parent if parent.kardex_kind else None
+
+    def test_change_tray_type_when_empty(self):
+        tray = self.env.ref('stock_kardex.stock_location_kardex_demo_tray_1a')
+        tray_type = self.tray_type_klein_32x
+        tray.kardex_tray_type_id = tray_type
+        self.assertEqual(
+            len(tray.child_ids), tray_type.cols * tray_type.rows  # 32
+        )
+
+    def test_change_tray_type_error_when_not_empty(self):
+        tray = self.env.ref('stock_kardex.stock_location_kardex_demo_tray_1a')
+        self._update_quantity_in_cell(
+            self._cell_for(tray, x=1, y=1), self.product_socks, 1
+        )
+        tray_type = self.tray_type_klein_32x
+        message = 'cannot be modified when they contain products'
+        with self.assertRaisesRegex(exceptions.UserError, message):
+            tray.kardex_tray_type_id = tray_type
diff --git a/stock_kardex/tests/test_kardex_tray_type.py b/stock_kardex/tests/test_kardex_tray_type.py
new file mode 100644
index 000000000000..8a78b6e417b5
--- /dev/null
+++ b/stock_kardex/tests/test_kardex_tray_type.py
@@ -0,0 +1,70 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import exceptions
+
+from .common import KardexCase
+
+
+class TestKardexTrayType(KardexCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.used_tray_type = cls.env.ref(
+            'stock_kardex.kardex_tray_type_gross_16x'
+        )
+        cls.unused_tray_type = cls.env.ref(
+            'stock_kardex.kardex_tray_type_klein_16x_3'
+        )
+
+    def test_kardex_tray_type(self):
+        # any location created directly under the view is a shuttle
+        tray_type = self.env['stock.kardex.tray.type'].create(
+            {
+                'name': 'Test Type',
+                'code': '🐵',
+                'usage': 'internal',
+                'rows': 4,
+                'cols': 6,
+            }
+        )
+        self.assertEqual(
+            tray_type.tray_matrix,
+            {
+                'selected': [],  # no selection as this is the "model"
+                # a "full" matrix is generated for display on the UI
+                # fmt: off
+                'cells': [
+                    [1, 1, 1, 1, 1, 1],
+                    [1, 1, 1, 1, 1, 1],
+                    [1, 1, 1, 1, 1, 1],
+                    [1, 1, 1, 1, 1, 1],
+                ]
+                # fmt: on
+            },
+        )
+
+    def test_kardex_check_active(self):
+        # this type used by tray T1B, we should not be able to disable it
+        location = self.used_tray_type.location_ids
+        self.assertTrue(location)
+        message = 'cannot be archived.*{}.*'.format(location.name)
+        # we cannot archive used ones
+        with self.assertRaisesRegex(exceptions.ValidationError, message):
+            self.used_tray_type.active = False
+        # we can archive unused ones
+        self.unused_tray_type.active = False
+
+    def test_kardex_check_cols_rows(self):
+        # this type used by tray T1B, we should not be able to modify size
+        location = self.used_tray_type.location_ids
+        self.assertTrue(location)
+        message = 'size cannot be changed.*{}.*'.format(location.name)
+        # we cannot modify size of used ones
+        with self.assertRaisesRegex(exceptions.ValidationError, message):
+            self.used_tray_type.rows = 10
+        with self.assertRaisesRegex(exceptions.ValidationError, message):
+            self.used_tray_type.cols = 10
+        # we can modify size of unused ones
+        self.unused_tray_type.rows = 10
+        self.unused_tray_type.cols = 10

From 4b3fe4c25d180ac3e5822ed5d1d1ee4f876a8d6e Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 20 Jun 2019 17:32:26 +0200
Subject: [PATCH 14/50] Remove empty XML files

---
 stock_kardex/__manifest__.py                    | 2 --
 stock_kardex/views/stock_move_line_views.xml    | 4 ----
 stock_kardex/views/stock_picking_type_views.xml | 4 ----
 3 files changed, 10 deletions(-)
 delete mode 100644 stock_kardex/views/stock_move_line_views.xml
 delete mode 100644 stock_kardex/views/stock_picking_type_views.xml

diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
index d2f8d966afda..1fbe311dde48 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_kardex/__manifest__.py
@@ -23,8 +23,6 @@
     ],
     'data': [
         'views/stock_location_views.xml',
-        'views/stock_move_line_views.xml',
-        'views/stock_picking_type_views.xml',
         'views/stock_kardex_views.xml',
         'views/stock_kardex_tray_type_views.xml',
         'views/stock_kardex_templates.xml',
diff --git a/stock_kardex/views/stock_move_line_views.xml b/stock_kardex/views/stock_move_line_views.xml
deleted file mode 100644
index 1d77a6b31998..000000000000
--- a/stock_kardex/views/stock_move_line_views.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-</odoo>
diff --git a/stock_kardex/views/stock_picking_type_views.xml b/stock_kardex/views/stock_picking_type_views.xml
deleted file mode 100644
index 1d77a6b31998..000000000000
--- a/stock_kardex/views/stock_picking_type_views.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-</odoo>

From 310775038a7b2863b1b6a061f2133948c69a4ab5 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 20 Jun 2019 17:34:00 +0200
Subject: [PATCH 15/50] =?UTF-8?q?Rename=20current=5Fmove=5Fline=20?=
 =?UTF-8?q?=E2=86=92=20current=5Fmove=5Fline=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stock_kardex/models/stock_kardex.py       | 25 ++++++++++++-----------
 stock_kardex/tests/test_kardex.py         | 10 ++++-----
 stock_kardex/views/stock_kardex_views.xml |  6 +++---
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 5dbacd98f913..ff62df2fea9a 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -28,8 +28,7 @@ class StockKardex(models.Model):
     simulate = fields.Boolean(
         help="When ticked, commands will not be sent to the Shuttle."
     )
-    # TODO add _id
-    current_move_line = fields.Many2one(comodel_name='stock.move.line')
+    current_move_line_id = fields.Many2one(comodel_name='stock.move.line')
 
     number_of_ops = fields.Integer(
         compute='_compute_number_of_ops', string='Number of Operations'
@@ -70,21 +69,23 @@ class StockKardex(models.Model):
 
     # current operation information
     picking_id = fields.Many2one(
-        related='current_move_line.picking_id', readonly=True
+        related='current_move_line_id.picking_id', readonly=True
     )
     product_id = fields.Many2one(
-        related='current_move_line.product_id', readonly=True
+        related='current_move_line_id.product_id', readonly=True
     )
     product_uom_id = fields.Many2one(
-        related='current_move_line.product_uom_id', readonly=True
+        related='current_move_line_id.product_uom_id', readonly=True
     )
     product_uom_qty = fields.Float(
-        related='current_move_line.product_uom_qty', readonly=True
+        related='current_move_line_id.product_uom_qty', readonly=True
     )
     qty_done = fields.Float(
-        related='current_move_line.qty_done', readonly=True
+        related='current_move_line_id.qty_done', readonly=True
+    )
+    lot_id = fields.Many2one(
+        related='current_move_line_id.lot_id', readonly=True
     )
-    lot_id = fields.Many2one(related='current_move_line.lot_id', readonly=True)
 
     _barcode_scanned = fields.Char(
         "Barcode Scanned",
@@ -114,7 +115,7 @@ def _compute_kardex_tray_matrix(self):
                 # TODO what to do for inventory?
                 'inventory': 'location_id',
             }
-            location = record.current_move_line[modes[record.mode]]
+            location = record.current_move_line_id[modes[record.mode]]
             tray_type = location.location_id.kardex_tray_type_id
             selected = []
             cells = []
@@ -183,7 +184,7 @@ def button_release(self):
     def process_current_pick(self):
         # test code, TODO the smart one
         # (scan of barcode increments qty, save calls action_done?)
-        line = self.current_move_line
+        line = self.current_move_line_id
         line.qty_done = line.product_qty
         line.move_id._action_done()
 
@@ -200,7 +201,7 @@ def button_save(self):
         method = 'process_current_{}'.format(self.mode)
         getattr(self, method)()
         self.select_next_move_line()
-        if not self.current_move_line:
+        if not self.current_move_line_id:
             # sorry not sorry
             return {
                 'effect': {
@@ -216,7 +217,7 @@ def select_next_move_line(self):
         next_move_line = self.env['stock.move.line'].search(
             self._domain_move_lines_to_do(), limit=1
         )
-        self.current_move_line = next_move_line
+        self.current_move_line_id = next_move_line
         descr = _('Scan next PID') if next_move_line else _('No operations')
         self.operation_descr = descr
 
diff --git a/stock_kardex/tests/test_kardex.py b/stock_kardex/tests/test_kardex.py
index 9e46209a3a37..64ad2ec865b3 100644
--- a/stock_kardex/tests/test_kardex.py
+++ b/stock_kardex/tests/test_kardex.py
@@ -32,7 +32,7 @@ def test_switch_inventory(self):
     def test_pick_action_open_screen(self):
         self.kardex.switch_pick()
         action = self.kardex.action_open_screen()
-        self.assertTrue(self.kardex.current_move_line)
+        self.assertTrue(self.kardex.current_move_line_id)
         self.assertEqual(action['type'], 'ir.actions.act_window')
         self.assertEqual(action['res_model'], 'stock.kardex')
         self.assertEqual(action['res_id'], self.kardex.id)
@@ -40,14 +40,14 @@ def test_pick_action_open_screen(self):
     def test_pick_select_next_move_line(self):
         self.kardex.switch_pick()
         self.kardex.select_next_move_line()
-        self.assertEqual(self.kardex.current_move_line, self.out_move_line)
+        self.assertEqual(self.kardex.current_move_line_id, self.out_move_line)
         self.assertEqual(self.kardex.operation_descr, _('Scan next PID'))
 
     def test_pick_save(self):
         self.kardex.switch_pick()
-        self.kardex.current_move_line = self.out_move_line
+        self.kardex.current_move_line_id = self.out_move_line
         result = self.kardex.button_save()
-        self.assertFalse(self.kardex.current_move_line)
+        self.assertFalse(self.kardex.current_move_line_id)
         self.assertEqual(self.kardex.operation_descr, _('No operations'))
         expected_result = {
             'effect': {
@@ -71,7 +71,7 @@ def test_button_release(self):
 
     def test_process_current_pick(self):
         self.kardex.switch_pick()
-        self.kardex.current_move_line = self.out_move_line
+        self.kardex.current_move_line_id = self.out_move_line
         qty_to_process = self.out_move_line.product_qty
         self.kardex.process_current_pick()
         self.assertEqual(self.out_move_line.state, 'done')
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index 3307f2cd4a2a..caf5991e9838 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -49,11 +49,11 @@
             <field name="operation_descr"/>
           </div>
         </div>
-        <div class="o_kardex_data" attrs="{'invisible': [('current_move_line', '=', False)]}">
+        <div class="o_kardex_data" attrs="{'invisible': [('current_move_line_id', '=', False)]}">
           <!-- on the left of the screen -->
           <div class="o_kardex_data_content o_kardex_move">
             <div>
-              <field name="current_move_line" invisible="1"/>
+              <field name="current_move_line_id" invisible="1"/>
               <label for="product_id"/>
               <field name="product_id" readonly="1" options="{'no_open': True}"/>
               <field name="qty_done" readonly="1" force_save="1"/> / 
@@ -129,7 +129,7 @@
           <field name="simulate" groups="base.group_no_one"/>
           <!-- move line visible and editable for prototyping purposes, to
 remove later -->
-          <field name="current_move_line" groups="base.group_no_one"/>
+          <field name="current_move_line_id" groups="base.group_no_one"/>
         </group>
       </form>
     </field>

From e64f868fd9b078b08123c79a8d979f8b70b07ae6 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 20 Jun 2019 17:36:46 +0200
Subject: [PATCH 16/50] Rename German in trays by English words

---
 stock_kardex/data/stock_kardex_tray_type.xml | 41 ++++++++++----------
 stock_kardex/demo/stock_location_demo.xml    | 18 ++++-----
 stock_kardex/tests/common.py                 |  8 ++--
 stock_kardex/tests/test_kardex_location.py   |  6 +--
 stock_kardex/tests/test_kardex_tray_type.py  |  4 +-
 5 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/stock_kardex/data/stock_kardex_tray_type.xml b/stock_kardex/data/stock_kardex_tray_type.xml
index e847731eb5cb..323a9cbffb96 100644
--- a/stock_kardex/data/stock_kardex_tray_type.xml
+++ b/stock_kardex/data/stock_kardex_tray_type.xml
@@ -1,72 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
-  <!-- TODO rename xmlids in english  -->
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_32x">
-    <field name="name">Klein 32x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_32x">
+    <field name="name">Small 32x</field>
     <field name="code">B10804</field>
     <field name="rows">4</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_16x">
-    <field name="name">Klein 16x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_16x">
+    <field name="name">Small 16x</field>
     <field name="code">B20802</field>
     <field name="rows">2</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_8x">
-    <field name="name">Klein 8x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_8x">
+    <field name="name">Small 8x</field>
     <field name="code">B20402</field>
     <field name="rows">2</field>
     <field name="cols">4</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_16x_2">
-    <field name="name">Klein 16x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_16x_2">
+    <field name="name">Small 16x</field>
     <field name="code">B40802</field>
     <field name="rows">2</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_klein_16x_3">
-    <field name="name">Klein 16x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_16x_3">
+    <field name="name">Small 16x</field>
     <field name="code">B30404</field>
     <field name="rows">4</field>
     <field name="cols">4</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_32x">
-    <field name="name">Gross 32x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_32x">
+    <field name="name">Large 32x</field>
     <field name="code">B20804</field>
     <field name="rows">4</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_16x">
-    <field name="name">Gross 16x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_16x">
+    <field name="name">Large 16x</field>
     <field name="code">B30802</field>
     <field name="rows">2</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_8x">
-    <field name="name">Gross 8x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_8x">
+    <field name="name">Large 8x</field>
     <field name="code">B30402</field>
     <field name="rows">2</field>
     <field name="cols">4</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_4x">
-    <field name="name">Gross 4x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_4x">
+    <field name="name">Large 4x</field>
     <field name="code">B30401</field>
     <field name="rows">1</field>
     <field name="cols">4</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_gross_16x_2">
-    <field name="name">Gross 16x</field>
+  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_16x_2">
+    <field name="name">Large 16x</field>
     <field name="code">B30404</field>
     <field name="rows">4</field>
     <field name="cols">4</field>
diff --git a/stock_kardex/demo/stock_location_demo.xml b/stock_kardex/demo/stock_location_demo.xml
index 1919232052fd..7b24f64f0786 100644
--- a/stock_kardex/demo/stock_location_demo.xml
+++ b/stock_kardex/demo/stock_location_demo.xml
@@ -11,7 +11,7 @@
     <field name="name">Tray 1A</field>
     <field name="barcode">T1A</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_klein_8x"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_small_8x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -19,7 +19,7 @@
     <field name="name">Tray 1B</field>
     <field name="barcode">T1B</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_16x"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_16x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -27,7 +27,7 @@
     <field name="name">Tray 1C</field>
     <field name="barcode">T1C</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_32x"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_32x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -41,7 +41,7 @@
     <field name="name">Tray 2A</field>
     <field name="barcode">T2A</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_8x"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_8x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -49,7 +49,7 @@
     <field name="name">Tray 2B</field>
     <field name="barcode">T2B</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_4x"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_4x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -57,7 +57,7 @@
     <field name="name">Tray 2C</field>
     <field name="barcode">T2C</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_16x_2"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_16x_2"/>
     <field name="usage">internal</field>
   </record>
 
@@ -65,7 +65,7 @@
     <field name="name">Tray 2D</field>
     <field name="barcode">T2D</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_klein_8x"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_small_8x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -79,7 +79,7 @@
     <field name="name">Tray 3A</field>
     <field name="barcode">T3A</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_3"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_klein_32x"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_small_32x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -87,7 +87,7 @@
     <field name="name">Tray 3B</field>
     <field name="barcode">T3B</field>
     <field name="location_id" ref="stock_location_kardex_demo_shuttle_3"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_gross_32x"/>
+    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_32x"/>
     <field name="usage">internal</field>
   </record>
 
diff --git a/stock_kardex/tests/common.py b/stock_kardex/tests/common.py
index 3db31a0ee648..19cc92e67ef6 100644
--- a/stock_kardex/tests/common.py
+++ b/stock_kardex/tests/common.py
@@ -11,11 +11,11 @@ def setUpClass(cls):
         cls.kardex = cls.env.ref('stock_kardex.stock_kardex_demo_shuttle_1')
         cls.product_socks = cls.env.ref('stock_kardex.product_running_socks')
         cls.kardex_view = cls.env.ref('stock_kardex.stock_location_kardex')
-        cls.tray_type_klein_8x = cls.env.ref(
-            'stock_kardex.kardex_tray_type_klein_8x'
+        cls.tray_type_small_8x = cls.env.ref(
+            'stock_kardex.kardex_tray_type_small_8x'
         )
-        cls.tray_type_klein_32x = cls.env.ref(
-            'stock_kardex.kardex_tray_type_klein_32x'
+        cls.tray_type_small_32x = cls.env.ref(
+            'stock_kardex.kardex_tray_type_small_32x'
         )
 
     def _cell_for(self, tray, x=1, y=1):
diff --git a/stock_kardex/tests/test_kardex_location.py b/stock_kardex/tests/test_kardex_location.py
index e5ea3bcab1ec..52b1ca7dc6eb 100644
--- a/stock_kardex/tests/test_kardex_location.py
+++ b/stock_kardex/tests/test_kardex_location.py
@@ -43,7 +43,7 @@ def test_kardex_create_tray(self):
         shuttle_loc = self.env.ref(
             'stock_kardex.stock_location_kardex_demo_shuttle_1'
         )
-        tray_type = self.tray_type_klein_8x
+        tray_type = self.tray_type_small_8x
         tray_loc = self.env['stock.location'].create(
             {
                 'name': 'Tray Z',
@@ -192,7 +192,7 @@ def test_check_active_not_empty(self):
 
     def test_change_tray_type_when_empty(self):
         tray = self.env.ref('stock_kardex.stock_location_kardex_demo_tray_1a')
-        tray_type = self.tray_type_klein_32x
+        tray_type = self.tray_type_small_32x
         tray.kardex_tray_type_id = tray_type
         self.assertEqual(
             len(tray.child_ids), tray_type.cols * tray_type.rows  # 32
@@ -203,7 +203,7 @@ def test_change_tray_type_error_when_not_empty(self):
         self._update_quantity_in_cell(
             self._cell_for(tray, x=1, y=1), self.product_socks, 1
         )
-        tray_type = self.tray_type_klein_32x
+        tray_type = self.tray_type_small_32x
         message = 'cannot be modified when they contain products'
         with self.assertRaisesRegex(exceptions.UserError, message):
             tray.kardex_tray_type_id = tray_type
diff --git a/stock_kardex/tests/test_kardex_tray_type.py b/stock_kardex/tests/test_kardex_tray_type.py
index 8a78b6e417b5..c18b9a3efab3 100644
--- a/stock_kardex/tests/test_kardex_tray_type.py
+++ b/stock_kardex/tests/test_kardex_tray_type.py
@@ -11,10 +11,10 @@ class TestKardexTrayType(KardexCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.used_tray_type = cls.env.ref(
-            'stock_kardex.kardex_tray_type_gross_16x'
+            'stock_kardex.kardex_tray_type_large_16x'
         )
         cls.unused_tray_type = cls.env.ref(
-            'stock_kardex.kardex_tray_type_klein_16x_3'
+            'stock_kardex.kardex_tray_type_small_16x_3'
         )
 
     def test_kardex_tray_type(self):

From dd8ece257a77e12ec8b17c7a644257b56b8d7552 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Fri, 21 Jun 2019 10:07:30 +0200
Subject: [PATCH 17/50] Increase test coverage

---
 stock_kardex/demo/product_demo.xml  |  14 +++
 stock_kardex/models/__init__.py     |   1 +
 stock_kardex/models/stock_kardex.py |   5 +-
 stock_kardex/models/stock_move.py   |  23 +++++
 stock_kardex/tests/common.py        |  30 +++++++
 stock_kardex/tests/test_kardex.py   | 131 +++++++++++++++++++++++++++-
 6 files changed, 200 insertions(+), 4 deletions(-)
 create mode 100644 stock_kardex/models/stock_move.py

diff --git a/stock_kardex/demo/product_demo.xml b/stock_kardex/demo/product_demo.xml
index dd1aead41680..bfe8ab90d8e6 100644
--- a/stock_kardex/demo/product_demo.xml
+++ b/stock_kardex/demo/product_demo.xml
@@ -15,4 +15,18 @@
     <field name="property_stock_inventory" ref="stock.location_inventory"/>
   </record>
 
+  <record id="product_recovery_socks" model="product.product">
+    <field name="default_code">RS300</field>
+    <field name="name">Recovery Socks</field>
+    <field name="type">product</field>
+    <field name="categ_id" ref="product.product_category_6"/>
+    <field name="lst_price">30.0</field>
+    <field name="standard_price">20.0</field>
+    <field name="weight">1.0</field>
+    <field name="tracking">none</field>
+    <field name="uom_id" ref="uom.product_uom_unit"/>
+    <field name="uom_po_id" ref="uom.product_uom_unit"/>
+    <field name="property_stock_inventory" ref="stock.location_inventory"/>
+  </record>
+
 </odoo>
diff --git a/stock_kardex/models/__init__.py b/stock_kardex/models/__init__.py
index 1b2819b65308..14f97108c639 100644
--- a/stock_kardex/models/__init__.py
+++ b/stock_kardex/models/__init__.py
@@ -1,3 +1,4 @@
 from . import stock_kardex
 from . import stock_kardex_tray_type
 from . import stock_location
+from . import stock_move
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index ff62df2fea9a..78147477c32a 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -124,7 +124,7 @@ def _compute_kardex_tray_matrix(self):
                 cells = location._tray_cells_matrix()
 
             record.kardex_tray_location_id = location.id
-            record.kardex_tray_name = location.name
+            record.kardex_tray_name = location.barcode or location.name
             record.kardex_tray_type_id = tray_type.id
             record.kardex_tray_type_code = tray_type.code
             record.kardex_tray_x = location.posx
@@ -252,9 +252,12 @@ def action_menu(self):
     # TODO: should the mode be changed on all the kardex at the same time?
     def switch_pick(self):
         self.mode = 'pick'
+        self.select_next_move_line()
 
     def switch_put(self):
         self.mode = 'put'
+        self.select_next_move_line()
 
     def switch_inventory(self):
         self.mode = 'inventory'
+        self.select_next_move_line()
diff --git a/stock_kardex/models/stock_move.py b/stock_kardex/models/stock_move.py
new file mode 100644
index 000000000000..dbad4df4cab1
--- /dev/null
+++ b/stock_kardex/models/stock_move.py
@@ -0,0 +1,23 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class StockMove(models.Model):
+    _inherit = 'stock.move'
+
+    @api.multi
+    def write(self, vals):
+        result = super().write(vals)
+        if 'state' in vals:
+            # We cannot have fields to depends on to invalidate these
+            # computed fields on stock.kardex. But we know that when the state
+            # of any move line changes, we can invalidate them as the count
+            # of assigned move lines may change (and we track this in stock.move,
+            # not stock.move.line, becaus the state of the lines is a related to
+            # this one).
+            self.env['stock.kardex'].invalidate_cache(
+                ['number_of_ops', 'number_of_ops_all']
+            )
+        return result
diff --git a/stock_kardex/tests/common.py b/stock_kardex/tests/common.py
index 19cc92e67ef6..5adac3c50cea 100644
--- a/stock_kardex/tests/common.py
+++ b/stock_kardex/tests/common.py
@@ -33,3 +33,33 @@ def _update_quantity_in_cell(self, cell, product, quantity):
         self.env['stock.quant']._update_available_quantity(
             product, cell, quantity
         )
+
+    @classmethod
+    def _create_simple_picking_out(cls, product, quantity):
+        stock_loc = cls.env.ref('stock.stock_location_stock')
+        customer_loc = cls.env.ref('stock.stock_location_customers')
+        picking_type = cls.env.ref('stock.picking_type_out')
+        partner = cls.env.ref('base.res_partner_1')
+        return cls.env['stock.picking'].create(
+            {
+                'picking_type_id': picking_type.id,
+                'partner_id': partner.id,
+                'location_id': stock_loc.id,
+                'location_dest_id': customer_loc.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': picking_type.id,
+                            'location_id': stock_loc.id,
+                            'location_dest_id': customer_loc.id,
+                        },
+                    )
+                ],
+            }
+        )
diff --git a/stock_kardex/tests/test_kardex.py b/stock_kardex/tests/test_kardex.py
index 64ad2ec865b3..a05b760de91d 100644
--- a/stock_kardex/tests/test_kardex.py
+++ b/stock_kardex/tests/test_kardex.py
@@ -1,6 +1,8 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+import unittest
+
 from odoo import _, exceptions
 
 from .common import KardexCase
@@ -20,14 +22,25 @@ def setUpClass(cls):
     def test_switch_pick(self):
         self.kardex.switch_pick()
         self.assertEqual(self.kardex.mode, 'pick')
+        self.assertEqual(self.kardex.current_move_line_id, self.out_move_line)
 
     def test_switch_put(self):
         self.kardex.switch_put()
         self.assertEqual(self.kardex.mode, 'put')
+        # TODO check that we have an incoming move when switching
+        self.assertEqual(
+            self.kardex.current_move_line_id,
+            self.env['stock.move.line'].browse(),
+        )
 
     def test_switch_inventory(self):
         self.kardex.switch_inventory()
         self.assertEqual(self.kardex.mode, 'inventory')
+        # TODO check that we have what we should (what?)
+        self.assertEqual(
+            self.kardex.current_move_line_id,
+            self.env['stock.move.line'].browse(),
+        )
 
     def test_pick_action_open_screen(self):
         self.kardex.switch_pick()
@@ -59,6 +72,102 @@ def test_pick_save(self):
         }
         self.assertEqual(result, expected_result)
 
+    def test_pick_related_fields(self):
+        self.kardex.switch_pick()
+        ml = self.kardex.current_move_line_id = self.out_move_line
+
+        # Kardex trays related fields
+        # For pick, this is the source location, which is the cell where the
+        # product is.
+        self.assertEqual(self.kardex.kardex_tray_location_id, ml.location_id)
+        self.assertEqual(self.kardex.kardex_tray_name, ml.location_id.name)
+        self.assertEqual(
+            self.kardex.kardex_tray_type_id,
+            # the tray type is on the parent of the cell (on the tray)
+            ml.location_id.location_id.kardex_tray_type_id,
+        )
+        self.assertEqual(
+            self.kardex.kardex_tray_type_code,
+            ml.location_id.location_id.kardex_tray_type_id.code,
+        )
+        self.assertEqual(self.kardex.kardex_tray_x, ml.location_id.posx)
+        self.assertEqual(self.kardex.kardex_tray_y, ml.location_id.posy)
+
+        # Move line related fields
+        self.assertEqual(self.kardex.picking_id, ml.picking_id)
+        self.assertEqual(self.kardex.product_id, ml.product_id)
+        self.assertEqual(self.kardex.product_uom_id, ml.product_uom_id)
+        self.assertEqual(self.kardex.product_uom_qty, ml.product_uom_qty)
+        self.assertEqual(self.kardex.qty_done, ml.qty_done)
+        self.assertEqual(self.kardex.lot_id, ml.lot_id)
+
+    def test_pick_count_move_lines(self):
+        product1 = self.env.ref('stock_kardex.product_running_socks')
+        product2 = self.env.ref('stock_kardex.product_recovery_socks')
+        # cancel the picking from demo data to start from a clean state
+        self.env.ref(
+            'stock_kardex.stock_picking_out_demo_kardex_1'
+        ).action_cancel()
+
+        # ensure that we have stock in some cells, we'll put product1
+        # in the first kardex and product2 in the second
+        cell1 = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+        )
+        self._update_quantity_in_cell(cell1, product1, 50)
+        cell2 = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_2a_x1y1'
+        )
+        self._update_quantity_in_cell(cell2, product2, 50)
+
+        # create pickings (we already have an existing one from demo data)
+        pickings = self.env['stock.picking'].browse()
+        pickings |= self._create_simple_picking_out(product1, 1)
+        pickings |= self._create_simple_picking_out(product1, 1)
+        pickings |= self._create_simple_picking_out(product1, 1)
+        pickings |= self._create_simple_picking_out(product1, 1)
+        pickings |= self._create_simple_picking_out(product2, 20)
+        pickings |= self._create_simple_picking_out(product2, 30)
+        # this one should be 'assigned', so should be included in the operation
+        # count
+        unassigned = self._create_simple_picking_out(product2, 1)
+        pickings |= unassigned
+        pickings.action_confirm()
+        # product1 will be taken from the kardex1, product2 from kardex2
+        pickings.action_assign()
+
+        kardex1 = self.kardex
+        kardex2 = self.env.ref('stock_kardex.stock_kardex_demo_shuttle_2')
+
+        self.assertEqual(kardex1.number_of_ops, 4)
+        self.assertEqual(kardex2.number_of_ops, 2)
+        self.assertEqual(kardex1.number_of_ops_all, 6)
+        self.assertEqual(kardex2.number_of_ops_all, 6)
+
+        # Process a line, should change the numbers.
+        kardex1.select_next_move_line()
+        kardex1.process_current_pick()
+        self.assertEqual(kardex1.number_of_ops, 3)
+        self.assertEqual(kardex2.number_of_ops, 2)
+        self.assertEqual(kardex1.number_of_ops_all, 5)
+        self.assertEqual(kardex2.number_of_ops_all, 5)
+
+        # add stock and make the last one assigned to check the number is updated
+        self._update_quantity_in_cell(cell2, product2, 10)
+        unassigned.action_assign()
+        self.assertEqual(kardex1.number_of_ops, 3)
+        self.assertEqual(kardex2.number_of_ops, 3)
+        self.assertEqual(kardex1.number_of_ops_all, 6)
+        self.assertEqual(kardex2.number_of_ops_all, 6)
+
+    @unittest.skip('Not implemented')
+    def test_put_count_move_lines(self):
+        pass
+
+    @unittest.skip('Not implemented')
+    def test_inventory_count_move_lines(self):
+        pass
+
     def test_on_barcode_scanned(self):
         # test to implement when the code is implemented
         with self.assertRaises(exceptions.UserError):
@@ -87,6 +196,22 @@ def test_process_current_inventory(self):
         with self.assertRaises(exceptions.UserError):
             self.kardex.process_current_inventory()
 
-    # TODO count move lines (need to create a few in different shuttles)
-    # TODO test matrix
-    # TODO test related fields
+    def test_matrix(self):
+        self.kardex.switch_pick()
+        self.kardex.current_move_line_id = self.out_move_line
+        location = self.out_move_line.location_id
+        # offset by -1 because the fields are for humans
+        expected_x = location.posx - 1
+        expected_y = location.posy - 1
+        self.assertEqual(
+            self.kardex.kardex_tray_matrix,
+            {
+                'selected': [expected_x, expected_y],
+                # fmt: off
+                'cells': [
+                    [0, 0, 0, 0, 0, 0, 0, 0],
+                    [0, 0, 1, 0, 0, 0, 0, 0],
+                ]
+                # fmt: on
+            },
+        )

From ebf703a2643379eb0eede41daa763f3a7494eb03 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Fri, 21 Jun 2019 17:07:21 +0200
Subject: [PATCH 18/50] Add new fields on kardex view

---
 stock_kardex/__manifest__.py                  |  1 +
 stock_kardex/models/__init__.py               |  1 +
 stock_kardex/models/stock_kardex.py           | 57 +++++++++++++++++-
 stock_kardex/models/stock_quant.py            | 16 +++++
 stock_kardex/static/src/scss/kardex_view.scss |  5 ++
 stock_kardex/templates/kardex_screen.xml      | 17 ++++++
 stock_kardex/tests/test_kardex.py             | 21 ++++++-
 stock_kardex/views/stock_kardex_views.xml     | 60 ++++++++++++++-----
 8 files changed, 160 insertions(+), 18 deletions(-)
 create mode 100644 stock_kardex/models/stock_quant.py
 create mode 100644 stock_kardex/templates/kardex_screen.xml

diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
index 1fbe311dde48..9b670418c891 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_kardex/__manifest__.py
@@ -26,6 +26,7 @@
         'views/stock_kardex_views.xml',
         'views/stock_kardex_tray_type_views.xml',
         'views/stock_kardex_templates.xml',
+        'templates/kardex_screen.xml',
         'data/stock_location.xml',
         'data/stock_kardex_tray_type.xml',
         'security/ir.model.access.csv',
diff --git a/stock_kardex/models/__init__.py b/stock_kardex/models/__init__.py
index 14f97108c639..6a0668233699 100644
--- a/stock_kardex/models/__init__.py
+++ b/stock_kardex/models/__init__.py
@@ -2,3 +2,4 @@
 from . import stock_kardex_tray_type
 from . import stock_location
 from . import stock_move
+from . import stock_quant
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 78147477c32a..a1dafbb1e068 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -66,11 +66,20 @@ class StockKardex(models.Model):
         string='Y', compute='_compute_kardex_tray_matrix'
     )
     kardex_tray_matrix = Serialized(compute='_compute_kardex_tray_matrix')
+    kardex_tray_qty = fields.Float(
+        string='Stock Quantity', compute='_compute_kardex_tray_qty'
+    )
 
     # current operation information
     picking_id = fields.Many2one(
         related='current_move_line_id.picking_id', readonly=True
     )
+    picking_origin = fields.Char(
+        related='current_move_line_id.picking_id.origin', readonly=True
+    )
+    picking_partner_id = fields.Many2one(
+        related='current_move_line_id.picking_id.partner_id', readonly=True
+    )
     product_id = fields.Many2one(
         related='current_move_line_id.product_id', readonly=True
     )
@@ -80,6 +89,9 @@ class StockKardex(models.Model):
     product_uom_qty = fields.Float(
         related='current_move_line_id.product_uom_qty', readonly=True
     )
+    product_packagings = fields.Html(
+        string='Packaging', compute='_compute_product_packagings'
+    )
     qty_done = fields.Float(
         related='current_move_line_id.qty_done', readonly=True
     )
@@ -87,6 +99,8 @@ class StockKardex(models.Model):
         related='current_move_line_id.lot_id', readonly=True
     )
 
+    # TODO add a glue addon with product_expiry to add the field
+
     _barcode_scanned = fields.Char(
         "Barcode Scanned",
         help="Value of the last barcode scanned.",
@@ -96,6 +110,27 @@ class StockKardex(models.Model):
     def on_barcode_scanned(self, barcode):
         raise exceptions.UserError('Scanned barcode: {}'.format(barcode))
 
+    @api.depends('current_move_line_id.product_id.packaging_ids')
+    def _compute_product_packagings(self):
+        for record in self:
+            if not record.current_move_line_id:
+                continue
+            product = record.current_move_line_id.product_id
+            values = {
+                'packagings': [
+                    {
+                        'name': pkg.name,
+                        'qty': pkg.qty,
+                        'unit': product.uom_id.name,
+                    }
+                    for pkg in product.packaging_ids
+                ]
+            }
+            content = self.env['ir.qweb'].render(
+                'stock_kardex.packagings', values
+            )
+            record.product_packagings = content
+
     @api.depends()
     def _compute_number_of_ops(self):
         for record in self:
@@ -106,6 +141,22 @@ def _compute_number_of_ops_all(self):
         for record in self:
             record.number_of_ops_all = record.count_move_lines_to_do_all()
 
+    @api.depends('kardex_tray_location_id', 'current_move_line_id.product_id')
+    def _compute_kardex_tray_qty(self):
+        for record in self:
+            if not (
+                record.kardex_tray_location_id and record.current_move_line_id
+            ):
+                continue
+            product = record.current_move_line_id.product_id
+            quants = self.env['stock.quant'].search(
+                [
+                    ('location_id', '=', record.kardex_tray_location_id.id),
+                    ('product_id', '=', product.id),
+                ]
+            )
+            record.kardex_tray_qty = sum(quants.mapped('quantity'))
+
     @api.depends()
     def _compute_kardex_tray_matrix(self):
         for record in self:
@@ -123,8 +174,10 @@ def _compute_kardex_tray_matrix(self):
                 selected = location._kardex_cell_coords()
                 cells = location._tray_cells_matrix()
 
+            # this is the current cell
             record.kardex_tray_location_id = location.id
-            record.kardex_tray_name = location.barcode or location.name
+            # name of the tray where the cell is
+            record.kardex_tray_name = location.location_id.name
             record.kardex_tray_type_id = tray_type.id
             record.kardex_tray_type_code = tray_type.code
             record.kardex_tray_x = location.posx
@@ -179,7 +232,7 @@ def count_move_lines_to_do_all(self):
         )
 
     def button_release(self):
-        raise exceptions.UserError(_('what does this one do?'))
+        raise exceptions.UserError(_('Not implemented'))
 
     def process_current_pick(self):
         # test code, TODO the smart one
diff --git a/stock_kardex/models/stock_quant.py b/stock_kardex/models/stock_quant.py
new file mode 100644
index 000000000000..485bce326511
--- /dev/null
+++ b/stock_kardex/models/stock_quant.py
@@ -0,0 +1,16 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class StockQuant(models.Model):
+    _inherit = 'stock.quant'
+
+    def _update_available_quantity(self, *args, **kwargs):
+        result = super()._update_available_quantity(*args, **kwargs)
+        # We cannot have fields to depends on to invalidate this
+        # computed fields on stock.kardex. But we know that when the quantity
+        # of quant changes, we can invalidate the field on the kardex tray.
+        self.env['stock.kardex'].invalidate_cache(['kardex_tray_qty'])
+        return result
diff --git a/stock_kardex/static/src/scss/kardex_view.scss b/stock_kardex/static/src/scss/kardex_view.scss
index c99642ca5045..305c396628fe 100644
--- a/stock_kardex/static/src/scss/kardex_view.scss
+++ b/stock_kardex/static/src/scss/kardex_view.scss
@@ -91,6 +91,11 @@
                     width: 450px;
                 }
             }
+
+            .kardex_highlight {
+                padding: 6px;
+                border-radius: 10px;
+            }
         }
 
     }
diff --git a/stock_kardex/templates/kardex_screen.xml b/stock_kardex/templates/kardex_screen.xml
new file mode 100644
index 000000000000..636e44b78d89
--- /dev/null
+++ b/stock_kardex/templates/kardex_screen.xml
@@ -0,0 +1,17 @@
+<odoo>
+
+<template id="packagings">
+  <ul class="o_kardex_packaging list-unstyled">
+    <t t-foreach="packagings" t-as="packaging">
+      <li>
+        <span>1</span>
+        <span class="packaging_name" itemprop="name" t-esc="packaging['name']"/>
+        <span>: </span>
+        <span class="packaging_qty" itemprop="qty" t-esc="packaging['qty']"/>
+        <span class="packaging_unit" itemprop="unit" t-esc="packaging['unit']"/>
+      </li>
+    </t>
+  </ul>
+</template>
+
+</odoo>
diff --git a/stock_kardex/tests/test_kardex.py b/stock_kardex/tests/test_kardex.py
index a05b760de91d..c561a1cfc711 100644
--- a/stock_kardex/tests/test_kardex.py
+++ b/stock_kardex/tests/test_kardex.py
@@ -80,7 +80,11 @@ def test_pick_related_fields(self):
         # For pick, this is the source location, which is the cell where the
         # product is.
         self.assertEqual(self.kardex.kardex_tray_location_id, ml.location_id)
-        self.assertEqual(self.kardex.kardex_tray_name, ml.location_id.name)
+        self.assertEqual(
+            self.kardex.kardex_tray_name,
+            # parent = tray
+            ml.location_id.location_id.name,
+        )
         self.assertEqual(
             self.kardex.kardex_tray_type_id,
             # the tray type is on the parent of the cell (on the tray)
@@ -95,6 +99,10 @@ def test_pick_related_fields(self):
 
         # Move line related fields
         self.assertEqual(self.kardex.picking_id, ml.picking_id)
+        self.assertEqual(self.kardex.picking_origin, ml.picking_id.origin)
+        self.assertEqual(
+            self.kardex.picking_partner_id, ml.picking_id.partner_id
+        )
         self.assertEqual(self.kardex.product_id, ml.product_id)
         self.assertEqual(self.kardex.product_uom_id, ml.product_uom_id)
         self.assertEqual(self.kardex.product_uom_qty, ml.product_uom_qty)
@@ -215,3 +223,14 @@ def test_matrix(self):
                 # fmt: on
             },
         )
+
+    def test_kardex_tray_qty(self):
+        cell = self.env.ref(
+            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+        )
+        self.out_move_line.location_id = cell
+        self.kardex.current_move_line_id = self.out_move_line
+        self._update_quantity_in_cell(cell, self.out_move_line.product_id, 50)
+        self.assertEqual(self.kardex.kardex_tray_qty, 50)
+        self._update_quantity_in_cell(cell, self.out_move_line.product_id, -20)
+        self.assertEqual(self.kardex.kardex_tray_qty, 30)
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index caf5991e9838..b855e3678214 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -10,6 +10,7 @@
         <!-- <field name="product_id" invisible="1"/> -->
         <div class="o_kardex_header">
           <div class="o_kardex_header_left o_kardex_header_content">
+            <field name="name" readonly="1"/>
           </div>
           <div class="o_kardex_header_center o_kardex_header_content">
             <label for="mode"/>
@@ -53,17 +54,38 @@
           <!-- on the left of the screen -->
           <div class="o_kardex_data_content o_kardex_move">
             <div>
-              <field name="current_move_line_id" invisible="1"/>
-              <label for="product_id"/>
-              <field name="product_id" readonly="1" options="{'no_open': True}"/>
-              <field name="qty_done" readonly="1" force_save="1"/> / 
-              <field name="product_uom_qty" readonly="1"/>
-              <label for="product_uom_id" string=" "/>
-              <field name="product_uom_id" options="{'no_open': True}" class="oe_inline"/>
-            </div>
-            <div>
-              <label for="lot_id"/>
-              <field name="lot_id"/>
+              <group>
+                <field name="current_move_line_id" invisible="1"/>
+                <label for="picking_id"/>
+                <div>
+                  <div>
+                    <field name="picking_id" options="{'no_open': True}" class="mr8"/>
+                    <span>/</span>
+                    <field name="picking_origin" class="oe_inline ml8"/>
+                  </div>
+                </div>
+                <label for="picking_partner_id"/>
+                <div>
+                  <field name="picking_partner_id" options="{'no_open': True}"/>
+                </div>
+                <label for="product_id"/>
+                <div colspan="2" class="oe_title">
+                  <h1>
+                    <field name="product_id" options="{'no_open': True}"/>
+                  </h1>
+                </div>
+                <div colspan="2">
+                  <field name="product_packagings"/>
+                </div>
+                <field name="lot_id"/>
+                <label for="product_uom_qty" string="Quantity" class="ml32"/>
+                <div colspan="2" class="ml32">
+                  <h1 class="bg-primary kardex_highlight">
+                    <field name="product_uom_qty" class="oe_inline text-white"/>
+                    <field name="product_uom_id" options="{'no_open': True}" class="oe_inline ml8 text-white"/>
+                  </h1>
+                </div>
+              </group>
             </div>
           </div>
           <!-- on the right of the screen -->
@@ -73,11 +95,19 @@
               <field name="kardex_tray_type_code"/>
               <field name="kardex_tray_y"/>
               <field name="kardex_tray_x"/>
+              <label for="kardex_tray_qty"/>
+              <div colspan="2" class="oe_title">
+                <h1>
+                  <field name="kardex_tray_qty"/>
+                </h1>
+              </div>
+            </group>
+            <group>
+              <div>
+                <field name="kardex_tray_matrix"
+                      widget="kardex_tray_matrix"/>
+              </div>
             </group>
-            <div>
-              <field name="kardex_tray_matrix"
-                     widget="kardex_tray_matrix"/>
-            </div>
           </div>
         </div>
         <field name="_barcode_scanned" widget="barcode_handler"/>

From 4cc84b4403a2080f77b93abc3a334994258a095a Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Mon, 24 Jun 2019 09:14:46 +0200
Subject: [PATCH 19/50] Fix operation alignment

---
 stock_kardex/models/stock_kardex.py           | 2 ++
 stock_kardex/static/src/scss/kardex_view.scss | 1 +
 2 files changed, 3 insertions(+)

diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index a1dafbb1e068..8467d545e11a 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -196,6 +196,8 @@ def _domain_move_lines_to_do(self):
         ]
         domain_extensions = {
             'pick': [('location_id', 'child_of', self.location_id.id)],
+            # TODO ensure that we cannot have the same ml in 2 kardex (cannot
+            # happen with 'pick' as they are in the kardex' location)
             'put': [('location_dest_id', 'child_of', self.location_id.id)],
             # TODO
             'inventory': [('id', '=', 0)],
diff --git a/stock_kardex/static/src/scss/kardex_view.scss b/stock_kardex/static/src/scss/kardex_view.scss
index 305c396628fe..76b39cc37c98 100644
--- a/stock_kardex/static/src/scss/kardex_view.scss
+++ b/stock_kardex/static/src/scss/kardex_view.scss
@@ -50,6 +50,7 @@
         }
 
         .o_kardex_operation {
+            text-align: center;
             font-size: 2.5em;
             padding: 0.5em;
             color: #ffffff;

From 837129e5182abf0b5264ea9259efd97dcd6df758 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Mon, 24 Jun 2019 10:04:58 +0200
Subject: [PATCH 20/50] Add a wizard to enter a barcode manually

---
 stock_kardex/__manifest__.py                  |  1 +
 stock_kardex/models/stock_kardex.py           | 27 ++++++++++++++++++-
 stock_kardex/static/src/scss/kardex_view.scss | 13 +++++++++
 stock_kardex/views/stock_kardex_views.xml     | 25 +++++++++++++++++
 4 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/stock_kardex/__manifest__.py b/stock_kardex/__manifest__.py
index 9b670418c891..1a44afa93e5d 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_kardex/__manifest__.py
@@ -12,6 +12,7 @@
         'stock',
         'barcodes',
         'base_sparse_field',
+        'web_notify',
     ],
     'website': 'https://www.camptocamp.com',
     'demo': [
diff --git a/stock_kardex/models/stock_kardex.py b/stock_kardex/models/stock_kardex.py
index 8467d545e11a..33b857a95198 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_kardex/models/stock_kardex.py
@@ -108,7 +108,7 @@ class StockKardex(models.Model):
     )
 
     def on_barcode_scanned(self, barcode):
-        raise exceptions.UserError('Scanned barcode: {}'.format(barcode))
+        self.env.user.notify_info('Scanned barcode: {}'.format(barcode))
 
     @api.depends('current_move_line_id.product_id.packaging_ids')
     def _compute_product_packagings(self):
@@ -304,6 +304,15 @@ def action_menu(self):
             'res_id': self.id,
         }
 
+    def action_manual_barcode(self):
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'stock.kardex.manual.barcode',
+            'view_mode': 'form',
+            'name': _('Barcode'),
+            'target': 'new',
+        }
+
     # TODO: should the mode be changed on all the kardex at the same time?
     def switch_pick(self):
         self.mode = 'pick'
@@ -316,3 +325,19 @@ def switch_put(self):
     def switch_inventory(self):
         self.mode = 'inventory'
         self.select_next_move_line()
+
+
+class StockKardexManualBarcode(models.TransientModel):
+    _name = 'stock.kardex.manual.barcode'
+    _description = 'Action to input a barcode'
+
+    barcode = fields.Char(string="Barcode")
+
+    @api.multi
+    def button_save(self):
+        kardex_id = self.env.context.get('active_id')
+        kardex = self.env['stock.kardex'].browse(kardex_id).exists()
+        if not kardex:
+            return
+        if self.barcode:
+            kardex.on_barcode_scanned(self.barcode)
diff --git a/stock_kardex/static/src/scss/kardex_view.scss b/stock_kardex/static/src/scss/kardex_view.scss
index 76b39cc37c98..17f812ae0473 100644
--- a/stock_kardex/static/src/scss/kardex_view.scss
+++ b/stock_kardex/static/src/scss/kardex_view.scss
@@ -113,4 +113,17 @@
             text-align: center;
         }
     }
+
+    .o_kardex_manual_barcode {
+        .o_field_char {
+            padding: 1em;
+            font-size: 2em;
+        }
+
+        .btn {
+            padding: 1em;
+            font-size: 2em;
+            text-transform: uppercase;
+        }
+    }
 }
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index b855e3678214..1103422d2286 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -28,6 +28,10 @@
                     class="btn-secondary o_kardex_icon_btn"
                     string="" icon="fa-bars"
                     aria-label="Dropdown menu" title="Dropdown menu"/>
+            <button name="action_manual_barcode" type="object"
+                    class="btn-secondary o_kardex_icon_btn"
+                    string="" icon="fa-terminal"
+                    aria-label="Barcode Input" title="Barcode Input"/>
           </div>
           <div class="o_kardex_content o_kardex_content_right">
             <div>
@@ -146,6 +150,27 @@
     </field>
   </record>
 
+  <record id="stock_kardex_manual_barcode_form" model="ir.ui.view">
+    <field name="name">stock.kardex.manual.barcode.view.form</field>
+    <field name="model">stock.kardex.manual.barcode</field>
+    <field name="arch" type="xml">
+      <form string="Kardex">
+        <div class="row o_kardex_manual_barcode">
+          <div class="col-8">
+            <field name="barcode"/>
+          </div>
+          <div class="col-2">
+            <button name="button_save"
+                    string="Confirm"
+                    type="object"
+                    class="btn-primary"/>
+          </div>
+        </div>
+        <footer></footer>
+      </form>
+    </field>
+  </record>
+
   <record id="stock_kardex_view_form" model="ir.ui.view">
     <field name="name">stock.kardex.view.form</field>
     <field name="model">stock.kardex</field>

From 2c151ae7637facb92f4c0bde57609a70e7afcc05 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 26 Jun 2019 11:26:48 +0200
Subject: [PATCH 21/50] Add onclick handler on tray matrix widget

Allow to specify an action, example on the location view: open the location
with the clicked coordinates.
---
 stock_kardex/models/stock_location.py       | 29 +++++++++
 stock_kardex/static/src/js/kardex.js        | 72 ++++++++++++++++++++-
 stock_kardex/views/stock_kardex_views.xml   |  3 +-
 stock_kardex/views/stock_location_views.xml |  3 +-
 4 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/stock_kardex/models/stock_location.py b/stock_kardex/models/stock_location.py
index 23938d3a6372..fcfbc72e0813 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_kardex/models/stock_location.py
@@ -73,6 +73,35 @@ def _compute_tray_matrix(self):
                 'cells': location._tray_cells_matrix(),
             }
 
+    @api.multi
+    def action_tray_matrix_click(self, coordX, coordY):
+        self.ensure_one()
+        if self.kardex_kind == 'cell':
+            tray = self.location_id
+        else:
+            tray = self
+        location = self.search(
+            [
+                ('id', 'child_of', tray.ids),
+                # we receive positions counting from 0 but they are stored
+                # in the "human" format starting from 1
+                ('posx', '=', coordX + 1),
+                ('posy', '=', coordY + 1),
+            ]
+        )
+        view = self.env.ref('stock.view_location_form')
+        action = self.env.ref('stock.action_location_form').read()[0]
+        action.update(
+            {
+                'res_id': location.id,
+                'view_mode': 'form',
+                'view_type': 'form',
+                'view_id': view.id,
+                'views': [(view.id, 'form')],
+            }
+        )
+        return action
+
     @api.model_create_multi
     def create(self, vals_list):
         records = super().create(vals_list)
diff --git a/stock_kardex/static/src/js/kardex.js b/stock_kardex/static/src/js/kardex.js
index c314fe7870eb..83ba2bf385fa 100644
--- a/stock_kardex/static/src/js/kardex.js
+++ b/stock_kardex/static/src/js/kardex.js
@@ -19,8 +19,8 @@ KanbanRecord.include({
                 method: 'action_open_screen',
                 model: self.modelName,
                 args: [self.id],
-            }).then(function (result) {
-                self.do_action(result);
+            }).then(function (action) {
+                self.trigger_up('do_action', {action: action});
             });
         } else {
             this._super.apply(this, arguments);
@@ -48,10 +48,27 @@ var ExitButton = FieldInteger.extend({
     },
 });
 
+/**
+* Shows a canvas with the Tray's cells
+*
+* An action can be configured which is called when a cell is clicked.
+* The action must be an action.multi, it will receive the x and y positions
+* of the cell clicked (starting from 0). The action must be configured in
+* the options of the field and be on the same model:
+*
+* <field name="tray_matrix"
+*        widget="kardex_tray_matrix"
+*        options="{'click_action': 'action_tray_matrix_click'}"
+*        />
+*
+*/
 var KardexTrayMatrixField = DebouncedField.extend({
     className: 'o_field_kardex_tray_matrix',
     tagName: 'canvas',
     supportedFieldTypes: ['serialized'],
+    events: {
+        'click': '_onClick',
+    },
 
     cellColorEmpty: '#ffffff',
     cellColorNotEmpty: '#4e6bfd',
@@ -60,6 +77,12 @@ var KardexTrayMatrixField = DebouncedField.extend({
     globalAlpha: 0.8,
     cellPadding: 2,
 
+    init: function (parent, name, record, options) {
+        this._super.apply(this, arguments);
+        this.nodeOptions = _.defaults(this.nodeOptions, {});
+        this.clickAction = 'clickAction' in (options || {}) ? options.clickAction : this.nodeOptions.click_action;
+    },
+
     isSet: function () {
         if (Object.keys(this.value).length === 0) {
             return false;
@@ -78,6 +101,9 @@ var KardexTrayMatrixField = DebouncedField.extend({
 
         var self = this;
         return this._super.apply(this, arguments).then(function () {
+            if (self.clickAction) {
+                self.$el.css('cursor', 'pointer');
+            }
             // _super calls _render(), but the function
             // resizeCanvasToDisplaySize would resize the canvas
             // to 0 because the actual canvas would still be unknown.
@@ -88,6 +114,48 @@ var KardexTrayMatrixField = DebouncedField.extend({
         });
     },
 
+    _onClick: function (ev) {
+        if (!this.isSet()) {
+            return;
+        }
+        if (!this.clickAction) {
+            return;
+        }
+        var width = this.canvas.width,
+            height = this.canvas.height,
+            rect = this.canvas.getBoundingClientRect();
+
+        var clickX = ev.clientX - rect.left,
+            clickY = ev.clientY - rect.top;
+
+        var cells = this.value.cells,
+            cols = cells[0].length,
+            rows = cells.length;
+
+        // we remove 1 to start counting from 0
+        var coordX = Math.ceil(clickX * cols / width) - 1,
+            coordY = Math.ceil(clickY * rows / height) - 1;
+        // if we click on the last pixel on the bottom or the right
+        // we would get an offset index
+        if (coordX >= cols) { coordX = cols - 1; }
+        if (coordY >= rows) { coordY = rows - 1; }
+
+        // the coordinate we get when we click is from top,
+        // but we are looking for the coordinate from the bottom
+        // to match the user's expectations, invert Y
+        coordY = Math.abs(coordY - rows + 1);
+
+        var self = this;
+        this._rpc({
+            model: this.model,
+            method: this.clickAction,
+            args: [[this.res_id], coordX, coordY]
+        })
+        .then(function (action) {
+            self.trigger_up('do_action', {action: action});
+        });
+    },
+
     /**
      * Debounce the rendering on resize.
      * It is useless to render on each resize event.
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_kardex/views/stock_kardex_views.xml
index 1103422d2286..4afc46986fd7 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_kardex/views/stock_kardex_views.xml
@@ -109,7 +109,8 @@
             <group>
               <div>
                 <field name="kardex_tray_matrix"
-                      widget="kardex_tray_matrix"/>
+                       widget="kardex_tray_matrix"
+                       />
               </div>
             </group>
           </div>
diff --git a/stock_kardex/views/stock_location_views.xml b/stock_kardex/views/stock_location_views.xml
index 5c8f4d903c60..01ba13039fbc 100644
--- a/stock_kardex/views/stock_location_views.xml
+++ b/stock_kardex/views/stock_location_views.xml
@@ -8,7 +8,7 @@
     <field name="arch" type="xml">
       <field name="return_location" position="after">
         <field name="kardex_location"
-               attrs="{'invisible': [('kardex_kind', '!=', False)]}"
+               attrs="{'invisible': [('kardex_kind', '!=', False), ('kardex_kind', '!=', 'view')]}"
                />
       </field>
       <group name="localization" position="after">
@@ -20,6 +20,7 @@
           <field name="tray_matrix"
                  widget="kardex_tray_matrix"
                  attrs="{'invisible': [('kardex_kind', 'not in', ('tray', 'cell'))]}"
+                 options="{'click_action': 'action_tray_matrix_click'}"
                  />
         </group>
       </group>

From 2e99fff560dde45fd2ecf47c05d3c22f2772a1b3 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 26 Jun 2019 13:33:23 +0200
Subject: [PATCH 22/50] Rename to stock_vertical_lift

Preparing the module to be a generic core for supporting Vertical Lifts
/ Carousels. The Kardex one willbe a submodule.
---
 stock_kardex/demo/stock_inventory_demo.xml    |  20 --
 stock_kardex/demo/stock_location_demo.xml     | 102 -----------
 stock_kardex/security/ir.model.access.csv     |   5 -
 stock_kardex/tests/__init__.py                |   3 -
 stock_kardex/views/stock_kardex_templates.xml |  11 --
 stock_kardex/views/stock_location_views.xml   |  50 -----
 .../__init__.py                               |   0
 .../__manifest__.py                           |  18 +-
 .../data/stock_location.xml                   |  12 +-
 .../data/vertical_lift_tray_type.xml          |  20 +-
 .../demo/product_demo.xml                     |   0
 .../demo/stock_inventory_demo.xml             |  20 ++
 .../demo/stock_location_demo.xml              | 102 +++++++++++
 .../demo/stock_picking_demo.xml               |  12 +-
 .../demo/vertical_lift_shuttle_demo.xml       |  12 +-
 .../models/__init__.py                        |   4 +-
 .../models/stock_location.py                  | 101 +++++-----
 .../models/stock_move.py                      |  14 +-
 .../models/stock_quant.py                     |   8 +-
 .../models/vertical_lift_shuttle.py           | 118 ++++++------
 .../models/vertical_lift_tray_type.py         |  17 +-
 .../security/ir.model.access.csv              |   5 +
 .../static/src/js/vertical_lift.js            |  23 ++-
 .../static/src/scss/vertical_lift.scss        |  44 ++---
 stock_vertical_lift/tests/__init__.py         |   3 +
 .../tests/common.py                           |  18 +-
 .../tests/test_location.py                    |  87 +++++----
 .../tests/test_vertical_lift_shuttle.py       | 172 +++++++++---------
 .../tests/test_vertical_lift_tray_type.py     |  16 +-
 .../views/shuttle_screen_templates.xml        |   2 +-
 .../views/stock_location_views.xml            |  50 +++++
 .../views/stock_vertical_lift_templates.xml   |  11 ++
 .../views/vertical_lift_shuttle_views.xml     | 112 ++++++------
 .../views/vertical_lift_tray_type_views.xml   |  42 ++---
 34 files changed, 623 insertions(+), 611 deletions(-)
 delete mode 100644 stock_kardex/demo/stock_inventory_demo.xml
 delete mode 100644 stock_kardex/demo/stock_location_demo.xml
 delete mode 100644 stock_kardex/security/ir.model.access.csv
 delete mode 100644 stock_kardex/tests/__init__.py
 delete mode 100644 stock_kardex/views/stock_kardex_templates.xml
 delete mode 100644 stock_kardex/views/stock_location_views.xml
 rename {stock_kardex => stock_vertical_lift}/__init__.py (100%)
 rename {stock_kardex => stock_vertical_lift}/__manifest__.py (62%)
 rename {stock_kardex => stock_vertical_lift}/data/stock_location.xml (52%)
 rename stock_kardex/data/stock_kardex_tray_type.xml => stock_vertical_lift/data/vertical_lift_tray_type.xml (66%)
 rename {stock_kardex => stock_vertical_lift}/demo/product_demo.xml (100%)
 create mode 100644 stock_vertical_lift/demo/stock_inventory_demo.xml
 create mode 100644 stock_vertical_lift/demo/stock_location_demo.xml
 rename {stock_kardex => stock_vertical_lift}/demo/stock_picking_demo.xml (71%)
 rename stock_kardex/demo/stock_kardex_demo.xml => stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml (54%)
 rename {stock_kardex => stock_vertical_lift}/models/__init__.py (51%)
 rename {stock_kardex => stock_vertical_lift}/models/stock_location.py (69%)
 rename {stock_kardex => stock_vertical_lift}/models/stock_move.py (58%)
 rename {stock_kardex => stock_vertical_lift}/models/stock_quant.py (65%)
 rename stock_kardex/models/stock_kardex.py => stock_vertical_lift/models/vertical_lift_shuttle.py (73%)
 rename stock_kardex/models/stock_kardex_tray_type.py => stock_vertical_lift/models/vertical_lift_tray_type.py (84%)
 create mode 100644 stock_vertical_lift/security/ir.model.access.csv
 rename stock_kardex/static/src/js/kardex.js => stock_vertical_lift/static/src/js/vertical_lift.js (93%)
 rename stock_kardex/static/src/scss/kardex_view.scss => stock_vertical_lift/static/src/scss/vertical_lift.scss (72%)
 create mode 100644 stock_vertical_lift/tests/__init__.py
 rename {stock_kardex => stock_vertical_lift}/tests/common.py (79%)
 rename stock_kardex/tests/test_kardex_location.py => stock_vertical_lift/tests/test_location.py (67%)
 rename stock_kardex/tests/test_kardex.py => stock_vertical_lift/tests/test_vertical_lift_shuttle.py (51%)
 rename stock_kardex/tests/test_kardex_tray_type.py => stock_vertical_lift/tests/test_vertical_lift_tray_type.py (84%)
 rename stock_kardex/templates/kardex_screen.xml => stock_vertical_lift/views/shuttle_screen_templates.xml (89%)
 create mode 100644 stock_vertical_lift/views/stock_location_views.xml
 create mode 100644 stock_vertical_lift/views/stock_vertical_lift_templates.xml
 rename stock_kardex/views/stock_kardex_views.xml => stock_vertical_lift/views/vertical_lift_shuttle_views.xml (70%)
 rename stock_kardex/views/stock_kardex_tray_type_views.xml => stock_vertical_lift/views/vertical_lift_tray_type_views.xml (60%)

diff --git a/stock_kardex/demo/stock_inventory_demo.xml b/stock_kardex/demo/stock_inventory_demo.xml
deleted file mode 100644
index 4de41d398a04..000000000000
--- a/stock_kardex/demo/stock_inventory_demo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="1">
-
-  <record id="stock_inventory_kardex_0" model="stock.inventory">
-    <field name="name">Starting Kardex Inventory</field>
-  </record>
-
-  <record id="stock_inventory_kardex_line_1" model="stock.inventory.line">
-    <field name="product_id" ref="product_running_socks"/>
-    <field name="product_uom_id" ref="uom.product_uom_unit"/>
-    <field name="inventory_id" ref="stock_inventory_kardex_0"/>
-    <field name="product_qty">30.0</field>
-    <field name="location_id" ref="stock_location_kardex_demo_tray_1b_x3y2"/>
-  </record>
-
-  <function model="stock.inventory" name="action_validate">
-    <function eval="[[('state','=','draft'),('id', '=', ref('stock_kardex.stock_inventory_kardex_0'))]]" model="stock.inventory" name="search"/>
-  </function>
-
-</odoo>
diff --git a/stock_kardex/demo/stock_location_demo.xml b/stock_kardex/demo/stock_location_demo.xml
deleted file mode 100644
index 7b24f64f0786..000000000000
--- a/stock_kardex/demo/stock_location_demo.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="1">
-
-  <record id="stock_location_kardex_demo_shuttle_1" model="stock.location">
-    <field name="name">Shuttle 1</field>
-    <field name="location_id" ref="stock_location_kardex"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_1a" model="stock.location">
-    <field name="name">Tray 1A</field>
-    <field name="barcode">T1A</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_small_8x"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_1b" model="stock.location">
-    <field name="name">Tray 1B</field>
-    <field name="barcode">T1B</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_16x"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_1c" model="stock.location">
-    <field name="name">Tray 1C</field>
-    <field name="barcode">T1C</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_32x"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_shuttle_2" model="stock.location">
-    <field name="name">Shuttle 2</field>
-    <field name="location_id" ref="stock_location_kardex"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_2a" model="stock.location">
-    <field name="name">Tray 2A</field>
-    <field name="barcode">T2A</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_8x"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_2b" model="stock.location">
-    <field name="name">Tray 2B</field>
-    <field name="barcode">T2B</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_4x"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_2c" model="stock.location">
-    <field name="name">Tray 2C</field>
-    <field name="barcode">T2C</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_16x_2"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_2d" model="stock.location">
-    <field name="name">Tray 2D</field>
-    <field name="barcode">T2D</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_small_8x"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_shuttle_3" model="stock.location">
-    <field name="name">Shuttle 3</field>
-    <field name="location_id" ref="stock_location_kardex"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_3a" model="stock.location">
-    <field name="name">Tray 3A</field>
-    <field name="barcode">T3A</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_3"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_small_32x"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <record id="stock_location_kardex_demo_tray_3b" model="stock.location">
-    <field name="name">Tray 3B</field>
-    <field name="barcode">T3B</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_3"/>
-    <field name="kardex_tray_type_id" ref="kardex_tray_type_large_32x"/>
-    <field name="usage">internal</field>
-  </record>
-
-  <!-- When the trays are created, they will create their 'cell' locations.
-       This method will add xmlids on them to be able to reference them in
-       other demo data and tests.
-  -->
-  <function model="stock.location" name="_create_tray_xmlids">
-    <function eval="[[('kardex_kind', '=', 'cell')]]" model="stock.location" name="search"/>
-  </function>
-
-</odoo>
diff --git a/stock_kardex/security/ir.model.access.csv b/stock_kardex/security/ir.model.access.csv
deleted file mode 100644
index 32b082c9579b..000000000000
--- a/stock_kardex/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_kardex_stock_user,access_stock_kardex stock user,model_stock_kardex,stock.group_stock_user,1,0,0,0
-access_stock_kardex_manager,access_stock_kardex stock manager,model_stock_kardex,stock.group_stock_manager,1,1,1,1
-access_stock_kardex_tray_type_stock_user,access_stock_kardex_tray_type stock user,model_stock_kardex_tray_type,stock.group_stock_user,1,0,0,0
-access_stock_kardex_tray_type_manager,access_stock_kardex_tray_type stock manager,model_stock_kardex_tray_type,stock.group_stock_manager,1,1,1,1
diff --git a/stock_kardex/tests/__init__.py b/stock_kardex/tests/__init__.py
deleted file mode 100644
index 1907d4cb7b32..000000000000
--- a/stock_kardex/tests/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from . import test_kardex_location
-from . import test_kardex_tray_type
-from . import test_kardex
diff --git a/stock_kardex/views/stock_kardex_templates.xml b/stock_kardex/views/stock_kardex_templates.xml
deleted file mode 100644
index 340339fdef03..000000000000
--- a/stock_kardex/views/stock_kardex_templates.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-  <template id="stock_move_line_kardex_view_form_css" name="kardex.view.form.css" inherit_id="web.assets_backend">
-    <xpath expr="." position="inside">
-      <link rel="stylesheet" type="text/scss" href="/stock_kardex/static/src/scss/kardex_view.scss"/>
-      <script type="text/javascript" src="/stock_kardex/static/src/js/kardex.js"></script>
-    </xpath>
-  </template>
-
-</odoo>
diff --git a/stock_kardex/views/stock_location_views.xml b/stock_kardex/views/stock_location_views.xml
deleted file mode 100644
index 01ba13039fbc..000000000000
--- a/stock_kardex/views/stock_location_views.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-  <record id="view_location_form_kardex" model="ir.ui.view">
-    <field name="name">stock.location.form.kardex</field>
-    <field name="model">stock.location</field>
-    <field name="inherit_id" ref="stock.view_location_form"/>
-    <field name="arch" type="xml">
-      <field name="return_location" position="after">
-        <field name="kardex_location"
-               attrs="{'invisible': [('kardex_kind', '!=', False), ('kardex_kind', '!=', 'view')]}"
-               />
-      </field>
-      <group name="localization" position="after">
-        <group string="Kardex" name="kardex"
-               attrs="{'invisible': [('kardex_kind', 'not in', ('shuttle', 'tray', 'cell'))]}">
-          <field name="kardex_kind"/>
-          <field name="kardex_tray_type_id"
-                 attrs="{'invisible': [('kardex_kind', '!=', 'tray')], 'required': [('kardex_kind', '=', 'tray')]}"/>
-          <field name="tray_matrix"
-                 widget="kardex_tray_matrix"
-                 attrs="{'invisible': [('kardex_kind', 'not in', ('tray', 'cell'))]}"
-                 options="{'click_action': 'action_tray_matrix_click'}"
-                 />
-        </group>
-      </group>
-
-      <field name="posx" position="attributes">
-        <attribute name="attrs">{'readonly': [('kardex_kind', '=', 'cell')]}</attribute>
-      </field>
-      <field name="posy" position="attributes">
-        <attribute name="attrs">{'readonly': [('kardex_kind', '=', 'cell')]}</attribute>
-      </field>
-    </field>
-  </record>
-
-  <record id="view_location_search_kardex" model="ir.ui.view">
-    <field name="name">stock.location.search.kardex</field>
-    <field name="model">stock.location</field>
-    <field name="inherit_id" ref="stock.view_location_search"/>
-    <field name="arch" type="xml">
-      <field name="location_id" position="after">
-        <separator/>
-        <field name="kardex_kind"/>
-        <field name="kardex_tray_type_id"/>
-      </field>
-    </field>
-  </record>
-
-</odoo>
diff --git a/stock_kardex/__init__.py b/stock_vertical_lift/__init__.py
similarity index 100%
rename from stock_kardex/__init__.py
rename to stock_vertical_lift/__init__.py
diff --git a/stock_kardex/__manifest__.py b/stock_vertical_lift/__manifest__.py
similarity index 62%
rename from stock_kardex/__manifest__.py
rename to stock_vertical_lift/__manifest__.py
index 1a44afa93e5d..c43fbf678095 100644
--- a/stock_kardex/__manifest__.py
+++ b/stock_vertical_lift/__manifest__.py
@@ -2,8 +2,8 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
-    'name': 'Kardex',
-    'summary': 'Provides interaction and GUI for Kardex',
+    'name': 'Vertical Lift',
+    'summary': 'Provides the core for integration with Vertical Lifts',
     'version': '12.0.1.0.0',
     'category': 'Stock',
     'author': 'Camptocamp',
@@ -12,24 +12,24 @@
         'stock',
         'barcodes',
         'base_sparse_field',
-        'web_notify',
+        'web_notify',  # OCA/web
     ],
     'website': 'https://www.camptocamp.com',
     'demo': [
         'demo/stock_location_demo.xml',
-        'demo/stock_kardex_demo.xml',
+        'demo/vertical_lift_shuttle_demo.xml',
         'demo/product_demo.xml',
         'demo/stock_inventory_demo.xml',
         'demo/stock_picking_demo.xml',
     ],
     'data': [
         'views/stock_location_views.xml',
-        'views/stock_kardex_views.xml',
-        'views/stock_kardex_tray_type_views.xml',
-        'views/stock_kardex_templates.xml',
-        'templates/kardex_screen.xml',
+        'views/vertical_lift_shuttle_views.xml',
+        'views/vertical_lift_tray_type_views.xml',
+        'views/stock_vertical_lift_templates.xml',
+        'views/shuttle_screen_templates.xml',
         'data/stock_location.xml',
-        'data/stock_kardex_tray_type.xml',
+        'data/vertical_lift_tray_type.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
diff --git a/stock_kardex/data/stock_location.xml b/stock_vertical_lift/data/stock_location.xml
similarity index 52%
rename from stock_kardex/data/stock_location.xml
rename to stock_vertical_lift/data/stock_location.xml
index c6fc59df3e12..462e1d6a1679 100644
--- a/stock_kardex/data/stock_location.xml
+++ b/stock_vertical_lift/data/stock_location.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
-  <record id="stock_location_kardex" model="stock.location">
-    <field name="name">Kardex View</field>
+  <record id="stock_location_vertical_lift" model="stock.location">
+    <field name="name">Vertical Lift</field>
     <!-- Beware, must not be view, even if we should have stock here.
-         Because stock moves targetting views are not included in the
-         inventory at date, and we want to be able to use "Kardex View"
-         as destination (the final destination will be a "cell" in a kardex).
+         Because stock moves targeting views are not included in the
+         inventory at date, and we want to be able to use "Vertical Lift View"
+         as destination (the final destination will be a "cell" in a Shuttle).
     -->
     <field name="location_id" ref="stock.stock_location_stock"/>
     <field name="usage">internal</field>
-    <field name="kardex_location" eval="True"/>
+    <field name="vertical_lift_location" eval="True"/>
     <field name="company_id"></field>
   </record>
 
diff --git a/stock_kardex/data/stock_kardex_tray_type.xml b/stock_vertical_lift/data/vertical_lift_tray_type.xml
similarity index 66%
rename from stock_kardex/data/stock_kardex_tray_type.xml
rename to stock_vertical_lift/data/vertical_lift_tray_type.xml
index 323a9cbffb96..419594d8a5b6 100644
--- a/stock_kardex/data/stock_kardex_tray_type.xml
+++ b/stock_vertical_lift/data/vertical_lift_tray_type.xml
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_32x">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_32x">
     <field name="name">Small 32x</field>
     <field name="code">B10804</field>
     <field name="rows">4</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_16x">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_16x">
     <field name="name">Small 16x</field>
     <field name="code">B20802</field>
     <field name="rows">2</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_8x">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_8x">
     <field name="name">Small 8x</field>
     <field name="code">B20402</field>
     <field name="rows">2</field>
     <field name="cols">4</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_16x_2">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_16x_2">
     <field name="name">Small 16x</field>
     <field name="code">B40802</field>
     <field name="rows">2</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_small_16x_3">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_16x_3">
     <field name="name">Small 16x</field>
     <field name="code">B30404</field>
     <field name="rows">4</field>
     <field name="cols">4</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_32x">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_32x">
     <field name="name">Large 32x</field>
     <field name="code">B20804</field>
     <field name="rows">4</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_16x">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_16x">
     <field name="name">Large 16x</field>
     <field name="code">B30802</field>
     <field name="rows">2</field>
     <field name="cols">8</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_8x">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_8x">
     <field name="name">Large 8x</field>
     <field name="code">B30402</field>
     <field name="rows">2</field>
     <field name="cols">4</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_4x">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_4x">
     <field name="name">Large 4x</field>
     <field name="code">B30401</field>
     <field name="rows">1</field>
     <field name="cols">4</field>
   </record>
 
-  <record model="stock.kardex.tray.type" id="kardex_tray_type_large_16x_2">
+  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_16x_2">
     <field name="name">Large 16x</field>
     <field name="code">B30404</field>
     <field name="rows">4</field>
diff --git a/stock_kardex/demo/product_demo.xml b/stock_vertical_lift/demo/product_demo.xml
similarity index 100%
rename from stock_kardex/demo/product_demo.xml
rename to stock_vertical_lift/demo/product_demo.xml
diff --git a/stock_vertical_lift/demo/stock_inventory_demo.xml b/stock_vertical_lift/demo/stock_inventory_demo.xml
new file mode 100644
index 000000000000..4b17fcdcd6ec
--- /dev/null
+++ b/stock_vertical_lift/demo/stock_inventory_demo.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+  <record id="stock_inventory_vertical_lift_0" model="stock.inventory">
+    <field name="name">Starting Vertical Lift Inventory</field>
+  </record>
+
+  <record id="stock_inventory_vertical_lift_line_1" model="stock.inventory.line">
+    <field name="product_id" ref="product_running_socks"/>
+    <field name="product_uom_id" ref="uom.product_uom_unit"/>
+    <field name="inventory_id" ref="stock_inventory_vertical_lift_0"/>
+    <field name="product_qty">30.0</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_tray_1b_x3y2"/>
+  </record>
+
+  <function model="stock.inventory" name="action_validate">
+    <function eval="[[('state','=','draft'),('id', '=', ref('stock_vertical_lift.stock_inventory_vertical_lift_0'))]]" model="stock.inventory" name="search"/>
+  </function>
+
+</odoo>
diff --git a/stock_vertical_lift/demo/stock_location_demo.xml b/stock_vertical_lift/demo/stock_location_demo.xml
new file mode 100644
index 000000000000..bb87661e8c20
--- /dev/null
+++ b/stock_vertical_lift/demo/stock_location_demo.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+  <record id="stock_location_vertical_lift_demo_shuttle_1" model="stock.location">
+    <field name="name">Shuttle 1</field>
+    <field name="location_id" ref="stock_location_vertical_lift"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_1a" model="stock.location">
+    <field name="name">Tray 1A</field>
+    <field name="barcode">T1A</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_small_8x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_1b" model="stock.location">
+    <field name="name">Tray 1B</field>
+    <field name="barcode">T1B</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_16x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_1c" model="stock.location">
+    <field name="name">Tray 1C</field>
+    <field name="barcode">T1C</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_32x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_shuttle_2" model="stock.location">
+    <field name="name">Shuttle 2</field>
+    <field name="location_id" ref="stock_location_vertical_lift"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_2a" model="stock.location">
+    <field name="name">Tray 2A</field>
+    <field name="barcode">T2A</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_8x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_2b" model="stock.location">
+    <field name="name">Tray 2B</field>
+    <field name="barcode">T2B</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_4x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_2c" model="stock.location">
+    <field name="name">Tray 2C</field>
+    <field name="barcode">T2C</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_16x_2"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_2d" model="stock.location">
+    <field name="name">Tray 2D</field>
+    <field name="barcode">T2D</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_small_8x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_shuttle_3" model="stock.location">
+    <field name="name">Shuttle 3</field>
+    <field name="location_id" ref="stock_location_vertical_lift"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_3a" model="stock.location">
+    <field name="name">Tray 3A</field>
+    <field name="barcode">T3A</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_small_32x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <record id="stock_location_vertical_lift_demo_tray_3b" model="stock.location">
+    <field name="name">Tray 3B</field>
+    <field name="barcode">T3B</field>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3"/>
+    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_32x"/>
+    <field name="usage">internal</field>
+  </record>
+
+  <!-- When the trays are created, they will create their 'cell' locations.
+       This method will add xmlids on them to be able to reference them in
+       other demo data and tests.
+  -->
+  <function model="stock.location" name="_create_tray_xmlids">
+    <function eval="[[('vertical_lift_kind', '=', 'cell')]]" model="stock.location" name="search"/>
+  </function>
+
+</odoo>
diff --git a/stock_kardex/demo/stock_picking_demo.xml b/stock_vertical_lift/demo/stock_picking_demo.xml
similarity index 71%
rename from stock_kardex/demo/stock_picking_demo.xml
rename to stock_vertical_lift/demo/stock_picking_demo.xml
index af59b358865b..520d97925101 100644
--- a/stock_kardex/demo/stock_picking_demo.xml
+++ b/stock_vertical_lift/demo/stock_picking_demo.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
-  <record id="stock_picking_out_demo_kardex_1" model="stock.picking">
+  <record id="stock_picking_out_demo_vertical_lift_1" model="stock.picking">
     <field name="picking_type_id" ref="stock.picking_type_out"/>
-    <field name="origin">outgoing shipment from kardex</field>
+    <field name="origin">Outgoing shipment from Vertical Lift (demo)</field>
     <field name="partner_id" ref="base.res_partner_1"/>
     <field name="date" eval="DateTime.today()"/>
     <field name="location_id" ref="stock.stock_location_stock"/>
     <field name="location_dest_id" ref="stock.stock_location_customers"/>
     <field name="move_lines" model="stock.move" eval="[(0, 0, {
-                                                      'name': obj().env.ref('stock_kardex.product_running_socks').name,
-                                                      'product_id': ref('stock_kardex.product_running_socks'),
+                                                      'name': obj().env.ref('stock_vertical_lift.product_running_socks').name,
+                                                      'product_id': ref('stock_vertical_lift.product_running_socks'),
                                                       'product_uom': ref('uom.product_uom_unit'),
                                                       'product_uom_qty': 15.0,
                                                       'picking_type_id': ref('stock.picking_type_out'),
@@ -20,11 +20,11 @@
   </record>
 
   <function model="stock.picking" name="action_confirm">
-    <value model="stock.picking" eval="[obj().env.ref('stock_kardex.stock_picking_out_demo_kardex_1').id]"/>
+    <value model="stock.picking" eval="[obj().env.ref('stock_vertical_lift.stock_picking_out_demo_vertical_lift_1').id]"/>
   </function>
 
   <function model="stock.picking" name="action_assign">
-    <value model="stock.picking" eval="[obj().env.ref('stock_kardex.stock_picking_out_demo_kardex_1').id]"/>
+    <value model="stock.picking" eval="[obj().env.ref('stock_vertical_lift.stock_picking_out_demo_vertical_lift_1').id]"/>
   </function>
 
 </odoo>
diff --git a/stock_kardex/demo/stock_kardex_demo.xml b/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
similarity index 54%
rename from stock_kardex/demo/stock_kardex_demo.xml
rename to stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
index 9cd9c0fb05a8..0dafcc526739 100644
--- a/stock_kardex/demo/stock_kardex_demo.xml
+++ b/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
-  <record id="stock_kardex_demo_shuttle_1" model="stock.kardex">
+  <record id="stock_vertical_lift_demo_shuttle_1" model="vertical.lift.shuttle">
     <field name="name">Shuttle 1</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_1"/>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
     <field name="address">10.0.30.1</field>
     <field name="simulate" eval="True"/>
     <field name="mode">pick</field>
   </record>
 
-  <record id="stock_kardex_demo_shuttle_2" model="stock.kardex">
+  <record id="stock_vertical_lift_demo_shuttle_2" model="vertical.lift.shuttle">
     <field name="name">Shuttle 2</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_2"/>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
     <field name="address">10.0.30.2</field>
     <field name="simulate" eval="True"/>
     <field name="mode">pick</field>
   </record>
 
-  <record id="stock_kardex_demo_shuttle_3" model="stock.kardex">
+  <record id="stock_vertical_lift_demo_shuttle_3" model="vertical.lift.shuttle">
     <field name="name">Shuttle 3</field>
-    <field name="location_id" ref="stock_location_kardex_demo_shuttle_3"/>
+    <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3"/>
     <field name="address">10.0.30.3</field>
     <field name="simulate" eval="True"/>
     <field name="mode">pick</field>
diff --git a/stock_kardex/models/__init__.py b/stock_vertical_lift/models/__init__.py
similarity index 51%
rename from stock_kardex/models/__init__.py
rename to stock_vertical_lift/models/__init__.py
index 6a0668233699..83e852f12247 100644
--- a/stock_kardex/models/__init__.py
+++ b/stock_vertical_lift/models/__init__.py
@@ -1,5 +1,5 @@
-from . import stock_kardex
-from . import stock_kardex_tray_type
+from . import vertical_lift_shuttle
+from . import vertical_lift_tray_type
 from . import stock_location
 from . import stock_move
 from . import stock_quant
diff --git a/stock_kardex/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
similarity index 69%
rename from stock_kardex/models/stock_location.py
rename to stock_vertical_lift/models/stock_location.py
index fcfbc72e0813..ea30e9d7e22a 100644
--- a/stock_kardex/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -8,75 +8,78 @@
 class StockLocation(models.Model):
     _inherit = "stock.location"
 
-    kardex_location = fields.Boolean(
-        'Is a Kardex View Location?',
+    vertical_lift_location = fields.Boolean(
+        'Is a Vertical Lift View Location?',
         default=False,
-        help="Check this box to use it as the view for Kardex shuttles.",
+        help="Check this box to use it as the view for Vertical Lift Shuttles.",
     )
-    kardex_kind = fields.Selection(
+    vertical_lift_kind = fields.Selection(
         selection=[
             ('view', 'View'),
             ('shuttle', 'Shuttle'),
             ('tray', 'Tray'),
             ('cell', 'Cell'),
         ],
-        compute='_compute_kardex_kind',
+        compute='_compute_vertical_lift_kind',
         store=True,
     )
-    kardex_tray_type_id = fields.Many2one(
-        comodel_name="stock.kardex.tray.type", ondelete="restrict"
+    vertical_lift_tray_type_id = fields.Many2one(
+        comodel_name="vertical.lift.tray.type", ondelete="restrict"
     )
-    kardex_cell_contains_stock = fields.Boolean(
-        compute='_compute_kardex_cell_contains_stock',
-        help="Used to know if a Kardex location is empty.",
+    tray_cell_contains_stock = fields.Boolean(
+        compute='_compute_tray_cell_contains_stock',
+        help="Used to know if a cell of a Tray location is empty.",
     )
-    tray_matrix = Serialized(compute='_compute_tray_matrix')
+    tray_matrix = Serialized(string='Cells', compute='_compute_tray_matrix')
 
     # TODO document hierarchy
-    # by an optional selection kardex_view, shuttle, tray, cell
-    # Kardex View
+    # Vertical Lift View
     #   -> Shuttle
     #     -> Tray
     #       -> Cell
 
-    @api.depends('location_id', 'location_id.kardex_kind', 'kardex_location')
-    def _compute_kardex_kind(self):
+    @api.depends(
+        'location_id',
+        'location_id.vertical_lift_kind',
+        'vertical_lift_location',
+    )
+    def _compute_vertical_lift_kind(self):
         tree = {'view': 'shuttle', 'shuttle': 'tray', 'tray': 'cell'}
         for location in self:
-            if location.kardex_location:
-                location.kardex_kind = 'view'
+            if location.vertical_lift_location:
+                location.vertical_lift_kind = 'view'
                 continue
-            kind = tree.get(location.location_id.kardex_kind)
+            kind = tree.get(location.location_id.vertical_lift_kind)
             if kind:
-                location.kardex_kind = kind
+                location.vertical_lift_kind = kind
 
     @api.depends('quant_ids.quantity')
-    def _compute_kardex_cell_contains_stock(self):
+    def _compute_tray_cell_contains_stock(self):
         for location in self:
-            if not location.kardex_kind == 'cell':
+            if not location.vertical_lift_kind == 'cell':
                 # we skip the others only for performance
                 continue
             quants = location.quant_ids.filtered(lambda r: r.quantity > 0)
-            location.kardex_cell_contains_stock = bool(quants)
+            location.tray_cell_contains_stock = bool(quants)
 
     @api.depends(
         'quant_ids.quantity',
-        'kardex_tray_type_id',
-        'location_id.kardex_tray_type_id',
+        'vertical_lift_tray_type_id',
+        'location_id.vertical_lift_tray_type_id',
     )
     def _compute_tray_matrix(self):
         for location in self:
-            if location.kardex_kind not in ('tray', 'cell'):
+            if location.vertical_lift_kind not in ('tray', 'cell'):
                 continue
             location.tray_matrix = {
-                'selected': location._kardex_cell_coords(),
-                'cells': location._tray_cells_matrix(),
+                'selected': location._tray_cell_coords(),
+                'cells': location._tray_cell_matrix(),
             }
 
     @api.multi
     def action_tray_matrix_click(self, coordX, coordY):
         self.ensure_one()
-        if self.kardex_kind == 'cell':
+        if self.vertical_lift_kind == 'cell':
             tray = self.location_id
         else:
             tray = self
@@ -112,10 +115,10 @@ def create(self, vals_list):
     def write(self, vals):
         for location in self:
             trays_to_update = False
-            if 'kardex_tray_type_id' in vals:
-                new_tray_type_id = vals.get('kardex_tray_type_id')
+            if 'vertical_lift_tray_type_id' in vals:
+                new_tray_type_id = vals.get('vertical_lift_tray_type_id')
                 trays_to_update = (
-                    location.kardex_tray_type_id.id != new_tray_type_id
+                    location.vertical_lift_tray_type_id.id != new_tray_type_id
                 )
             super(StockLocation, location).write(vals)
             if trays_to_update:
@@ -123,9 +126,9 @@ def write(self, vals):
         return True
 
     @api.constrains('active')
-    def _stock_kardex_check_active(self):
+    def _vertical_lift_check_active(self):
         for record in self:
-            if not record.kardex_kind:
+            if not record.vertical_lift_kind:
                 continue
             if record.active:
                 continue
@@ -133,35 +136,35 @@ def _stock_kardex_check_active(self):
             # if at least one of the cell contains stock.
             # We cannot disable a tray, a shuffle or a view if
             # at least one of their tray contain stock.
-            if record.kardex_kind == 'cell':
+            if record.vertical_lift_kind == 'cell':
                 parent = record.location_id
             else:
                 parent = record
             # Add the record to the search: as it has set inactive, it will not
             # be found by the search.
             locs = self.search([('id', 'child_of', parent.id)]) | record
-            if any(loc.kardex_cell_contains_stock for loc in locs):
+            if any(loc.tray_cell_contains_stock for loc in locs):
                 raise exceptions.ValidationError(
                     _(
-                        "Kardex locations cannot be archived when "
+                        "Vertical Lift locations cannot be archived when "
                         "they contain products."
                     )
                 )
 
-    def _kardex_cell_coords(self):
-        if self.kardex_kind != 'cell':
+    def _tray_cell_coords(self):
+        if self.vertical_lift_kind != 'cell':
             return []
         return [self.posx - 1, self.posy - 1]
 
-    def _tray_cells_matrix(self):
-        assert self.kardex_kind in ('tray', 'cell')
-        if self.kardex_kind == 'tray':
+    def _tray_cell_matrix(self):
+        assert self.vertical_lift_kind in ('tray', 'cell')
+        if self.vertical_lift_kind == 'tray':
             location = self
         else:  # cell
             location = self.location_id
-        cells = location.kardex_tray_type_id._generate_cells_matrix()
+        cells = location.vertical_lift_tray_type_id._generate_cells_matrix()
         for cell in location.child_ids:
-            if cell.kardex_cell_contains_stock:
+            if cell.tray_cell_contains_stock:
                 cells[cell.posy - 1][cell.posx - 1] = 1
         return cells
 
@@ -169,19 +172,19 @@ def _tray_cells_matrix(self):
     def _update_tray_sublocations(self):
         values = []
         for location in self:
-            if not location.kardex_kind == 'tray':
+            if not location.vertical_lift_kind == 'tray':
                 continue
 
-            tray_type = location.kardex_tray_type_id
+            tray_type = location.vertical_lift_tray_type_id
 
             try:
                 location.child_ids.write({'active': False})
             except exceptions.ValidationError:
-                # trap this check (_stock_kardex_check_active) to display a
+                # trap this check (_vertical_lift_check_active) to display a
                 # contextual error message
                 raise exceptions.UserError(
                     _(
-                        "Kardex trays cannot be modified when "
+                        "Vertical Lift trays cannot be modified when "
                         "they contain products."
                     )
                 )
@@ -206,7 +209,7 @@ def _update_tray_sublocations(self):
     def _create_tray_xmlids(self):
         """Create external IDs for generated cells
 
-        Called from stock/kardex/demo/stock_location_demo.xml.
+        Called from stock_vertical_lift/demo/stock_location_demo.xml.
 
         If the tray has one. Used for the demo/test data. It will not handle
         properly changing the tray format as the former cells will keep the
@@ -215,7 +218,7 @@ def _create_tray_xmlids(self):
         not a problem and should not be used for other purposes.
         """
         for location in self:
-            if location.kardex_kind != 'cell':
+            if location.vertical_lift_kind != 'cell':
                 continue
             tray = location.location_id
             tray_external_id = tray.get_external_id().get(tray.id)
diff --git a/stock_kardex/models/stock_move.py b/stock_vertical_lift/models/stock_move.py
similarity index 58%
rename from stock_kardex/models/stock_move.py
rename to stock_vertical_lift/models/stock_move.py
index dbad4df4cab1..333a143f295c 100644
--- a/stock_kardex/models/stock_move.py
+++ b/stock_vertical_lift/models/stock_move.py
@@ -11,13 +11,13 @@ class StockMove(models.Model):
     def write(self, vals):
         result = super().write(vals)
         if 'state' in vals:
-            # We cannot have fields to depends on to invalidate these
-            # computed fields on stock.kardex. But we know that when the state
-            # of any move line changes, we can invalidate them as the count
-            # of assigned move lines may change (and we track this in stock.move,
-            # not stock.move.line, becaus the state of the lines is a related to
-            # this one).
-            self.env['stock.kardex'].invalidate_cache(
+            # We cannot have fields to depends on to invalidate these computed
+            # fields on vertical.lift.shuttle. But we know that when the state of
+            # any move line changes, we can invalidate them as the count of
+            # assigned move lines may change (and we track this in stock.move,
+            # not stock.move.line, becaus the state of the lines is a related
+            # to this one).
+            self.env['vertical.lift.shuttle'].invalidate_cache(
                 ['number_of_ops', 'number_of_ops_all']
             )
         return result
diff --git a/stock_kardex/models/stock_quant.py b/stock_vertical_lift/models/stock_quant.py
similarity index 65%
rename from stock_kardex/models/stock_quant.py
rename to stock_vertical_lift/models/stock_quant.py
index 485bce326511..905484139a7e 100644
--- a/stock_kardex/models/stock_quant.py
+++ b/stock_vertical_lift/models/stock_quant.py
@@ -9,8 +9,8 @@ class StockQuant(models.Model):
 
     def _update_available_quantity(self, *args, **kwargs):
         result = super()._update_available_quantity(*args, **kwargs)
-        # We cannot have fields to depends on to invalidate this
-        # computed fields on stock.kardex. But we know that when the quantity
-        # of quant changes, we can invalidate the field on the kardex tray.
-        self.env['stock.kardex'].invalidate_cache(['kardex_tray_qty'])
+        # We cannot have fields to depends on to invalidate this computed
+        # fields on vertical.lift.shuttle. But we know that when the quantity
+        # of quant changes, we can invalidate the field on the shuttles.
+        self.env['vertical.lift.shuttle'].invalidate_cache(['tray_qty'])
         return result
diff --git a/stock_kardex/models/stock_kardex.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
similarity index 73%
rename from stock_kardex/models/stock_kardex.py
rename to stock_vertical_lift/models/vertical_lift_shuttle.py
index 33b857a95198..adddf6a00039 100644
--- a/stock_kardex/models/stock_kardex.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -5,10 +5,10 @@
 from odoo.addons.base_sparse_field.models.fields import Serialized
 
 
-class StockKardex(models.Model):
-    _name = 'stock.kardex'
+class VerticalLiftShuttle(models.Model):
+    _name = 'vertical.lift.shuttle'
     _inherit = 'barcodes.barcode_events_mixin'
-    _description = 'Stock Kardex'
+    _description = 'Vertical Lift Shuttle'
 
     name = fields.Char()
     address = fields.Char()
@@ -20,9 +20,9 @@ class StockKardex(models.Model):
     location_id = fields.Many2one(
         comodel_name='stock.location',
         required=True,
-        domain="[('kardex_kind', '=', 'shuttle')]",
+        domain="[('vertical_lift_kind', '=', 'shuttle')]",
         ondelete='restrict',
-        help="The Kardex source location for Pick operations "
+        help="The Shuttle source location for Pick operations "
         "and destination location for Put operations.",
     )
     simulate = fields.Boolean(
@@ -35,7 +35,7 @@ class StockKardex(models.Model):
     )
     number_of_ops_all = fields.Integer(
         compute='_compute_number_of_ops_all',
-        string='Number of Operations in all Kardex',
+        string='Number of Operations in all shuttles',
     )
 
     operation_descr = fields.Char(
@@ -43,31 +43,25 @@ class StockKardex(models.Model):
     )
 
     # tray information (will come from stock.location or a new tray model)
-    kardex_tray_location_id = fields.Many2one(
+    tray_location_id = fields.Many2one(
         comodel_name='stock.location',
-        compute='_compute_kardex_tray_matrix',
+        compute='_compute_tray_matrix',
         string='Tray Location',
     )
-    kardex_tray_name = fields.Char(
-        compute='_compute_kardex_tray_matrix', string='Tray Name'
-    )
-    kardex_tray_type_id = fields.Many2one(
-        comodel_name='stock.kardex.tray.type',
-        compute='_compute_kardex_tray_matrix',
+    tray_name = fields.Char(compute='_compute_tray_matrix', string='Tray Name')
+    tray_type_id = fields.Many2one(
+        comodel_name='vertical.lift.tray.type',
+        compute='_compute_tray_matrix',
         string='Tray Type',
     )
-    kardex_tray_type_code = fields.Char(
-        compute='_compute_kardex_tray_matrix', string='Tray Code'
-    )
-    kardex_tray_x = fields.Integer(
-        string='X', compute='_compute_kardex_tray_matrix'
+    tray_type_code = fields.Char(
+        compute='_compute_tray_matrix', string='Tray Code'
     )
-    kardex_tray_y = fields.Integer(
-        string='Y', compute='_compute_kardex_tray_matrix'
-    )
-    kardex_tray_matrix = Serialized(compute='_compute_kardex_tray_matrix')
-    kardex_tray_qty = fields.Float(
-        string='Stock Quantity', compute='_compute_kardex_tray_qty'
+    tray_x = fields.Integer(string='X', compute='_compute_tray_matrix')
+    tray_y = fields.Integer(string='Y', compute='_compute_tray_matrix')
+    tray_matrix = Serialized(string='Cells', compute='_compute_tray_matrix')
+    tray_qty = fields.Float(
+        string='Stock Quantity', compute='_compute_tray_qty'
     )
 
     # current operation information
@@ -127,7 +121,7 @@ def _compute_product_packagings(self):
                 ]
             }
             content = self.env['ir.qweb'].render(
-                'stock_kardex.packagings', values
+                'stock_vertical_lift.packagings', values
             )
             record.product_packagings = content
 
@@ -141,24 +135,22 @@ def _compute_number_of_ops_all(self):
         for record in self:
             record.number_of_ops_all = record.count_move_lines_to_do_all()
 
-    @api.depends('kardex_tray_location_id', 'current_move_line_id.product_id')
-    def _compute_kardex_tray_qty(self):
+    @api.depends('tray_location_id', 'current_move_line_id.product_id')
+    def _compute_tray_qty(self):
         for record in self:
-            if not (
-                record.kardex_tray_location_id and record.current_move_line_id
-            ):
+            if not (record.tray_location_id and record.current_move_line_id):
                 continue
             product = record.current_move_line_id.product_id
             quants = self.env['stock.quant'].search(
                 [
-                    ('location_id', '=', record.kardex_tray_location_id.id),
+                    ('location_id', '=', record.tray_location_id.id),
                     ('product_id', '=', product.id),
                 ]
             )
-            record.kardex_tray_qty = sum(quants.mapped('quantity'))
+            record.tray_qty = sum(quants.mapped('quantity'))
 
     @api.depends()
-    def _compute_kardex_tray_matrix(self):
+    def _compute_tray_matrix(self):
         for record in self:
             modes = {
                 'pick': 'location_id',
@@ -167,22 +159,22 @@ def _compute_kardex_tray_matrix(self):
                 'inventory': 'location_id',
             }
             location = record.current_move_line_id[modes[record.mode]]
-            tray_type = location.location_id.kardex_tray_type_id
+            tray_type = location.location_id.vertical_lift_tray_type_id
             selected = []
             cells = []
             if location:
-                selected = location._kardex_cell_coords()
-                cells = location._tray_cells_matrix()
+                selected = location._tray_cell_coords()
+                cells = location._tray_cell_matrix()
 
             # this is the current cell
-            record.kardex_tray_location_id = location.id
+            record.tray_location_id = location.id
             # name of the tray where the cell is
-            record.kardex_tray_name = location.location_id.name
-            record.kardex_tray_type_id = tray_type.id
-            record.kardex_tray_type_code = tray_type.code
-            record.kardex_tray_x = location.posx
-            record.kardex_tray_y = location.posy
-            record.kardex_tray_matrix = {
+            record.tray_name = location.location_id.name
+            record.tray_type_id = tray_type.id
+            record.tray_type_code = tray_type.code
+            record.tray_x = location.posx
+            record.tray_y = location.posy
+            record.tray_matrix = {
                 # x, y: position of the selected cell
                 'selected': selected,
                 # 0 is empty, 1 is not
@@ -196,8 +188,8 @@ def _domain_move_lines_to_do(self):
         ]
         domain_extensions = {
             'pick': [('location_id', 'child_of', self.location_id.id)],
-            # TODO ensure that we cannot have the same ml in 2 kardex (cannot
-            # happen with 'pick' as they are in the kardex' location)
+            # TODO ensure that we cannot have the same ml in 2 shuttles (cannot
+            # happen with 'pick' as they are in the shuttle's location)
             'put': [('location_dest_id', 'child_of', self.location_id.id)],
             # TODO
             'inventory': [('id', '=', 0)],
@@ -209,13 +201,13 @@ def _domain_move_lines_to_do_all(self):
             # TODO check state
             ('state', '=', 'assigned')
         ]
-        # TODO search only in the view being a parent of kardex's location
-        kardex_locations = self.env['stock.location'].search(
-            [('kardex_kind', '=', 'view')]
+        # TODO search only in the view being a parent of shuttle's location
+        shuttle_locations = self.env['stock.location'].search(
+            [('vertical_lift_kind', '=', 'view')]
         )
         domain_extensions = {
-            'pick': [('location_id', 'child_of', kardex_locations.ids)],
-            'put': [('location_dest_id', 'child_of', kardex_locations.ids)],
+            'pick': [('location_id', 'child_of', shuttle_locations.ids)],
+            'put': [('location_dest_id', 'child_of', shuttle_locations.ids)],
             # TODO
             'inventory': [('id', '=', 0)],
         }
@@ -279,7 +271,9 @@ def select_next_move_line(self):
     def action_open_screen(self):
         self.select_next_move_line()
         self.ensure_one()
-        screen_xmlid = 'stock_kardex.stock_kardex_view_form_screen'
+        screen_xmlid = (
+            'stock_vertical_lift.vertical_lift_shuttle_view_form_screen'
+        )
         return {
             'type': 'ir.actions.act_window',
             'res_model': self._name,
@@ -294,10 +288,10 @@ def action_open_screen(self):
         }
 
     def action_menu(self):
-        menu_xmlid = 'stock_kardex.stock_kardex_form_menu'
+        menu_xmlid = 'stock_vertical_lift.vertical_lift_shuttle_form_menu'
         return {
             'type': 'ir.actions.act_window',
-            'res_model': 'stock.kardex',
+            'res_model': 'vertical.lift.shuttle',
             'views': [[self.env.ref(menu_xmlid).id, 'form']],
             'name': _('Menu'),
             'target': 'new',
@@ -307,13 +301,13 @@ def action_menu(self):
     def action_manual_barcode(self):
         return {
             'type': 'ir.actions.act_window',
-            'res_model': 'stock.kardex.manual.barcode',
+            'res_model': 'vertical.lift.shuttle.manual.barcode',
             'view_mode': 'form',
             'name': _('Barcode'),
             'target': 'new',
         }
 
-    # TODO: should the mode be changed on all the kardex at the same time?
+    # TODO: should the mode be changed on all the shuttles at the same time?
     def switch_pick(self):
         self.mode = 'pick'
         self.select_next_move_line()
@@ -327,17 +321,17 @@ def switch_inventory(self):
         self.select_next_move_line()
 
 
-class StockKardexManualBarcode(models.TransientModel):
-    _name = 'stock.kardex.manual.barcode'
+class VerticalLiftShuttleManualBarcode(models.TransientModel):
+    _name = 'vertical.lift.shuttle.manual.barcode'
     _description = 'Action to input a barcode'
 
     barcode = fields.Char(string="Barcode")
 
     @api.multi
     def button_save(self):
-        kardex_id = self.env.context.get('active_id')
-        kardex = self.env['stock.kardex'].browse(kardex_id).exists()
-        if not kardex:
+        shuttle_id = self.env.context.get('active_id')
+        shuttle = self.env['vertical.lift.shuttle'].browse(shuttle_id).exists()
+        if not shuttle:
             return
         if self.barcode:
-            kardex.on_barcode_scanned(self.barcode)
+            shuttle.on_barcode_scanned(self.barcode)
diff --git a/stock_kardex/models/stock_kardex_tray_type.py b/stock_vertical_lift/models/vertical_lift_tray_type.py
similarity index 84%
rename from stock_kardex/models/stock_kardex_tray_type.py
rename to stock_vertical_lift/models/vertical_lift_tray_type.py
index b3ee4810110c..b6dfa0b5615a 100644
--- a/stock_kardex/models/stock_kardex_tray_type.py
+++ b/stock_vertical_lift/models/vertical_lift_tray_type.py
@@ -5,9 +5,9 @@
 from odoo.addons.base_sparse_field.models.fields import Serialized
 
 
-class StockKardexTrayType(models.Model):
-    _name = 'stock.kardex.tray.type'
-    _description = 'Stock Kardex Tray Type'
+class VerticalLiftTrayType(models.Model):
+    _name = 'vertical.lift.tray.type'
+    _description = 'Vertical Lift Tray Type'
 
     name = fields.Char(required=True)
     code = fields.Char(required=True)
@@ -16,7 +16,8 @@ class StockKardexTrayType(models.Model):
     active = fields.Boolean(default=True)
     tray_matrix = Serialized(compute='_compute_tray_matrix')
     location_ids = fields.One2many(
-        comodel_name='stock.location', inverse_name='kardex_tray_type_id'
+        comodel_name='stock.location',
+        inverse_name='vertical_lift_tray_type_id',
     )
     # TODO do we want box size, or a many2one to 'product.packaging'?
     # TODO add the code in the name_search
@@ -35,7 +36,7 @@ def _generate_cells_matrix(self, default_state=0):
         return [[default_state] * self.cols for __ in range(self.rows)]
 
     @api.constrains('active')
-    def _stock_kardex_check_active(self):
+    def _vertical_lift_check_active(self):
         for record in self:
             if record.active:
                 continue
@@ -52,7 +53,7 @@ def _stock_kardex_check_active(self):
                 )
 
     @api.constrains('rows', 'cols')
-    def _stock_kardex_check_rows_cols(self):
+    def _vertical_lift_check_rows_cols(self):
         for record in self:
             if record.location_ids:
                 location_bullets = [
@@ -69,7 +70,7 @@ def _stock_kardex_check_rows_cols(self):
     @api.multi
     def open_locations(self):
         action = self.env.ref('stock.action_location_form').read()[0]
-        action['domain'] = [('kardex_tray_type_id', 'in', self.ids)]
+        action['domain'] = [('vertical_lift_tray_type_id', 'in', self.ids)]
         if len(self.ids) == 1:
-            action['context'] = {'default_kardex_tray_type_id': self.id}
+            action['context'] = {'default_vertical_lift_tray_type_id': self.id}
         return action
diff --git a/stock_vertical_lift/security/ir.model.access.csv b/stock_vertical_lift/security/ir.model.access.csv
new file mode 100644
index 000000000000..e87ef767b334
--- /dev/null
+++ b/stock_vertical_lift/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_vertical_lift_shuttle_stock_user,access_vertical_lift_shuttle stock user,model_vertical_lift_shuttle,stock.group_stock_user,1,0,0,0
+access_vertical_lift_shuttle_manager,access_vertical_lift_shuttle stock manager,model_vertical_lift_shuttle,stock.group_stock_manager,1,1,1,1
+access_vertical_lift_tray_type_stock_user,access_vertical_lift_tray_type stock user,model_vertical_lift_tray_type,stock.group_stock_user,1,0,0,0
+access_vertical_lift_tray_type_manager,access_vertical_lift_tray_type stock manager,model_vertical_lift_tray_type,stock.group_stock_manager,1,1,1,1
diff --git a/stock_kardex/static/src/js/kardex.js b/stock_vertical_lift/static/src/js/vertical_lift.js
similarity index 93%
rename from stock_kardex/static/src/js/kardex.js
rename to stock_vertical_lift/static/src/js/vertical_lift.js
index 83ba2bf385fa..22fe718076a2 100644
--- a/stock_kardex/static/src/js/kardex.js
+++ b/stock_vertical_lift/static/src/js/vertical_lift.js
@@ -1,7 +1,6 @@
-odoo.define('stock_kardex.kardex', function (require) {
+odoo.define('stock_vertical_lift.vertical_lift', function (require) {
 "use strict";
 
-
 var core = require('web.core');
 var KanbanRecord = require('web.KanbanRecord');
 var basicFields = require('web.basic_fields');
@@ -12,8 +11,8 @@ var FieldInteger = basicFields.FieldInteger;
 KanbanRecord.include({
 
     _openRecord: function () {
-        if (this.modelName === 'stock.kardex'
-            && this.$el.hasClass("open_kardex_screen")) {
+        if (this.modelName === 'vertical.lift.shuttle'
+            && this.$el.hasClass("open_shuttle_screen")) {
             var self = this;
             this._rpc({
                 method: 'action_open_screen',
@@ -31,7 +30,7 @@ KanbanRecord.include({
 
 var ExitButton = FieldInteger.extend({
     tagName: 'button',
-    className: 'btn btn-danger btn-block btn-lg o_kardex_exit',
+    className: 'btn btn-danger btn-block btn-lg o_shuttle_exit',
     events: {
         'click': '_onClick',
     },
@@ -42,7 +41,7 @@ var ExitButton = FieldInteger.extend({
         // the only reason to have this field widget is to be able
         // to inject clear_breadcrumbs in the action:
         // it will revert back to a normal - non-headless - view
-        this.do_action('stock_kardex.stock_kardex_action', {
+        this.do_action('stock_vertical_lift.vertical_lift_shuttle_action', {
             clear_breadcrumbs: true,
         });
     },
@@ -57,13 +56,13 @@ var ExitButton = FieldInteger.extend({
 * the options of the field and be on the same model:
 *
 * <field name="tray_matrix"
-*        widget="kardex_tray_matrix"
+*        widget="location_tray_matrix"
 *        options="{'click_action': 'action_tray_matrix_click'}"
 *        />
 *
 */
-var KardexTrayMatrixField = DebouncedField.extend({
-    className: 'o_field_kardex_tray_matrix',
+var LocationTrayMatrixField = DebouncedField.extend({
+    className: 'o_field_location_tray_matrix',
     tagName: 'canvas',
     supportedFieldTypes: ['serialized'],
     events: {
@@ -281,12 +280,12 @@ var KardexTrayMatrixField = DebouncedField.extend({
 });
 
 
-field_registry.add('exit_button', ExitButton);
-field_registry.add('kardex_tray_matrix', KardexTrayMatrixField);
+field_registry.add('vlift_shuttle_exit_button', ExitButton);
+field_registry.add('location_tray_matrix', LocationTrayMatrixField);
 
 return {
     ExitButton: ExitButton,
-    KardexTrayMatrixField: KardexTrayMatrixField
+    LocationTrayMatrixField: LocationTrayMatrixField
 };
 
 });
diff --git a/stock_kardex/static/src/scss/kardex_view.scss b/stock_vertical_lift/static/src/scss/vertical_lift.scss
similarity index 72%
rename from stock_kardex/static/src/scss/kardex_view.scss
rename to stock_vertical_lift/static/src/scss/vertical_lift.scss
index 17f812ae0473..0fc24b43e572 100644
--- a/stock_kardex/static/src/scss/kardex_view.scss
+++ b/stock_vertical_lift/static/src/scss/vertical_lift.scss
@@ -1,12 +1,12 @@
-.o_field_kardex_tray_matrix {
+.o_field_location_tray_matrix {
     background-color: #eeeeee;
     border: 2px #000000 solid;
 }
 
 .o_web_client.o_fullscreen {
-    $o-kardex-padding: $o-horizontal-padding;
+    $o-shuttle-padding: $o-horizontal-padding;
 
-    .o_form_view.o_kardex {
+    .o_form_view.o_vlift_shuttle {
         display: flex;
         flex-flow: column nowrap;
         padding: 0;
@@ -23,13 +23,13 @@
             margin: 0 5px;
         }
 
-        .o_kardex_header {
+        .o_shuttle_header {
             display: flex;
             flex-flow: row wrap;
-            padding: $o-kardex-padding;
+            padding: $o-shuttle-padding;
         }
 
-        .o_kardex_header_content {
+        .o_shuttle_header_content {
             display: flex;
             flex-flow: row nowrap;
             font-size: 2.0em;
@@ -37,49 +37,49 @@
             align-items: center;
             width: 33%;
 
-            &.o_kardex_header_right {
+            &.o_shuttle_header_right {
                 justify-content: flex-end;
             }
         }
 
-        .o_kardex_actions {
+        .o_shuttle_actions {
             display: flex;
             flex-flow: row nowrap;
             font-size: 1.2em;
-            padding: $o-kardex-padding * 0.5;
+            padding: $o-shuttle-padding * 0.5;
         }
 
-        .o_kardex_operation {
+        .o_shuttle_operation {
             text-align: center;
             font-size: 2.5em;
             padding: 0.5em;
             color: #ffffff;
         }
 
-        .o_kardex_content {
+        .o_shuttle_content {
             display: flex;
             flex-flow: row nowrap;
             flex: 1 0 auto;
             align-items: center;
 
-            &.o_kardex_content_right {
+            &.o_shuttle_content_right {
                 justify-content: flex-end;
             }
         }
 
-        .o_kardex_data {
+        .o_shuttle_data {
             display: flex;
             flex-flow: row wrap;
-            padding: $o-kardex-padding * 0.5;
+            padding: $o-shuttle-padding * 0.5;
 
-            .o_kardex_data_content {
+            .o_shuttle_data_content {
                 flex-flow: row nowrap;
                 font-size: 1.2em;
                 flex: 1 0 auto;
                 align-items: center;
                 width: 50%;
 
-                &.o_kardex_tray {
+                &.o_shuttle_tray {
                     display: flex;
                     justify-content: flex-end;
 
@@ -88,12 +88,12 @@
                     }
                 }
 
-                .o_field_kardex_tray_matrix {
+                .o_field_location_tray_matrix {
                     width: 450px;
                 }
             }
 
-            .kardex_highlight {
+            .o_shuttle_highlight {
                 padding: 6px;
                 border-radius: 10px;
             }
@@ -101,20 +101,20 @@
 
     }
 
-    .o_kardex_menu {
+    .o_vlift_shuttle_menu {
         .btn {
-            margin-bottom: $o-kardex-padding;
+            margin-bottom: $o-shuttle-padding;
             padding: 1em;
             font-size: 2em;
             text-transform: uppercase;
         }
 
-        .o_kardex_exit {
+        .o_shuttle_exit {
             text-align: center;
         }
     }
 
-    .o_kardex_manual_barcode {
+    .o_vlift_shuttle_manual_barcode {
         .o_field_char {
             padding: 1em;
             font-size: 2em;
diff --git a/stock_vertical_lift/tests/__init__.py b/stock_vertical_lift/tests/__init__.py
new file mode 100644
index 000000000000..61fbd1fd98e6
--- /dev/null
+++ b/stock_vertical_lift/tests/__init__.py
@@ -0,0 +1,3 @@
+from . import test_location
+from . import test_vertical_lift_tray_type
+from . import test_vertical_lift_shuttle
diff --git a/stock_kardex/tests/common.py b/stock_vertical_lift/tests/common.py
similarity index 79%
rename from stock_kardex/tests/common.py
rename to stock_vertical_lift/tests/common.py
index 5adac3c50cea..10d20e683072 100644
--- a/stock_kardex/tests/common.py
+++ b/stock_vertical_lift/tests/common.py
@@ -4,18 +4,24 @@
 from odoo.tests import common
 
 
-class KardexCase(common.SavepointCase):
+class VerticalLiftCase(common.SavepointCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.kardex = cls.env.ref('stock_kardex.stock_kardex_demo_shuttle_1')
-        cls.product_socks = cls.env.ref('stock_kardex.product_running_socks')
-        cls.kardex_view = cls.env.ref('stock_kardex.stock_location_kardex')
+        cls.shuttle = cls.env.ref(
+            'stock_vertical_lift.stock_vertical_lift_demo_shuttle_1'
+        )
+        cls.product_socks = cls.env.ref(
+            'stock_vertical_lift.product_running_socks'
+        )
+        cls.vertical_lift_loc = cls.env.ref(
+            'stock_vertical_lift.stock_location_vertical_lift'
+        )
         cls.tray_type_small_8x = cls.env.ref(
-            'stock_kardex.kardex_tray_type_small_8x'
+            'stock_vertical_lift.vertical_lift_tray_type_small_8x'
         )
         cls.tray_type_small_32x = cls.env.ref(
-            'stock_kardex.kardex_tray_type_small_32x'
+            'stock_vertical_lift.vertical_lift_tray_type_small_32x'
         )
 
     def _cell_for(self, tray, x=1, y=1):
diff --git a/stock_kardex/tests/test_kardex_location.py b/stock_vertical_lift/tests/test_location.py
similarity index 67%
rename from stock_kardex/tests/test_kardex_location.py
rename to stock_vertical_lift/tests/test_location.py
index 52b1ca7dc6eb..af24fa761322 100644
--- a/stock_kardex/tests/test_kardex_location.py
+++ b/stock_vertical_lift/tests/test_location.py
@@ -3,45 +3,48 @@
 
 from odoo import exceptions
 
-from .common import KardexCase
+from .common import VerticalLiftCase
 
 
-class TestKardexLocation(KardexCase):
-    def test_kardex_kind(self):
-        # this boolean is what defines a "Kardex View", the upper level
+class TestVerticalLiftLocation(VerticalLiftCase):
+    def test_vertical_lift_kind(self):
+        # this boolean is what defines a "Vertical Lift View", the upper level
         # of the tree (View -> Shuttles -> Trays -> Cells)
-        self.assertTrue(self.kardex_view.kardex_location)
-        self.assertEqual(self.kardex_view.kardex_kind, 'view')
+        self.assertTrue(self.vertical_lift_loc.vertical_lift_location)
+        self.assertEqual(self.vertical_lift_loc.vertical_lift_kind, 'view')
 
         # check types accross the hierarchy
-        shuttles = self.kardex_view.child_ids
+        shuttles = self.vertical_lift_loc.child_ids
         self.assertTrue(
-            all(location.kardex_kind == 'shuttle' for location in shuttles)
+            all(
+                location.vertical_lift_kind == 'shuttle'
+                for location in shuttles
+            )
         )
         trays = shuttles.mapped('child_ids')
         self.assertTrue(
-            all(location.kardex_kind == 'tray' for location in trays)
+            all(location.vertical_lift_kind == 'tray' for location in trays)
         )
         cells = trays.mapped('child_ids')
         self.assertTrue(
-            all(location.kardex_kind == 'cell' for location in cells)
+            all(location.vertical_lift_kind == 'cell' for location in cells)
         )
 
-    def test_kardex_create_shuttle(self):
+    def test_create_shuttle(self):
         # any location created directly under the view is a shuttle
         shuttle_loc = self.env['stock.location'].create(
             {
                 'name': 'Shuttle 42',
-                'location_id': self.kardex_view.id,
+                'location_id': self.vertical_lift_loc.id,
                 'usage': 'internal',
             }
         )
-        self.assertEqual(shuttle_loc.kardex_kind, 'shuttle')
+        self.assertEqual(shuttle_loc.vertical_lift_kind, 'shuttle')
 
-    def test_kardex_create_tray(self):
+    def test_create_tray(self):
         # any location created directly under a shuttle is a tray
         shuttle_loc = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_shuttle_1'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_shuttle_1'
         )
         tray_type = self.tray_type_small_8x
         tray_loc = self.env['stock.location'].create(
@@ -49,34 +52,34 @@ def test_kardex_create_tray(self):
                 'name': 'Tray Z',
                 'location_id': shuttle_loc.id,
                 'usage': 'internal',
-                'kardex_tray_type_id': tray_type.id,
+                'vertical_lift_tray_type_id': tray_type.id,
             }
         )
 
-        self.assertEqual(tray_loc.kardex_kind, 'tray')
+        self.assertEqual(tray_loc.vertical_lift_kind, 'tray')
         self.assertEqual(
             len(tray_loc.child_ids), tray_type.cols * tray_type.rows  # 8
         )
 
-    def test_kardex_tray_has_stock(self):
+    def test_tray_has_stock(self):
         cell = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self.assertFalse(cell.quant_ids)
-        self.assertFalse(cell.kardex_cell_contains_stock)
+        self.assertFalse(cell.tray_cell_contains_stock)
         self._update_quantity_in_cell(cell, self.product_socks, 1)
         self.assertTrue(cell.quant_ids)
-        self.assertTrue(cell.kardex_cell_contains_stock)
+        self.assertTrue(cell.tray_cell_contains_stock)
         self._update_quantity_in_cell(cell, self.product_socks, -1)
         self.assertTrue(cell.quant_ids)
-        self.assertFalse(cell.kardex_cell_contains_stock)
+        self.assertFalse(cell.tray_cell_contains_stock)
 
     def test_matrix_empty_tray(self):
         tray_loc = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_1a'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a'
         )
-        self.assertEqual(tray_loc.kardex_tray_type_id.cols, 4)
-        self.assertEqual(tray_loc.kardex_tray_type_id.rows, 2)
+        self.assertEqual(tray_loc.vertical_lift_tray_type_id.cols, 4)
+        self.assertEqual(tray_loc.vertical_lift_tray_type_id.rows, 2)
         self.assertEqual(
             tray_loc.tray_matrix,
             {
@@ -94,7 +97,7 @@ def test_matrix_empty_tray(self):
 
     def test_matrix_stock_tray(self):
         tray_loc = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_1a'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a'
         )
         self._update_quantity_in_cell(
             self._cell_for(tray_loc, x=1, y=1), self.product_socks, 100
@@ -105,8 +108,8 @@ def test_matrix_stock_tray(self):
         self._update_quantity_in_cell(
             self._cell_for(tray_loc, x=4, y=2), self.product_socks, 100
         )
-        self.assertEqual(tray_loc.kardex_tray_type_id.cols, 4)
-        self.assertEqual(tray_loc.kardex_tray_type_id.rows, 2)
+        self.assertEqual(tray_loc.vertical_lift_tray_type_id.cols, 4)
+        self.assertEqual(tray_loc.vertical_lift_tray_type_id.rows, 2)
         self.assertEqual(
             tray_loc.tray_matrix,
             {
@@ -131,7 +134,7 @@ def test_matrix_stock_tray(self):
 
     def test_matrix_stock_cell(self):
         tray_loc = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_1c'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1c'
         )
         cell = self._cell_for(tray_loc, x=7, y=3)
         self._update_quantity_in_cell(cell, self.product_socks, 100)
@@ -141,8 +144,8 @@ def test_matrix_stock_cell(self):
         self._update_quantity_in_cell(
             self._cell_for(tray_loc, x=3, y=2), self.product_socks, 100
         )
-        self.assertEqual(tray_loc.kardex_tray_type_id.cols, 8)
-        self.assertEqual(tray_loc.kardex_tray_type_id.rows, 4)
+        self.assertEqual(tray_loc.vertical_lift_tray_type_id.cols, 8)
+        self.assertEqual(tray_loc.vertical_lift_tray_type_id.rows, 4)
         self.assertEqual(
             cell.tray_matrix,
             {
@@ -165,18 +168,18 @@ def test_matrix_stock_cell(self):
     def test_check_active_empty(self):
         # this type used by tray T1B, we should not be able to disable it
         cell = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
-        self.assertFalse(cell.kardex_cell_contains_stock)
+        self.assertFalse(cell.tray_cell_contains_stock)
         # allowed to archive empty cell
         cell.active = False
 
     def test_check_active_not_empty(self):
         cell = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self._update_quantity_in_cell(cell, self.product_socks, 1)
-        self.assertTrue(cell.kardex_cell_contains_stock)
+        self.assertTrue(cell.tray_cell_contains_stock)
 
         # we cannot archive an empty cell or any parent
         location = cell
@@ -188,22 +191,26 @@ def test_check_active_not_empty(self):
             # restore state for the next test loop
             location.active = True
             parent = location.location_id
-            location = parent if parent.kardex_kind else None
+            location = parent if parent.vertical_lift_kind else None
 
     def test_change_tray_type_when_empty(self):
-        tray = self.env.ref('stock_kardex.stock_location_kardex_demo_tray_1a')
+        tray = self.env.ref(
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a'
+        )
         tray_type = self.tray_type_small_32x
-        tray.kardex_tray_type_id = tray_type
+        tray.vertical_lift_tray_type_id = tray_type
         self.assertEqual(
             len(tray.child_ids), tray_type.cols * tray_type.rows  # 32
         )
 
     def test_change_tray_type_error_when_not_empty(self):
-        tray = self.env.ref('stock_kardex.stock_location_kardex_demo_tray_1a')
+        tray = self.env.ref(
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a'
+        )
         self._update_quantity_in_cell(
             self._cell_for(tray, x=1, y=1), self.product_socks, 1
         )
         tray_type = self.tray_type_small_32x
         message = 'cannot be modified when they contain products'
         with self.assertRaisesRegex(exceptions.UserError, message):
-            tray.kardex_tray_type_id = tray_type
+            tray.vertical_lift_tray_type_id = tray_type
diff --git a/stock_kardex/tests/test_kardex.py b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
similarity index 51%
rename from stock_kardex/tests/test_kardex.py
rename to stock_vertical_lift/tests/test_vertical_lift_shuttle.py
index c561a1cfc711..a8d6631f01e9 100644
--- a/stock_kardex/tests/test_kardex.py
+++ b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
@@ -5,63 +5,63 @@
 
 from odoo import _, exceptions
 
-from .common import KardexCase
+from .common import VerticalLiftCase
 
 
-class TestKardexTrayType(KardexCase):
+class TestVerticalLiftTrayType(VerticalLiftCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
         cls.picking_out = cls.env.ref(
-            'stock_kardex.stock_picking_out_demo_kardex_1'
+            'stock_vertical_lift.stock_picking_out_demo_vertical_lift_1'
         )
         # we have a move line to pick created by demo picking
-        # stock_picking_out_demo_kardex_1
+        # stock_picking_out_demo_vertical_lift_1
         cls.out_move_line = cls.picking_out.move_line_ids
 
     def test_switch_pick(self):
-        self.kardex.switch_pick()
-        self.assertEqual(self.kardex.mode, 'pick')
-        self.assertEqual(self.kardex.current_move_line_id, self.out_move_line)
+        self.shuttle.switch_pick()
+        self.assertEqual(self.shuttle.mode, 'pick')
+        self.assertEqual(self.shuttle.current_move_line_id, self.out_move_line)
 
     def test_switch_put(self):
-        self.kardex.switch_put()
-        self.assertEqual(self.kardex.mode, 'put')
+        self.shuttle.switch_put()
+        self.assertEqual(self.shuttle.mode, 'put')
         # TODO check that we have an incoming move when switching
         self.assertEqual(
-            self.kardex.current_move_line_id,
+            self.shuttle.current_move_line_id,
             self.env['stock.move.line'].browse(),
         )
 
     def test_switch_inventory(self):
-        self.kardex.switch_inventory()
-        self.assertEqual(self.kardex.mode, 'inventory')
+        self.shuttle.switch_inventory()
+        self.assertEqual(self.shuttle.mode, 'inventory')
         # TODO check that we have what we should (what?)
         self.assertEqual(
-            self.kardex.current_move_line_id,
+            self.shuttle.current_move_line_id,
             self.env['stock.move.line'].browse(),
         )
 
     def test_pick_action_open_screen(self):
-        self.kardex.switch_pick()
-        action = self.kardex.action_open_screen()
-        self.assertTrue(self.kardex.current_move_line_id)
+        self.shuttle.switch_pick()
+        action = self.shuttle.action_open_screen()
+        self.assertTrue(self.shuttle.current_move_line_id)
         self.assertEqual(action['type'], 'ir.actions.act_window')
-        self.assertEqual(action['res_model'], 'stock.kardex')
-        self.assertEqual(action['res_id'], self.kardex.id)
+        self.assertEqual(action['res_model'], 'vertical.lift.shuttle')
+        self.assertEqual(action['res_id'], self.shuttle.id)
 
     def test_pick_select_next_move_line(self):
-        self.kardex.switch_pick()
-        self.kardex.select_next_move_line()
-        self.assertEqual(self.kardex.current_move_line_id, self.out_move_line)
-        self.assertEqual(self.kardex.operation_descr, _('Scan next PID'))
+        self.shuttle.switch_pick()
+        self.shuttle.select_next_move_line()
+        self.assertEqual(self.shuttle.current_move_line_id, self.out_move_line)
+        self.assertEqual(self.shuttle.operation_descr, _('Scan next PID'))
 
     def test_pick_save(self):
-        self.kardex.switch_pick()
-        self.kardex.current_move_line_id = self.out_move_line
-        result = self.kardex.button_save()
-        self.assertFalse(self.kardex.current_move_line_id)
-        self.assertEqual(self.kardex.operation_descr, _('No operations'))
+        self.shuttle.switch_pick()
+        self.shuttle.current_move_line_id = self.out_move_line
+        result = self.shuttle.button_save()
+        self.assertFalse(self.shuttle.current_move_line_id)
+        self.assertEqual(self.shuttle.operation_descr, _('No operations'))
         expected_result = {
             'effect': {
                 'fadeout': 'slow',
@@ -73,58 +73,58 @@ def test_pick_save(self):
         self.assertEqual(result, expected_result)
 
     def test_pick_related_fields(self):
-        self.kardex.switch_pick()
-        ml = self.kardex.current_move_line_id = self.out_move_line
+        self.shuttle.switch_pick()
+        ml = self.shuttle.current_move_line_id = self.out_move_line
 
-        # Kardex trays related fields
+        # Trays related fields
         # For pick, this is the source location, which is the cell where the
         # product is.
-        self.assertEqual(self.kardex.kardex_tray_location_id, ml.location_id)
+        self.assertEqual(self.shuttle.tray_location_id, ml.location_id)
         self.assertEqual(
-            self.kardex.kardex_tray_name,
+            self.shuttle.tray_name,
             # parent = tray
             ml.location_id.location_id.name,
         )
         self.assertEqual(
-            self.kardex.kardex_tray_type_id,
+            self.shuttle.tray_type_id,
             # the tray type is on the parent of the cell (on the tray)
-            ml.location_id.location_id.kardex_tray_type_id,
+            ml.location_id.location_id.vertical_lift_tray_type_id,
         )
         self.assertEqual(
-            self.kardex.kardex_tray_type_code,
-            ml.location_id.location_id.kardex_tray_type_id.code,
+            self.shuttle.tray_type_code,
+            ml.location_id.location_id.vertical_lift_tray_type_id.code,
         )
-        self.assertEqual(self.kardex.kardex_tray_x, ml.location_id.posx)
-        self.assertEqual(self.kardex.kardex_tray_y, ml.location_id.posy)
+        self.assertEqual(self.shuttle.tray_x, ml.location_id.posx)
+        self.assertEqual(self.shuttle.tray_y, ml.location_id.posy)
 
         # Move line related fields
-        self.assertEqual(self.kardex.picking_id, ml.picking_id)
-        self.assertEqual(self.kardex.picking_origin, ml.picking_id.origin)
+        self.assertEqual(self.shuttle.picking_id, ml.picking_id)
+        self.assertEqual(self.shuttle.picking_origin, ml.picking_id.origin)
         self.assertEqual(
-            self.kardex.picking_partner_id, ml.picking_id.partner_id
+            self.shuttle.picking_partner_id, ml.picking_id.partner_id
         )
-        self.assertEqual(self.kardex.product_id, ml.product_id)
-        self.assertEqual(self.kardex.product_uom_id, ml.product_uom_id)
-        self.assertEqual(self.kardex.product_uom_qty, ml.product_uom_qty)
-        self.assertEqual(self.kardex.qty_done, ml.qty_done)
-        self.assertEqual(self.kardex.lot_id, ml.lot_id)
+        self.assertEqual(self.shuttle.product_id, ml.product_id)
+        self.assertEqual(self.shuttle.product_uom_id, ml.product_uom_id)
+        self.assertEqual(self.shuttle.product_uom_qty, ml.product_uom_qty)
+        self.assertEqual(self.shuttle.qty_done, ml.qty_done)
+        self.assertEqual(self.shuttle.lot_id, ml.lot_id)
 
     def test_pick_count_move_lines(self):
-        product1 = self.env.ref('stock_kardex.product_running_socks')
-        product2 = self.env.ref('stock_kardex.product_recovery_socks')
+        product1 = self.env.ref('stock_vertical_lift.product_running_socks')
+        product2 = self.env.ref('stock_vertical_lift.product_recovery_socks')
         # cancel the picking from demo data to start from a clean state
         self.env.ref(
-            'stock_kardex.stock_picking_out_demo_kardex_1'
+            'stock_vertical_lift.stock_picking_out_demo_vertical_lift_1'
         ).action_cancel()
 
         # ensure that we have stock in some cells, we'll put product1
-        # in the first kardex and product2 in the second
+        # in the first Shuttle and product2 in the second
         cell1 = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self._update_quantity_in_cell(cell1, product1, 50)
         cell2 = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_2a_x1y1'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_2a_x1y1'
         )
         self._update_quantity_in_cell(cell2, product2, 50)
 
@@ -141,32 +141,34 @@ def test_pick_count_move_lines(self):
         unassigned = self._create_simple_picking_out(product2, 1)
         pickings |= unassigned
         pickings.action_confirm()
-        # product1 will be taken from the kardex1, product2 from kardex2
+        # product1 will be taken from the shuttle1, product2 from shuttle2
         pickings.action_assign()
 
-        kardex1 = self.kardex
-        kardex2 = self.env.ref('stock_kardex.stock_kardex_demo_shuttle_2')
+        shuttle1 = self.shuttle
+        shuttle2 = self.env.ref(
+            'stock_vertical_lift.stock_vertical_lift_demo_shuttle_2'
+        )
 
-        self.assertEqual(kardex1.number_of_ops, 4)
-        self.assertEqual(kardex2.number_of_ops, 2)
-        self.assertEqual(kardex1.number_of_ops_all, 6)
-        self.assertEqual(kardex2.number_of_ops_all, 6)
+        self.assertEqual(shuttle1.number_of_ops, 4)
+        self.assertEqual(shuttle2.number_of_ops, 2)
+        self.assertEqual(shuttle1.number_of_ops_all, 6)
+        self.assertEqual(shuttle2.number_of_ops_all, 6)
 
         # Process a line, should change the numbers.
-        kardex1.select_next_move_line()
-        kardex1.process_current_pick()
-        self.assertEqual(kardex1.number_of_ops, 3)
-        self.assertEqual(kardex2.number_of_ops, 2)
-        self.assertEqual(kardex1.number_of_ops_all, 5)
-        self.assertEqual(kardex2.number_of_ops_all, 5)
+        shuttle1.select_next_move_line()
+        shuttle1.process_current_pick()
+        self.assertEqual(shuttle1.number_of_ops, 3)
+        self.assertEqual(shuttle2.number_of_ops, 2)
+        self.assertEqual(shuttle1.number_of_ops_all, 5)
+        self.assertEqual(shuttle2.number_of_ops_all, 5)
 
         # add stock and make the last one assigned to check the number is updated
         self._update_quantity_in_cell(cell2, product2, 10)
         unassigned.action_assign()
-        self.assertEqual(kardex1.number_of_ops, 3)
-        self.assertEqual(kardex2.number_of_ops, 3)
-        self.assertEqual(kardex1.number_of_ops_all, 6)
-        self.assertEqual(kardex2.number_of_ops_all, 6)
+        self.assertEqual(shuttle1.number_of_ops, 3)
+        self.assertEqual(shuttle2.number_of_ops, 3)
+        self.assertEqual(shuttle1.number_of_ops_all, 6)
+        self.assertEqual(shuttle2.number_of_ops_all, 6)
 
     @unittest.skip('Not implemented')
     def test_put_count_move_lines(self):
@@ -176,43 +178,43 @@ def test_put_count_move_lines(self):
     def test_inventory_count_move_lines(self):
         pass
 
+    @unittest.skip('Not implemented')
     def test_on_barcode_scanned(self):
         # test to implement when the code is implemented
-        with self.assertRaises(exceptions.UserError):
-            self.kardex.on_barcode_scanned('foo')
+        pass
 
     def test_button_release(self):
         # test to implement when the code is implemented
         with self.assertRaises(exceptions.UserError):
-            self.kardex.button_release()
+            self.shuttle.button_release()
 
     def test_process_current_pick(self):
-        self.kardex.switch_pick()
-        self.kardex.current_move_line_id = self.out_move_line
+        self.shuttle.switch_pick()
+        self.shuttle.current_move_line_id = self.out_move_line
         qty_to_process = self.out_move_line.product_qty
-        self.kardex.process_current_pick()
+        self.shuttle.process_current_pick()
         self.assertEqual(self.out_move_line.state, 'done')
         self.assertEqual(self.out_move_line.qty_done, qty_to_process)
 
     def test_process_current_put(self):
         # test to implement when the code is implemented
         with self.assertRaises(exceptions.UserError):
-            self.kardex.process_current_put()
+            self.shuttle.process_current_put()
 
     def test_process_current_inventory(self):
         # test to implement when the code is implemented
         with self.assertRaises(exceptions.UserError):
-            self.kardex.process_current_inventory()
+            self.shuttle.process_current_inventory()
 
     def test_matrix(self):
-        self.kardex.switch_pick()
-        self.kardex.current_move_line_id = self.out_move_line
+        self.shuttle.switch_pick()
+        self.shuttle.current_move_line_id = self.out_move_line
         location = self.out_move_line.location_id
         # offset by -1 because the fields are for humans
         expected_x = location.posx - 1
         expected_y = location.posy - 1
         self.assertEqual(
-            self.kardex.kardex_tray_matrix,
+            self.shuttle.tray_matrix,
             {
                 'selected': [expected_x, expected_y],
                 # fmt: off
@@ -224,13 +226,13 @@ def test_matrix(self):
             },
         )
 
-    def test_kardex_tray_qty(self):
+    def test_tray_qty(self):
         cell = self.env.ref(
-            'stock_kardex.stock_location_kardex_demo_tray_1a_x3y2'
+            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self.out_move_line.location_id = cell
-        self.kardex.current_move_line_id = self.out_move_line
+        self.shuttle.current_move_line_id = self.out_move_line
         self._update_quantity_in_cell(cell, self.out_move_line.product_id, 50)
-        self.assertEqual(self.kardex.kardex_tray_qty, 50)
+        self.assertEqual(self.shuttle.tray_qty, 50)
         self._update_quantity_in_cell(cell, self.out_move_line.product_id, -20)
-        self.assertEqual(self.kardex.kardex_tray_qty, 30)
+        self.assertEqual(self.shuttle.tray_qty, 30)
diff --git a/stock_kardex/tests/test_kardex_tray_type.py b/stock_vertical_lift/tests/test_vertical_lift_tray_type.py
similarity index 84%
rename from stock_kardex/tests/test_kardex_tray_type.py
rename to stock_vertical_lift/tests/test_vertical_lift_tray_type.py
index c18b9a3efab3..53dbcc77134f 100644
--- a/stock_kardex/tests/test_kardex_tray_type.py
+++ b/stock_vertical_lift/tests/test_vertical_lift_tray_type.py
@@ -3,23 +3,23 @@
 
 from odoo import exceptions
 
-from .common import KardexCase
+from .common import VerticalLiftCase
 
 
-class TestKardexTrayType(KardexCase):
+class TestVerticalLiftTrayType(VerticalLiftCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
         cls.used_tray_type = cls.env.ref(
-            'stock_kardex.kardex_tray_type_large_16x'
+            'stock_vertical_lift.vertical_lift_tray_type_large_16x'
         )
         cls.unused_tray_type = cls.env.ref(
-            'stock_kardex.kardex_tray_type_small_16x_3'
+            'stock_vertical_lift.vertical_lift_tray_type_small_16x_3'
         )
 
-    def test_kardex_tray_type(self):
+    def test_tray_type(self):
         # any location created directly under the view is a shuttle
-        tray_type = self.env['stock.kardex.tray.type'].create(
+        tray_type = self.env['vertical.lift.tray.type'].create(
             {
                 'name': 'Test Type',
                 'code': '🐵',
@@ -44,7 +44,7 @@ def test_kardex_tray_type(self):
             },
         )
 
-    def test_kardex_check_active(self):
+    def test_check_active(self):
         # this type used by tray T1B, we should not be able to disable it
         location = self.used_tray_type.location_ids
         self.assertTrue(location)
@@ -55,7 +55,7 @@ def test_kardex_check_active(self):
         # we can archive unused ones
         self.unused_tray_type.active = False
 
-    def test_kardex_check_cols_rows(self):
+    def test_check_cols_rows(self):
         # this type used by tray T1B, we should not be able to modify size
         location = self.used_tray_type.location_ids
         self.assertTrue(location)
diff --git a/stock_kardex/templates/kardex_screen.xml b/stock_vertical_lift/views/shuttle_screen_templates.xml
similarity index 89%
rename from stock_kardex/templates/kardex_screen.xml
rename to stock_vertical_lift/views/shuttle_screen_templates.xml
index 636e44b78d89..3301f4ca70df 100644
--- a/stock_kardex/templates/kardex_screen.xml
+++ b/stock_vertical_lift/views/shuttle_screen_templates.xml
@@ -1,7 +1,7 @@
 <odoo>
 
 <template id="packagings">
-  <ul class="o_kardex_packaging list-unstyled">
+  <ul class="o_vlift_packaging list-unstyled">
     <t t-foreach="packagings" t-as="packaging">
       <li>
         <span>1</span>
diff --git a/stock_vertical_lift/views/stock_location_views.xml b/stock_vertical_lift/views/stock_location_views.xml
new file mode 100644
index 000000000000..5ca0f6e4e505
--- /dev/null
+++ b/stock_vertical_lift/views/stock_location_views.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record id="view_location_form_vertical_lift" model="ir.ui.view">
+    <field name="name">stock.location.form.vertical.lift</field>
+    <field name="model">stock.location</field>
+    <field name="inherit_id" ref="stock.view_location_form"/>
+    <field name="arch" type="xml">
+      <field name="return_location" position="after">
+        <field name="vertical_lift_location"
+               attrs="{'invisible': [('vertical_lift_kind', '!=', False), ('vertical_lift_kind', '!=', 'view')]}"
+               />
+      </field>
+      <group name="localization" position="after">
+        <group string="Vertical Lift" name="vertical_lift"
+               attrs="{'invisible': [('vertical_lift_kind', 'not in', ('shuttle', 'tray', 'cell'))]}">
+          <field name="vertical_lift_kind"/>
+          <field name="vertical_lift_tray_type_id"
+                 attrs="{'invisible': [('vertical_lift_kind', '!=', 'tray')], 'required': [('vertical_lift_kind', '=', 'tray')]}"/>
+          <field name="tray_matrix"
+                 widget="location_tray_matrix"
+                 attrs="{'invisible': [('vertical_lift_kind', 'not in', ('tray', 'cell'))]}"
+                 options="{'click_action': 'action_tray_matrix_click'}"
+                 />
+        </group>
+      </group>
+
+      <field name="posx" position="attributes">
+        <attribute name="attrs">{'readonly': [('vertical_lift_kind', '=', 'cell')]}</attribute>
+      </field>
+      <field name="posy" position="attributes">
+        <attribute name="attrs">{'readonly': [('vertical_lift_kind', '=', 'cell')]}</attribute>
+      </field>
+    </field>
+  </record>
+
+  <record id="view_location_search_vertical_lift" model="ir.ui.view">
+    <field name="name">stock.location.search.vertical.lift</field>
+    <field name="model">stock.location</field>
+    <field name="inherit_id" ref="stock.view_location_search"/>
+    <field name="arch" type="xml">
+      <field name="location_id" position="after">
+        <separator/>
+        <field name="vertical_lift_kind"/>
+        <field name="vertical_lift_tray_type_id"/>
+      </field>
+    </field>
+  </record>
+
+</odoo>
diff --git a/stock_vertical_lift/views/stock_vertical_lift_templates.xml b/stock_vertical_lift/views/stock_vertical_lift_templates.xml
new file mode 100644
index 000000000000..d1931819c9d2
--- /dev/null
+++ b/stock_vertical_lift/views/stock_vertical_lift_templates.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <template id="stock_vertical_lift_assets" name="stock.vertical.lift.assets" inherit_id="web.assets_backend">
+    <xpath expr="." position="inside">
+      <link rel="stylesheet" type="text/scss" href="/stock_vertical_lift/static/src/scss/vertical_lift.scss"/>
+      <script type="text/javascript" src="/stock_vertical_lift/static/src/js/vertical_lift.js"></script>
+    </xpath>
+  </template>
+
+</odoo>
diff --git a/stock_kardex/views/stock_kardex_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
similarity index 70%
rename from stock_kardex/views/stock_kardex_views.xml
rename to stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index 4afc46986fd7..3c4c5defc28a 100644
--- a/stock_kardex/views/stock_kardex_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-  <record id="stock_kardex_view_form_screen" model="ir.ui.view">
-    <field name="name">stock.kardex.view.form.screen</field>
-    <field name="model">stock.kardex</field>
+  <record id="vertical_lift_shuttle_view_form_screen" model="ir.ui.view">
+    <field name="name">vertical.lift.shuttle.view.form.screen</field>
+    <field name="model">vertical.lift.shuttle</field>
     <field name="priority">99</field>
     <field name="arch" type="xml">
-      <form string="Operations" delete="0" create="0" class="o_kardex">
+      <form string="Operations" delete="0" create="0" class="o_vlift_shuttle">
         <!-- <field name="product_id" invisible="1"/> -->
-        <div class="o_kardex_header">
-          <div class="o_kardex_header_left o_kardex_header_content">
+        <div class="o_shuttle_header">
+          <div class="o_shuttle_header_left o_shuttle_header_content">
             <field name="name" readonly="1"/>
           </div>
-          <div class="o_kardex_header_center o_kardex_header_content">
+          <div class="o_shuttle_header_center o_shuttle_header_content">
             <label for="mode"/>
             <field name="mode" readonly="1"/>
           </div>
-          <div class="o_kardex_header_right o_kardex_header_content">
+          <div class="o_shuttle_header_right o_shuttle_header_content">
             <label for="number_of_ops"/>
             <field name="number_of_ops" readonly="1"/> /
             <field name="number_of_ops_all" readonly="1"/>
           </div>
         </div>
-        <div class="o_kardex_actions">
-          <div class="o_kardex_content">
+        <div class="o_shuttle_actions">
+          <div class="o_shuttle_content">
             <button name="action_menu" type="object"
-                    class="btn-secondary o_kardex_icon_btn"
+                    class="btn-secondary o_shuttle_icon_btn"
                     string="" icon="fa-bars"
                     aria-label="Dropdown menu" title="Dropdown menu"/>
             <button name="action_manual_barcode" type="object"
-                    class="btn-secondary o_kardex_icon_btn"
+                    class="btn-secondary o_shuttle_icon_btn"
                     string="" icon="fa-terminal"
                     aria-label="Barcode Input" title="Barcode Input"/>
           </div>
-          <div class="o_kardex_content o_kardex_content_right">
+          <div class="o_shuttle_content o_shuttle_content_right">
             <div>
               <button name="button_save"
                       type="object"
@@ -49,14 +49,14 @@
             </div>
           </div>
         </div>
-        <div class="o_kardex_operation bg-primary jumbotron jumbotron-fluid">
+        <div class="o_shuttle_operation bg-primary jumbotron jumbotron-fluid">
           <div class="container">
             <field name="operation_descr"/>
           </div>
         </div>
-        <div class="o_kardex_data" attrs="{'invisible': [('current_move_line_id', '=', False)]}">
+        <div class="o_shuttle_data" attrs="{'invisible': [('current_move_line_id', '=', False)]}">
           <!-- on the left of the screen -->
-          <div class="o_kardex_data_content o_kardex_move">
+          <div class="o_shuttle_data_content o_shuttle_move">
             <div>
               <group>
                 <field name="current_move_line_id" invisible="1"/>
@@ -84,7 +84,7 @@
                 <field name="lot_id"/>
                 <label for="product_uom_qty" string="Quantity" class="ml32"/>
                 <div colspan="2" class="ml32">
-                  <h1 class="bg-primary kardex_highlight">
+                  <h1 class="bg-primary o_shuttle_highlight">
                     <field name="product_uom_qty" class="oe_inline text-white"/>
                     <field name="product_uom_id" options="{'no_open': True}" class="oe_inline ml8 text-white"/>
                   </h1>
@@ -93,23 +93,23 @@
             </div>
           </div>
           <!-- on the right of the screen -->
-          <div class="o_kardex_data_content o_kardex_tray">
+          <div class="o_shuttle_data_content o_shuttle_tray">
             <group col="1">
-              <field name="kardex_tray_name"/>
-              <field name="kardex_tray_type_code"/>
-              <field name="kardex_tray_y"/>
-              <field name="kardex_tray_x"/>
-              <label for="kardex_tray_qty"/>
+              <field name="tray_name"/>
+              <field name="tray_type_code"/>
+              <field name="tray_y"/>
+              <field name="tray_x"/>
+              <label for="tray_qty"/>
               <div colspan="2" class="oe_title">
                 <h1>
-                  <field name="kardex_tray_qty"/>
+                  <field name="tray_qty"/>
                 </h1>
               </div>
             </group>
             <group>
               <div>
-                <field name="kardex_tray_matrix"
-                       widget="kardex_tray_matrix"
+                <field name="tray_matrix"
+                       widget="location_tray_matrix"
                        />
               </div>
             </group>
@@ -120,13 +120,13 @@
     </field>
   </record>
 
-  <record id="stock_kardex_form_menu" model="ir.ui.view">
-    <field name="name">stock.kardex.view.form.menu</field>
-    <field name="model">stock.kardex</field>
+  <record id="vertical_lift_shuttle_form_menu" model="ir.ui.view">
+    <field name="name">vertical.lift.shuttle.view.form.menu</field>
+    <field name="model">vertical.lift.shuttle</field>
     <field name="priority">100</field>
     <field name="arch" type="xml">
-      <form string="Kardex">
-        <div class="row o_kardex_menu">
+      <form string="Shuttle">
+        <div class="row o_vlift_shuttle_menu">
           <div class="col-6">
             <button name="switch_pick"
                     type="object"
@@ -143,7 +143,7 @@
           </div>
           <div class="col-6">
             <field name="id" string="Back to settings"
-                   widget="exit_button" readonly="1"/>
+                   widget="vlift_shuttle_exit_button" readonly="1"/>
           </div>
         </div>
         <footer></footer>
@@ -151,12 +151,12 @@
     </field>
   </record>
 
-  <record id="stock_kardex_manual_barcode_form" model="ir.ui.view">
-    <field name="name">stock.kardex.manual.barcode.view.form</field>
-    <field name="model">stock.kardex.manual.barcode</field>
+  <record id="vertical_lift_shuttle_manual_barcode_form" model="ir.ui.view">
+    <field name="name">vertical.lift.shuttle.manual.barcode.view.form</field>
+    <field name="model">vertical.lift.shuttle.manual.barcode</field>
     <field name="arch" type="xml">
-      <form string="Kardex">
-        <div class="row o_kardex_manual_barcode">
+      <form string="Shuttle">
+        <div class="row o_vlift_shuttle_manual_barcode">
           <div class="col-8">
             <field name="barcode"/>
           </div>
@@ -172,9 +172,9 @@
     </field>
   </record>
 
-  <record id="stock_kardex_view_form" model="ir.ui.view">
-    <field name="name">stock.kardex.view.form</field>
-    <field name="model">stock.kardex</field>
+  <record id="vertical_lift_shuttle_view_form" model="ir.ui.view">
+    <field name="name">vertical.lift.shuttle.view.form</field>
+    <field name="model">vertical.lift.shuttle</field>
     <field name="arch" type="xml">
       <form string="Operations">
         <group>
@@ -191,9 +191,9 @@ remove later -->
     </field>
   </record>
 
-  <record model="ir.ui.view" id="stock_kardex_view_kanban">
-    <field name="name">stock.kardex.kanban</field>
-    <field name="model">stock.kardex</field>
+  <record model="ir.ui.view" id="vertical_lift_shuttle_view_kanban">
+    <field name="name">vertical.lift.shuttle.kanban</field>
+    <field name="model">vertical.lift.shuttle</field>
     <field name="arch" type="xml">
       <kanban class="o_kanban_dashboard">
         <field name="name"/>
@@ -203,8 +203,8 @@ remove later -->
         <field name="number_of_ops_all"/>
         <templates>
           <t t-name="kanban-box">
-            <div class="oe_kanban_global_click o_has_icon open_kardex_screen">
-              <div class="o_kardex_kanban_main">
+            <div class="oe_kanban_global_click o_has_icon open_shuttle_screen">
+              <div class="o_vlift_kanban_main">
 
                 <div class="o_kanban_card_content">
                   <div class="o_kanban_primary_left">
@@ -246,21 +246,21 @@ remove later -->
     </field>
   </record>
 
-  <record model="ir.ui.view" id="stock_kardex_view_tree">
-    <field name="name">stock.kardex.tree</field>
-    <field name="model">stock.kardex</field>
+  <record model="ir.ui.view" id="vertical_lift_shuttle_view_tree">
+    <field name="name">vertical.lift.shuttle.tree</field>
+    <field name="model">vertical.lift.shuttle</field>
     <field name="arch" type="xml">
-      <tree string="Kardex">
+      <tree string="Shuttle">
         <field name="name"/>
         <field name="address"/>
       </tree>
     </field>
   </record>
 
-  <record model="ir.actions.act_window" id="stock_kardex_action">
-    <field name="name">Kardex</field>
+  <record model="ir.actions.act_window" id="vertical_lift_shuttle_action">
+    <field name="name">Vertical Lift Shuttles</field>
     <field name="type">ir.actions.act_window</field>
-    <field name="res_model">stock.kardex</field>
+    <field name="res_model">vertical.lift.shuttle</field>
     <field name="view_type">form</field>
     <field name="view_mode">kanban,tree,form</field>
     <field name="target">current</field>
@@ -268,14 +268,14 @@ remove later -->
     <field name="context">{}</field>
     <field name="help" type="html">
       <p class="o_view_nocontent_smiling_face">
-        Open the Kardex Interface.
+        Open the Shuttle Interface.
       </p>
     </field>
   </record>
 
-  <menuitem id="stock_kardex"
-            name="Kardex"
-            action="stock_kardex_action"
+  <menuitem id="vertical_lift_shuttle"
+            name="Vertical Lift Shuttles"
+            action="vertical_lift_shuttle_action"
             parent="stock.menu_stock_warehouse_mgmt"
             sequence="15"/>
 
diff --git a/stock_kardex/views/stock_kardex_tray_type_views.xml b/stock_vertical_lift/views/vertical_lift_tray_type_views.xml
similarity index 60%
rename from stock_kardex/views/stock_kardex_tray_type_views.xml
rename to stock_vertical_lift/views/vertical_lift_tray_type_views.xml
index 326d1619629b..1cf9c3311bd8 100644
--- a/stock_kardex/views/stock_kardex_tray_type_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_tray_type_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-  <record id="view_stock_kardex_tray_type_form" model="ir.ui.view">
-    <field name="name">stock.kardex.tray.type.form</field>
-    <field name="model">stock.kardex.tray.type</field>
+  <record id="view_vertical_lift_tray_type_form" model="ir.ui.view">
+    <field name="name">vertical.lift.tray.type.form</field>
+    <field name="model">vertical.lift.tray.type</field>
     <field name="arch" type="xml">
-      <form string="Kardex Tray Type">
+      <form string="Vertical Lift Tray Type">
         <div class="oe_button_box" name="button_box">
           <button string="Locations"
                   class="oe_stat_button"
@@ -26,7 +26,7 @@
           </group>
           <group string="Disposition" name="disposition">
             <field name="tray_matrix"
-                   widget="kardex_tray_matrix"
+                   widget="location_tray_matrix"
                    nolabel="1"/>
           </group>
         </group>
@@ -34,11 +34,11 @@
     </field>
   </record>
 
-  <record id="view_stock_kardex_tray_type_search" model="ir.ui.view">
-    <field name="name">stock.kardex.tray.type.search</field>
-    <field name="model">stock.kardex.tray.type</field>
+  <record id="view_vertical_lift_tray_type_search" model="ir.ui.view">
+    <field name="name">vertical.lift.tray.type.search</field>
+    <field name="model">vertical.lift.tray.type</field>
     <field name="arch" type="xml">
-      <search string="Kardex Tray Type">
+      <search string="Vertical Lift Tray Type">
         <field name="name"/>
         <field name="code"/>
         <separator/>
@@ -47,11 +47,11 @@
     </field>
   </record>
 
-  <record id="view_stock_kardex_tray_type_tree" model="ir.ui.view">
-    <field name="name">stock.kardex.tray.type</field>
-    <field name="model">stock.kardex.tray.type</field>
+  <record id="view_vertical_lift_tray_type_tree" model="ir.ui.view">
+    <field name="name">vertical.lift.tray.type</field>
+    <field name="model">vertical.lift.tray.type</field>
     <field name="arch" type="xml">
-      <tree string="Kardey Tray Type">
+      <tree string="Vertical Lift Tray Type">
         <field name="name"/>
         <field name="code"/>
         <field name="rows"/>
@@ -60,17 +60,17 @@
     </field>
   </record>
 
-  <record id="action_stock_kardex_tray_type" model="ir.actions.act_window">
-    <field name="name">Kardex Tray Types</field>
-    <field name="res_model">stock.kardex.tray.type</field>
+  <record id="action_vertical_lift_tray_type" model="ir.actions.act_window">
+    <field name="name">Vertical Lift Tray Types</field>
+    <field name="res_model">vertical.lift.tray.type</field>
     <field name="type">ir.actions.act_window</field>
     <field name="view_type">form</field>
-    <field name="view_id" ref="view_stock_kardex_tray_type_tree"/>
-    <field name="search_view_id" ref="view_stock_kardex_tray_type_search"/>
+    <field name="view_id" ref="view_vertical_lift_tray_type_tree"/>
+    <field name="search_view_id" ref="view_vertical_lift_tray_type_search"/>
     <field name="context"></field>
     <field name="help" type="html">
       <p class="o_view_nocontent_smiling_face">
-        Add a Kardex Tray Type
+        Add a Vertical Lift Tray Type
         </p><p>
         Define the number of rows and cols on a tray, depending of the boxes
 size.
@@ -78,8 +78,8 @@ size.
     </field>
   </record>
 
-  <menuitem action="action_stock_kardex_tray_type"
-            id="menu_stock_kardex_tray_type"
+  <menuitem action="action_vertical_lift_tray_type"
+            id="menu_vertical_lift_tray_type"
             parent="stock.menu_warehouse_config" sequence="10"/>
 
 </odoo>

From a653ad4db1e38dae032d682924abf0ca59996cfc Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 26 Jun 2019 15:00:07 +0200
Subject: [PATCH 23/50] Add selection of hardware for shuttles

The default one being 'simulation', new ones must be added by other
addons. An empty shell is created for Kardex, where we'll later add the
"driver" part to drive Kardex Shuttles.
---
 .../demo/vertical_lift_shuttle_demo.xml       |  3 -
 .../models/vertical_lift_shuttle.py           | 67 +++++++++++++++----
 .../views/vertical_lift_shuttle_views.xml     |  2 +-
 stock_vertical_lift_kardex/__init__.py        |  1 +
 stock_vertical_lift_kardex/__manifest__.py    | 17 +++++
 stock_vertical_lift_kardex/models/__init__.py |  1 +
 .../models/vertical_lift_shuttle.py           | 14 ++++
 7 files changed, 87 insertions(+), 18 deletions(-)
 create mode 100644 stock_vertical_lift_kardex/__init__.py
 create mode 100644 stock_vertical_lift_kardex/__manifest__.py
 create mode 100644 stock_vertical_lift_kardex/models/__init__.py
 create mode 100644 stock_vertical_lift_kardex/models/vertical_lift_shuttle.py

diff --git a/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml b/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
index 0dafcc526739..87f856682fac 100644
--- a/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
+++ b/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
@@ -5,7 +5,6 @@
     <field name="name">Shuttle 1</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
     <field name="address">10.0.30.1</field>
-    <field name="simulate" eval="True"/>
     <field name="mode">pick</field>
   </record>
 
@@ -13,7 +12,6 @@
     <field name="name">Shuttle 2</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
     <field name="address">10.0.30.2</field>
-    <field name="simulate" eval="True"/>
     <field name="mode">pick</field>
   </record>
 
@@ -21,7 +19,6 @@
     <field name="name">Shuttle 3</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3"/>
     <field name="address">10.0.30.3</field>
-    <field name="simulate" eval="True"/>
     <field name="mode">pick</field>
   </record>
 
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index adddf6a00039..b96b3104c36b 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -25,8 +25,8 @@ class VerticalLiftShuttle(models.Model):
         help="The Shuttle source location for Pick operations "
         "and destination location for Put operations.",
     )
-    simulate = fields.Boolean(
-        help="When ticked, commands will not be sent to the Shuttle."
+    hardware = fields.Selection(
+        selection='_selection_hardware', default='simulation', required=True
     )
     current_move_line_id = fields.Many2one(comodel_name='stock.move.line')
 
@@ -104,6 +104,10 @@ class VerticalLiftShuttle(models.Model):
     def on_barcode_scanned(self, barcode):
         self.env.user.notify_info('Scanned barcode: {}'.format(barcode))
 
+    @api.model
+    def _selection_hardware(self):
+        return [('simulation', 'Simulation')]
+
     @api.depends('current_move_line_id.product_id.packaging_ids')
     def _compute_product_packagings(self):
         for record in self:
@@ -226,7 +230,19 @@ def count_move_lines_to_do_all(self):
         )
 
     def button_release(self):
-        raise exceptions.UserError(_('Not implemented'))
+        self._hardware_switch_off_laser_pointer()
+        self._hardware_close_tray()
+        self.select_next_move_line()
+        if not self.current_move_line_id:
+            # sorry not sorry
+            return {
+                'effect': {
+                    'fadeout': 'slow',
+                    'message': _('Congrats, you cleared the queue!'),
+                    'img_url': '/web/static/src/img/smile.svg',
+                    'type': 'rainbow_man',
+                }
+            }
 
     def process_current_pick(self):
         # test code, TODO the smart one
@@ -247,17 +263,7 @@ def button_save(self):
         self.ensure_one()
         method = 'process_current_{}'.format(self.mode)
         getattr(self, method)()
-        self.select_next_move_line()
-        if not self.current_move_line_id:
-            # sorry not sorry
-            return {
-                'effect': {
-                    'fadeout': 'slow',
-                    'message': _('Congrats, you cleared the queue!'),
-                    'img_url': '/web/static/src/img/smile.svg',
-                    'type': 'rainbow_man',
-                }
-            }
+        self.operation_descr = _('Release')
 
     def select_next_move_line(self):
         self.ensure_one()
@@ -267,6 +273,9 @@ def select_next_move_line(self):
         self.current_move_line_id = next_move_line
         descr = _('Scan next PID') if next_move_line else _('No operations')
         self.operation_descr = descr
+        if next_move_line:
+            self._hardware_switch_on_laser_pointer()
+            self._hardware_open_tray()
 
     def action_open_screen(self):
         self.select_next_move_line()
@@ -320,6 +329,36 @@ def switch_inventory(self):
         self.mode = 'inventory'
         self.select_next_move_line()
 
+    def _hardware_switch_on_laser_pointer(self):
+        if self.hardware == 'simulation':
+            self.env.user.notify_info(
+                message=_('Laser pointer on x{} y{}').format(
+                    self.tray_x, self.tray_y
+                ),
+                title=_('Lift Simulation'),
+            )
+
+    def _hardware_switch_off_laser_pointer(self):
+        if self.hardware == 'simulation':
+            self.env.user.notify_info(
+                message=_('Switch off laser pointer'),
+                title=_('Lift Simulation'),
+            )
+
+    def _hardware_open_tray(self):
+        if self.hardware == 'simulation':
+            self.env.user.notify_info(
+                message=_('Opening tray {}').format(self.tray_name),
+                title=_('Lift Simulation'),
+            )
+
+    def _hardware_close_tray(self):
+        if self.hardware == 'simulation':
+            self.env.user.notify_info(
+                message=_('Closing tray {}').format(self.tray_name),
+                title=_('Lift Simulation'),
+            )
+
 
 class VerticalLiftShuttleManualBarcode(models.TransientModel):
     _name = 'vertical.lift.shuttle.manual.barcode'
diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index 3c4c5defc28a..6ac961ecf6df 100644
--- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -182,7 +182,7 @@
           <field name="address"/>
           <field name="mode"/>
           <field name="location_id"/>
-          <field name="simulate" groups="base.group_no_one"/>
+          <field name="hardware"/>
           <!-- move line visible and editable for prototyping purposes, to
 remove later -->
           <field name="current_move_line_id" groups="base.group_no_one"/>
diff --git a/stock_vertical_lift_kardex/__init__.py b/stock_vertical_lift_kardex/__init__.py
new file mode 100644
index 000000000000..0650744f6bc6
--- /dev/null
+++ b/stock_vertical_lift_kardex/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/stock_vertical_lift_kardex/__manifest__.py b/stock_vertical_lift_kardex/__manifest__.py
new file mode 100644
index 000000000000..a913db4cc3f2
--- /dev/null
+++ b/stock_vertical_lift_kardex/__manifest__.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+{
+    'name': 'Vertical Lift - Kardex',
+    'summary': 'Integrate with Kardex Remstar Vertical Lifts',
+    'version': '12.0.1.0.0',
+    'category': 'Stock',
+    'author': 'Camptocamp',
+    'license': 'AGPL-3',
+    'depends': [
+        'stock_vertical_lift',
+    ],
+    'website': 'https://www.camptocamp.com',
+    'data': [],
+    'installable': True,
+}
diff --git a/stock_vertical_lift_kardex/models/__init__.py b/stock_vertical_lift_kardex/models/__init__.py
new file mode 100644
index 000000000000..e99db92f6582
--- /dev/null
+++ b/stock_vertical_lift_kardex/models/__init__.py
@@ -0,0 +1 @@
+from . import vertical_lift_shuttle
diff --git a/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py b/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py
new file mode 100644
index 000000000000..cfd3c74b9dbf
--- /dev/null
+++ b/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py
@@ -0,0 +1,14 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class VerticalLiftShuttle(models.Model):
+    _inherit = 'vertical.lift.shuttle'
+
+    @api.model
+    def _selection_hardware(self):
+        values = super()._selection_hardware()
+        values += [('kardex', 'Kardex')]
+        return values

From e31ae19f8ad4d9ee37664671c80d3ba469ded09d Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 26 Jun 2019 16:03:33 +0200
Subject: [PATCH 24/50] Scan destination for pick operations

---
 stock_vertical_lift/models/stock_location.py  |  3 +-
 stock_vertical_lift/models/stock_move.py      |  4 +-
 .../models/vertical_lift_shuttle.py           | 49 ++++++++++++++---
 .../static/src/js/vertical_lift.js            |  4 +-
 stock_vertical_lift/tests/test_location.py    |  9 ++--
 .../tests/test_vertical_lift_shuttle.py       | 54 ++++++++++++-------
 .../views/vertical_lift_shuttle_views.xml     |  8 +++
 7 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index ea30e9d7e22a..2913488f49ed 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -11,7 +11,8 @@ class StockLocation(models.Model):
     vertical_lift_location = fields.Boolean(
         'Is a Vertical Lift View Location?',
         default=False,
-        help="Check this box to use it as the view for Vertical Lift Shuttles.",
+        help="Check this box to use it as the view for Vertical"
+        " Lift Shuttles.",
     )
     vertical_lift_kind = fields.Selection(
         selection=[
diff --git a/stock_vertical_lift/models/stock_move.py b/stock_vertical_lift/models/stock_move.py
index 333a143f295c..1210d6b09c1b 100644
--- a/stock_vertical_lift/models/stock_move.py
+++ b/stock_vertical_lift/models/stock_move.py
@@ -12,8 +12,8 @@ def write(self, vals):
         result = super().write(vals)
         if 'state' in vals:
             # We cannot have fields to depends on to invalidate these computed
-            # fields on vertical.lift.shuttle. But we know that when the state of
-            # any move line changes, we can invalidate them as the count of
+            # fields on vertical.lift.shuttle. But we know that when the state
+            # of any move line changes, we can invalidate them as the count of
             # assigned move lines may change (and we track this in stock.move,
             # not stock.move.line, becaus the state of the lines is a related
             # to this one).
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index b96b3104c36b..96ba3660cdae 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -39,7 +39,9 @@ class VerticalLiftShuttle(models.Model):
     )
 
     operation_descr = fields.Char(
-        string="Operation", default="Scan next PID", readonly=True
+        string="Operation",
+        default="Scan New Destination Location",
+        readonly=True,
     )
 
     # tray information (will come from stock.location or a new tray model)
@@ -92,6 +94,11 @@ class VerticalLiftShuttle(models.Model):
     lot_id = fields.Many2one(
         related='current_move_line_id.lot_id', readonly=True
     )
+    location_dest_id = fields.Many2one(
+        string="Destination",
+        related='current_move_line_id.location_dest_id',
+        readonly=True,
+    )
 
     # TODO add a glue addon with product_expiry to add the field
 
@@ -102,7 +109,29 @@ class VerticalLiftShuttle(models.Model):
     )
 
     def on_barcode_scanned(self, barcode):
+        self.ensure_one()
+        # FIXME notify_info is only for the demo
         self.env.user.notify_info('Scanned barcode: {}'.format(barcode))
+        method = 'on_barcode_scanned_{}'.format(self.mode)
+        getattr(self, method)(barcode)
+
+    def on_barcode_scanned_pick(self, barcode):
+        location = self.env['stock.location'].search(
+            [('barcode', '=', barcode)]
+        )
+        if location:
+            self.current_move_line_id.location_dest_id = location
+            self.operation_descr = _('Save')
+        else:
+            self.env.user.notify_warning(
+                _('No location found for barcode {}').format(barcode)
+            )
+
+    def on_barcode_scanned_put(self, barcode):
+        pass
+
+    def on_barcode_scanned_inventory(self, barcode):
+        pass
 
     @api.model
     def _selection_hardware(self):
@@ -230,8 +259,9 @@ def count_move_lines_to_do_all(self):
         )
 
     def button_release(self):
-        self._hardware_switch_off_laser_pointer()
-        self._hardware_close_tray()
+        if self.current_move_line_id:
+            self._hardware_switch_off_laser_pointer()
+            self._hardware_close_tray()
         self.select_next_move_line()
         if not self.current_move_line_id:
             # sorry not sorry
@@ -248,8 +278,9 @@ def process_current_pick(self):
         # test code, TODO the smart one
         # (scan of barcode increments qty, save calls action_done?)
         line = self.current_move_line_id
-        line.qty_done = line.product_qty
-        line.move_id._action_done()
+        if line.state != 'done':
+            line.qty_done = line.product_qty
+            line.move_id._action_done()
 
     def process_current_put(self):
         raise exceptions.UserError(_('Put workflow not implemented'))
@@ -258,7 +289,7 @@ def process_current_inventory(self):
         raise exceptions.UserError(_('Inventory workflow not implemented'))
 
     def button_save(self):
-        if not self:
+        if not (self and self.current_move_line_id):
             return
         self.ensure_one()
         method = 'process_current_{}'.format(self.mode)
@@ -271,7 +302,11 @@ def select_next_move_line(self):
             self._domain_move_lines_to_do(), limit=1
         )
         self.current_move_line_id = next_move_line
-        descr = _('Scan next PID') if next_move_line else _('No operations')
+        descr = (
+            _('Scan New Destination Location')
+            if next_move_line
+            else _('No operations')
+        )
         self.operation_descr = descr
         if next_move_line:
             self._hardware_switch_on_laser_pointer()
diff --git a/stock_vertical_lift/static/src/js/vertical_lift.js b/stock_vertical_lift/static/src/js/vertical_lift.js
index 22fe718076a2..8a65119b63ce 100644
--- a/stock_vertical_lift/static/src/js/vertical_lift.js
+++ b/stock_vertical_lift/static/src/js/vertical_lift.js
@@ -193,8 +193,8 @@ var LocationTrayMatrixField = DebouncedField.extend({
      */
     resizeCanvasToDisplaySize: function(canvas) {
         // look up the size the canvas is being displayed
-        const width = canvas.clientWidth;
-        const height = canvas.clientHeight;
+        var width = canvas.clientWidth;
+        var height = canvas.clientHeight;
 
         // If it's resolution does not match change it
         if (canvas.width !== width || canvas.height !== height) {
diff --git a/stock_vertical_lift/tests/test_location.py b/stock_vertical_lift/tests/test_location.py
index af24fa761322..ef7b1980db4b 100644
--- a/stock_vertical_lift/tests/test_location.py
+++ b/stock_vertical_lift/tests/test_location.py
@@ -63,7 +63,8 @@ def test_create_tray(self):
 
     def test_tray_has_stock(self):
         cell = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
+            'stock_vertical_lift.'
+            'stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self.assertFalse(cell.quant_ids)
         self.assertFalse(cell.tray_cell_contains_stock)
@@ -168,7 +169,8 @@ def test_matrix_stock_cell(self):
     def test_check_active_empty(self):
         # this type used by tray T1B, we should not be able to disable it
         cell = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
+            'stock_vertical_lift.'
+            'stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self.assertFalse(cell.tray_cell_contains_stock)
         # allowed to archive empty cell
@@ -176,7 +178,8 @@ def test_check_active_empty(self):
 
     def test_check_active_not_empty(self):
         cell = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
+            'stock_vertical_lift.'
+            'stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self._update_quantity_in_cell(cell, self.product_socks, 1)
         self.assertTrue(cell.tray_cell_contains_stock)
diff --git a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
index a8d6631f01e9..26601253018d 100644
--- a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
+++ b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
@@ -54,23 +54,20 @@ def test_pick_select_next_move_line(self):
         self.shuttle.switch_pick()
         self.shuttle.select_next_move_line()
         self.assertEqual(self.shuttle.current_move_line_id, self.out_move_line)
-        self.assertEqual(self.shuttle.operation_descr, _('Scan next PID'))
+        self.assertEqual(
+            self.shuttle.operation_descr,
+            _('Scan New Destination Location')
+        )
 
     def test_pick_save(self):
         self.shuttle.switch_pick()
         self.shuttle.current_move_line_id = self.out_move_line
-        result = self.shuttle.button_save()
-        self.assertFalse(self.shuttle.current_move_line_id)
-        self.assertEqual(self.shuttle.operation_descr, _('No operations'))
-        expected_result = {
-            'effect': {
-                'fadeout': 'slow',
-                'message': _('Congrats, you cleared the queue!'),
-                'img_url': '/web/static/src/img/smile.svg',
-                'type': 'rainbow_man',
-            }
-        }
-        self.assertEqual(result, expected_result)
+        self.shuttle.button_save()
+        self.assertEqual(
+            self.shuttle.current_move_line_id.state,
+            'done'
+        )
+        self.assertEqual(self.shuttle.operation_descr, _('Release'))
 
     def test_pick_related_fields(self):
         self.shuttle.switch_pick()
@@ -120,11 +117,13 @@ def test_pick_count_move_lines(self):
         # ensure that we have stock in some cells, we'll put product1
         # in the first Shuttle and product2 in the second
         cell1 = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
+            'stock_vertical_lift.'
+            'stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self._update_quantity_in_cell(cell1, product1, 50)
         cell2 = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_2a_x1y1'
+            'stock_vertical_lift.'
+            'stock_location_vertical_lift_demo_tray_2a_x1y1'
         )
         self._update_quantity_in_cell(cell2, product2, 50)
 
@@ -162,7 +161,8 @@ def test_pick_count_move_lines(self):
         self.assertEqual(shuttle1.number_of_ops_all, 5)
         self.assertEqual(shuttle2.number_of_ops_all, 5)
 
-        # add stock and make the last one assigned to check the number is updated
+        # add stock and make the last one assigned to check the number is
+        # updated
         self._update_quantity_in_cell(cell2, product2, 10)
         unassigned.action_assign()
         self.assertEqual(shuttle1.number_of_ops, 3)
@@ -184,9 +184,22 @@ def test_on_barcode_scanned(self):
         pass
 
     def test_button_release(self):
-        # test to implement when the code is implemented
-        with self.assertRaises(exceptions.UserError):
-            self.shuttle.button_release()
+        # for the test, we'll consider our last line has been delivered
+        self.out_move_line.qty_done = self.out_move_line.product_qty
+        self.out_move_line.move_id._action_done()
+        # release, no further operation in queue
+        result = self.shuttle.button_release()
+        self.assertFalse(self.shuttle.current_move_line_id)
+        self.assertEqual(self.shuttle.operation_descr, _('No operations'))
+        expected_result = {
+            'effect': {
+                'fadeout': 'slow',
+                'message': _('Congrats, you cleared the queue!'),
+                'img_url': '/web/static/src/img/smile.svg',
+                'type': 'rainbow_man',
+            }
+        }
+        self.assertEqual(result, expected_result)
 
     def test_process_current_pick(self):
         self.shuttle.switch_pick()
@@ -228,7 +241,8 @@ def test_matrix(self):
 
     def test_tray_qty(self):
         cell = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a_x3y2'
+            'stock_vertical_lift.'
+            'stock_location_vertical_lift_demo_tray_1a_x3y2'
         )
         self.out_move_line.location_id = cell
         self.shuttle.current_move_line_id = self.out_move_line
diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index 6ac961ecf6df..2afa60ee9c0d 100644
--- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -35,12 +35,14 @@
           </div>
           <div class="o_shuttle_content o_shuttle_content_right">
             <div>
+              <!-- will react on barcode 'O-BTN.save' -->
               <button name="button_save"
                       type="object"
                       string="Save"
                       icon="fa-check"
                       class="btn-primary"
                       barcode_trigger="save"/>
+              <!-- will react on barcode 'O-BTN.release -->
               <button name="button_release"
                       type="object"
                       string="Release"
@@ -72,6 +74,12 @@
                 <div>
                   <field name="picking_partner_id" options="{'no_open': True}"/>
                 </div>
+                <label for="location_dest_id"/>
+                <div>
+                  <field name="location_dest_id"
+                         class="bg-primary o_shuttle_highlight"
+                         options="{'no_open': True}"/>
+                </div>
                 <label for="product_id"/>
                 <div colspan="2" class="oe_title">
                   <h1>

From 24d07a29e7676f2debf0b685e38f95e0164d8a60 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 26 Jun 2019 16:53:55 +0200
Subject: [PATCH 25/50] Add svg files for the buttons barcodes

---
 stock_vertical_lift/images/O-BTN.release.svg | 55 ++++++++++++++++++++
 stock_vertical_lift/images/O-BTN.save.svg    | 46 ++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 stock_vertical_lift/images/O-BTN.release.svg
 create mode 100644 stock_vertical_lift/images/O-BTN.save.svg

diff --git a/stock_vertical_lift/images/O-BTN.release.svg b/stock_vertical_lift/images/O-BTN.release.svg
new file mode 100644
index 000000000000..42535a126d9a
--- /dev/null
+++ b/stock_vertical_lift/images/O-BTN.release.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" width="356" height="81.587" viewBox="0 0 356 81.587">
+<desc></desc>
+<rect x="0" y="0" width="356" height="81.587" style="fill:#ffffff;" />
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="2" y1="0" x2="2" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="7" y1="0" x2="7" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="13" y1="0" x2="13" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="23" y1="0" x2="23" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="33" y1="0" x2="33" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="40" y1="0" x2="40" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="45" y1="0" x2="45" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="52" y1="0" x2="52" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="59" y1="0" x2="59" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="67" y1="0" x2="67" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="75" y1="0" x2="75" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="80" y1="0" x2="80" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="90" y1="0" x2="90" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="97" y1="0" x2="97" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="107" y1="0" x2="107" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="111" y1="0" x2="111" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="117" y1="0" x2="117" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="128" y1="0" x2="128" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="133" y1="0" x2="133" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="140" y1="0" x2="140" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="149" y1="0" x2="149" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="155" y1="0" x2="155" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="161" y1="0" x2="161" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:8;" x1="170" y1="0" x2="170" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="177" y1="0" x2="177" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="182" y1="0" x2="182" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="189" y1="0" x2="189" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="200" y1="0" x2="200" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="207" y1="0" x2="207" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="211" y1="0" x2="211" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="221" y1="0" x2="221" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="226" y1="0" x2="226" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="233" y1="0" x2="233" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="243" y1="0" x2="243" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="249" y1="0" x2="249" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="254" y1="0" x2="254" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="265" y1="0" x2="265" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:8;" x1="272" y1="0" x2="272" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="281" y1="0" x2="281" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="287" y1="0" x2="287" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="292" y1="0" x2="292" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="299" y1="0" x2="299" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="309" y1="0" x2="309" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="318" y1="0" x2="318" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="327" y1="0" x2="327" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="332" y1="0" x2="332" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="343" y1="0" x2="343" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="349" y1="0" x2="349" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="354" y1="0" x2="354" y2="60"/>
+<text x="178" y="77.271" text-anchor="middle" style="font-family: Tahoma; font-size: 20px; stroke: none; fill:#000000;">O-BTN.release</text></svg>
\ No newline at end of file
diff --git a/stock_vertical_lift/images/O-BTN.save.svg b/stock_vertical_lift/images/O-BTN.save.svg
new file mode 100644
index 000000000000..f32e290a8e53
--- /dev/null
+++ b/stock_vertical_lift/images/O-BTN.save.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" width="290" height="81.587" viewBox="0 0 290 81.587">
+<desc></desc>
+<rect x="0" y="0" width="290" height="81.587" style="fill:#ffffff;" />
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="2" y1="0" x2="2" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="7" y1="0" x2="7" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="13" y1="0" x2="13" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="23" y1="0" x2="23" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="33" y1="0" x2="33" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="40" y1="0" x2="40" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="45" y1="0" x2="45" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="52" y1="0" x2="52" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="59" y1="0" x2="59" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="67" y1="0" x2="67" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="75" y1="0" x2="75" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="80" y1="0" x2="80" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="90" y1="0" x2="90" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="97" y1="0" x2="97" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="107" y1="0" x2="107" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="111" y1="0" x2="111" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="117" y1="0" x2="117" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="128" y1="0" x2="128" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="133" y1="0" x2="133" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="140" y1="0" x2="140" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="149" y1="0" x2="149" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="155" y1="0" x2="155" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:8;" x1="162" y1="0" x2="162" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="171" y1="0" x2="171" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="177" y1="0" x2="177" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="183" y1="0" x2="183" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="188" y1="0" x2="188" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:8;" x1="202" y1="0" x2="202" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="209" y1="0" x2="209" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="215" y1="0" x2="215" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="221" y1="0" x2="221" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="226" y1="0" x2="226" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="233" y1="0" x2="233" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="243" y1="0" x2="243" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="248" y1="0" x2="248" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="259" y1="0" x2="259" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="266" y1="0" x2="266" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:6;" x1="277" y1="0" x2="277" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:2;" x1="283" y1="0" x2="283" y2="60"/>
+<line fill="none" style="stroke:#000000; stroke-width:4;" x1="288" y1="0" x2="288" y2="60"/>
+<text x="145" y="77.271" text-anchor="middle" style="font-family: Tahoma; font-size: 20px; stroke: none; fill:#000000;">O-BTN.save</text></svg>
\ No newline at end of file

From d5e1546dda2a91b988e5bddd85203a50ac2134cb Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 28 Aug 2019 16:23:42 +0200
Subject: [PATCH 26/50] Add option to generate custom name format for cells

Following the proposal of @damendieta, implement differently
---
 stock_vertical_lift/models/stock_location.py  | 28 ++++++++++++++++++-
 .../views/stock_location_views.xml            |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index 2913488f49ed..ec1f17ec4183 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -1,6 +1,7 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from collections import defaultdict
 from odoo import _, api, exceptions, fields, models
 from odoo.addons.base_sparse_field.models.fields import Serialized
 
@@ -32,6 +33,19 @@ class StockLocation(models.Model):
         help="Used to know if a cell of a Tray location is empty.",
     )
     tray_matrix = Serialized(string='Cells', compute='_compute_tray_matrix')
+    cell_name_format = fields.Char(
+        string='Name Format for Cells',
+        default=lambda self: self._default_cell_name_format(),
+        help="Cells sub-locations generated in a tray will be named"
+        " after this format. Replacement fields between curly braces are used"
+        " to inject positions. {x} will be replaced by the x position and"
+        " {y} by the y position. Complex formatting (such as padding, ...)"
+        " can be done using the format specification at "
+        " https://docs.python.org/2/library/string.html#formatstrings",
+    )
+
+    def _default_cell_name_format(self):
+        return 'x{x:0>2}y{y:0>2}'
 
     # TODO document hierarchy
     # Vertical Lift View
@@ -121,6 +135,13 @@ def write(self, vals):
                 trays_to_update = (
                     location.vertical_lift_tray_type_id.id != new_tray_type_id
                 )
+            # short-circuit this check if we already know that we have to
+            # update trays
+            if not trays_to_update and 'cell_name_format' in vals:
+                new_format = vals.get('cell_name_format')
+                trays_to_update = (
+                    location.cell_name_format != new_format
+                )
             super(StockLocation, location).write(vals)
             if trays_to_update:
                 self._update_tray_sublocations()
@@ -169,6 +190,11 @@ def _tray_cell_matrix(self):
                 cells[cell.posy - 1][cell.posx - 1] = 1
         return cells
 
+    def _format_tray_sublocation_name(self, x, y):
+        template = self.cell_name_format or self._default_cell_name_format()
+        # using format_map allow to have missing replacement strings
+        return template.format_map(defaultdict(str, x=x, y=y))
+
     @api.multi
     def _update_tray_sublocations(self):
         values = []
@@ -196,7 +222,7 @@ def _update_tray_sublocations(self):
             for row in range(1, tray_type.rows + 1):
                 for col in range(1, tray_type.cols + 1):
                     subloc_values = {
-                        'name': _('x{}y{}').format(col, row),
+                        'name': location._format_tray_sublocation_name(col, row),
                         'posx': col,
                         'posy': row,
                         'location_id': location.id,
diff --git a/stock_vertical_lift/views/stock_location_views.xml b/stock_vertical_lift/views/stock_location_views.xml
index 5ca0f6e4e505..18016973e3f9 100644
--- a/stock_vertical_lift/views/stock_location_views.xml
+++ b/stock_vertical_lift/views/stock_location_views.xml
@@ -15,6 +15,7 @@
         <group string="Vertical Lift" name="vertical_lift"
                attrs="{'invisible': [('vertical_lift_kind', 'not in', ('shuttle', 'tray', 'cell'))]}">
           <field name="vertical_lift_kind"/>
+          <field name="cell_name_format" attrs="{'invisible': [('vertical_lift_kind', '!=', 'tray')]}"/>
           <field name="vertical_lift_tray_type_id"
                  attrs="{'invisible': [('vertical_lift_kind', '!=', 'tray')], 'required': [('vertical_lift_kind', '=', 'tray')]}"/>
           <field name="tray_matrix"

From 116ace82854626ead5957fad53b94d0ef6b369a3 Mon Sep 17 00:00:00 2001
From: Daniel Alejandro Mendieta <damendieta@gmail.com>
Date: Wed, 28 Aug 2019 16:36:36 +0200
Subject: [PATCH 27/50] Add position z in tray cells

---
 stock_vertical_lift/models/stock_location.py  | 19 ++++++++++++++-----
 .../views/stock_location_views.xml            |  3 +++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index ec1f17ec4183..f628b521a9da 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -38,8 +38,8 @@ class StockLocation(models.Model):
         default=lambda self: self._default_cell_name_format(),
         help="Cells sub-locations generated in a tray will be named"
         " after this format. Replacement fields between curly braces are used"
-        " to inject positions. {x} will be replaced by the x position and"
-        " {y} by the y position. Complex formatting (such as padding, ...)"
+        " to inject positions. {x}, {y}, and {z} will be replaced by their"
+        " corresponding position. Complex formatting (such as padding, ...)"
         " can be done using the format specification at "
         " https://docs.python.org/2/library/string.html#formatstrings",
     )
@@ -145,6 +145,10 @@ def write(self, vals):
             super(StockLocation, location).write(vals)
             if trays_to_update:
                 self._update_tray_sublocations()
+            elif 'posz' in vals and location.vertical_lift_kind == 'tray':
+                # On initial generation (when tray_to_update is true),
+                # the sublocations are already generated with the pos z.
+                location.child_ids.write({'posz': vals['posz']})
         return True
 
     @api.constrains('active')
@@ -190,10 +194,10 @@ def _tray_cell_matrix(self):
                 cells[cell.posy - 1][cell.posx - 1] = 1
         return cells
 
-    def _format_tray_sublocation_name(self, x, y):
+    def _format_tray_sublocation_name(self, x, y, z):
         template = self.cell_name_format or self._default_cell_name_format()
         # using format_map allow to have missing replacement strings
-        return template.format_map(defaultdict(str, x=x, y=y))
+        return template.format_map(defaultdict(str, x=x, y=y, z=z))
 
     @api.multi
     def _update_tray_sublocations(self):
@@ -219,12 +223,17 @@ def _update_tray_sublocations(self):
                 continue
 
             # create accepts several records now
+            posz = location.posz or 0
             for row in range(1, tray_type.rows + 1):
                 for col in range(1, tray_type.cols + 1):
+                    cell_name = location._format_tray_sublocation_name(
+                        col, row, posz
+                    )
                     subloc_values = {
-                        'name': location._format_tray_sublocation_name(col, row),
+                        'name': cell_name,
                         'posx': col,
                         'posy': row,
+                        'posz': posz,
                         'location_id': location.id,
                         'company_id': location.company_id.id,
                     }
diff --git a/stock_vertical_lift/views/stock_location_views.xml b/stock_vertical_lift/views/stock_location_views.xml
index 18016973e3f9..8ebb83aa8d29 100644
--- a/stock_vertical_lift/views/stock_location_views.xml
+++ b/stock_vertical_lift/views/stock_location_views.xml
@@ -32,6 +32,9 @@
       <field name="posy" position="attributes">
         <attribute name="attrs">{'readonly': [('vertical_lift_kind', '=', 'cell')]}</attribute>
       </field>
+      <field name="posz" position="attributes">
+        <attribute name="attrs">{'readonly': [('vertical_lift_kind', '=', 'cell')]}</attribute>
+      </field>
     </field>
   </record>
 

From 6636b8eb8a2c963c2ba18866a2ab8c1c1c823270 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 29 Aug 2019 09:34:12 +0200
Subject: [PATCH 28/50] Add development status, readme, pip files

---
 .../odoo/addons/stock_vertical_lift           |   1 +
 setup/stock_vertical_lift/setup.py            |   6 +
 .../odoo/addons/stock_vertical_lift_kardex    |   1 +
 setup/stock_vertical_lift_kardex/setup.py     |   6 +
 stock_vertical_lift/README.rst                | 134 +++++
 stock_vertical_lift/__manifest__.py           |   4 +-
 .../models/vertical_lift_shuttle.py           |   2 +
 stock_vertical_lift/readme/CONFIGURE.rst      |  39 ++
 stock_vertical_lift/readme/CONTRIBUTORS.rst   |   1 +
 stock_vertical_lift/readme/DESCRIPTION.rst    |   3 +
 stock_vertical_lift/readme/ROADMAP.rst        |   7 +
 .../static/description/index.html             | 490 ++++++++++++++++++
 stock_vertical_lift_kardex/__manifest__.py    |   4 +-
 .../readme/CONTRIBUTORS.rst                   |   1 +
 .../readme/DESCRIPTION.rst                    |   2 +
 stock_vertical_lift_kardex/readme/ROADMAP.rst |   1 +
 16 files changed, 698 insertions(+), 4 deletions(-)
 create mode 120000 setup/stock_vertical_lift/odoo/addons/stock_vertical_lift
 create mode 100644 setup/stock_vertical_lift/setup.py
 create mode 120000 setup/stock_vertical_lift_kardex/odoo/addons/stock_vertical_lift_kardex
 create mode 100644 setup/stock_vertical_lift_kardex/setup.py
 create mode 100644 stock_vertical_lift/README.rst
 create mode 100644 stock_vertical_lift/readme/CONFIGURE.rst
 create mode 100644 stock_vertical_lift/readme/CONTRIBUTORS.rst
 create mode 100644 stock_vertical_lift/readme/DESCRIPTION.rst
 create mode 100644 stock_vertical_lift/readme/ROADMAP.rst
 create mode 100644 stock_vertical_lift/static/description/index.html
 create mode 100644 stock_vertical_lift_kardex/readme/CONTRIBUTORS.rst
 create mode 100644 stock_vertical_lift_kardex/readme/DESCRIPTION.rst
 create mode 100644 stock_vertical_lift_kardex/readme/ROADMAP.rst

diff --git a/setup/stock_vertical_lift/odoo/addons/stock_vertical_lift b/setup/stock_vertical_lift/odoo/addons/stock_vertical_lift
new file mode 120000
index 000000000000..61bf9f018226
--- /dev/null
+++ b/setup/stock_vertical_lift/odoo/addons/stock_vertical_lift
@@ -0,0 +1 @@
+../../../../stock_vertical_lift
\ No newline at end of file
diff --git a/setup/stock_vertical_lift/setup.py b/setup/stock_vertical_lift/setup.py
new file mode 100644
index 000000000000..28c57bb64031
--- /dev/null
+++ b/setup/stock_vertical_lift/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/stock_vertical_lift_kardex/odoo/addons/stock_vertical_lift_kardex b/setup/stock_vertical_lift_kardex/odoo/addons/stock_vertical_lift_kardex
new file mode 120000
index 000000000000..0c99c9c02ea6
--- /dev/null
+++ b/setup/stock_vertical_lift_kardex/odoo/addons/stock_vertical_lift_kardex
@@ -0,0 +1 @@
+../../../../stock_vertical_lift_kardex
\ No newline at end of file
diff --git a/setup/stock_vertical_lift_kardex/setup.py b/setup/stock_vertical_lift_kardex/setup.py
new file mode 100644
index 000000000000..28c57bb64031
--- /dev/null
+++ b/setup/stock_vertical_lift_kardex/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/stock_vertical_lift/README.rst b/stock_vertical_lift/README.rst
new file mode 100644
index 000000000000..a40a55da2046
--- /dev/null
+++ b/stock_vertical_lift/README.rst
@@ -0,0 +1,134 @@
+=============
+Vertical Lift
+=============
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! 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/12.0/stock_vertical_lift
+    :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-12-0/stock-logistics-warehouse-12-0-stock_vertical_lift
+    :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/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+Add configuration and dedicated screens to work with Vertical Lift
+systems (such as Kardex Remstar, Modula, ...). Drivers for controlling
+the lifts physically must be added by additional addons.
+
+.. 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://github.com/OCA/odoo-community.org/blob/master/website/Contribution/oca_module_lifecycle_development_status.rst>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+General
+~~~~~~~
+
+In Inventory Settings, you must have:
+
+ * Storage Locations
+ * Multi-Warehouses
+ * Multi-Step Routes
+
+Locations
+~~~~~~~~~
+
+Additional configuration parameters are added in Locations:
+
+* Sub-locations of a location with the "Is a Vertical Lift View Location"
+  activated are considered as "Shuttles". A shuttle is a vertical lift shelf.
+* Sub-locations of shuttles are considered as "Trays", which is a tier of a
+  shuttle. When a tray is created, a tray type must be selected. When saved, the
+  tray location will automatically create as many sub-locations - called
+  "Cells" - as the tray type contains.
+* The tray type of a tray can be changed as long as none of its cell contains
+  products. When changed, it archives the cells and creates new ones as
+  configured on the new tray type.
+
+Tray types
+~~~~~~~~~~
+
+Tray types can be configured in the Inventory settings.
+A tray type defines how much cells a tray can hold. It is a square or rectangle
+matrix of n cols * m rows.
+
+Vertical Lift Shuttles
+~~~~~~~~~~~~~~~~~~~~~~
+
+The Shuttles are the Vertical Lift Trays. One Shuttle entity has to be created
+in Odoo for each physical shuttle. Depending of the subsidiary addons installed
+(eg. Kardex), different options may be required (host address, ...). The base
+addon only includes shuttles of kind "simulation" which will not send orders to
+the hardware.
+
+Known issues / Roadmap
+======================
+
+* Extract the tray types and matrix widget in a module, they can be used
+  alone without vertical lift
+* Consider merging the 'vertical_lift_kind' with the kind added by
+  stock_location_zone
+* Complete Pick screen and workflow (currently enough for a demo, not for production)
+* Implement Put-away screen and workflow
+* Implement Inventory screen and workflow
+
+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%0Aversion:%2012.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>
+
+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/12.0/stock_vertical_lift>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_vertical_lift/__manifest__.py b/stock_vertical_lift/__manifest__.py
index c43fbf678095..4722e2c9f4f6 100644
--- a/stock_vertical_lift/__manifest__.py
+++ b/stock_vertical_lift/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
@@ -6,7 +5,7 @@
     'summary': 'Provides the core for integration with Vertical Lifts',
     'version': '12.0.1.0.0',
     'category': 'Stock',
-    'author': 'Camptocamp',
+    'author': 'Camptocamp, Odoo Community Association (OCA)',
     'license': 'AGPL-3',
     'depends': [
         'stock',
@@ -33,4 +32,5 @@
         'security/ir.model.access.csv',
     ],
     'installable': True,
+    'development_status': 'Alpha',
 }
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index 96ba3660cdae..56813bb5c667 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -302,6 +302,8 @@ def select_next_move_line(self):
             self._domain_move_lines_to_do(), limit=1
         )
         self.current_move_line_id = next_move_line
+        # TODO use a state machine to define next steps and
+        # description?
         descr = (
             _('Scan New Destination Location')
             if next_move_line
diff --git a/stock_vertical_lift/readme/CONFIGURE.rst b/stock_vertical_lift/readme/CONFIGURE.rst
new file mode 100644
index 000000000000..1e2e98985d28
--- /dev/null
+++ b/stock_vertical_lift/readme/CONFIGURE.rst
@@ -0,0 +1,39 @@
+General
+~~~~~~~
+
+In Inventory Settings, you must have:
+
+ * Storage Locations
+ * Multi-Warehouses
+ * Multi-Step Routes
+
+Locations
+~~~~~~~~~
+
+Additional configuration parameters are added in Locations:
+
+* Sub-locations of a location with the "Is a Vertical Lift View Location"
+  activated are considered as "Shuttles". A shuttle is a vertical lift shelf.
+* Sub-locations of shuttles are considered as "Trays", which is a tier of a
+  shuttle. When a tray is created, a tray type must be selected. When saved, the
+  tray location will automatically create as many sub-locations - called
+  "Cells" - as the tray type contains.
+* The tray type of a tray can be changed as long as none of its cell contains
+  products. When changed, it archives the cells and creates new ones as
+  configured on the new tray type.
+
+Tray types
+~~~~~~~~~~
+
+Tray types can be configured in the Inventory settings.
+A tray type defines how much cells a tray can hold. It is a square or rectangle
+matrix of n cols * m rows.
+
+Vertical Lift Shuttles
+~~~~~~~~~~~~~~~~~~~~~~
+
+The Shuttles are the Vertical Lift Trays. One Shuttle entity has to be created
+in Odoo for each physical shuttle. Depending of the subsidiary addons installed
+(eg. Kardex), different options may be required (host address, ...). The base
+addon only includes shuttles of kind "simulation" which will not send orders to
+the hardware.
diff --git a/stock_vertical_lift/readme/CONTRIBUTORS.rst b/stock_vertical_lift/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000000..48286263cd35
--- /dev/null
+++ b/stock_vertical_lift/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Guewen Baconnier <guewen.baconnier@camptocamp.com>
diff --git a/stock_vertical_lift/readme/DESCRIPTION.rst b/stock_vertical_lift/readme/DESCRIPTION.rst
new file mode 100644
index 000000000000..f1bc969d4689
--- /dev/null
+++ b/stock_vertical_lift/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+Add configuration and dedicated screens to work with Vertical Lift
+systems (such as Kardex Remstar, Modula, ...). Drivers for controlling
+the lifts physically must be added by additional addons.
diff --git a/stock_vertical_lift/readme/ROADMAP.rst b/stock_vertical_lift/readme/ROADMAP.rst
new file mode 100644
index 000000000000..94222e7d5b5d
--- /dev/null
+++ b/stock_vertical_lift/readme/ROADMAP.rst
@@ -0,0 +1,7 @@
+* Extract the tray types and matrix widget in a module, they can be used
+  alone without vertical lift
+* Consider merging the 'vertical_lift_kind' with the kind added by
+  stock_location_zone
+* Complete Pick screen and workflow (currently enough for a demo, not for production)
+* Implement Put-away screen and workflow
+* Implement Inventory screen and workflow
diff --git a/stock_vertical_lift/static/description/index.html b/stock_vertical_lift/static/description/index.html
new file mode 100644
index 000000000000..b8536e3beed3
--- /dev/null
+++ b/stock_vertical_lift/static/description/index.html
@@ -0,0 +1,490 @@
+<?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 0.14: http://docutils.sourceforge.net/" />
+<title>Vertical Lift</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">
+<h1 class="title">Vertical Lift</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/12.0/stock_vertical_lift"><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-12-0/stock-logistics-warehouse-12-0-stock_vertical_lift"><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/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p>Add configuration and dedicated screens to work with Vertical Lift
+systems (such as Kardex Remstar, Modula, …). Drivers for controlling
+the lifts physically must be added by additional addons.</p>
+<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://github.com/OCA/odoo-community.org/blob/master/website/Contribution/oca_module_lifecycle_development_status.rst">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="#configuration" id="id1">Configuration</a><ul>
+<li><a class="reference internal" href="#general" id="id2">General</a></li>
+<li><a class="reference internal" href="#locations" id="id3">Locations</a></li>
+<li><a class="reference internal" href="#tray-types" id="id4">Tray types</a></li>
+<li><a class="reference internal" href="#vertical-lift-shuttles" id="id5">Vertical Lift Shuttles</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id6">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id7">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id8">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id9">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id10">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id11">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<div class="section" id="general">
+<h2><a class="toc-backref" href="#id2">General</a></h2>
+<p>In Inventory Settings, you must have:</p>
+<blockquote>
+<ul class="simple">
+<li>Storage Locations</li>
+<li>Multi-Warehouses</li>
+<li>Multi-Step Routes</li>
+</ul>
+</blockquote>
+</div>
+<div class="section" id="locations">
+<h2><a class="toc-backref" href="#id3">Locations</a></h2>
+<p>Additional configuration parameters are added in Locations:</p>
+<ul class="simple">
+<li>Sub-locations of a location with the “Is a Vertical Lift View Location”
+activated are considered as “Shuttles”. A shuttle is a vertical lift shelf.</li>
+<li>Sub-locations of shuttles are considered as “Trays”, which is a tier of a
+shuttle. When a tray is created, a tray type must be selected. When saved, the
+tray location will automatically create as many sub-locations - called
+“Cells” - as the tray type contains.</li>
+<li>The tray type of a tray can be changed as long as none of its cell contains
+products. When changed, it archives the cells and creates new ones as
+configured on the new tray type.</li>
+</ul>
+</div>
+<div class="section" id="tray-types">
+<h2><a class="toc-backref" href="#id4">Tray types</a></h2>
+<p>Tray types can be configured in the Inventory settings.
+A tray type defines how much cells a tray can hold. It is a square or rectangle
+matrix of n cols * m rows.</p>
+</div>
+<div class="section" id="vertical-lift-shuttles">
+<h2><a class="toc-backref" href="#id5">Vertical Lift Shuttles</a></h2>
+<p>The Shuttles are the Vertical Lift Trays. One Shuttle entity has to be created
+in Odoo for each physical shuttle. Depending of the subsidiary addons installed
+(eg. Kardex), different options may be required (host address, …). The base
+addon only includes shuttles of kind “simulation” which will not send orders to
+the hardware.</p>
+</div>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id6">Known issues / Roadmap</a></h1>
+<ul class="simple">
+<li>Extract the tray types and matrix widget in a module, they can be used
+alone without vertical lift</li>
+<li>Consider merging the ‘vertical_lift_kind’ with the kind added by
+stock_location_zone</li>
+<li>Complete Pick screen and workflow (currently enough for a demo, not for production)</li>
+<li>Implement Put-away screen and workflow</li>
+<li>Implement Inventory screen and workflow</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#id7">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%0Aversion:%2012.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="#id8">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id9">Authors</a></h2>
+<ul class="simple">
+<li>Camptocamp</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#id10">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>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id11">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/12.0/stock_vertical_lift">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>
diff --git a/stock_vertical_lift_kardex/__manifest__.py b/stock_vertical_lift_kardex/__manifest__.py
index a913db4cc3f2..35670055d868 100644
--- a/stock_vertical_lift_kardex/__manifest__.py
+++ b/stock_vertical_lift_kardex/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
@@ -6,7 +5,7 @@
     'summary': 'Integrate with Kardex Remstar Vertical Lifts',
     'version': '12.0.1.0.0',
     'category': 'Stock',
-    'author': 'Camptocamp',
+    'author': 'Camptocamp, Odoo Community Association (OCA)',
     'license': 'AGPL-3',
     'depends': [
         'stock_vertical_lift',
@@ -14,4 +13,5 @@
     'website': 'https://www.camptocamp.com',
     'data': [],
     'installable': True,
+    'development_status': 'Alpha',
 }
diff --git a/stock_vertical_lift_kardex/readme/CONTRIBUTORS.rst b/stock_vertical_lift_kardex/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000000..48286263cd35
--- /dev/null
+++ b/stock_vertical_lift_kardex/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Guewen Baconnier <guewen.baconnier@camptocamp.com>
diff --git a/stock_vertical_lift_kardex/readme/DESCRIPTION.rst b/stock_vertical_lift_kardex/readme/DESCRIPTION.rst
new file mode 100644
index 000000000000..c4b64e9b08ac
--- /dev/null
+++ b/stock_vertical_lift_kardex/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+Add support for Kardex Remstar vertical lifts to the Vertical Lift
+module.
diff --git a/stock_vertical_lift_kardex/readme/ROADMAP.rst b/stock_vertical_lift_kardex/readme/ROADMAP.rst
new file mode 100644
index 000000000000..3d8aefd2ecb3
--- /dev/null
+++ b/stock_vertical_lift_kardex/readme/ROADMAP.rst
@@ -0,0 +1 @@
+* Add support of the hardware

From e74b74dea0da7052f6116eae3f48a0d4d5656cc6 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 19 Sep 2019 13:23:32 +0200
Subject: [PATCH 29/50] Remove tray type from vertical lift

It has been extracted in another addon
(https://github.com/OCA/stock-logistics-warehouse/pull/719)
---
 stock_vertical_lift/__manifest__.py           |   6 +-
 stock_vertical_lift/data/stock_location.xml   |  17 --
 .../data/vertical_lift_tray_type.xml          |  74 ------
 .../demo/stock_location_demo.xml              |  34 ++-
 stock_vertical_lift/models/__init__.py        |   1 -
 stock_vertical_lift/models/stock_location.py  | 243 +-----------------
 .../models/vertical_lift_shuttle.py           |   4 +-
 .../models/vertical_lift_tray_type.py         |  76 ------
 stock_vertical_lift/readme/ROADMAP.rst        |   4 -
 .../security/ir.model.access.csv              |   2 -
 .../static/src/js/vertical_lift.js            | 236 -----------------
 .../static/src/scss/vertical_lift.scss        |   5 -
 stock_vertical_lift/tests/__init__.py         |   1 -
 stock_vertical_lift/tests/common.py           |  26 +-
 stock_vertical_lift/tests/test_location.py    | 179 -------------
 .../tests/test_vertical_lift_shuttle.py       |   4 +-
 .../tests/test_vertical_lift_tray_type.py     |  70 -----
 .../views/stock_location_views.xml            |  78 +++---
 .../views/vertical_lift_tray_type_views.xml   |  85 ------
 19 files changed, 63 insertions(+), 1082 deletions(-)
 delete mode 100644 stock_vertical_lift/data/stock_location.xml
 delete mode 100644 stock_vertical_lift/data/vertical_lift_tray_type.xml
 delete mode 100644 stock_vertical_lift/models/vertical_lift_tray_type.py
 delete mode 100644 stock_vertical_lift/tests/test_vertical_lift_tray_type.py
 delete mode 100644 stock_vertical_lift/views/vertical_lift_tray_type_views.xml

diff --git a/stock_vertical_lift/__manifest__.py b/stock_vertical_lift/__manifest__.py
index 4722e2c9f4f6..e259e71f48db 100644
--- a/stock_vertical_lift/__manifest__.py
+++ b/stock_vertical_lift/__manifest__.py
@@ -11,9 +11,10 @@
         'stock',
         'barcodes',
         'base_sparse_field',
+        'stock_location_tray',  # OCA/stock-logistics-warehouse
         'web_notify',  # OCA/web
     ],
-    'website': 'https://www.camptocamp.com',
+    'website': 'https://github.com/OCA/stock-logistics-warehouse',
     'demo': [
         'demo/stock_location_demo.xml',
         'demo/vertical_lift_shuttle_demo.xml',
@@ -24,11 +25,8 @@
     'data': [
         'views/stock_location_views.xml',
         'views/vertical_lift_shuttle_views.xml',
-        'views/vertical_lift_tray_type_views.xml',
         'views/stock_vertical_lift_templates.xml',
         'views/shuttle_screen_templates.xml',
-        'data/stock_location.xml',
-        'data/vertical_lift_tray_type.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
diff --git a/stock_vertical_lift/data/stock_location.xml b/stock_vertical_lift/data/stock_location.xml
deleted file mode 100644
index 462e1d6a1679..000000000000
--- a/stock_vertical_lift/data/stock_location.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="1">
-
-  <record id="stock_location_vertical_lift" model="stock.location">
-    <field name="name">Vertical Lift</field>
-    <!-- Beware, must not be view, even if we should have stock here.
-         Because stock moves targeting views are not included in the
-         inventory at date, and we want to be able to use "Vertical Lift View"
-         as destination (the final destination will be a "cell" in a Shuttle).
-    -->
-    <field name="location_id" ref="stock.stock_location_stock"/>
-    <field name="usage">internal</field>
-    <field name="vertical_lift_location" eval="True"/>
-    <field name="company_id"></field>
-  </record>
-
-</odoo>
diff --git a/stock_vertical_lift/data/vertical_lift_tray_type.xml b/stock_vertical_lift/data/vertical_lift_tray_type.xml
deleted file mode 100644
index 419594d8a5b6..000000000000
--- a/stock_vertical_lift/data/vertical_lift_tray_type.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="1">
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_32x">
-    <field name="name">Small 32x</field>
-    <field name="code">B10804</field>
-    <field name="rows">4</field>
-    <field name="cols">8</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_16x">
-    <field name="name">Small 16x</field>
-    <field name="code">B20802</field>
-    <field name="rows">2</field>
-    <field name="cols">8</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_8x">
-    <field name="name">Small 8x</field>
-    <field name="code">B20402</field>
-    <field name="rows">2</field>
-    <field name="cols">4</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_16x_2">
-    <field name="name">Small 16x</field>
-    <field name="code">B40802</field>
-    <field name="rows">2</field>
-    <field name="cols">8</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_small_16x_3">
-    <field name="name">Small 16x</field>
-    <field name="code">B30404</field>
-    <field name="rows">4</field>
-    <field name="cols">4</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_32x">
-    <field name="name">Large 32x</field>
-    <field name="code">B20804</field>
-    <field name="rows">4</field>
-    <field name="cols">8</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_16x">
-    <field name="name">Large 16x</field>
-    <field name="code">B30802</field>
-    <field name="rows">2</field>
-    <field name="cols">8</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_8x">
-    <field name="name">Large 8x</field>
-    <field name="code">B30402</field>
-    <field name="rows">2</field>
-    <field name="cols">4</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_4x">
-    <field name="name">Large 4x</field>
-    <field name="code">B30401</field>
-    <field name="rows">1</field>
-    <field name="cols">4</field>
-  </record>
-
-  <record model="vertical.lift.tray.type" id="vertical_lift_tray_type_large_16x_2">
-    <field name="name">Large 16x</field>
-    <field name="code">B30404</field>
-    <field name="rows">4</field>
-    <field name="cols">4</field>
-  </record>
-
-</odoo>
diff --git a/stock_vertical_lift/demo/stock_location_demo.xml b/stock_vertical_lift/demo/stock_location_demo.xml
index bb87661e8c20..78257a926b40 100644
--- a/stock_vertical_lift/demo/stock_location_demo.xml
+++ b/stock_vertical_lift/demo/stock_location_demo.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
+    <record id="stock_location_vertical_lift" model="stock.location">
+        <field name="name">Vertical Lift</field>
+        <!-- Beware, must not be view, even if we must not have stock here.
+             Because stock moves targeting views are not included in the
+             inventory at date, and we want to be able to use "Vertical Lift View"
+             as destination (the final destination will be a "cell" in a Shuttle).
+        -->
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="usage">internal</field>
+        <field name="vertical_lift_location" eval="True"/>
+        <field name="company_id"></field>
+    </record>
+
   <record id="stock_location_vertical_lift_demo_shuttle_1" model="stock.location">
     <field name="name">Shuttle 1</field>
     <field name="location_id" ref="stock_location_vertical_lift"/>
@@ -11,7 +24,7 @@
     <field name="name">Tray 1A</field>
     <field name="barcode">T1A</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_small_8x"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_small_8x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -19,7 +32,7 @@
     <field name="name">Tray 1B</field>
     <field name="barcode">T1B</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_16x"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_16x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -27,7 +40,7 @@
     <field name="name">Tray 1C</field>
     <field name="barcode">T1C</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_32x"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_32x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -41,7 +54,7 @@
     <field name="name">Tray 2A</field>
     <field name="barcode">T2A</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_8x"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_8x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -49,7 +62,7 @@
     <field name="name">Tray 2B</field>
     <field name="barcode">T2B</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_4x"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_4x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -57,7 +70,7 @@
     <field name="name">Tray 2C</field>
     <field name="barcode">T2C</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_16x_2"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_16x_2"/>
     <field name="usage">internal</field>
   </record>
 
@@ -65,7 +78,7 @@
     <field name="name">Tray 2D</field>
     <field name="barcode">T2D</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_small_8x"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_small_8x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -79,7 +92,7 @@
     <field name="name">Tray 3A</field>
     <field name="barcode">T3A</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_small_32x"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_small_32x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -87,7 +100,7 @@
     <field name="name">Tray 3B</field>
     <field name="barcode">T3B</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3"/>
-    <field name="vertical_lift_tray_type_id" ref="vertical_lift_tray_type_large_32x"/>
+    <field name="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_32x"/>
     <field name="usage">internal</field>
   </record>
 
@@ -96,7 +109,8 @@
        other demo data and tests.
   -->
   <function model="stock.location" name="_create_tray_xmlids">
-    <function eval="[[('vertical_lift_kind', '=', 'cell')]]" model="stock.location" name="search"/>
+      <function eval="[[('cell_in_tray_type_id', '!=', False)]]" model="stock.location" name="search"/>
+      <value>stock_vertical_lift</value>
   </function>
 
 </odoo>
diff --git a/stock_vertical_lift/models/__init__.py b/stock_vertical_lift/models/__init__.py
index 83e852f12247..2a0e1d40b651 100644
--- a/stock_vertical_lift/models/__init__.py
+++ b/stock_vertical_lift/models/__init__.py
@@ -1,5 +1,4 @@
 from . import vertical_lift_shuttle
-from . import vertical_lift_tray_type
 from . import stock_location
 from . import stock_move
 from . import stock_quant
diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index f628b521a9da..a8d19e0a03b3 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -1,9 +1,7 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from collections import defaultdict
-from odoo import _, api, exceptions, fields, models
-from odoo.addons.base_sparse_field.models.fields import Serialized
+from odoo import api, fields, models
 
 
 class StockLocation(models.Model):
@@ -25,33 +23,6 @@ class StockLocation(models.Model):
         compute='_compute_vertical_lift_kind',
         store=True,
     )
-    vertical_lift_tray_type_id = fields.Many2one(
-        comodel_name="vertical.lift.tray.type", ondelete="restrict"
-    )
-    tray_cell_contains_stock = fields.Boolean(
-        compute='_compute_tray_cell_contains_stock',
-        help="Used to know if a cell of a Tray location is empty.",
-    )
-    tray_matrix = Serialized(string='Cells', compute='_compute_tray_matrix')
-    cell_name_format = fields.Char(
-        string='Name Format for Cells',
-        default=lambda self: self._default_cell_name_format(),
-        help="Cells sub-locations generated in a tray will be named"
-        " after this format. Replacement fields between curly braces are used"
-        " to inject positions. {x}, {y}, and {z} will be replaced by their"
-        " corresponding position. Complex formatting (such as padding, ...)"
-        " can be done using the format specification at "
-        " https://docs.python.org/2/library/string.html#formatstrings",
-    )
-
-    def _default_cell_name_format(self):
-        return 'x{x:0>2}y{y:0>2}'
-
-    # TODO document hierarchy
-    # Vertical Lift View
-    #   -> Shuttle
-    #     -> Tray
-    #       -> Cell
 
     @api.depends(
         'location_id',
@@ -67,215 +38,3 @@ def _compute_vertical_lift_kind(self):
             kind = tree.get(location.location_id.vertical_lift_kind)
             if kind:
                 location.vertical_lift_kind = kind
-
-    @api.depends('quant_ids.quantity')
-    def _compute_tray_cell_contains_stock(self):
-        for location in self:
-            if not location.vertical_lift_kind == 'cell':
-                # we skip the others only for performance
-                continue
-            quants = location.quant_ids.filtered(lambda r: r.quantity > 0)
-            location.tray_cell_contains_stock = bool(quants)
-
-    @api.depends(
-        'quant_ids.quantity',
-        'vertical_lift_tray_type_id',
-        'location_id.vertical_lift_tray_type_id',
-    )
-    def _compute_tray_matrix(self):
-        for location in self:
-            if location.vertical_lift_kind not in ('tray', 'cell'):
-                continue
-            location.tray_matrix = {
-                'selected': location._tray_cell_coords(),
-                'cells': location._tray_cell_matrix(),
-            }
-
-    @api.multi
-    def action_tray_matrix_click(self, coordX, coordY):
-        self.ensure_one()
-        if self.vertical_lift_kind == 'cell':
-            tray = self.location_id
-        else:
-            tray = self
-        location = self.search(
-            [
-                ('id', 'child_of', tray.ids),
-                # we receive positions counting from 0 but they are stored
-                # in the "human" format starting from 1
-                ('posx', '=', coordX + 1),
-                ('posy', '=', coordY + 1),
-            ]
-        )
-        view = self.env.ref('stock.view_location_form')
-        action = self.env.ref('stock.action_location_form').read()[0]
-        action.update(
-            {
-                'res_id': location.id,
-                'view_mode': 'form',
-                'view_type': 'form',
-                'view_id': view.id,
-                'views': [(view.id, 'form')],
-            }
-        )
-        return action
-
-    @api.model_create_multi
-    def create(self, vals_list):
-        records = super().create(vals_list)
-        records._update_tray_sublocations()
-        return records
-
-    @api.multi
-    def write(self, vals):
-        for location in self:
-            trays_to_update = False
-            if 'vertical_lift_tray_type_id' in vals:
-                new_tray_type_id = vals.get('vertical_lift_tray_type_id')
-                trays_to_update = (
-                    location.vertical_lift_tray_type_id.id != new_tray_type_id
-                )
-            # short-circuit this check if we already know that we have to
-            # update trays
-            if not trays_to_update and 'cell_name_format' in vals:
-                new_format = vals.get('cell_name_format')
-                trays_to_update = (
-                    location.cell_name_format != new_format
-                )
-            super(StockLocation, location).write(vals)
-            if trays_to_update:
-                self._update_tray_sublocations()
-            elif 'posz' in vals and location.vertical_lift_kind == 'tray':
-                # On initial generation (when tray_to_update is true),
-                # the sublocations are already generated with the pos z.
-                location.child_ids.write({'posz': vals['posz']})
-        return True
-
-    @api.constrains('active')
-    def _vertical_lift_check_active(self):
-        for record in self:
-            if not record.vertical_lift_kind:
-                continue
-            if record.active:
-                continue
-            # We cannot disable any cell of a tray (entire tray)
-            # if at least one of the cell contains stock.
-            # We cannot disable a tray, a shuffle or a view if
-            # at least one of their tray contain stock.
-            if record.vertical_lift_kind == 'cell':
-                parent = record.location_id
-            else:
-                parent = record
-            # Add the record to the search: as it has set inactive, it will not
-            # be found by the search.
-            locs = self.search([('id', 'child_of', parent.id)]) | record
-            if any(loc.tray_cell_contains_stock for loc in locs):
-                raise exceptions.ValidationError(
-                    _(
-                        "Vertical Lift locations cannot be archived when "
-                        "they contain products."
-                    )
-                )
-
-    def _tray_cell_coords(self):
-        if self.vertical_lift_kind != 'cell':
-            return []
-        return [self.posx - 1, self.posy - 1]
-
-    def _tray_cell_matrix(self):
-        assert self.vertical_lift_kind in ('tray', 'cell')
-        if self.vertical_lift_kind == 'tray':
-            location = self
-        else:  # cell
-            location = self.location_id
-        cells = location.vertical_lift_tray_type_id._generate_cells_matrix()
-        for cell in location.child_ids:
-            if cell.tray_cell_contains_stock:
-                cells[cell.posy - 1][cell.posx - 1] = 1
-        return cells
-
-    def _format_tray_sublocation_name(self, x, y, z):
-        template = self.cell_name_format or self._default_cell_name_format()
-        # using format_map allow to have missing replacement strings
-        return template.format_map(defaultdict(str, x=x, y=y, z=z))
-
-    @api.multi
-    def _update_tray_sublocations(self):
-        values = []
-        for location in self:
-            if not location.vertical_lift_kind == 'tray':
-                continue
-
-            tray_type = location.vertical_lift_tray_type_id
-
-            try:
-                location.child_ids.write({'active': False})
-            except exceptions.ValidationError:
-                # trap this check (_vertical_lift_check_active) to display a
-                # contextual error message
-                raise exceptions.UserError(
-                    _(
-                        "Vertical Lift trays cannot be modified when "
-                        "they contain products."
-                    )
-                )
-            if not tray_type:
-                continue
-
-            # create accepts several records now
-            posz = location.posz or 0
-            for row in range(1, tray_type.rows + 1):
-                for col in range(1, tray_type.cols + 1):
-                    cell_name = location._format_tray_sublocation_name(
-                        col, row, posz
-                    )
-                    subloc_values = {
-                        'name': cell_name,
-                        'posx': col,
-                        'posy': row,
-                        'posz': posz,
-                        'location_id': location.id,
-                        'company_id': location.company_id.id,
-                    }
-                    values.append(subloc_values)
-        if values:
-            self.create(values)
-
-    @api.multi
-    def _create_tray_xmlids(self):
-        """Create external IDs for generated cells
-
-        Called from stock_vertical_lift/demo/stock_location_demo.xml.
-
-        If the tray has one. Used for the demo/test data. It will not handle
-        properly changing the tray format as the former cells will keep the
-        original xmlid built on x and y, the new ones will not be able to used
-        them. As these xmlids are meant for the demo data and the tests, it is
-        not a problem and should not be used for other purposes.
-        """
-        for location in self:
-            if location.vertical_lift_kind != 'cell':
-                continue
-            tray = location.location_id
-            tray_external_id = tray.get_external_id().get(tray.id)
-            if not tray_external_id:
-                continue
-            if '.' not in tray_external_id:
-                continue
-            module, tray_name = tray_external_id.split('.')
-            tray_external = self.env['ir.model.data'].browse(
-                self.env['ir.model.data']._get_id(module, tray_name)
-            )
-            cell_external_id = "{}_x{}y{}".format(
-                tray_name, location.posx, location.posy
-            )
-            if not self.env.ref(cell_external_id, raise_if_not_found=False):
-                self.env['ir.model.data'].create(
-                    {
-                        'name': cell_external_id,
-                        'module': module,
-                        'model': self._name,
-                        'res_id': location.id,
-                        'noupdate': tray_external.noupdate,
-                    }
-                )
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index 56813bb5c667..ce21c794c6f8 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -52,7 +52,7 @@ class VerticalLiftShuttle(models.Model):
     )
     tray_name = fields.Char(compute='_compute_tray_matrix', string='Tray Name')
     tray_type_id = fields.Many2one(
-        comodel_name='vertical.lift.tray.type',
+        comodel_name='stock.location.tray.type',
         compute='_compute_tray_matrix',
         string='Tray Type',
     )
@@ -192,7 +192,7 @@ def _compute_tray_matrix(self):
                 'inventory': 'location_id',
             }
             location = record.current_move_line_id[modes[record.mode]]
-            tray_type = location.location_id.vertical_lift_tray_type_id
+            tray_type = location.location_id.tray_type_id
             selected = []
             cells = []
             if location:
diff --git a/stock_vertical_lift/models/vertical_lift_tray_type.py b/stock_vertical_lift/models/vertical_lift_tray_type.py
deleted file mode 100644
index b6dfa0b5615a..000000000000
--- a/stock_vertical_lift/models/vertical_lift_tray_type.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2019 Camptocamp SA
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import _, api, exceptions, fields, models
-from odoo.addons.base_sparse_field.models.fields import Serialized
-
-
-class VerticalLiftTrayType(models.Model):
-    _name = 'vertical.lift.tray.type'
-    _description = 'Vertical Lift Tray Type'
-
-    name = fields.Char(required=True)
-    code = fields.Char(required=True)
-    rows = fields.Integer(required=True)
-    cols = fields.Integer(required=True)
-    active = fields.Boolean(default=True)
-    tray_matrix = Serialized(compute='_compute_tray_matrix')
-    location_ids = fields.One2many(
-        comodel_name='stock.location',
-        inverse_name='vertical_lift_tray_type_id',
-    )
-    # TODO do we want box size, or a many2one to 'product.packaging'?
-    # TODO add the code in the name_search
-
-    @api.depends('rows', 'cols')
-    def _compute_tray_matrix(self):
-        for record in self:
-            # As we only want to show the disposition of
-            # the tray, we generate a "full" tray, we'll
-            # see all the boxes on the web widget.
-            # (0 means empty, 1 means used)
-            cells = self._generate_cells_matrix(default_state=1)
-            record.tray_matrix = {'selected': [], 'cells': cells}
-
-    def _generate_cells_matrix(self, default_state=0):
-        return [[default_state] * self.cols for __ in range(self.rows)]
-
-    @api.constrains('active')
-    def _vertical_lift_check_active(self):
-        for record in self:
-            if record.active:
-                continue
-            if record.location_ids:
-                location_bullets = [
-                    ' - {}'.format(location.display_name)
-                    for location in record.location_ids
-                ]
-                raise exceptions.ValidationError(
-                    _(
-                        "The tray type {} is used by the following locations "
-                        "and cannot be archived:\n\n{}"
-                    ).format(record.name, '\n'.join(location_bullets))
-                )
-
-    @api.constrains('rows', 'cols')
-    def _vertical_lift_check_rows_cols(self):
-        for record in self:
-            if record.location_ids:
-                location_bullets = [
-                    ' - {}'.format(location.display_name)
-                    for location in record.location_ids
-                ]
-                raise exceptions.ValidationError(
-                    _(
-                        "The tray type {} is used by the following locations, "
-                        "it's size cannot be changed:\n\n{}"
-                    ).format(record.name, '\n'.join(location_bullets))
-                )
-
-    @api.multi
-    def open_locations(self):
-        action = self.env.ref('stock.action_location_form').read()[0]
-        action['domain'] = [('vertical_lift_tray_type_id', 'in', self.ids)]
-        if len(self.ids) == 1:
-            action['context'] = {'default_vertical_lift_tray_type_id': self.id}
-        return action
diff --git a/stock_vertical_lift/readme/ROADMAP.rst b/stock_vertical_lift/readme/ROADMAP.rst
index 94222e7d5b5d..c56a030779b4 100644
--- a/stock_vertical_lift/readme/ROADMAP.rst
+++ b/stock_vertical_lift/readme/ROADMAP.rst
@@ -1,7 +1,3 @@
-* Extract the tray types and matrix widget in a module, they can be used
-  alone without vertical lift
-* Consider merging the 'vertical_lift_kind' with the kind added by
-  stock_location_zone
 * Complete Pick screen and workflow (currently enough for a demo, not for production)
 * Implement Put-away screen and workflow
 * Implement Inventory screen and workflow
diff --git a/stock_vertical_lift/security/ir.model.access.csv b/stock_vertical_lift/security/ir.model.access.csv
index e87ef767b334..dc7cb4b87a83 100644
--- a/stock_vertical_lift/security/ir.model.access.csv
+++ b/stock_vertical_lift/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_vertical_lift_shuttle_stock_user,access_vertical_lift_shuttle stock user,model_vertical_lift_shuttle,stock.group_stock_user,1,0,0,0
 access_vertical_lift_shuttle_manager,access_vertical_lift_shuttle stock manager,model_vertical_lift_shuttle,stock.group_stock_manager,1,1,1,1
-access_vertical_lift_tray_type_stock_user,access_vertical_lift_tray_type stock user,model_vertical_lift_tray_type,stock.group_stock_user,1,0,0,0
-access_vertical_lift_tray_type_manager,access_vertical_lift_tray_type stock manager,model_vertical_lift_tray_type,stock.group_stock_manager,1,1,1,1
diff --git a/stock_vertical_lift/static/src/js/vertical_lift.js b/stock_vertical_lift/static/src/js/vertical_lift.js
index 8a65119b63ce..7c0e5d6f4ff1 100644
--- a/stock_vertical_lift/static/src/js/vertical_lift.js
+++ b/stock_vertical_lift/static/src/js/vertical_lift.js
@@ -5,7 +5,6 @@ var core = require('web.core');
 var KanbanRecord = require('web.KanbanRecord');
 var basicFields = require('web.basic_fields');
 var field_registry = require('web.field_registry');
-var DebouncedField = basicFields.DebouncedField;
 var FieldInteger = basicFields.FieldInteger;
 
 KanbanRecord.include({
@@ -47,245 +46,10 @@ var ExitButton = FieldInteger.extend({
     },
 });
 
-/**
-* Shows a canvas with the Tray's cells
-*
-* An action can be configured which is called when a cell is clicked.
-* The action must be an action.multi, it will receive the x and y positions
-* of the cell clicked (starting from 0). The action must be configured in
-* the options of the field and be on the same model:
-*
-* <field name="tray_matrix"
-*        widget="location_tray_matrix"
-*        options="{'click_action': 'action_tray_matrix_click'}"
-*        />
-*
-*/
-var LocationTrayMatrixField = DebouncedField.extend({
-    className: 'o_field_location_tray_matrix',
-    tagName: 'canvas',
-    supportedFieldTypes: ['serialized'],
-    events: {
-        'click': '_onClick',
-    },
-
-    cellColorEmpty: '#ffffff',
-    cellColorNotEmpty: '#4e6bfd',
-    selectedColor: '#08f46b',
-    selectedLineWidth: 5,
-    globalAlpha: 0.8,
-    cellPadding: 2,
-
-    init: function (parent, name, record, options) {
-        this._super.apply(this, arguments);
-        this.nodeOptions = _.defaults(this.nodeOptions, {});
-        this.clickAction = 'clickAction' in (options || {}) ? options.clickAction : this.nodeOptions.click_action;
-    },
-
-    isSet: function () {
-        if (Object.keys(this.value).length === 0) {
-            return false;
-        }
-        if (this.value.cells.length === 0) {
-            return false;
-        }
-        return this._super.apply(this, arguments);
-    },
-
-    start: function () {
-        // Setup resize events to redraw the canvas
-        this._resizeDebounce = this._resizeDebounce.bind(this);
-        this._resizePromise = null;
-        $(window).on('resize', this._resizeDebounce);
-
-        var self = this;
-        return this._super.apply(this, arguments).then(function () {
-            if (self.clickAction) {
-                self.$el.css('cursor', 'pointer');
-            }
-            // _super calls _render(), but the function
-            // resizeCanvasToDisplaySize would resize the canvas
-            // to 0 because the actual canvas would still be unknown.
-            // Call again _render() here but through a setTimeout to
-            // let the js renderer thread catch up.
-            self._ready = true;
-            return self._resizeDebounce();
-        });
-    },
-
-    _onClick: function (ev) {
-        if (!this.isSet()) {
-            return;
-        }
-        if (!this.clickAction) {
-            return;
-        }
-        var width = this.canvas.width,
-            height = this.canvas.height,
-            rect = this.canvas.getBoundingClientRect();
-
-        var clickX = ev.clientX - rect.left,
-            clickY = ev.clientY - rect.top;
-
-        var cells = this.value.cells,
-            cols = cells[0].length,
-            rows = cells.length;
-
-        // we remove 1 to start counting from 0
-        var coordX = Math.ceil(clickX * cols / width) - 1,
-            coordY = Math.ceil(clickY * rows / height) - 1;
-        // if we click on the last pixel on the bottom or the right
-        // we would get an offset index
-        if (coordX >= cols) { coordX = cols - 1; }
-        if (coordY >= rows) { coordY = rows - 1; }
-
-        // the coordinate we get when we click is from top,
-        // but we are looking for the coordinate from the bottom
-        // to match the user's expectations, invert Y
-        coordY = Math.abs(coordY - rows + 1);
-
-        var self = this;
-        this._rpc({
-            model: this.model,
-            method: this.clickAction,
-            args: [[this.res_id], coordX, coordY]
-        })
-        .then(function (action) {
-            self.trigger_up('do_action', {action: action});
-        });
-    },
-
-    /**
-     * Debounce the rendering on resize.
-     * It is useless to render on each resize event.
-     *
-     */
-    _resizeDebounce: function(){
-        clearTimeout(this._resizePromise);
-        var self = this;
-        this._resizePromise = setTimeout(function(){
-            self._render();
-        }, 20);
-    },
-
-    destroy: function () {
-        $(window).off('resize', this._resizeDebounce);
-        this._super.apply(this, arguments);
-    },
-
-    /**
-     * Render the widget only when it is in the DOM.
-     * We need the width and height of the widget to draw the canvas.
-     *
-     */
-    _render: function () {
-        if (this._ready) {
-            return this._renderInDOM();
-        }
-        return $.when();
-    },
-
-    /**
-     * Resize the canvas width and height to the actual size.
-     * If we don't do that, it will automatically scale to the
-     * CSS size with blurry squares.
-     *
-     */
-    resizeCanvasToDisplaySize: function(canvas) {
-        // look up the size the canvas is being displayed
-        var width = canvas.clientWidth;
-        var height = canvas.clientHeight;
-
-        // If it's resolution does not match change it
-        if (canvas.width !== width || canvas.height !== height) {
-            canvas.width = width;
-            canvas.height = height;
-            return true;
-        }
-
-        return false;
-    },
-
-    /**
-     * Resize the canvas, clear it and redraw the cells
-     * Should be called only if the canvas is already in DOM
-     *
-     */
-    _renderInDOM: function () {
-        this.canvas = this.$el.find('canvas').context;
-        var canvas = this.canvas;
-        var ctx = canvas.getContext('2d');
-        this.resizeCanvasToDisplaySize(ctx.canvas);
-        ctx.clearRect(0, 0, canvas.width, canvas.height);
-        ctx.save();
-        if (this.isSet()) {
-            var selected = this.value.selected || [];
-            var cells = this.value.cells;
-            this._drawMatrix(canvas, ctx, cells, selected);
-        }
-    },
-
-    /**
-     * Draw the cells in the canvas.
-     *
-     */
-    _drawMatrix: function (canvas, ctx, cells, selected) {
-        var colors = {
-          0: this.cellColorEmpty,
-          1: this.cellColorNotEmpty,
-        };
-
-        var cols = cells[0].length;
-        var rows = cells.length;
-        var selectedX, selectedY;
-        if (selected.length) {
-            selectedX = selected[0];
-            // we draw top to bottom, but the highlighted cell should
-            // be a coordinate from bottom to top: reverse the y axis
-            selectedY = Math.abs(selected[1] - rows + 1);
-        }
-
-        var padding = this.cellPadding;
-        var w = ((canvas.width - padding * cols) / cols);
-        var h = ((canvas.height - padding * rows) / rows);
-
-        ctx.globalAlpha = this.globalAlpha;
-        // again, our matrix is top to bottom (0 is the first line)
-        // but visually, we want them bottom to top
-        var reversed_cells = cells.slice().reverse();
-        for (var y = 0; y < rows; y++) {
-            for (var x = 0; x < cols; x++) {
-                ctx.fillStyle = colors[reversed_cells[y][x]];
-                var fillWidth = w;
-                var fillHeight = h;
-                // cheat: remove the padding at bottom and right
-                // the cells will be a bit larger but not really noticeable
-                if (x === cols - 1) {fillWidth += padding;}
-                if (y === rows - 1) {fillHeight += padding;}
-                ctx.fillRect(
-                    x * (w + padding), y * (h + padding),
-                    fillWidth, fillHeight
-                );
-                if (selected && selectedX === x && selectedY === y) {
-                    ctx.globalAlpha = 1.0;
-                    ctx.strokeStyle = this.selectedColor;
-                    ctx.lineWidth = this.selectedLineWidth;
-                    ctx.strokeRect(x * (w + padding), y * (h + padding), w, h);
-                    ctx.globalAlpha = this.globalAlpha;
-                }
-            }
-        }
-        ctx.restore();
-    }
-});
-
-
 field_registry.add('vlift_shuttle_exit_button', ExitButton);
-field_registry.add('location_tray_matrix', LocationTrayMatrixField);
 
 return {
     ExitButton: ExitButton,
-    LocationTrayMatrixField: LocationTrayMatrixField
 };
 
 });
diff --git a/stock_vertical_lift/static/src/scss/vertical_lift.scss b/stock_vertical_lift/static/src/scss/vertical_lift.scss
index 0fc24b43e572..11678e055490 100644
--- a/stock_vertical_lift/static/src/scss/vertical_lift.scss
+++ b/stock_vertical_lift/static/src/scss/vertical_lift.scss
@@ -1,8 +1,3 @@
-.o_field_location_tray_matrix {
-    background-color: #eeeeee;
-    border: 2px #000000 solid;
-}
-
 .o_web_client.o_fullscreen {
     $o-shuttle-padding: $o-horizontal-padding;
 
diff --git a/stock_vertical_lift/tests/__init__.py b/stock_vertical_lift/tests/__init__.py
index 61fbd1fd98e6..c73943e06e0c 100644
--- a/stock_vertical_lift/tests/__init__.py
+++ b/stock_vertical_lift/tests/__init__.py
@@ -1,3 +1,2 @@
 from . import test_location
-from . import test_vertical_lift_tray_type
 from . import test_vertical_lift_shuttle
diff --git a/stock_vertical_lift/tests/common.py b/stock_vertical_lift/tests/common.py
index 10d20e683072..811121caef61 100644
--- a/stock_vertical_lift/tests/common.py
+++ b/stock_vertical_lift/tests/common.py
@@ -1,10 +1,10 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo.tests import common
+from odoo.addons.stock_location_tray.tests import common
 
 
-class VerticalLiftCase(common.SavepointCase):
+class VerticalLiftCase(common.LocationTrayTypeCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -17,28 +17,6 @@ def setUpClass(cls):
         cls.vertical_lift_loc = cls.env.ref(
             'stock_vertical_lift.stock_location_vertical_lift'
         )
-        cls.tray_type_small_8x = cls.env.ref(
-            'stock_vertical_lift.vertical_lift_tray_type_small_8x'
-        )
-        cls.tray_type_small_32x = cls.env.ref(
-            'stock_vertical_lift.vertical_lift_tray_type_small_32x'
-        )
-
-    def _cell_for(self, tray, x=1, y=1):
-        cell = self.env['stock.location'].search(
-            [('location_id', '=', tray.id), ('posx', '=', x), ('posy', '=', y)]
-        )
-        self.assertEqual(
-            len(cell),
-            1,
-            "Cell x{}y{} not found for {}".format(x, y, tray.name),
-        )
-        return cell
-
-    def _update_quantity_in_cell(self, cell, product, quantity):
-        self.env['stock.quant']._update_available_quantity(
-            product, cell, quantity
-        )
 
     @classmethod
     def _create_simple_picking_out(cls, product, quantity):
diff --git a/stock_vertical_lift/tests/test_location.py b/stock_vertical_lift/tests/test_location.py
index ef7b1980db4b..710c9cdc0a5c 100644
--- a/stock_vertical_lift/tests/test_location.py
+++ b/stock_vertical_lift/tests/test_location.py
@@ -1,8 +1,6 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import exceptions
-
 from .common import VerticalLiftCase
 
 
@@ -40,180 +38,3 @@ def test_create_shuttle(self):
             }
         )
         self.assertEqual(shuttle_loc.vertical_lift_kind, 'shuttle')
-
-    def test_create_tray(self):
-        # any location created directly under a shuttle is a tray
-        shuttle_loc = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_shuttle_1'
-        )
-        tray_type = self.tray_type_small_8x
-        tray_loc = self.env['stock.location'].create(
-            {
-                'name': 'Tray Z',
-                'location_id': shuttle_loc.id,
-                'usage': 'internal',
-                'vertical_lift_tray_type_id': tray_type.id,
-            }
-        )
-
-        self.assertEqual(tray_loc.vertical_lift_kind, 'tray')
-        self.assertEqual(
-            len(tray_loc.child_ids), tray_type.cols * tray_type.rows  # 8
-        )
-
-    def test_tray_has_stock(self):
-        cell = self.env.ref(
-            'stock_vertical_lift.'
-            'stock_location_vertical_lift_demo_tray_1a_x3y2'
-        )
-        self.assertFalse(cell.quant_ids)
-        self.assertFalse(cell.tray_cell_contains_stock)
-        self._update_quantity_in_cell(cell, self.product_socks, 1)
-        self.assertTrue(cell.quant_ids)
-        self.assertTrue(cell.tray_cell_contains_stock)
-        self._update_quantity_in_cell(cell, self.product_socks, -1)
-        self.assertTrue(cell.quant_ids)
-        self.assertFalse(cell.tray_cell_contains_stock)
-
-    def test_matrix_empty_tray(self):
-        tray_loc = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a'
-        )
-        self.assertEqual(tray_loc.vertical_lift_tray_type_id.cols, 4)
-        self.assertEqual(tray_loc.vertical_lift_tray_type_id.rows, 2)
-        self.assertEqual(
-            tray_loc.tray_matrix,
-            {
-                # we show the entire tray, not a cell
-                'selected': [],
-                # we have no stock in this location
-                # fmt: off
-                'cells': [
-                    [0, 0, 0, 0],
-                    [0, 0, 0, 0],
-                ]
-                # fmt: on
-            },
-        )
-
-    def test_matrix_stock_tray(self):
-        tray_loc = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a'
-        )
-        self._update_quantity_in_cell(
-            self._cell_for(tray_loc, x=1, y=1), self.product_socks, 100
-        )
-        self._update_quantity_in_cell(
-            self._cell_for(tray_loc, x=2, y=1), self.product_socks, 100
-        )
-        self._update_quantity_in_cell(
-            self._cell_for(tray_loc, x=4, y=2), self.product_socks, 100
-        )
-        self.assertEqual(tray_loc.vertical_lift_tray_type_id.cols, 4)
-        self.assertEqual(tray_loc.vertical_lift_tray_type_id.rows, 2)
-        self.assertEqual(
-            tray_loc.tray_matrix,
-            {
-                # We show the entire tray, not a cell.
-                'selected': [],
-                # Note: the coords are stored according to their index in the
-                # arrays so it is easier to manipulate them. However, we
-                # display them with the Y axis inverted in the UI to represent
-                # the view of the operator.
-                #
-                #   [0, 0, 0, 1],
-                #   [1, 1, 0, 0],
-                #
-                # fmt: off
-                'cells': [
-                    [1, 1, 0, 0],
-                    [0, 0, 0, 1],
-                ]
-                # fmt: on
-            },
-        )
-
-    def test_matrix_stock_cell(self):
-        tray_loc = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1c'
-        )
-        cell = self._cell_for(tray_loc, x=7, y=3)
-        self._update_quantity_in_cell(cell, self.product_socks, 100)
-        self._update_quantity_in_cell(
-            self._cell_for(tray_loc, x=1, y=1), self.product_socks, 100
-        )
-        self._update_quantity_in_cell(
-            self._cell_for(tray_loc, x=3, y=2), self.product_socks, 100
-        )
-        self.assertEqual(tray_loc.vertical_lift_tray_type_id.cols, 8)
-        self.assertEqual(tray_loc.vertical_lift_tray_type_id.rows, 4)
-        self.assertEqual(
-            cell.tray_matrix,
-            {
-                # When called on a cell, we expect to have its coords. Worth to
-                # note: the cell's coordinate are 7 and 3 in the posx and posy
-                # fields as they make sense for humans. Here, they are offset
-                # by -1 to have the indexes in the matrix.
-                'selected': [6, 2],
-                # fmt: off
-                'cells': [
-                    [1, 0, 0, 0, 0, 0, 0, 0],
-                    [0, 0, 1, 0, 0, 0, 0, 0],
-                    [0, 0, 0, 0, 0, 0, 1, 0],
-                    [0, 0, 0, 0, 0, 0, 0, 0],
-                ]
-                # fmt: on
-            },
-        )
-
-    def test_check_active_empty(self):
-        # this type used by tray T1B, we should not be able to disable it
-        cell = self.env.ref(
-            'stock_vertical_lift.'
-            'stock_location_vertical_lift_demo_tray_1a_x3y2'
-        )
-        self.assertFalse(cell.tray_cell_contains_stock)
-        # allowed to archive empty cell
-        cell.active = False
-
-    def test_check_active_not_empty(self):
-        cell = self.env.ref(
-            'stock_vertical_lift.'
-            'stock_location_vertical_lift_demo_tray_1a_x3y2'
-        )
-        self._update_quantity_in_cell(cell, self.product_socks, 1)
-        self.assertTrue(cell.tray_cell_contains_stock)
-
-        # we cannot archive an empty cell or any parent
-        location = cell
-        message = 'cannot be archived'
-        while location:
-            with self.assertRaisesRegex(exceptions.ValidationError, message):
-                location.active = False
-
-            # restore state for the next test loop
-            location.active = True
-            parent = location.location_id
-            location = parent if parent.vertical_lift_kind else None
-
-    def test_change_tray_type_when_empty(self):
-        tray = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a'
-        )
-        tray_type = self.tray_type_small_32x
-        tray.vertical_lift_tray_type_id = tray_type
-        self.assertEqual(
-            len(tray.child_ids), tray_type.cols * tray_type.rows  # 32
-        )
-
-    def test_change_tray_type_error_when_not_empty(self):
-        tray = self.env.ref(
-            'stock_vertical_lift.stock_location_vertical_lift_demo_tray_1a'
-        )
-        self._update_quantity_in_cell(
-            self._cell_for(tray, x=1, y=1), self.product_socks, 1
-        )
-        tray_type = self.tray_type_small_32x
-        message = 'cannot be modified when they contain products'
-        with self.assertRaisesRegex(exceptions.UserError, message):
-            tray.vertical_lift_tray_type_id = tray_type
diff --git a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
index 26601253018d..1575051cbdce 100644
--- a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
+++ b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
@@ -85,11 +85,11 @@ def test_pick_related_fields(self):
         self.assertEqual(
             self.shuttle.tray_type_id,
             # the tray type is on the parent of the cell (on the tray)
-            ml.location_id.location_id.vertical_lift_tray_type_id,
+            ml.location_id.location_id.tray_type_id,
         )
         self.assertEqual(
             self.shuttle.tray_type_code,
-            ml.location_id.location_id.vertical_lift_tray_type_id.code,
+            ml.location_id.location_id.tray_type_id.code,
         )
         self.assertEqual(self.shuttle.tray_x, ml.location_id.posx)
         self.assertEqual(self.shuttle.tray_y, ml.location_id.posy)
diff --git a/stock_vertical_lift/tests/test_vertical_lift_tray_type.py b/stock_vertical_lift/tests/test_vertical_lift_tray_type.py
deleted file mode 100644
index 53dbcc77134f..000000000000
--- a/stock_vertical_lift/tests/test_vertical_lift_tray_type.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2019 Camptocamp SA
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import exceptions
-
-from .common import VerticalLiftCase
-
-
-class TestVerticalLiftTrayType(VerticalLiftCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.used_tray_type = cls.env.ref(
-            'stock_vertical_lift.vertical_lift_tray_type_large_16x'
-        )
-        cls.unused_tray_type = cls.env.ref(
-            'stock_vertical_lift.vertical_lift_tray_type_small_16x_3'
-        )
-
-    def test_tray_type(self):
-        # any location created directly under the view is a shuttle
-        tray_type = self.env['vertical.lift.tray.type'].create(
-            {
-                'name': 'Test Type',
-                'code': '🐵',
-                'usage': 'internal',
-                'rows': 4,
-                'cols': 6,
-            }
-        )
-        self.assertEqual(
-            tray_type.tray_matrix,
-            {
-                'selected': [],  # no selection as this is the "model"
-                # a "full" matrix is generated for display on the UI
-                # fmt: off
-                'cells': [
-                    [1, 1, 1, 1, 1, 1],
-                    [1, 1, 1, 1, 1, 1],
-                    [1, 1, 1, 1, 1, 1],
-                    [1, 1, 1, 1, 1, 1],
-                ]
-                # fmt: on
-            },
-        )
-
-    def test_check_active(self):
-        # this type used by tray T1B, we should not be able to disable it
-        location = self.used_tray_type.location_ids
-        self.assertTrue(location)
-        message = 'cannot be archived.*{}.*'.format(location.name)
-        # we cannot archive used ones
-        with self.assertRaisesRegex(exceptions.ValidationError, message):
-            self.used_tray_type.active = False
-        # we can archive unused ones
-        self.unused_tray_type.active = False
-
-    def test_check_cols_rows(self):
-        # this type used by tray T1B, we should not be able to modify size
-        location = self.used_tray_type.location_ids
-        self.assertTrue(location)
-        message = 'size cannot be changed.*{}.*'.format(location.name)
-        # we cannot modify size of used ones
-        with self.assertRaisesRegex(exceptions.ValidationError, message):
-            self.used_tray_type.rows = 10
-        with self.assertRaisesRegex(exceptions.ValidationError, message):
-            self.used_tray_type.cols = 10
-        # we can modify size of unused ones
-        self.unused_tray_type.rows = 10
-        self.unused_tray_type.cols = 10
diff --git a/stock_vertical_lift/views/stock_location_views.xml b/stock_vertical_lift/views/stock_location_views.xml
index 8ebb83aa8d29..b58c661b8c5e 100644
--- a/stock_vertical_lift/views/stock_location_views.xml
+++ b/stock_vertical_lift/views/stock_location_views.xml
@@ -1,54 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-  <record id="view_location_form_vertical_lift" model="ir.ui.view">
-    <field name="name">stock.location.form.vertical.lift</field>
-    <field name="model">stock.location</field>
-    <field name="inherit_id" ref="stock.view_location_form"/>
-    <field name="arch" type="xml">
-      <field name="return_location" position="after">
-        <field name="vertical_lift_location"
-               attrs="{'invisible': [('vertical_lift_kind', '!=', False), ('vertical_lift_kind', '!=', 'view')]}"
-               />
-      </field>
-      <group name="localization" position="after">
-        <group string="Vertical Lift" name="vertical_lift"
-               attrs="{'invisible': [('vertical_lift_kind', 'not in', ('shuttle', 'tray', 'cell'))]}">
-          <field name="vertical_lift_kind"/>
-          <field name="cell_name_format" attrs="{'invisible': [('vertical_lift_kind', '!=', 'tray')]}"/>
-          <field name="vertical_lift_tray_type_id"
-                 attrs="{'invisible': [('vertical_lift_kind', '!=', 'tray')], 'required': [('vertical_lift_kind', '=', 'tray')]}"/>
-          <field name="tray_matrix"
-                 widget="location_tray_matrix"
-                 attrs="{'invisible': [('vertical_lift_kind', 'not in', ('tray', 'cell'))]}"
-                 options="{'click_action': 'action_tray_matrix_click'}"
-                 />
-        </group>
-      </group>
+    <record id="view_location_form_vertical_lift" model="ir.ui.view">
+        <field name="name">stock.location.form.vertical.lift</field>
+        <field name="model">stock.location</field>
+        <field name="inherit_id" ref="stock_location_tray.view_location_form_tray_type"/>
+        <field name="arch" type="xml">
+            <field name="return_location" position="after">
+                <field name="vertical_lift_location"
+                       attrs="{'invisible': [('vertical_lift_kind', '!=', False), ('vertical_lift_kind', '!=', 'view')]}"
+                />
+                <field name="vertical_lift_kind"/>
+            </field>
+            <field name="tray_type_id" position="attributes">
+                <attribute name="attrs">
+                    {'invisible': [('cell_in_tray_type_id', '!=', False)],
+                     'required': [('vertical_lift_kind', '=', 'tray')]}
+                </attribute>
+            </field>
+        </field>
+    </record>
 
-      <field name="posx" position="attributes">
-        <attribute name="attrs">{'readonly': [('vertical_lift_kind', '=', 'cell')]}</attribute>
-      </field>
-      <field name="posy" position="attributes">
-        <attribute name="attrs">{'readonly': [('vertical_lift_kind', '=', 'cell')]}</attribute>
-      </field>
-      <field name="posz" position="attributes">
-        <attribute name="attrs">{'readonly': [('vertical_lift_kind', '=', 'cell')]}</attribute>
-      </field>
-    </field>
-  </record>
-
-  <record id="view_location_search_vertical_lift" model="ir.ui.view">
-    <field name="name">stock.location.search.vertical.lift</field>
-    <field name="model">stock.location</field>
-    <field name="inherit_id" ref="stock.view_location_search"/>
-    <field name="arch" type="xml">
-      <field name="location_id" position="after">
-        <separator/>
-        <field name="vertical_lift_kind"/>
-        <field name="vertical_lift_tray_type_id"/>
-      </field>
-    </field>
-  </record>
+    <record id="view_location_search_vertical_lift" model="ir.ui.view">
+        <field name="name">stock.location.search.vertical.lift</field>
+        <field name="model">stock.location</field>
+        <field name="inherit_id" ref="stock.view_location_search"/>
+        <field name="arch" type="xml">
+            <field name="location_id" position="after">
+                <separator/>
+                <field name="vertical_lift_kind"/>
+            </field>
+        </field>
+    </record>
 
 </odoo>
diff --git a/stock_vertical_lift/views/vertical_lift_tray_type_views.xml b/stock_vertical_lift/views/vertical_lift_tray_type_views.xml
deleted file mode 100644
index 1cf9c3311bd8..000000000000
--- a/stock_vertical_lift/views/vertical_lift_tray_type_views.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-  <record id="view_vertical_lift_tray_type_form" model="ir.ui.view">
-    <field name="name">vertical.lift.tray.type.form</field>
-    <field name="model">vertical.lift.tray.type</field>
-    <field name="arch" type="xml">
-      <form string="Vertical Lift Tray Type">
-        <div class="oe_button_box" name="button_box">
-          <button string="Locations"
-                  class="oe_stat_button"
-                  icon="fa-filter" name="open_locations"
-                  type="object"
-                  />
-          <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-            <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
-          </button>
-        </div>
-        <label for="name" class="oe_edit_only"/>
-        <h1><field name="name"/></h1>
-        <group>
-          <group string="Tray Configuration" name="settings">
-            <field name="code"/>
-            <field name="rows"/>
-            <field name="cols"/>
-          </group>
-          <group string="Disposition" name="disposition">
-            <field name="tray_matrix"
-                   widget="location_tray_matrix"
-                   nolabel="1"/>
-          </group>
-        </group>
-      </form>
-    </field>
-  </record>
-
-  <record id="view_vertical_lift_tray_type_search" model="ir.ui.view">
-    <field name="name">vertical.lift.tray.type.search</field>
-    <field name="model">vertical.lift.tray.type</field>
-    <field name="arch" type="xml">
-      <search string="Vertical Lift Tray Type">
-        <field name="name"/>
-        <field name="code"/>
-        <separator/>
-        <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
-      </search>
-    </field>
-  </record>
-
-  <record id="view_vertical_lift_tray_type_tree" model="ir.ui.view">
-    <field name="name">vertical.lift.tray.type</field>
-    <field name="model">vertical.lift.tray.type</field>
-    <field name="arch" type="xml">
-      <tree string="Vertical Lift Tray Type">
-        <field name="name"/>
-        <field name="code"/>
-        <field name="rows"/>
-        <field name="cols"/>
-      </tree>
-    </field>
-  </record>
-
-  <record id="action_vertical_lift_tray_type" model="ir.actions.act_window">
-    <field name="name">Vertical Lift Tray Types</field>
-    <field name="res_model">vertical.lift.tray.type</field>
-    <field name="type">ir.actions.act_window</field>
-    <field name="view_type">form</field>
-    <field name="view_id" ref="view_vertical_lift_tray_type_tree"/>
-    <field name="search_view_id" ref="view_vertical_lift_tray_type_search"/>
-    <field name="context"></field>
-    <field name="help" type="html">
-      <p class="o_view_nocontent_smiling_face">
-        Add a Vertical Lift Tray Type
-        </p><p>
-        Define the number of rows and cols on a tray, depending of the boxes
-size.
-      </p>
-    </field>
-  </record>
-
-  <menuitem action="action_vertical_lift_tray_type"
-            id="menu_vertical_lift_tray_type"
-            parent="stock.menu_warehouse_config" sequence="10"/>
-
-</odoo>

From 095e23c018c4b5d0ef11364440d7ee2b8a639189 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 19 Sep 2019 13:32:26 +0200
Subject: [PATCH 30/50] Add temporary oca_dependencies until it's merged

---
 oca_dependencies.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/oca_dependencies.txt b/oca_dependencies.txt
index e4926f44a534..8897ba0df3e7 100644
--- a/oca_dependencies.txt
+++ b/oca_dependencies.txt
@@ -4,3 +4,5 @@ account-analytic
 product-attribute
 server-ux
 web
+
+stock-logistics-warehouse https://github.com/guewen/stock-logistics-warehouse 12.0-add-stock_location_tray

From 16e6b646a9d10feaf9fb304bfc7d159fabf9ee1b Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 19 Sep 2019 14:18:28 +0200
Subject: [PATCH 31/50] Add merge=union attribute on oca_dependencies.txt

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..10bca0cac86f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+oca_dependencies.txt merge=union

From 7a319cb6bf4f6cac81a04b25b3cae5e64e96681d Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 8 Oct 2019 13:45:42 +0200
Subject: [PATCH 32/50] Adapt views xmlids to follow stock_location_tray
 changes

---
 stock_vertical_lift/views/stock_location_views.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/stock_vertical_lift/views/stock_location_views.xml b/stock_vertical_lift/views/stock_location_views.xml
index b58c661b8c5e..930d7a179008 100644
--- a/stock_vertical_lift/views/stock_location_views.xml
+++ b/stock_vertical_lift/views/stock_location_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="view_location_form_vertical_lift" model="ir.ui.view">
+    <record id="view_location_form" model="ir.ui.view">
         <field name="name">stock.location.form.vertical.lift</field>
         <field name="model">stock.location</field>
-        <field name="inherit_id" ref="stock_location_tray.view_location_form_tray_type"/>
+        <field name="inherit_id" ref="stock_location_tray.view_location_form"/>
         <field name="arch" type="xml">
             <field name="return_location" position="after">
                 <field name="vertical_lift_location"
@@ -21,13 +21,12 @@
         </field>
     </record>
 
-    <record id="view_location_search_vertical_lift" model="ir.ui.view">
+    <record id="view_location_search" model="ir.ui.view">
         <field name="name">stock.location.search.vertical.lift</field>
         <field name="model">stock.location</field>
-        <field name="inherit_id" ref="stock.view_location_search"/>
+        <field name="inherit_id" ref="stock_location_tray.view_location_search"/>
         <field name="arch" type="xml">
-            <field name="location_id" position="after">
-                <separator/>
+            <field name="tray_type_id" position="after">
                 <field name="vertical_lift_kind"/>
             </field>
         </field>

From 8f5a6e8836ada121e2eb11f6bf304b67c5a67a73 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 8 Oct 2019 17:07:20 +0200
Subject: [PATCH 33/50] Add method on location to fetch a tray

* Add vertical_lift_shuttle_id field on stock.location, help to find the
shuttle for a location
* Add StockLocation.fetch_vertical_lift_tray(), that needs to be
implemented in addons to send commands to the hardward to fetch a tray,
and if existing show a cell (laser pointer, ...)
* Add helpers on stock.move.line fetch_vertical_lift_tray_source() and
fetch_vertical_lift_tray_dest() that fetch the tray directly from a move
line's source or destination location
---
 stock_vertical_lift/models/__init__.py        |   1 +
 stock_vertical_lift/models/stock_location.py  | 115 ++++++++++++++++--
 stock_vertical_lift/models/stock_move_line.py |  16 +++
 .../models/vertical_lift_shuttle.py           |  42 ++-----
 .../views/stock_location_views.xml            |   3 +
 5 files changed, 130 insertions(+), 47 deletions(-)
 create mode 100644 stock_vertical_lift/models/stock_move_line.py

diff --git a/stock_vertical_lift/models/__init__.py b/stock_vertical_lift/models/__init__.py
index 2a0e1d40b651..80b7355db36a 100644
--- a/stock_vertical_lift/models/__init__.py
+++ b/stock_vertical_lift/models/__init__.py
@@ -1,4 +1,5 @@
 from . import vertical_lift_shuttle
 from . import stock_location
 from . import stock_move
+from . import stock_move_line
 from . import stock_quant
diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index a8d19e0a03b3..bf31cad9a740 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -1,40 +1,131 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import _, api, exceptions, fields, models
 
 
 class StockLocation(models.Model):
     _inherit = "stock.location"
 
     vertical_lift_location = fields.Boolean(
-        'Is a Vertical Lift View Location?',
+        "Is a Vertical Lift View Location?",
         default=False,
         help="Check this box to use it as the view for Vertical"
         " Lift Shuttles.",
     )
     vertical_lift_kind = fields.Selection(
         selection=[
-            ('view', 'View'),
-            ('shuttle', 'Shuttle'),
-            ('tray', 'Tray'),
-            ('cell', 'Cell'),
+            ("view", "View"),
+            ("shuttle", "Shuttle"),
+            ("tray", "Tray"),
+            ("cell", "Cell"),
         ],
-        compute='_compute_vertical_lift_kind',
+        compute="_compute_vertical_lift_kind",
+        store=True,
+    )
+
+    # This is a one2one in practice, but this one is not really interesting.
+    # It's there only to be in the depends of 'vertical_lift_shuttle_id', which
+    # give the unique shuttle for any location in the tree (whether it's a
+    # shuttle, a tray or a cell)
+    inverse_vertical_lift_shuttle_ids = fields.One2many(
+        comodel_name="vertical.lift.shuttle",
+        inverse_name="location_id",
+        readonly=True,
+    )
+    # compute the unique shuttle for any shuttle, tray or cell location, by
+    # going through the parents
+    vertical_lift_shuttle_id = fields.Many2one(
+        comodel_name="vertical.lift.shuttle",
+        compute="_compute_vertical_lift_shuttle_id",
         store=True,
     )
 
     @api.depends(
-        'location_id',
-        'location_id.vertical_lift_kind',
-        'vertical_lift_location',
+        "location_id",
+        "location_id.vertical_lift_kind",
+        "vertical_lift_location",
     )
     def _compute_vertical_lift_kind(self):
-        tree = {'view': 'shuttle', 'shuttle': 'tray', 'tray': 'cell'}
+        tree = {"view": "shuttle", "shuttle": "tray", "tray": "cell"}
         for location in self:
             if location.vertical_lift_location:
-                location.vertical_lift_kind = 'view'
+                location.vertical_lift_kind = "view"
                 continue
             kind = tree.get(location.location_id.vertical_lift_kind)
             if kind:
                 location.vertical_lift_kind = kind
+
+    @api.depends(
+        "inverse_vertical_lift_shuttle_ids",
+        "location_id.vertical_lift_shuttle_id",
+    )
+    def _compute_vertical_lift_shuttle_id(self):
+        for location in self:
+            if location.inverse_vertical_lift_shuttle_ids:
+                # we have a unique constraint on the other side
+                assert len(location.inverse_vertical_lift_shuttle_ids) == 1
+                shuttle = location.inverse_vertical_lift_shuttle_ids
+            else:
+                shuttle = location.location_id.vertical_lift_shuttle_id
+            location.vertical_lift_shuttle_id = shuttle
+
+    def _fetch_vertical_lift_tray(self, cell_location=None):
+        """Send instructions to the vertical lift hardware
+
+        Private method, this is where the implementation actually happens.
+        Addons can add their instructions based on the hardware used for
+        this location.
+
+        The hardware used for a location can be found in:
+
+        ``self.vertical_lift_shuttle_id.hardware``
+
+        Each addon can implement its own mechanism depending of this value
+        and must call ``super``.
+
+        The method must send the command to the vertical lift to fetch / open
+        the tray. If a ``cell_location`` is passed and if the hardware supports
+        a way to show a cell (such as a laser pointer), it should send this
+        command as well.
+        """
+        if self.vertical_lift_shuttle_id.hardware == "simulation":
+            message = _("Opening tray {}.").format(self.name)
+            if cell_location:
+                message += _("<br/>Laser pointer on x{} y{}").format(
+                    cell_location.posx, cell_location.posy
+                )
+            self.env.user.notify_info(
+                message=message, title=_("Lift Simulation")
+            )
+
+    def fetch_vertical_lift_tray(self, cell_location=None):
+        """Send instructions to the vertical lift hardware
+
+        Public method to use for:
+        * fetch the vertical lift tray and presenting it to the operator
+          (physically)
+        * direct the laser pointer to the cell's location if set
+
+        Depending on the hardware, the laser pointer may not be implemented.
+
+        The actual implementation of the method goes in the private method
+        ``_fetch_vertical_lift_tray()``.
+        """
+        self.ensure_one()
+        if self.vertical_lift_kind == "cell":
+            if cell_location:
+                raise ValueError(
+                    "cell_location cannot be set when the location is "
+                    "a cell."
+                )
+            tray = self.location_id
+            tray.fetch_vertical_lift_tray(cell_location=self)
+        elif self.vertical_lift_kind == "tray":
+            self._fetch_vertical_lift_tray(cell_location=cell_location)
+        else:
+            raise exceptions.UserError(
+                _("Cannot fetch a vertical lift tray on location %s")
+                % (self.name,)
+            )
+        return True
diff --git a/stock_vertical_lift/models/stock_move_line.py b/stock_vertical_lift/models/stock_move_line.py
new file mode 100644
index 000000000000..ccfbe7746661
--- /dev/null
+++ b/stock_vertical_lift/models/stock_move_line.py
@@ -0,0 +1,16 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class StockMoveLine(models.Model):
+    _inherit = 'stock.move.line'
+
+    def fetch_vertical_lift_tray_source(self):
+        self.ensure_one()
+        return self.location_id.fetch_vertical_lift_tray()
+
+    def fetch_vertical_lift_tray_dest(self):
+        self.ensure_one()
+        return self.location_dest_id.fetch_vertical_lift_tray()
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index ce21c794c6f8..affcca3388e2 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -108,6 +108,11 @@ class VerticalLiftShuttle(models.Model):
         store=False,
     )
 
+    _sql_constraints = [
+        ('location_id_unique', 'UNIQUE(location_id)',
+         'You cannot have two shuttles using the same location.'),
+    ]
+
     def on_barcode_scanned(self, barcode):
         self.ensure_one()
         # FIXME notify_info is only for the demo
@@ -259,9 +264,6 @@ def count_move_lines_to_do_all(self):
         )
 
     def button_release(self):
-        if self.current_move_line_id:
-            self._hardware_switch_off_laser_pointer()
-            self._hardware_close_tray()
         self.select_next_move_line()
         if not self.current_move_line_id:
             # sorry not sorry
@@ -311,8 +313,8 @@ def select_next_move_line(self):
         )
         self.operation_descr = descr
         if next_move_line:
-            self._hardware_switch_on_laser_pointer()
-            self._hardware_open_tray()
+            # TODO different method (source vs dest) on pick/put scenario
+            next_move_line.fetch_vertical_lift_tray_source()
 
     def action_open_screen(self):
         self.select_next_move_line()
@@ -366,36 +368,6 @@ def switch_inventory(self):
         self.mode = 'inventory'
         self.select_next_move_line()
 
-    def _hardware_switch_on_laser_pointer(self):
-        if self.hardware == 'simulation':
-            self.env.user.notify_info(
-                message=_('Laser pointer on x{} y{}').format(
-                    self.tray_x, self.tray_y
-                ),
-                title=_('Lift Simulation'),
-            )
-
-    def _hardware_switch_off_laser_pointer(self):
-        if self.hardware == 'simulation':
-            self.env.user.notify_info(
-                message=_('Switch off laser pointer'),
-                title=_('Lift Simulation'),
-            )
-
-    def _hardware_open_tray(self):
-        if self.hardware == 'simulation':
-            self.env.user.notify_info(
-                message=_('Opening tray {}').format(self.tray_name),
-                title=_('Lift Simulation'),
-            )
-
-    def _hardware_close_tray(self):
-        if self.hardware == 'simulation':
-            self.env.user.notify_info(
-                message=_('Closing tray {}').format(self.tray_name),
-                title=_('Lift Simulation'),
-            )
-
 
 class VerticalLiftShuttleManualBarcode(models.TransientModel):
     _name = 'vertical.lift.shuttle.manual.barcode'
diff --git a/stock_vertical_lift/views/stock_location_views.xml b/stock_vertical_lift/views/stock_location_views.xml
index 930d7a179008..62c6e2996d0b 100644
--- a/stock_vertical_lift/views/stock_location_views.xml
+++ b/stock_vertical_lift/views/stock_location_views.xml
@@ -11,6 +11,8 @@
                        attrs="{'invisible': [('vertical_lift_kind', '!=', False), ('vertical_lift_kind', '!=', 'view')]}"
                 />
                 <field name="vertical_lift_kind"/>
+                <field name="vertical_lift_shuttle_id"
+                       attrs="{'invisible': [('vertical_lift_kind', 'not in', ('shuttle', 'tray', 'cell'))]}" />
             </field>
             <field name="tray_type_id" position="attributes">
                 <attribute name="attrs">
@@ -28,6 +30,7 @@
         <field name="arch" type="xml">
             <field name="tray_type_id" position="after">
                 <field name="vertical_lift_kind"/>
+                <field name="vertical_lift_shuttle_id"/>
             </field>
         </field>
     </record>

From 8a9a2e5703d3c00316d040d63ddba25b2dc9024b Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 8 Oct 2019 17:14:28 +0200
Subject: [PATCH 34/50] fixup! Add method on location to fetch a tray

---
 stock_vertical_lift/models/stock_location.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index bf31cad9a740..b77668bbc1df 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -70,7 +70,7 @@ def _compute_vertical_lift_shuttle_id(self):
                 shuttle = location.location_id.vertical_lift_shuttle_id
             location.vertical_lift_shuttle_id = shuttle
 
-    def _fetch_vertical_lift_tray(self, cell_location=None):
+    def _hardware_vertical_lift_tray(self, cell_location=None):
         """Send instructions to the vertical lift hardware
 
         Private method, this is where the implementation actually happens.
@@ -110,7 +110,7 @@ def fetch_vertical_lift_tray(self, cell_location=None):
         Depending on the hardware, the laser pointer may not be implemented.
 
         The actual implementation of the method goes in the private method
-        ``_fetch_vertical_lift_tray()``.
+        ``_hardware_vertical_lift_tray()``.
         """
         self.ensure_one()
         if self.vertical_lift_kind == "cell":
@@ -122,7 +122,7 @@ def fetch_vertical_lift_tray(self, cell_location=None):
             tray = self.location_id
             tray.fetch_vertical_lift_tray(cell_location=self)
         elif self.vertical_lift_kind == "tray":
-            self._fetch_vertical_lift_tray(cell_location=cell_location)
+            self._hardware_vertical_lift_tray(cell_location=cell_location)
         else:
             raise exceptions.UserError(
                 _("Cannot fetch a vertical lift tray on location %s")

From 55bb21143a3fda1b262c6ce9a778058e009117e2 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 8 Oct 2019 17:17:12 +0200
Subject: [PATCH 35/50] Remove vertical_lift_shuttle.address field

The way to connect to a vertical lift can change from a model to
another.
Let's not suppose every system needs an address per shuttle.
For instance, kardex may have a single server for all the shuttles.
That needs to be handled in the kardex specialized module.
---
 stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml   | 3 ---
 stock_vertical_lift/models/vertical_lift_shuttle.py       | 1 -
 stock_vertical_lift/views/vertical_lift_shuttle_views.xml | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml b/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
index 87f856682fac..435c80f3bcf5 100644
--- a/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
+++ b/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml
@@ -4,21 +4,18 @@
   <record id="stock_vertical_lift_demo_shuttle_1" model="vertical.lift.shuttle">
     <field name="name">Shuttle 1</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1"/>
-    <field name="address">10.0.30.1</field>
     <field name="mode">pick</field>
   </record>
 
   <record id="stock_vertical_lift_demo_shuttle_2" model="vertical.lift.shuttle">
     <field name="name">Shuttle 2</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2"/>
-    <field name="address">10.0.30.2</field>
     <field name="mode">pick</field>
   </record>
 
   <record id="stock_vertical_lift_demo_shuttle_3" model="vertical.lift.shuttle">
     <field name="name">Shuttle 3</field>
     <field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3"/>
-    <field name="address">10.0.30.3</field>
     <field name="mode">pick</field>
   </record>
 
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index affcca3388e2..fcdb4a3bd98d 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -11,7 +11,6 @@ class VerticalLiftShuttle(models.Model):
     _description = 'Vertical Lift Shuttle'
 
     name = fields.Char()
-    address = fields.Char()
     mode = fields.Selection(
         [('pick', 'Pick'), ('put', 'Put'), ('inventory', 'Inventory')],
         default='pick',
diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index 2afa60ee9c0d..6d5bb6d53502 100644
--- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -187,7 +187,6 @@
       <form string="Operations">
         <group>
           <field name="name"/>
-          <field name="address"/>
           <field name="mode"/>
           <field name="location_id"/>
           <field name="hardware"/>
@@ -205,7 +204,6 @@ remove later -->
     <field name="arch" type="xml">
       <kanban class="o_kanban_dashboard">
         <field name="name"/>
-        <field name="address"/>
         <field name="mode"/>
         <field name="number_of_ops"/>
         <field name="number_of_ops_all"/>
@@ -260,7 +258,6 @@ remove later -->
     <field name="arch" type="xml">
       <tree string="Shuttle">
         <field name="name"/>
-        <field name="address"/>
       </tree>
     </field>
   </record>

From 08e450c28fdad07312cc0a14f0e9d07958684a69 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 9 Oct 2019 15:00:19 +0200
Subject: [PATCH 36/50] fixup! fixup! Add method on location to fetch a tray

---
 stock_vertical_lift/__manifest__.py           |  1 +
 stock_vertical_lift/models/stock_location.py  | 29 +++++++++++++--
 stock_vertical_lift/models/stock_move_line.py |  8 +++--
 .../views/stock_move_line_views.xml           | 30 ++++++++++++++++
 stock_vertical_lift_kardex/models/__init__.py |  1 +
 .../models/stock_location.py                  | 35 +++++++++++++++++++
 6 files changed, 99 insertions(+), 5 deletions(-)
 create mode 100644 stock_vertical_lift/views/stock_move_line_views.xml
 create mode 100644 stock_vertical_lift_kardex/models/stock_location.py

diff --git a/stock_vertical_lift/__manifest__.py b/stock_vertical_lift/__manifest__.py
index e259e71f48db..580fc0706edf 100644
--- a/stock_vertical_lift/__manifest__.py
+++ b/stock_vertical_lift/__manifest__.py
@@ -24,6 +24,7 @@
     ],
     'data': [
         'views/stock_location_views.xml',
+        'views/stock_move_line_views.xml',
         'views/vertical_lift_shuttle_views.xml',
         'views/stock_vertical_lift_templates.xml',
         'views/shuttle_screen_templates.xml',
diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index b77668bbc1df..93e02cf6513b 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -88,12 +88,37 @@ def _hardware_vertical_lift_tray(self, cell_location=None):
         the tray. If a ``cell_location`` is passed and if the hardware supports
         a way to show a cell (such as a laser pointer), it should send this
         command as well.
+
+        Useful information that could be needed for the drivers:
+
+        * Any field of `self` (name, barcode, ...) which is the current tray.
+        * Any field of `cell_location` (name, barcode, ...) which is the cell
+          in the tray.
+        * ``self.vertical_lift_shuttle_id`` is the current Shuttle, where we
+          find details about the hardware, the current mode (pick, put, ...).
+        * ``self.tray_type_id`` is the kind of tray.
+        * ``self.tray_type_id.width_per_cell`` and
+          ``self.tray_type_id.depth_per_cell`` return the size of a cell in mm.
+        * ``cell_location.posx`` and ``posy`` are the coordinate from the
+          bottom-left of the tray.
+        * ``cell_location.tray_cell_center_position()`` returns the central
+          position of the cell in mm from the bottom-left of a tray. (distance
+          from left, distance from bottom). Can be used for instance for
+          highlighting the cell using a laser pointer.
         """
         if self.vertical_lift_shuttle_id.hardware == "simulation":
             message = _("Opening tray {}.").format(self.name)
             if cell_location:
-                message += _("<br/>Laser pointer on x{} y{}").format(
-                    cell_location.posx, cell_location.posy
+                from_left, from_bottom = (
+                    cell_location.tray_cell_center_position()
+                )
+                message += _(
+                    "<br/>Laser pointer on x{} y{} ({}mm, {}mm)"
+                ).format(
+                    cell_location.posx,
+                    cell_location.posy,
+                    from_left,
+                    from_bottom,
                 )
             self.env.user.notify_info(
                 message=message, title=_("Lift Simulation")
diff --git a/stock_vertical_lift/models/stock_move_line.py b/stock_vertical_lift/models/stock_move_line.py
index ccfbe7746661..a26873c0aeb2 100644
--- a/stock_vertical_lift/models/stock_move_line.py
+++ b/stock_vertical_lift/models/stock_move_line.py
@@ -5,12 +5,14 @@
 
 
 class StockMoveLine(models.Model):
-    _inherit = 'stock.move.line'
+    _inherit = "stock.move.line"
 
     def fetch_vertical_lift_tray_source(self):
         self.ensure_one()
-        return self.location_id.fetch_vertical_lift_tray()
+        self.location_id.fetch_vertical_lift_tray()
+        return {"type": "ir.actions.do_nothing"}
 
     def fetch_vertical_lift_tray_dest(self):
         self.ensure_one()
-        return self.location_dest_id.fetch_vertical_lift_tray()
+        self.location_dest_id.fetch_vertical_lift_tray()
+        return {"type": "ir.actions.do_nothing"}
diff --git a/stock_vertical_lift/views/stock_move_line_views.xml b/stock_vertical_lift/views/stock_move_line_views.xml
new file mode 100644
index 000000000000..39249814e392
--- /dev/null
+++ b/stock_vertical_lift/views/stock_move_line_views.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_stock_move_line_operation_tree" model="ir.ui.view">
+        <field name="name">stock.move.line.operations.tree.tray.type</field>
+        <field name="model">stock.move.line</field>
+        <field name="inherit_id" ref="stock_location_tray.view_stock_move_line_operation_tree" />
+        <field name="arch" type="xml">
+            <button name="action_show_source_tray" position="before">
+                <button name="fetch_vertical_lift_tray_source"
+                        string="Fetch Source Tray"
+                        type="object" icon="fa-hand-paper-o"
+                        attrs="{'invisible': [('tray_source_matrix', '=', {})]}"
+                        invisible="not context.get('show_source_location')"
+                        groups="stock.group_stock_multi_locations"
+                />
+            </button>
+            <button name="action_show_dest_tray" position="before">
+                <button name="fetch_vertical_lift_tray_dest"
+                        string="Fetch Destination Tray"
+                        type="object" icon="fa-hand-paper-o"
+                        attrs="{'invisible': [('tray_dest_matrix', '=', {})]}"
+                        invisible="not context.get('show_destination_location')"
+                        groups="stock.group_stock_multi_locations"
+                />
+            </button>
+        </field>
+    </record>
+
+</odoo>
diff --git a/stock_vertical_lift_kardex/models/__init__.py b/stock_vertical_lift_kardex/models/__init__.py
index e99db92f6582..51a3830f6e9a 100644
--- a/stock_vertical_lift_kardex/models/__init__.py
+++ b/stock_vertical_lift_kardex/models/__init__.py
@@ -1 +1,2 @@
+from . import stock_location
 from . import vertical_lift_shuttle
diff --git a/stock_vertical_lift_kardex/models/stock_location.py b/stock_vertical_lift_kardex/models/stock_location.py
new file mode 100644
index 000000000000..e6bf036107d4
--- /dev/null
+++ b/stock_vertical_lift_kardex/models/stock_location.py
@@ -0,0 +1,35 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class StockLocation(models.Model):
+    _inherit = 'stock.location'
+
+    def _hardware_kardex_prepare_payload(self, cell_location=None):
+        return ""
+
+    def _hardware_vertical_lift_tray(self, cell_location=None):
+        """Send instructions to the vertical lift hardware
+
+        Private method, this is where the implementation actually happens.
+        Addons can add their instructions based on the hardware used for
+        this location.
+
+        The hardware used for a location can be found in:
+
+        ``self.vertical_lift_shuttle_id.hardware``
+
+        Each addon can implement its own mechanism depending of this value
+        and must call ``super``.
+
+        The method must send the command to the vertical lift to fetch / open
+        the tray. If a ``cell_location`` is passed and if the hardware supports
+        a way to show a cell (such as a laser pointer), it should send this
+        command as well.
+        """
+        if self.vertical_lift_shuttle_id.hardware == "kardex":
+            payload = self._hardware_kardex_prepare_payload()
+            # TODO implement the communication with kardex
+        super()._hardware_vertical_lift_tray(cell_location=cell_location)

From 3ed2430a85b1909ec4de05184de4a914d8eb3611 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 9 Oct 2019 17:09:08 +0200
Subject: [PATCH 37/50] Split the shuttle operations in different models/views

Namely, the pick/put/inventory operations are now split in
different models.

Pick and Put share a model and customize their behavior, which is pretty
similar. The inventory operation will have a different view and
different workflow.

This changes will ease a lot the customization of the different
workflows and views.
---
 stock_vertical_lift/__manifest__.py           |   4 +
 stock_vertical_lift/models/__init__.py        |   4 +
 stock_vertical_lift/models/stock_move.py      |  23 +-
 stock_vertical_lift/models/stock_quant.py     |  13 +-
 .../models/vertical_lift_operation_base.py    | 264 ++++++++++++
 .../vertical_lift_operation_inventory.py      |  10 +
 .../models/vertical_lift_operation_pick.py    |  53 +++
 .../models/vertical_lift_operation_put.py     |  35 ++
 .../models/vertical_lift_shuttle.py           | 401 ++++--------------
 .../security/ir.model.access.csv              |   3 +
 .../tests/test_vertical_lift_shuttle.py       | 187 ++++----
 .../vertical_lift_operation_base_views.xml    | 147 +++++++
 ...ertical_lift_operation_inventory_views.xml |  19 +
 .../vertical_lift_operation_pick_views.xml    |  16 +
 .../vertical_lift_operation_put_views.xml     |  16 +
 .../views/vertical_lift_shuttle_views.xml     | 150 +------
 16 files changed, 780 insertions(+), 565 deletions(-)
 create mode 100644 stock_vertical_lift/models/vertical_lift_operation_base.py
 create mode 100644 stock_vertical_lift/models/vertical_lift_operation_inventory.py
 create mode 100644 stock_vertical_lift/models/vertical_lift_operation_pick.py
 create mode 100644 stock_vertical_lift/models/vertical_lift_operation_put.py
 create mode 100644 stock_vertical_lift/views/vertical_lift_operation_base_views.xml
 create mode 100644 stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
 create mode 100644 stock_vertical_lift/views/vertical_lift_operation_pick_views.xml
 create mode 100644 stock_vertical_lift/views/vertical_lift_operation_put_views.xml

diff --git a/stock_vertical_lift/__manifest__.py b/stock_vertical_lift/__manifest__.py
index 580fc0706edf..7d97d1741d11 100644
--- a/stock_vertical_lift/__manifest__.py
+++ b/stock_vertical_lift/__manifest__.py
@@ -26,6 +26,10 @@
         'views/stock_location_views.xml',
         'views/stock_move_line_views.xml',
         'views/vertical_lift_shuttle_views.xml',
+        'views/vertical_lift_operation_base_views.xml',
+        'views/vertical_lift_operation_pick_views.xml',
+        'views/vertical_lift_operation_put_views.xml',
+        'views/vertical_lift_operation_inventory_views.xml',
         'views/stock_vertical_lift_templates.xml',
         'views/shuttle_screen_templates.xml',
         'security/ir.model.access.csv',
diff --git a/stock_vertical_lift/models/__init__.py b/stock_vertical_lift/models/__init__.py
index 80b7355db36a..839f0488889b 100644
--- a/stock_vertical_lift/models/__init__.py
+++ b/stock_vertical_lift/models/__init__.py
@@ -1,4 +1,8 @@
 from . import vertical_lift_shuttle
+from . import vertical_lift_operation_base
+from . import vertical_lift_operation_pick
+from . import vertical_lift_operation_put
+from . import vertical_lift_operation_inventory
 from . import stock_location
 from . import stock_move
 from . import stock_move_line
diff --git a/stock_vertical_lift/models/stock_move.py b/stock_vertical_lift/models/stock_move.py
index 1210d6b09c1b..42222e716edd 100644
--- a/stock_vertical_lift/models/stock_move.py
+++ b/stock_vertical_lift/models/stock_move.py
@@ -5,19 +5,24 @@
 
 
 class StockMove(models.Model):
-    _inherit = 'stock.move'
+    _inherit = "stock.move"
 
     @api.multi
     def write(self, vals):
         result = super().write(vals)
-        if 'state' in vals:
+        if "state" in vals:
             # We cannot have fields to depends on to invalidate these computed
-            # fields on vertical.lift.shuttle. But we know that when the state
-            # of any move line changes, we can invalidate them as the count of
-            # assigned move lines may change (and we track this in stock.move,
-            # not stock.move.line, becaus the state of the lines is a related
-            # to this one).
-            self.env['vertical.lift.shuttle'].invalidate_cache(
-                ['number_of_ops', 'number_of_ops_all']
+            # fields on vertical.lift.operation.*. But we know that when the
+            # state of any move line changes, we can invalidate them as the
+            # count of assigned move lines may change (and we track this in
+            # stock.move, not stock.move.line, because the state of the lines
+            # is a related to this one).
+            models = (
+                "vertical.lift.operation.pick",
+                "vertical.lift.operation.put",
             )
+            for model in models:
+                self.env[model].invalidate_cache(
+                    ["number_of_ops", "number_of_ops_all"]
+                )
         return result
diff --git a/stock_vertical_lift/models/stock_quant.py b/stock_vertical_lift/models/stock_quant.py
index 905484139a7e..5a5ba4f86aa8 100644
--- a/stock_vertical_lift/models/stock_quant.py
+++ b/stock_vertical_lift/models/stock_quant.py
@@ -10,7 +10,14 @@ class StockQuant(models.Model):
     def _update_available_quantity(self, *args, **kwargs):
         result = super()._update_available_quantity(*args, **kwargs)
         # We cannot have fields to depends on to invalidate this computed
-        # fields on vertical.lift.shuttle. But we know that when the quantity
-        # of quant changes, we can invalidate the field on the shuttles.
-        self.env['vertical.lift.shuttle'].invalidate_cache(['tray_qty'])
+        # fields on vertical.lift.operation.* models. But we know that when the
+        # quantity of quant changes, we can invalidate the field
+        models = (
+            "vertical.lift.operation.pick",
+            "vertical.lift.operation.put",
+        )
+        for model in models:
+            self.env[model].invalidate_cache(
+                ["tray_qty"]
+            )
         return result
diff --git a/stock_vertical_lift/models/vertical_lift_operation_base.py b/stock_vertical_lift/models/vertical_lift_operation_base.py
new file mode 100644
index 000000000000..a23cdc2ec1f2
--- /dev/null
+++ b/stock_vertical_lift/models/vertical_lift_operation_base.py
@@ -0,0 +1,264 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+from odoo.addons.base_sparse_field.models.fields import Serialized
+
+
+class VerticalLiftOperationBase(models.AbstractModel):
+    """Base model for shuttle operations (pick, put, inventory)"""
+
+    _name = "vertical.lift.operation.base"
+    _inherit = "barcodes.barcode_events_mixin"
+    _description = "Vertical Lift Operation - Base"
+
+    name = fields.Char(related="shuttle_id.name", readonly=True)
+    shuttle_id = fields.Many2one(
+        comodel_name="vertical.lift.shuttle", required=True, readonly=True
+    )
+    location_id = fields.Many2one(
+        related="shuttle_id.location_id", readonly=True
+    )
+    mode = fields.Selection(related="shuttle_id.mode", readonly=True)
+    operation_descr = fields.Char(
+        string="Operation", default="...", readonly=True
+    )
+
+    _sql_constraints = [
+        (
+            "shuttle_id_unique",
+            "UNIQUE(shuttle_id)",
+            "One pick can be run at a time for a shuttle.",
+        )
+    ]
+
+    def on_barcode_scanned(self, barcode):
+        self.ensure_one()
+        # to implement in sub-classes
+
+    def on_screen_open(self):
+        """Called when the screen is open
+
+        To implement in sub-classes.
+        """
+
+    def action_open_screen(self):
+        return self.shuttle_id.action_open_screen()
+
+    def action_menu(self):
+        return self.shuttle_id.action_menu()
+
+    def action_manual_barcode(self):
+        return self.shuttle_id.action_manual_barcode()
+
+
+class VerticalLiftOperationTransfer(models.AbstractModel):
+    """Base model for shuttle pick and put operations"""
+
+    _name = "vertical.lift.operation.transfer"
+    _inherit = "vertical.lift.operation.base"
+    _description = "Vertical Lift Operation - Transfer"
+
+    current_move_line_id = fields.Many2one(comodel_name="stock.move.line")
+
+    number_of_ops = fields.Integer(
+        compute="_compute_number_of_ops", string="Number of Operations"
+    )
+    number_of_ops_all = fields.Integer(
+        compute="_compute_number_of_ops_all",
+        string="Number of Operations in all shuttles",
+    )
+
+    tray_location_id = fields.Many2one(
+        comodel_name="stock.location",
+        compute="_compute_tray_data",
+        string="Tray Location",
+    )
+    tray_name = fields.Char(compute="_compute_tray_data", string="Tray Name")
+    tray_type_id = fields.Many2one(
+        comodel_name="stock.location.tray.type",
+        compute="_compute_tray_data",
+        string="Tray Type",
+    )
+    tray_type_code = fields.Char(
+        compute="_compute_tray_data", string="Tray Code"
+    )
+    tray_x = fields.Integer(string="X", compute="_compute_tray_data")
+    tray_y = fields.Integer(string="Y", compute="_compute_tray_data")
+    tray_matrix = Serialized(string="Cells", compute="_compute_tray_data")
+    tray_qty = fields.Float(
+        string="Stock Quantity", compute="_compute_tray_qty"
+    )
+
+    # current operation information
+    picking_id = fields.Many2one(
+        related="current_move_line_id.picking_id", readonly=True
+    )
+    picking_origin = fields.Char(
+        related="current_move_line_id.picking_id.origin", readonly=True
+    )
+    picking_partner_id = fields.Many2one(
+        related="current_move_line_id.picking_id.partner_id", readonly=True
+    )
+    product_id = fields.Many2one(
+        related="current_move_line_id.product_id", readonly=True
+    )
+    product_uom_id = fields.Many2one(
+        related="current_move_line_id.product_uom_id", readonly=True
+    )
+    product_uom_qty = fields.Float(
+        related="current_move_line_id.product_uom_qty", readonly=True
+    )
+    product_packagings = fields.Html(
+        string="Packaging", compute="_compute_product_packagings"
+    )
+    qty_done = fields.Float(
+        related="current_move_line_id.qty_done", readonly=True
+    )
+    lot_id = fields.Many2one(
+        related="current_move_line_id.lot_id", readonly=True
+    )
+    location_dest_id = fields.Many2one(
+        string="Destination",
+        related="current_move_line_id.location_dest_id",
+        readonly=True,
+    )
+    # TODO add a glue addon with product_expiry to add the field
+
+    def on_barcode_scanned(self, barcode):
+        self.ensure_one()
+        self.env.user.notify_info(
+            "Scanned barcode: {}. Not implemented.".format(barcode)
+        )
+
+    @api.depends("current_move_line_id.product_id.packaging_ids")
+    def _compute_product_packagings(self):
+        for record in self:
+            if not record.current_move_line_id:
+                continue
+            product = record.current_move_line_id.product_id
+            values = {
+                "packagings": [
+                    {
+                        "name": pkg.name,
+                        "qty": pkg.qty,
+                        "unit": product.uom_id.name,
+                    }
+                    for pkg in product.packaging_ids
+                ]
+            }
+            content = self.env["ir.qweb"].render(
+                "stock_vertical_lift.packagings", values
+            )
+            record.product_packagings = content
+
+    @api.depends()
+    def _compute_number_of_ops(self):
+        for record in self:
+            record.number_of_ops = record.count_move_lines_to_do()
+
+    @api.depends()
+    def _compute_number_of_ops_all(self):
+        for record in self:
+            record.number_of_ops_all = record.count_move_lines_to_do_all()
+
+    @api.depends("tray_location_id", "current_move_line_id.product_id")
+    def _compute_tray_qty(self):
+        for record in self:
+            if not (record.tray_location_id and record.current_move_line_id):
+                continue
+            product = record.current_move_line_id.product_id
+            quants = self.env["stock.quant"].search(
+                [
+                    ("location_id", "=", record.tray_location_id.id),
+                    ("product_id", "=", product.id),
+                ]
+            )
+            record.tray_qty = sum(quants.mapped("quantity"))
+
+    # depends of the quantity so we can't have all triggers
+    @api.depends("current_move_line_id")
+    def _compute_tray_data(self):
+        for record in self:
+            modes = {"pick": "location_id", "put": "location_dest_id"}
+            location = record.current_move_line_id[modes[record.mode]]
+            tray_type = location.location_id.tray_type_id
+            # this is the current cell
+            record.tray_location_id = location.id
+            # name of the tray where the cell is
+            record.tray_name = location.location_id.name
+            record.tray_type_id = tray_type.id
+            record.tray_type_code = tray_type.code
+            record.tray_x = location.posx
+            record.tray_y = location.posy
+            record.tray_matrix = location.tray_matrix
+
+    def _domain_move_lines_to_do(self):
+        # to implement in sub-classes
+        return [("id", "=", 0)]
+
+    def _domain_move_lines_to_do_all(self):
+        # to implement in sub-classes
+        return [("id", "=", 0)]
+
+    def count_move_lines_to_do(self):
+        """Count move lines to process in current shuttles"""
+        self.ensure_one()
+        return self.env["stock.move.line"].search_count(
+            self._domain_move_lines_to_do()
+        )
+
+    def count_move_lines_to_do_all(self):
+        """Count move lines to process in all shuttles"""
+        self.ensure_one()
+        return self.env["stock.move.line"].search_count(
+            self._domain_move_lines_to_do_all()
+        )
+
+    def on_screen_open(self):
+        """Called when the screen is open"""
+        self.select_next_move_line()
+
+    def button_release(self):
+        """Release the operation, go to the next"""
+        self.select_next_move_line()
+        if not self.current_move_line_id:
+            # sorry not sorry
+            return {
+                "effect": {
+                    "fadeout": "slow",
+                    "message": _("Congrats, you cleared the queue!"),
+                    "img_url": "/web/static/src/img/smile.svg",
+                    "type": "rainbow_man",
+                }
+            }
+
+    def process_current(self):
+        raise NotImplementedError
+
+    def button_save(self):
+        if not (self and self.current_move_line_id):
+            return
+        self.ensure_one()
+        self.process_current()
+        self.operation_descr = _("Release")
+
+    def fetch_tray(self):
+        return
+
+    def select_next_move_line(self):
+        self.ensure_one()
+        next_move_line = self.env["stock.move.line"].search(
+            self._domain_move_lines_to_do(), limit=1
+        )
+        self.current_move_line_id = next_move_line
+        # TODO use a state machine to define next steps and
+        # description?
+        descr = (
+            _("Scan New Destination Location")
+            if next_move_line
+            else _("No operations")
+        )
+        self.operation_descr = descr
+        if next_move_line:
+            self.fetch_tray()
diff --git a/stock_vertical_lift/models/vertical_lift_operation_inventory.py b/stock_vertical_lift/models/vertical_lift_operation_inventory.py
new file mode 100644
index 000000000000..17fd732cda98
--- /dev/null
+++ b/stock_vertical_lift/models/vertical_lift_operation_inventory.py
@@ -0,0 +1,10 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class VerticalLiftOperationInventory(models.Model):
+    _name = 'vertical.lift.operation.inventory'
+    _inherit = 'vertical.lift.operation.base'
+    _description = 'Vertical Lift Operation Inventory'
diff --git a/stock_vertical_lift/models/vertical_lift_operation_pick.py b/stock_vertical_lift/models/vertical_lift_operation_pick.py
new file mode 100644
index 000000000000..25bd4017338d
--- /dev/null
+++ b/stock_vertical_lift/models/vertical_lift_operation_pick.py
@@ -0,0 +1,53 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, models
+
+
+class VerticalLiftOperationPick(models.Model):
+    _name = "vertical.lift.operation.pick"
+    _inherit = "vertical.lift.operation.transfer"
+    _description = "Vertical Lift Operation Pick"
+
+    def on_barcode_scanned(self, barcode):
+        self.ensure_one()
+        location = self.env["stock.location"].search(
+            [("barcode", "=", barcode)]
+        )
+        if location:
+            self.current_move_line_id.location_dest_id = location
+            self.operation_descr = _("Save")
+        else:
+            self.env.user.notify_warning(
+                _("No location found for barcode {}").format(barcode)
+            )
+
+    def _domain_move_lines_to_do(self):
+        # TODO check domain
+        domain = [
+            ("state", "=", "assigned"),
+            ("location_id", "child_of", self.location_id.id),
+        ]
+        return domain
+
+    def _domain_move_lines_to_do_all(self):
+        shuttle_locations = self.env["stock.location"].search(
+            [("vertical_lift_kind", "=", "view")]
+        )
+        # TODO check domain
+        domain = [
+            ("state", "=", "assigned"),
+            ("location_id", "child_of", shuttle_locations.ids),
+        ]
+        return domain
+
+    def fetch_tray(self):
+        self.current_move_line_id.fetch_vertical_lift_tray_source()
+
+    def process_current(self):
+        # test code, TODO the smart one
+        # (scan of barcode increments qty, save calls action_done?)
+        line = self.current_move_line_id
+        if line.state != "done":
+            line.qty_done = line.product_qty
+            line.move_id._action_done()
diff --git a/stock_vertical_lift/models/vertical_lift_operation_put.py b/stock_vertical_lift/models/vertical_lift_operation_put.py
new file mode 100644
index 000000000000..92903fb01bc0
--- /dev/null
+++ b/stock_vertical_lift/models/vertical_lift_operation_put.py
@@ -0,0 +1,35 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import _, exceptions, models
+
+
+class VerticalLiftOperationPut(models.Model):
+    _name = "vertical.lift.operation.put"
+    _inherit = "vertical.lift.operation.transfer"
+    _description = "Vertical Lift Operation Put"
+
+    def _domain_move_lines_to_do(self):
+        # TODO check domain
+        domain = [
+            ("state", "=", "assigned"),
+            ("location_dest_id", "child_of", self.location_id.id),
+        ]
+        return domain
+
+    def _domain_move_lines_to_do_all(self):
+        shuttle_locations = self.env["stock.location"].search(
+            [("vertical_lift_kind", "=", "view")]
+        )
+        domain = [
+            # TODO check state
+            ("state", "=", "assigned"),
+            ("location_dest_id", "child_of", shuttle_locations.ids),
+        ]
+        return domain
+
+    def fetch_tray(self):
+        self.current_move_line_id.fetch_vertical_lift_tray_dest()
+
+    def process_current(self):
+        raise exceptions.UserError(_("Put workflow not implemented"))
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index fcdb4a3bd98d..e62536a24f5a 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -2,383 +2,140 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, exceptions, fields, models
-from odoo.addons.base_sparse_field.models.fields import Serialized
 
 
 class VerticalLiftShuttle(models.Model):
-    _name = 'vertical.lift.shuttle'
-    _inherit = 'barcodes.barcode_events_mixin'
-    _description = 'Vertical Lift Shuttle'
+    _name = "vertical.lift.shuttle"
+    _inherit = "barcodes.barcode_events_mixin"
+    _description = "Vertical Lift Shuttle"
 
     name = fields.Char()
     mode = fields.Selection(
-        [('pick', 'Pick'), ('put', 'Put'), ('inventory', 'Inventory')],
-        default='pick',
+        [("pick", "Pick"), ("put", "Put"), ("inventory", "Inventory")],
+        default="pick",
         required=True,
     )
     location_id = fields.Many2one(
-        comodel_name='stock.location',
+        comodel_name="stock.location",
         required=True,
         domain="[('vertical_lift_kind', '=', 'shuttle')]",
-        ondelete='restrict',
+        ondelete="restrict",
         help="The Shuttle source location for Pick operations "
         "and destination location for Put operations.",
     )
     hardware = fields.Selection(
-        selection='_selection_hardware', default='simulation', required=True
-    )
-    current_move_line_id = fields.Many2one(comodel_name='stock.move.line')
-
-    number_of_ops = fields.Integer(
-        compute='_compute_number_of_ops', string='Number of Operations'
-    )
-    number_of_ops_all = fields.Integer(
-        compute='_compute_number_of_ops_all',
-        string='Number of Operations in all shuttles',
-    )
-
-    operation_descr = fields.Char(
-        string="Operation",
-        default="Scan New Destination Location",
-        readonly=True,
-    )
-
-    # tray information (will come from stock.location or a new tray model)
-    tray_location_id = fields.Many2one(
-        comodel_name='stock.location',
-        compute='_compute_tray_matrix',
-        string='Tray Location',
-    )
-    tray_name = fields.Char(compute='_compute_tray_matrix', string='Tray Name')
-    tray_type_id = fields.Many2one(
-        comodel_name='stock.location.tray.type',
-        compute='_compute_tray_matrix',
-        string='Tray Type',
-    )
-    tray_type_code = fields.Char(
-        compute='_compute_tray_matrix', string='Tray Code'
-    )
-    tray_x = fields.Integer(string='X', compute='_compute_tray_matrix')
-    tray_y = fields.Integer(string='Y', compute='_compute_tray_matrix')
-    tray_matrix = Serialized(string='Cells', compute='_compute_tray_matrix')
-    tray_qty = fields.Float(
-        string='Stock Quantity', compute='_compute_tray_qty'
-    )
-
-    # current operation information
-    picking_id = fields.Many2one(
-        related='current_move_line_id.picking_id', readonly=True
-    )
-    picking_origin = fields.Char(
-        related='current_move_line_id.picking_id.origin', readonly=True
-    )
-    picking_partner_id = fields.Many2one(
-        related='current_move_line_id.picking_id.partner_id', readonly=True
-    )
-    product_id = fields.Many2one(
-        related='current_move_line_id.product_id', readonly=True
-    )
-    product_uom_id = fields.Many2one(
-        related='current_move_line_id.product_uom_id', readonly=True
-    )
-    product_uom_qty = fields.Float(
-        related='current_move_line_id.product_uom_qty', readonly=True
-    )
-    product_packagings = fields.Html(
-        string='Packaging', compute='_compute_product_packagings'
-    )
-    qty_done = fields.Float(
-        related='current_move_line_id.qty_done', readonly=True
-    )
-    lot_id = fields.Many2one(
-        related='current_move_line_id.lot_id', readonly=True
-    )
-    location_dest_id = fields.Many2one(
-        string="Destination",
-        related='current_move_line_id.location_dest_id',
-        readonly=True,
-    )
-
-    # TODO add a glue addon with product_expiry to add the field
-
-    _barcode_scanned = fields.Char(
-        "Barcode Scanned",
-        help="Value of the last barcode scanned.",
-        store=False,
+        selection="_selection_hardware", default="simulation", required=True
     )
 
     _sql_constraints = [
-        ('location_id_unique', 'UNIQUE(location_id)',
-         'You cannot have two shuttles using the same location.'),
-    ]
-
-    def on_barcode_scanned(self, barcode):
-        self.ensure_one()
-        # FIXME notify_info is only for the demo
-        self.env.user.notify_info('Scanned barcode: {}'.format(barcode))
-        method = 'on_barcode_scanned_{}'.format(self.mode)
-        getattr(self, method)(barcode)
-
-    def on_barcode_scanned_pick(self, barcode):
-        location = self.env['stock.location'].search(
-            [('barcode', '=', barcode)]
+        (
+            "location_id_unique",
+            "UNIQUE(location_id)",
+            "You cannot have two shuttles using the same location.",
         )
-        if location:
-            self.current_move_line_id.location_dest_id = location
-            self.operation_descr = _('Save')
-        else:
-            self.env.user.notify_warning(
-                _('No location found for barcode {}').format(barcode)
-            )
-
-    def on_barcode_scanned_put(self, barcode):
-        pass
-
-    def on_barcode_scanned_inventory(self, barcode):
-        pass
+    ]
 
     @api.model
     def _selection_hardware(self):
-        return [('simulation', 'Simulation')]
-
-    @api.depends('current_move_line_id.product_id.packaging_ids')
-    def _compute_product_packagings(self):
-        for record in self:
-            if not record.current_move_line_id:
-                continue
-            product = record.current_move_line_id.product_id
-            values = {
-                'packagings': [
-                    {
-                        'name': pkg.name,
-                        'qty': pkg.qty,
-                        'unit': product.uom_id.name,
-                    }
-                    for pkg in product.packaging_ids
-                ]
-            }
-            content = self.env['ir.qweb'].render(
-                'stock_vertical_lift.packagings', values
-            )
-            record.product_packagings = content
-
-    @api.depends()
-    def _compute_number_of_ops(self):
-        for record in self:
-            record.number_of_ops = record.count_move_lines_to_do()
-
-    @api.depends()
-    def _compute_number_of_ops_all(self):
-        for record in self:
-            record.number_of_ops_all = record.count_move_lines_to_do_all()
-
-    @api.depends('tray_location_id', 'current_move_line_id.product_id')
-    def _compute_tray_qty(self):
-        for record in self:
-            if not (record.tray_location_id and record.current_move_line_id):
-                continue
-            product = record.current_move_line_id.product_id
-            quants = self.env['stock.quant'].search(
-                [
-                    ('location_id', '=', record.tray_location_id.id),
-                    ('product_id', '=', product.id),
-                ]
-            )
-            record.tray_qty = sum(quants.mapped('quantity'))
-
-    @api.depends()
-    def _compute_tray_matrix(self):
-        for record in self:
-            modes = {
-                'pick': 'location_id',
-                'put': 'location_dest_id',
-                # TODO what to do for inventory?
-                'inventory': 'location_id',
-            }
-            location = record.current_move_line_id[modes[record.mode]]
-            tray_type = location.location_id.tray_type_id
-            selected = []
-            cells = []
-            if location:
-                selected = location._tray_cell_coords()
-                cells = location._tray_cell_matrix()
-
-            # this is the current cell
-            record.tray_location_id = location.id
-            # name of the tray where the cell is
-            record.tray_name = location.location_id.name
-            record.tray_type_id = tray_type.id
-            record.tray_type_code = tray_type.code
-            record.tray_x = location.posx
-            record.tray_y = location.posy
-            record.tray_matrix = {
-                # x, y: position of the selected cell
-                'selected': selected,
-                # 0 is empty, 1 is not
-                'cells': cells,
-            }
+        return [("simulation", "Simulation")]
 
-    def _domain_move_lines_to_do(self):
-        domain = [
-            # TODO check state
-            ('state', '=', 'assigned')
-        ]
-        domain_extensions = {
-            'pick': [('location_id', 'child_of', self.location_id.id)],
-            # TODO ensure that we cannot have the same ml in 2 shuttles (cannot
-            # happen with 'pick' as they are in the shuttle's location)
-            'put': [('location_dest_id', 'child_of', self.location_id.id)],
-            # TODO
-            'inventory': [('id', '=', 0)],
+    @property
+    def _model_for_mode(self):
+        return {
+            "pick": "vertical.lift.operation.pick",
+            "put": "vertical.lift.operation.put",
+            "inventory": "vertical.lift.operation.inventory",
         }
-        return domain + domain_extensions[self.mode]
 
-    def _domain_move_lines_to_do_all(self):
-        domain = [
-            # TODO check state
-            ('state', '=', 'assigned')
-        ]
-        # TODO search only in the view being a parent of shuttle's location
-        shuttle_locations = self.env['stock.location'].search(
-            [('vertical_lift_kind', '=', 'view')]
-        )
-        domain_extensions = {
-            'pick': [('location_id', 'child_of', shuttle_locations.ids)],
-            'put': [('location_dest_id', 'child_of', shuttle_locations.ids)],
-            # TODO
-            'inventory': [('id', '=', 0)],
+    @property
+    def _screen_view_for_mode(self):
+        return {
+            "pick": (
+                "stock_vertical_lift."
+                "vertical_lift_operation_pick_screen_view"
+            ),
+            "put": (
+                "stock_vertical_lift."
+                "vertical_lift_operation_put_screen_view"
+            ),
+            "inventory": (
+                "stock_vertical_lift."
+                "vertical_lift_operation_inventory_screen_view"
+            ),
         }
-        return domain + domain_extensions[self.mode]
 
-    def count_move_lines_to_do(self):
-        self.ensure_one()
-        return self.env['stock.move.line'].search_count(
-            self._domain_move_lines_to_do()
-        )
-
-    def count_move_lines_to_do_all(self):
-        self.ensure_one()
-        return self.env['stock.move.line'].search_count(
-            self._domain_move_lines_to_do_all()
-        )
-
-    def button_release(self):
-        self.select_next_move_line()
-        if not self.current_move_line_id:
-            # sorry not sorry
-            return {
-                'effect': {
-                    'fadeout': 'slow',
-                    'message': _('Congrats, you cleared the queue!'),
-                    'img_url': '/web/static/src/img/smile.svg',
-                    'type': 'rainbow_man',
-                }
-            }
-
-    def process_current_pick(self):
-        # test code, TODO the smart one
-        # (scan of barcode increments qty, save calls action_done?)
-        line = self.current_move_line_id
-        if line.state != 'done':
-            line.qty_done = line.product_qty
-            line.move_id._action_done()
-
-    def process_current_put(self):
-        raise exceptions.UserError(_('Put workflow not implemented'))
-
-    def process_current_inventory(self):
-        raise exceptions.UserError(_('Inventory workflow not implemented'))
-
-    def button_save(self):
-        if not (self and self.current_move_line_id):
-            return
-        self.ensure_one()
-        method = 'process_current_{}'.format(self.mode)
-        getattr(self, method)()
-        self.operation_descr = _('Release')
-
-    def select_next_move_line(self):
-        self.ensure_one()
-        next_move_line = self.env['stock.move.line'].search(
-            self._domain_move_lines_to_do(), limit=1
-        )
-        self.current_move_line_id = next_move_line
-        # TODO use a state machine to define next steps and
-        # description?
-        descr = (
-            _('Scan New Destination Location')
-            if next_move_line
-            else _('No operations')
-        )
-        self.operation_descr = descr
-        if next_move_line:
-            # TODO different method (source vs dest) on pick/put scenario
-            next_move_line.fetch_vertical_lift_tray_source()
+    def _operation_for_mode(self):
+        model = self._model_for_mode[self.mode]
+        record = self.env[model].search([("shuttle_id", "=", self.id)])
+        if not record:
+            record = self.env[model].create({"shuttle_id": self.id})
+        return record
 
     def action_open_screen(self):
-        self.select_next_move_line()
         self.ensure_one()
-        screen_xmlid = (
-            'stock_vertical_lift.vertical_lift_shuttle_view_form_screen'
-        )
+        assert self.mode in ("pick", "put", "inventory")
+        screen_xmlid = self._screen_view_for_mode[self.mode]
+        operation = self._operation_for_mode()
+        operation.on_screen_open()
         return {
-            'type': 'ir.actions.act_window',
-            'res_model': self._name,
-            'views': [[self.env.ref(screen_xmlid).id, 'form']],
-            'res_id': self.id,
-            'target': 'fullscreen',
-            'flags': {
-                'headless': True,
-                'form_view_initial_mode': 'edit',
-                'no_breadcrumbs': True,
+            "type": "ir.actions.act_window",
+            "res_model": operation._name,
+            "views": [[self.env.ref(screen_xmlid).id, "form"]],
+            "res_id": operation.id,
+            "target": "fullscreen",
+            "flags": {
+                "headless": True,
+                "form_view_initial_mode": "edit",
+                "no_breadcrumbs": True,
             },
         }
 
     def action_menu(self):
-        menu_xmlid = 'stock_vertical_lift.vertical_lift_shuttle_form_menu'
+        menu_xmlid = "stock_vertical_lift.vertical_lift_shuttle_form_menu"
         return {
-            'type': 'ir.actions.act_window',
-            'res_model': 'vertical.lift.shuttle',
-            'views': [[self.env.ref(menu_xmlid).id, 'form']],
-            'name': _('Menu'),
-            'target': 'new',
-            'res_id': self.id,
+            "type": "ir.actions.act_window",
+            "res_model": "vertical.lift.shuttle",
+            "views": [[self.env.ref(menu_xmlid).id, "form"]],
+            "name": _("Menu"),
+            "target": "new",
+            "res_id": self.id,
         }
 
     def action_manual_barcode(self):
         return {
-            'type': 'ir.actions.act_window',
-            'res_model': 'vertical.lift.shuttle.manual.barcode',
-            'view_mode': 'form',
-            'name': _('Barcode'),
-            'target': 'new',
+            "type": "ir.actions.act_window",
+            "res_model": "vertical.lift.shuttle.manual.barcode",
+            "view_mode": "form",
+            "name": _("Barcode"),
+            "target": "new",
         }
 
     # TODO: should the mode be changed on all the shuttles at the same time?
     def switch_pick(self):
-        self.mode = 'pick'
-        self.select_next_move_line()
+        self.mode = "pick"
+        return self.action_open_screen()
 
     def switch_put(self):
-        self.mode = 'put'
-        self.select_next_move_line()
+        self.mode = "put"
+        return self.action_open_screen()
 
     def switch_inventory(self):
-        self.mode = 'inventory'
-        self.select_next_move_line()
+        self.mode = "inventory"
+        return self.action_open_screen()
 
 
 class VerticalLiftShuttleManualBarcode(models.TransientModel):
-    _name = 'vertical.lift.shuttle.manual.barcode'
-    _description = 'Action to input a barcode'
+    _name = "vertical.lift.shuttle.manual.barcode"
+    _description = "Action to input a barcode"
 
     barcode = fields.Char(string="Barcode")
 
     @api.multi
     def button_save(self):
-        shuttle_id = self.env.context.get('active_id')
-        shuttle = self.env['vertical.lift.shuttle'].browse(shuttle_id).exists()
-        if not shuttle:
+        active_id = self.env.context.get("active_id")
+        model = self.env.context.get("active_model")
+        record = self.env[model].browse(active_id).exists()
+        if not record:
             return
         if self.barcode:
-            shuttle.on_barcode_scanned(self.barcode)
+            record.on_barcode_scanned(self.barcode)
diff --git a/stock_vertical_lift/security/ir.model.access.csv b/stock_vertical_lift/security/ir.model.access.csv
index dc7cb4b87a83..2a69468e4540 100644
--- a/stock_vertical_lift/security/ir.model.access.csv
+++ b/stock_vertical_lift/security/ir.model.access.csv
@@ -1,3 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_vertical_lift_shuttle_stock_user,access_vertical_lift_shuttle stock user,model_vertical_lift_shuttle,stock.group_stock_user,1,0,0,0
 access_vertical_lift_shuttle_manager,access_vertical_lift_shuttle stock manager,model_vertical_lift_shuttle,stock.group_stock_manager,1,1,1,1
+access_vertical_lift_operation_pick_stock_user,access_vertical_lift_operation_pick stock user,model_vertical_lift_operation_pick,stock.group_stock_user,1,1,1,1
+access_vertical_lift_operation_put_stock_user,access_vertical_lift_operation_put stock user,model_vertical_lift_operation_put,stock.group_stock_user,1,1,1,1
+access_vertical_lift_operation_inventory_stock_user,access_vertical_lift_operation_inventory stock user,model_vertical_lift_operation_inventory,stock.group_stock_user,1,1,1,1
diff --git a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
index 1575051cbdce..b80e46c1e0b4 100644
--- a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
+++ b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
@@ -13,7 +13,7 @@ class TestVerticalLiftTrayType(VerticalLiftCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.picking_out = cls.env.ref(
-            'stock_vertical_lift.stock_picking_out_demo_vertical_lift_1'
+            "stock_vertical_lift.stock_picking_out_demo_vertical_lift_1"
         )
         # we have a move line to pick created by demo picking
         # stock_picking_out_demo_vertical_lift_1
@@ -21,114 +21,112 @@ def setUpClass(cls):
 
     def test_switch_pick(self):
         self.shuttle.switch_pick()
-        self.assertEqual(self.shuttle.mode, 'pick')
-        self.assertEqual(self.shuttle.current_move_line_id, self.out_move_line)
+        self.assertEqual(self.shuttle.mode, "pick")
+        self.assertEqual(
+            self.shuttle._operation_for_mode().current_move_line_id,
+            self.out_move_line,
+        )
 
     def test_switch_put(self):
         self.shuttle.switch_put()
-        self.assertEqual(self.shuttle.mode, 'put')
+        self.assertEqual(self.shuttle.mode, "put")
         # TODO check that we have an incoming move when switching
         self.assertEqual(
-            self.shuttle.current_move_line_id,
-            self.env['stock.move.line'].browse(),
+            self.shuttle._operation_for_mode().current_move_line_id,
+            self.env["stock.move.line"].browse(),
         )
 
     def test_switch_inventory(self):
         self.shuttle.switch_inventory()
-        self.assertEqual(self.shuttle.mode, 'inventory')
-        # TODO check that we have what we should (what?)
-        self.assertEqual(
-            self.shuttle.current_move_line_id,
-            self.env['stock.move.line'].browse(),
-        )
+        self.assertEqual(self.shuttle.mode, "inventory")
 
     def test_pick_action_open_screen(self):
         self.shuttle.switch_pick()
         action = self.shuttle.action_open_screen()
-        self.assertTrue(self.shuttle.current_move_line_id)
-        self.assertEqual(action['type'], 'ir.actions.act_window')
-        self.assertEqual(action['res_model'], 'vertical.lift.shuttle')
-        self.assertEqual(action['res_id'], self.shuttle.id)
+        operation = self.shuttle._operation_for_mode()
+        self.assertTrue(operation.current_move_line_id)
+        self.assertEqual(action["type"], "ir.actions.act_window")
+        self.assertEqual(action["res_model"], "vertical.lift.operation.pick")
+        self.assertEqual(action["res_id"], operation.id)
 
     def test_pick_select_next_move_line(self):
-        self.shuttle.switch_pick()
-        self.shuttle.select_next_move_line()
-        self.assertEqual(self.shuttle.current_move_line_id, self.out_move_line)
+        self.shuttle.mode = "pick"
+        operation = self.shuttle._operation_for_mode()
+        operation.select_next_move_line()
+        self.assertEqual(operation.current_move_line_id, self.out_move_line)
         self.assertEqual(
-            self.shuttle.operation_descr,
-            _('Scan New Destination Location')
+            operation.operation_descr, _("Scan New Destination Location")
         )
 
     def test_pick_save(self):
         self.shuttle.switch_pick()
-        self.shuttle.current_move_line_id = self.out_move_line
-        self.shuttle.button_save()
-        self.assertEqual(
-            self.shuttle.current_move_line_id.state,
-            'done'
-        )
-        self.assertEqual(self.shuttle.operation_descr, _('Release'))
+        operation = self.shuttle._operation_for_mode()
+        operation.current_move_line_id = self.out_move_line
+        operation.button_save()
+        self.assertEqual(operation.current_move_line_id.state, "done")
+        self.assertEqual(operation.operation_descr, _("Release"))
 
     def test_pick_related_fields(self):
         self.shuttle.switch_pick()
-        ml = self.shuttle.current_move_line_id = self.out_move_line
+        operation = self.shuttle._operation_for_mode()
+        ml = operation.current_move_line_id = self.out_move_line
 
         # Trays related fields
         # For pick, this is the source location, which is the cell where the
         # product is.
-        self.assertEqual(self.shuttle.tray_location_id, ml.location_id)
+        self.assertEqual(operation.tray_location_id, ml.location_id)
         self.assertEqual(
-            self.shuttle.tray_name,
+            operation.tray_name,
             # parent = tray
             ml.location_id.location_id.name,
         )
         self.assertEqual(
-            self.shuttle.tray_type_id,
+            operation.tray_type_id,
             # the tray type is on the parent of the cell (on the tray)
             ml.location_id.location_id.tray_type_id,
         )
         self.assertEqual(
-            self.shuttle.tray_type_code,
+            operation.tray_type_code,
             ml.location_id.location_id.tray_type_id.code,
         )
-        self.assertEqual(self.shuttle.tray_x, ml.location_id.posx)
-        self.assertEqual(self.shuttle.tray_y, ml.location_id.posy)
+        self.assertEqual(operation.tray_x, ml.location_id.posx)
+        self.assertEqual(operation.tray_y, ml.location_id.posy)
 
         # Move line related fields
-        self.assertEqual(self.shuttle.picking_id, ml.picking_id)
-        self.assertEqual(self.shuttle.picking_origin, ml.picking_id.origin)
+        self.assertEqual(operation.picking_id, ml.picking_id)
+        self.assertEqual(operation.picking_origin, ml.picking_id.origin)
         self.assertEqual(
-            self.shuttle.picking_partner_id, ml.picking_id.partner_id
+            operation.picking_partner_id, ml.picking_id.partner_id
         )
-        self.assertEqual(self.shuttle.product_id, ml.product_id)
-        self.assertEqual(self.shuttle.product_uom_id, ml.product_uom_id)
-        self.assertEqual(self.shuttle.product_uom_qty, ml.product_uom_qty)
-        self.assertEqual(self.shuttle.qty_done, ml.qty_done)
-        self.assertEqual(self.shuttle.lot_id, ml.lot_id)
+        self.assertEqual(operation.product_id, ml.product_id)
+        self.assertEqual(operation.product_uom_id, ml.product_uom_id)
+        self.assertEqual(operation.product_uom_qty, ml.product_uom_qty)
+        self.assertEqual(operation.qty_done, ml.qty_done)
+        self.assertEqual(operation.lot_id, ml.lot_id)
 
     def test_pick_count_move_lines(self):
-        product1 = self.env.ref('stock_vertical_lift.product_running_socks')
-        product2 = self.env.ref('stock_vertical_lift.product_recovery_socks')
+        product1 = self.env.ref("stock_vertical_lift.product_running_socks")
+        product2 = self.env.ref("stock_vertical_lift.product_recovery_socks")
         # cancel the picking from demo data to start from a clean state
         self.env.ref(
-            'stock_vertical_lift.stock_picking_out_demo_vertical_lift_1'
+            "stock_vertical_lift.stock_picking_out_demo_vertical_lift_1"
         ).action_cancel()
 
         # ensure that we have stock in some cells, we'll put product1
         # in the first Shuttle and product2 in the second
         cell1 = self.env.ref(
-            'stock_vertical_lift.'
-            'stock_location_vertical_lift_demo_tray_1a_x3y2'
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x3y2"
         )
         self._update_quantity_in_cell(cell1, product1, 50)
         cell2 = self.env.ref(
-            'stock_vertical_lift.'
-            'stock_location_vertical_lift_demo_tray_2a_x1y1'
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_2a_x1y1"
         )
         self._update_quantity_in_cell(cell2, product2, 50)
 
         # create pickings (we already have an existing one from demo data)
-        pickings = self.env['stock.picking'].browse()
+        pickings = self.env["stock.picking"].browse()
         pickings |= self._create_simple_picking_out(product1, 1)
         pickings |= self._create_simple_picking_out(product1, 1)
         pickings |= self._create_simple_picking_out(product1, 1)
@@ -144,41 +142,43 @@ def test_pick_count_move_lines(self):
         pickings.action_assign()
 
         shuttle1 = self.shuttle
+        operation1 = shuttle1._operation_for_mode()
         shuttle2 = self.env.ref(
-            'stock_vertical_lift.stock_vertical_lift_demo_shuttle_2'
+            "stock_vertical_lift.stock_vertical_lift_demo_shuttle_2"
         )
+        operation2 = shuttle2._operation_for_mode()
 
-        self.assertEqual(shuttle1.number_of_ops, 4)
-        self.assertEqual(shuttle2.number_of_ops, 2)
-        self.assertEqual(shuttle1.number_of_ops_all, 6)
-        self.assertEqual(shuttle2.number_of_ops_all, 6)
+        self.assertEqual(operation1.number_of_ops, 4)
+        self.assertEqual(operation2.number_of_ops, 2)
+        self.assertEqual(operation1.number_of_ops_all, 6)
+        self.assertEqual(operation2.number_of_ops_all, 6)
 
         # Process a line, should change the numbers.
-        shuttle1.select_next_move_line()
-        shuttle1.process_current_pick()
-        self.assertEqual(shuttle1.number_of_ops, 3)
-        self.assertEqual(shuttle2.number_of_ops, 2)
-        self.assertEqual(shuttle1.number_of_ops_all, 5)
-        self.assertEqual(shuttle2.number_of_ops_all, 5)
+        operation1.select_next_move_line()
+        operation1.process_current()
+        self.assertEqual(operation1.number_of_ops, 3)
+        self.assertEqual(operation2.number_of_ops, 2)
+        self.assertEqual(operation1.number_of_ops_all, 5)
+        self.assertEqual(operation2.number_of_ops_all, 5)
 
         # add stock and make the last one assigned to check the number is
         # updated
         self._update_quantity_in_cell(cell2, product2, 10)
         unassigned.action_assign()
-        self.assertEqual(shuttle1.number_of_ops, 3)
-        self.assertEqual(shuttle2.number_of_ops, 3)
-        self.assertEqual(shuttle1.number_of_ops_all, 6)
-        self.assertEqual(shuttle2.number_of_ops_all, 6)
+        self.assertEqual(operation1.number_of_ops, 3)
+        self.assertEqual(operation2.number_of_ops, 3)
+        self.assertEqual(operation1.number_of_ops_all, 6)
+        self.assertEqual(operation2.number_of_ops_all, 6)
 
-    @unittest.skip('Not implemented')
+    @unittest.skip("Not implemented")
     def test_put_count_move_lines(self):
         pass
 
-    @unittest.skip('Not implemented')
+    @unittest.skip("Not implemented")
     def test_inventory_count_move_lines(self):
         pass
 
-    @unittest.skip('Not implemented')
+    @unittest.skip("Not implemented")
     def test_on_barcode_scanned(self):
         # test to implement when the code is implemented
         pass
@@ -188,48 +188,52 @@ def test_button_release(self):
         self.out_move_line.qty_done = self.out_move_line.product_qty
         self.out_move_line.move_id._action_done()
         # release, no further operation in queue
-        result = self.shuttle.button_release()
-        self.assertFalse(self.shuttle.current_move_line_id)
-        self.assertEqual(self.shuttle.operation_descr, _('No operations'))
+        operation = self.shuttle._operation_for_mode()
+        result = operation.button_release()
+        self.assertFalse(operation.current_move_line_id)
+        self.assertEqual(operation.operation_descr, _("No operations"))
         expected_result = {
-            'effect': {
-                'fadeout': 'slow',
-                'message': _('Congrats, you cleared the queue!'),
-                'img_url': '/web/static/src/img/smile.svg',
-                'type': 'rainbow_man',
+            "effect": {
+                "fadeout": "slow",
+                "message": _("Congrats, you cleared the queue!"),
+                "img_url": "/web/static/src/img/smile.svg",
+                "type": "rainbow_man",
             }
         }
         self.assertEqual(result, expected_result)
 
     def test_process_current_pick(self):
         self.shuttle.switch_pick()
-        self.shuttle.current_move_line_id = self.out_move_line
+        operation = self.shuttle._operation_for_mode()
+        operation.current_move_line_id = self.out_move_line
         qty_to_process = self.out_move_line.product_qty
-        self.shuttle.process_current_pick()
-        self.assertEqual(self.out_move_line.state, 'done')
+        operation.process_current()
+        self.assertEqual(self.out_move_line.state, "done")
         self.assertEqual(self.out_move_line.qty_done, qty_to_process)
 
     def test_process_current_put(self):
         # test to implement when the code is implemented
+        self.shuttle.switch_put()
+        operation = self.shuttle._operation_for_mode()
         with self.assertRaises(exceptions.UserError):
-            self.shuttle.process_current_put()
+            operation.process_current()
 
     def test_process_current_inventory(self):
         # test to implement when the code is implemented
-        with self.assertRaises(exceptions.UserError):
-            self.shuttle.process_current_inventory()
+        self.shuttle.switch_inventory()
 
     def test_matrix(self):
         self.shuttle.switch_pick()
-        self.shuttle.current_move_line_id = self.out_move_line
+        operation = self.shuttle._operation_for_mode()
+        operation.current_move_line_id = self.out_move_line
         location = self.out_move_line.location_id
         # offset by -1 because the fields are for humans
         expected_x = location.posx - 1
         expected_y = location.posy - 1
         self.assertEqual(
-            self.shuttle.tray_matrix,
+            operation.tray_matrix,
             {
-                'selected': [expected_x, expected_y],
+                "selected": [expected_x, expected_y],
                 # fmt: off
                 'cells': [
                     [0, 0, 0, 0, 0, 0, 0, 0],
@@ -241,12 +245,13 @@ def test_matrix(self):
 
     def test_tray_qty(self):
         cell = self.env.ref(
-            'stock_vertical_lift.'
-            'stock_location_vertical_lift_demo_tray_1a_x3y2'
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x3y2"
         )
         self.out_move_line.location_id = cell
-        self.shuttle.current_move_line_id = self.out_move_line
+        operation = self.shuttle._operation_for_mode()
+        operation.current_move_line_id = self.out_move_line
         self._update_quantity_in_cell(cell, self.out_move_line.product_id, 50)
-        self.assertEqual(self.shuttle.tray_qty, 50)
+        self.assertEqual(operation.tray_qty, 50)
         self._update_quantity_in_cell(cell, self.out_move_line.product_id, -20)
-        self.assertEqual(self.shuttle.tray_qty, 30)
+        self.assertEqual(operation.tray_qty, 30)
diff --git a/stock_vertical_lift/views/vertical_lift_operation_base_views.xml b/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
new file mode 100644
index 000000000000..752dd5940411
--- /dev/null
+++ b/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="vertical_lift_operation_base_screen_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.base.screen.view</field>
+        <field name="model">vertical.lift.operation.base</field>
+        <field name="arch" type="xml">
+            <form string="Operations" delete="0" create="0" class="o_vlift_shuttle">
+                <div class="o_shuttle_header">
+                    <div class="o_shuttle_header_left o_shuttle_header_content">
+                        <field name="name" readonly="1"/>
+                    </div>
+                    <div class="o_shuttle_header_center o_shuttle_header_content">
+                        <label for="mode"/>
+                        <field name="mode" readonly="1"/>
+                    </div>
+                    <div class="o_shuttle_header_right o_shuttle_header_content">
+                    </div>
+                </div>
+                <div class="o_shuttle_actions">
+                    <div class="o_shuttle_content">
+                        <button name="action_menu" type="object"
+                                class="btn-secondary o_shuttle_icon_btn"
+                                string="" icon="fa-bars"
+                                aria-label="Dropdown menu" title="Dropdown menu"/>
+                        <button name="action_manual_barcode" type="object"
+                                class="btn-secondary o_shuttle_icon_btn"
+                                string="" icon="fa-terminal"
+                                aria-label="Barcode Input" title="Barcode Input"/>
+                    </div>
+                    <div class="o_shuttle_content o_shuttle_content_right">
+                        <div>
+                            <!-- will react on barcode 'O-BTN.save' -->
+                            <button name="button_save"
+                                    type="object"
+                                    string="Save"
+                                    icon="fa-check"
+                                    class="btn-primary"
+                                    barcode_trigger="save"/>
+                            <!-- will react on barcode 'O-BTN.release -->
+                            <button name="button_release"
+                                    type="object"
+                                    string="Release"
+                                    class="btn-primary"
+                                    barcode_trigger="release"/>
+                        </div>
+                    </div>
+                </div>
+                <div class="o_shuttle_operation bg-primary jumbotron jumbotron-fluid">
+                    <div class="container">
+                        <field name="operation_descr"/>
+                    </div>
+                </div>
+                <div class="o_shuttle_data">
+                </div>
+                <field name="_barcode_scanned" widget="barcode_handler"/>
+            </form>
+        </field>
+    </record>
+
+    <record id="vertical_lift_operation_transfer_screen_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.transfer.screen.view</field>
+        <field name="model">vertical.lift.operation.transfer</field>
+        <field name="inherit_id" ref="vertical_lift_operation_base_screen_view"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('o_shuttle_header_right')]" position="inside" >
+                <label for="number_of_ops"/>
+                <field name="number_of_ops" readonly="1"/> /
+                <field name="number_of_ops_all" readonly="1"/>
+            </xpath>
+            <xpath expr="//div[hasclass('o_shuttle_data')]" position="attributes" >
+                <attribute name="attrs" >{'invisible': [('current_move_line_id', '=', False)]}</attribute>
+            </xpath>
+
+            <xpath expr="//div[hasclass('o_shuttle_data')]" position="inside" >
+                <!-- on the left of the screen -->
+                <div class="o_shuttle_data_content o_shuttle_move">
+                    <div>
+                        <group>
+                            <field name="current_move_line_id" invisible="1"/>
+                            <label for="picking_id"/>
+                            <div>
+                                <div>
+                                    <field name="picking_id" options="{'no_open': True}" class="mr8"/>
+                                    <span>/</span>
+                                    <field name="picking_origin" class="oe_inline ml8"/>
+                                </div>
+                            </div>
+                            <label for="picking_partner_id"/>
+                            <div>
+                                <field name="picking_partner_id" options="{'no_open': True}"/>
+                            </div>
+                            <!-- TODO change for pick and put? -->
+                            <label for="location_dest_id"/>
+                            <div>
+                                <field name="location_dest_id"
+                                       class="bg-primary o_shuttle_highlight"
+                                       options="{'no_open': True}"/>
+                            </div>
+                            <label for="product_id"/>
+                            <div colspan="2" class="oe_title">
+                                <h1>
+                                    <field name="product_id" options="{'no_open': True}"/>
+                                </h1>
+                            </div>
+                            <div colspan="2">
+                                <field name="product_packagings"/>
+                            </div>
+                            <field name="lot_id"/>
+                            <label for="product_uom_qty" string="Quantity" class="ml32"/>
+                            <div colspan="2" class="ml32">
+                                <h1 class="bg-primary o_shuttle_highlight">
+                                    <field name="product_uom_qty" class="oe_inline text-white"/>
+                                    <field name="product_uom_id" options="{'no_open': True}" class="oe_inline ml8 text-white"/>
+                                </h1>
+                            </div>
+                        </group>
+                    </div>
+                </div>
+                <!-- on the right of the screen -->
+                <div class="o_shuttle_data_content o_shuttle_tray">
+                    <group col="1">
+                        <field name="tray_name"/>
+                        <field name="tray_type_code"/>
+                        <field name="tray_y"/>
+                        <field name="tray_x"/>
+                        <label for="tray_qty"/>
+                        <div colspan="2" class="oe_title">
+                            <h1>
+                                <field name="tray_qty"/>
+                            </h1>
+                        </div>
+                    </group>
+                    <group>
+                        <div>
+                            <field name="tray_matrix"
+                                   widget="location_tray_matrix"
+                            />
+                        </div>
+                    </group>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml b/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
new file mode 100644
index 000000000000..509b471c8e73
--- /dev/null
+++ b/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="vertical_lift_operation_inventory_screen_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.inventory.screen.view</field>
+        <field name="model">vertical.lift.operation.inventory</field>
+        <field name="inherit_id" ref="vertical_lift_operation_base_screen_view"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <form position="attributes">
+                <attribute name="string">Inventory Screen</attribute>
+            </form>
+            <xpath expr="//div[hasclass('o_shuttle_data')]" position="inside" >
+                <span>Not implemented</span>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/stock_vertical_lift/views/vertical_lift_operation_pick_views.xml b/stock_vertical_lift/views/vertical_lift_operation_pick_views.xml
new file mode 100644
index 000000000000..2fc407f9ef7c
--- /dev/null
+++ b/stock_vertical_lift/views/vertical_lift_operation_pick_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+  <record id="vertical_lift_operation_pick_screen_view" model="ir.ui.view">
+    <field name="name">vertical.lift.operation.pick.screen.view</field>
+    <field name="model">vertical.lift.operation.pick</field>
+    <field name="inherit_id" ref="vertical_lift_operation_transfer_screen_view"/>
+    <field name="mode">primary</field>
+    <field name="arch" type="xml">
+        <form position="attributes">
+            <attribute name="string">Pick Screen</attribute>
+        </form>
+    </field>
+  </record>
+
+</odoo>
diff --git a/stock_vertical_lift/views/vertical_lift_operation_put_views.xml b/stock_vertical_lift/views/vertical_lift_operation_put_views.xml
new file mode 100644
index 000000000000..4a891d9851cc
--- /dev/null
+++ b/stock_vertical_lift/views/vertical_lift_operation_put_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="vertical_lift_operation_put_screen_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.put.screen.view</field>
+        <field name="model">vertical.lift.operation.put</field>
+        <field name="inherit_id" ref="vertical_lift_operation_transfer_screen_view"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <form position="attributes">
+                <attribute name="string">Put Screen</attribute>
+            </form>
+        </field>
+    </record>
+
+</odoo>
diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index 6d5bb6d53502..97169a43cca3 100644
--- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -1,133 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-  <record id="vertical_lift_shuttle_view_form_screen" model="ir.ui.view">
-    <field name="name">vertical.lift.shuttle.view.form.screen</field>
-    <field name="model">vertical.lift.shuttle</field>
-    <field name="priority">99</field>
-    <field name="arch" type="xml">
-      <form string="Operations" delete="0" create="0" class="o_vlift_shuttle">
-        <!-- <field name="product_id" invisible="1"/> -->
-        <div class="o_shuttle_header">
-          <div class="o_shuttle_header_left o_shuttle_header_content">
-            <field name="name" readonly="1"/>
-          </div>
-          <div class="o_shuttle_header_center o_shuttle_header_content">
-            <label for="mode"/>
-            <field name="mode" readonly="1"/>
-          </div>
-          <div class="o_shuttle_header_right o_shuttle_header_content">
-            <label for="number_of_ops"/>
-            <field name="number_of_ops" readonly="1"/> /
-            <field name="number_of_ops_all" readonly="1"/>
-          </div>
-        </div>
-        <div class="o_shuttle_actions">
-          <div class="o_shuttle_content">
-            <button name="action_menu" type="object"
-                    class="btn-secondary o_shuttle_icon_btn"
-                    string="" icon="fa-bars"
-                    aria-label="Dropdown menu" title="Dropdown menu"/>
-            <button name="action_manual_barcode" type="object"
-                    class="btn-secondary o_shuttle_icon_btn"
-                    string="" icon="fa-terminal"
-                    aria-label="Barcode Input" title="Barcode Input"/>
-          </div>
-          <div class="o_shuttle_content o_shuttle_content_right">
-            <div>
-              <!-- will react on barcode 'O-BTN.save' -->
-              <button name="button_save"
-                      type="object"
-                      string="Save"
-                      icon="fa-check"
-                      class="btn-primary"
-                      barcode_trigger="save"/>
-              <!-- will react on barcode 'O-BTN.release -->
-              <button name="button_release"
-                      type="object"
-                      string="Release"
-                      class="btn-primary"
-                      barcode_trigger="release"/>
-            </div>
-          </div>
-        </div>
-        <div class="o_shuttle_operation bg-primary jumbotron jumbotron-fluid">
-          <div class="container">
-            <field name="operation_descr"/>
-          </div>
-        </div>
-        <div class="o_shuttle_data" attrs="{'invisible': [('current_move_line_id', '=', False)]}">
-          <!-- on the left of the screen -->
-          <div class="o_shuttle_data_content o_shuttle_move">
-            <div>
-              <group>
-                <field name="current_move_line_id" invisible="1"/>
-                <label for="picking_id"/>
-                <div>
-                  <div>
-                    <field name="picking_id" options="{'no_open': True}" class="mr8"/>
-                    <span>/</span>
-                    <field name="picking_origin" class="oe_inline ml8"/>
-                  </div>
-                </div>
-                <label for="picking_partner_id"/>
-                <div>
-                  <field name="picking_partner_id" options="{'no_open': True}"/>
-                </div>
-                <label for="location_dest_id"/>
-                <div>
-                  <field name="location_dest_id"
-                         class="bg-primary o_shuttle_highlight"
-                         options="{'no_open': True}"/>
-                </div>
-                <label for="product_id"/>
-                <div colspan="2" class="oe_title">
-                  <h1>
-                    <field name="product_id" options="{'no_open': True}"/>
-                  </h1>
-                </div>
-                <div colspan="2">
-                  <field name="product_packagings"/>
-                </div>
-                <field name="lot_id"/>
-                <label for="product_uom_qty" string="Quantity" class="ml32"/>
-                <div colspan="2" class="ml32">
-                  <h1 class="bg-primary o_shuttle_highlight">
-                    <field name="product_uom_qty" class="oe_inline text-white"/>
-                    <field name="product_uom_id" options="{'no_open': True}" class="oe_inline ml8 text-white"/>
-                  </h1>
-                </div>
-              </group>
-            </div>
-          </div>
-          <!-- on the right of the screen -->
-          <div class="o_shuttle_data_content o_shuttle_tray">
-            <group col="1">
-              <field name="tray_name"/>
-              <field name="tray_type_code"/>
-              <field name="tray_y"/>
-              <field name="tray_x"/>
-              <label for="tray_qty"/>
-              <div colspan="2" class="oe_title">
-                <h1>
-                  <field name="tray_qty"/>
-                </h1>
-              </div>
-            </group>
-            <group>
-              <div>
-                <field name="tray_matrix"
-                       widget="location_tray_matrix"
-                       />
-              </div>
-            </group>
-          </div>
-        </div>
-        <field name="_barcode_scanned" widget="barcode_handler"/>
-      </form>
-    </field>
-  </record>
-
   <record id="vertical_lift_shuttle_form_menu" model="ir.ui.view">
     <field name="name">vertical.lift.shuttle.view.form.menu</field>
     <field name="model">vertical.lift.shuttle</field>
@@ -190,9 +63,6 @@
           <field name="mode"/>
           <field name="location_id"/>
           <field name="hardware"/>
-          <!-- move line visible and editable for prototyping purposes, to
-remove later -->
-          <field name="current_move_line_id" groups="base.group_no_one"/>
         </group>
       </form>
     </field>
@@ -205,8 +75,8 @@ remove later -->
       <kanban class="o_kanban_dashboard">
         <field name="name"/>
         <field name="mode"/>
-        <field name="number_of_ops"/>
-        <field name="number_of_ops_all"/>
+        <!-- <field name="number_of_ops"/> -->
+        <!-- <field name="number_of_ops_all"/> -->
         <templates>
           <t t-name="kanban-box">
             <div class="oe_kanban_global_click o_has_icon open_shuttle_screen">
@@ -224,14 +94,14 @@ remove later -->
                         Mode:
                         <field name="mode"/>
                       </div>
-                      <div class="col-8">
-                        Operations:
-                        <field name="number_of_ops"/>
-                      </div>
-                      <div class="col-8">
-                        All <t t-esc="record.mode.value"/> Operations: 
-                        <field name="number_of_ops_all"/>
-                      </div>
+                      <!-- <div class="col-8"> -->
+                      <!-- Operations: -->
+                      <!-- <field name="number_of_ops"/> -->
+                      <!-- </div> -->
+                      <!-- <div class="col-8"> -->
+                      <!-- All <t t-esc="record.mode.value"/> Operations:  -->
+                      <!-- <field name="number_of_ops_all"/> -->
+                      <!-- </div> -->
                     </div>
                   </div>
                 </div>

From 935ce973eca00d12247328dcf263fd50f6b32d63 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 10 Oct 2019 08:10:58 +0200
Subject: [PATCH 38/50] fixup! Split the shuttle operations in different
 models/views

---
 stock_vertical_lift/models/vertical_lift_shuttle.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index e62536a24f5a..d3271acb297c 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -1,7 +1,7 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, exceptions, fields, models
+from odoo import _, api, fields, models
 
 
 class VerticalLiftShuttle(models.Model):

From a35742b6b9749fc57586b8c4f43bc11331ecbf69 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 10 Oct 2019 08:11:31 +0200
Subject: [PATCH 39/50] fixup! fixup! fixup! Add method on location to fetch a
 tray

---
 .../models/stock_location.py                  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/stock_vertical_lift_kardex/models/stock_location.py b/stock_vertical_lift_kardex/models/stock_location.py
index e6bf036107d4..d1098d59a124 100644
--- a/stock_vertical_lift_kardex/models/stock_location.py
+++ b/stock_vertical_lift_kardex/models/stock_location.py
@@ -1,8 +1,11 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+import logging
 from odoo import models
 
+_logger = logging.getLogger(__name__)
+
 
 class StockLocation(models.Model):
     _inherit = 'stock.location'
@@ -28,8 +31,26 @@ def _hardware_vertical_lift_tray(self, cell_location=None):
         the tray. If a ``cell_location`` is passed and if the hardware supports
         a way to show a cell (such as a laser pointer), it should send this
         command as well.
+
+        Useful information that could be needed for the drivers:
+
+        * Any field of `self` (name, barcode, ...) which is the current tray.
+        * Any field of `cell_location` (name, barcode, ...) which is the cell
+          in the tray.
+        * ``self.vertical_lift_shuttle_id`` is the current Shuttle, where we
+          find details about the hardware, the current mode (pick, put, ...).
+        * ``self.tray_type_id`` is the kind of tray.
+        * ``self.tray_type_id.width_per_cell`` and
+          ``self.tray_type_id.depth_per_cell`` return the size of a cell in mm.
+        * ``cell_location.posx`` and ``posy`` are the coordinate from the
+          bottom-left of the tray.
+        * ``cell_location.tray_cell_center_position()`` returns the central
+          position of the cell in mm from the bottom-left of a tray. (distance
+          from left, distance from bottom). Can be used for instance for
+          highlighting the cell using a laser pointer.
         """
         if self.vertical_lift_shuttle_id.hardware == "kardex":
             payload = self._hardware_kardex_prepare_payload()
+            _logger.debug("Sending to kardex: {}", payload)
             # TODO implement the communication with kardex
         super()._hardware_vertical_lift_tray(cell_location=cell_location)

From c9b397ef9cf3c5f8b73996e4c9bff6e0c71c361d Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 10 Oct 2019 08:59:16 +0200
Subject: [PATCH 40/50] Add default views to re-open the screen views properly

When we refresh the page on the browser when we are using the "screen"
view, odoo loses the information that we want the view to be headless,
fullscreen, etc. so it's displayed pretty badly.  This view is a
work-around: its priority is lower, so it will be picked up by default
on loading, and a button allows to re-open the screen view with the
proper options.
---
 .../vertical_lift_operation_base_views.xml    | 22 +++++++++++++++++++
 ...ertical_lift_operation_inventory_views.xml | 13 +++++++++++
 .../vertical_lift_operation_pick_views.xml    | 13 +++++++++++
 .../vertical_lift_operation_put_views.xml     | 15 ++++++++++++-
 4 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/stock_vertical_lift/views/vertical_lift_operation_base_views.xml b/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
index 752dd5940411..876e6012a7a6 100644
--- a/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <!--
+         When we refresh the page on the browser when we are using the
+         "screen" view, odoo loses the information that we want the view
+         to be headless, fullscreen, etc. so it's displayed pretty badly.
+         This view is a work-around: its priority is lower, so it will be
+         picked up by default on loading, and a button allows to re-open
+         the screen view with the proper options.
+    -->
+    <record id="vertical_lift_operation_base_button_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.base.button.view</field>
+        <field name="model">vertical.lift.operation.base</field>
+        <field name="arch" type="xml">
+            <form string="Operations" delete="0" create="0">
+                <button string="Reopen Screen"
+                        name="action_open_screen"
+                        type="object"
+                        class="btn-primary"
+                />
+            </form>
+        </field>
+    </record>
+
     <record id="vertical_lift_operation_base_screen_view" model="ir.ui.view">
         <field name="name">vertical.lift.operation.base.screen.view</field>
         <field name="model">vertical.lift.operation.base</field>
diff --git a/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml b/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
index 509b471c8e73..b6ae1de6a4d3 100644
--- a/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="vertical_lift_operation_inventory_button_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.inventory.button.view</field>
+        <field name="model">vertical.lift.operation.inventory</field>
+        <field name="inherit_id" ref="vertical_lift_operation_base_button_view"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <form position="attributes">
+                <attribute name="string">Inventory Screen</attribute>
+            </form>
+        </field>
+    </record>
+
     <record id="vertical_lift_operation_inventory_screen_view" model="ir.ui.view">
         <field name="name">vertical.lift.operation.inventory.screen.view</field>
         <field name="model">vertical.lift.operation.inventory</field>
         <field name="inherit_id" ref="vertical_lift_operation_base_screen_view"/>
+        <field name="priority">100</field>
         <field name="mode">primary</field>
         <field name="arch" type="xml">
             <form position="attributes">
diff --git a/stock_vertical_lift/views/vertical_lift_operation_pick_views.xml b/stock_vertical_lift/views/vertical_lift_operation_pick_views.xml
index 2fc407f9ef7c..6d538fdcba7a 100644
--- a/stock_vertical_lift/views/vertical_lift_operation_pick_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_operation_pick_views.xml
@@ -1,10 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="vertical_lift_operation_pick_button_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.pick.button.view</field>
+        <field name="model">vertical.lift.operation.pick</field>
+        <field name="inherit_id" ref="vertical_lift_operation_base_button_view"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <form position="attributes">
+                <attribute name="string">Pick Screen</attribute>
+            </form>
+        </field>
+    </record>
+
   <record id="vertical_lift_operation_pick_screen_view" model="ir.ui.view">
     <field name="name">vertical.lift.operation.pick.screen.view</field>
     <field name="model">vertical.lift.operation.pick</field>
     <field name="inherit_id" ref="vertical_lift_operation_transfer_screen_view"/>
+    <field name="priority">100</field>
     <field name="mode">primary</field>
     <field name="arch" type="xml">
         <form position="attributes">
diff --git a/stock_vertical_lift/views/vertical_lift_operation_put_views.xml b/stock_vertical_lift/views/vertical_lift_operation_put_views.xml
index 4a891d9851cc..0043870d0266 100644
--- a/stock_vertical_lift/views/vertical_lift_operation_put_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_operation_put_views.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <record id="vertical_lift_operation_put_button_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.put.button.view</field>
+        <field name="model">vertical.lift.operation.put</field>
+        <field name="inherit_id" ref="vertical_lift_operation_base_button_view"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <form position="attributes">
+                <attribute name="string">Put-Away Screen</attribute>
+            </form>
+        </field>
+    </record>
+
     <record id="vertical_lift_operation_put_screen_view" model="ir.ui.view">
         <field name="name">vertical.lift.operation.put.screen.view</field>
         <field name="model">vertical.lift.operation.put</field>
         <field name="inherit_id" ref="vertical_lift_operation_transfer_screen_view"/>
+        <field name="priority">100</field>
         <field name="mode">primary</field>
         <field name="arch" type="xml">
             <form position="attributes">
-                <attribute name="string">Put Screen</attribute>
+                <attribute name="string">Put-Away Screen</attribute>
             </form>
         </field>
     </record>

From 1e7c2bf3900627523405a7e641cfa4db0262896b Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Thu, 10 Oct 2019 17:14:38 +0200
Subject: [PATCH 41/50] Add Put-Away workflow

---
 stock_vertical_lift/demo/product_demo.xml     |   2 +
 .../demo/stock_picking_demo.xml               |  22 ++
 .../models/vertical_lift_operation_base.py    |  22 +-
 .../models/vertical_lift_operation_pick.py    |  21 ++
 .../models/vertical_lift_operation_put.py     | 237 +++++++++++++++--
 .../security/ir.model.access.csv              |   1 +
 .../static/src/scss/vertical_lift.scss        |  20 +-
 stock_vertical_lift/tests/__init__.py         |   3 +
 stock_vertical_lift/tests/common.py           |  52 ++++
 stock_vertical_lift/tests/test_inventory.py   |  31 +++
 stock_vertical_lift/tests/test_pick.py        | 211 +++++++++++++++
 stock_vertical_lift/tests/test_put.py         | 184 +++++++++++++
 .../tests/test_vertical_lift_shuttle.py       | 247 ------------------
 .../vertical_lift_operation_base_views.xml    |   2 +-
 .../vertical_lift_operation_put_views.xml     |  57 ++++
 .../views/vertical_lift_shuttle_views.xml     |   2 +-
 16 files changed, 827 insertions(+), 287 deletions(-)
 create mode 100644 stock_vertical_lift/tests/test_inventory.py
 create mode 100644 stock_vertical_lift/tests/test_pick.py
 create mode 100644 stock_vertical_lift/tests/test_put.py

diff --git a/stock_vertical_lift/demo/product_demo.xml b/stock_vertical_lift/demo/product_demo.xml
index bfe8ab90d8e6..b55184196807 100644
--- a/stock_vertical_lift/demo/product_demo.xml
+++ b/stock_vertical_lift/demo/product_demo.xml
@@ -3,6 +3,7 @@
 
   <record id="product_running_socks" model="product.product">
     <field name="default_code">RS200</field>
+    <field name="barcode">4491673293664</field>
     <field name="name">Running Socks</field>
     <field name="type">product</field>
     <field name="categ_id" ref="product.product_category_6"/>
@@ -17,6 +18,7 @@
 
   <record id="product_recovery_socks" model="product.product">
     <field name="default_code">RS300</field>
+    <field name="barcode">2779891103531</field>
     <field name="name">Recovery Socks</field>
     <field name="type">product</field>
     <field name="categ_id" ref="product.product_category_6"/>
diff --git a/stock_vertical_lift/demo/stock_picking_demo.xml b/stock_vertical_lift/demo/stock_picking_demo.xml
index 520d97925101..bff48ee18877 100644
--- a/stock_vertical_lift/demo/stock_picking_demo.xml
+++ b/stock_vertical_lift/demo/stock_picking_demo.xml
@@ -27,4 +27,26 @@
     <value model="stock.picking" eval="[obj().env.ref('stock_vertical_lift.stock_picking_out_demo_vertical_lift_1').id]"/>
   </function>
 
+  <record id="stock_picking_in_demo_vertical_lift_1" model="stock.picking">
+    <field name="picking_type_id" ref="stock.picking_type_in"/>
+    <field name="origin">Incoming shipment from Vertical Lift (demo)</field>
+    <field name="partner_id" ref="base.res_partner_1"/>
+    <field name="date" eval="DateTime.today()"/>
+    <field name="location_id" ref="stock.stock_location_suppliers"/>
+    <field name="location_dest_id" ref="stock.stock_location_stock"/>
+    <field name="move_lines" model="stock.move" eval="[(0, 0, {
+                                                      'name': obj().env.ref('stock_vertical_lift.product_running_socks').name,
+                                                      'product_id': ref('stock_vertical_lift.product_running_socks'),
+                                                      'product_uom': ref('uom.product_uom_unit'),
+                                                      'product_uom_qty': 15.0,
+                                                      'picking_type_id': ref('stock.picking_type_in'),
+                                                      'location_id': ref('stock.stock_location_suppliers'),
+                                                      'location_dest_id': ref('stock.stock_location_stock'),
+                                                      })]"/>
+  </record>
+
+  <function model="stock.picking" name="action_confirm">
+      <value model="stock.picking" eval="[obj().env.ref('stock_vertical_lift.stock_picking_in_demo_vertical_lift_1').id]"/>
+  </function>
+
 </odoo>
diff --git a/stock_vertical_lift/models/vertical_lift_operation_base.py b/stock_vertical_lift/models/vertical_lift_operation_base.py
index a23cdc2ec1f2..8d0656cbcaab 100644
--- a/stock_vertical_lift/models/vertical_lift_operation_base.py
+++ b/stock_vertical_lift/models/vertical_lift_operation_base.py
@@ -59,7 +59,9 @@ class VerticalLiftOperationTransfer(models.AbstractModel):
     _inherit = "vertical.lift.operation.base"
     _description = "Vertical Lift Operation - Transfer"
 
-    current_move_line_id = fields.Many2one(comodel_name="stock.move.line")
+    current_move_line_id = fields.Many2one(
+        comodel_name="stock.move.line", readonly=True
+    )
 
     number_of_ops = fields.Integer(
         compute="_compute_number_of_ops", string="Number of Operations"
@@ -217,7 +219,6 @@ def count_move_lines_to_do_all(self):
 
     def on_screen_open(self):
         """Called when the screen is open"""
-        self.select_next_move_line()
 
     def button_release(self):
         """Release the operation, go to the next"""
@@ -245,20 +246,3 @@ def button_save(self):
 
     def fetch_tray(self):
         return
-
-    def select_next_move_line(self):
-        self.ensure_one()
-        next_move_line = self.env["stock.move.line"].search(
-            self._domain_move_lines_to_do(), limit=1
-        )
-        self.current_move_line_id = next_move_line
-        # TODO use a state machine to define next steps and
-        # description?
-        descr = (
-            _("Scan New Destination Location")
-            if next_move_line
-            else _("No operations")
-        )
-        self.operation_descr = descr
-        if next_move_line:
-            self.fetch_tray()
diff --git a/stock_vertical_lift/models/vertical_lift_operation_pick.py b/stock_vertical_lift/models/vertical_lift_operation_pick.py
index 25bd4017338d..030541c82d94 100644
--- a/stock_vertical_lift/models/vertical_lift_operation_pick.py
+++ b/stock_vertical_lift/models/vertical_lift_operation_pick.py
@@ -51,3 +51,24 @@ def process_current(self):
         if line.state != "done":
             line.qty_done = line.product_qty
             line.move_id._action_done()
+
+    def on_screen_open(self):
+        """Called when the screen is open"""
+        self.select_next_move_line()
+
+    def select_next_move_line(self):
+        self.ensure_one()
+        next_move_line = self.env["stock.move.line"].search(
+            self._domain_move_lines_to_do(), limit=1
+        )
+        self.current_move_line_id = next_move_line
+        # TODO use a state machine to define next steps and
+        # description?
+        descr = (
+            _("Scan New Destination Location")
+            if next_move_line
+            else _("No operations")
+        )
+        self.operation_descr = descr
+        if next_move_line:
+            self.fetch_tray()
diff --git a/stock_vertical_lift/models/vertical_lift_operation_put.py b/stock_vertical_lift/models/vertical_lift_operation_put.py
index 92903fb01bc0..694ca30f930a 100644
--- a/stock_vertical_lift/models/vertical_lift_operation_put.py
+++ b/stock_vertical_lift/models/vertical_lift_operation_put.py
@@ -1,7 +1,8 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, exceptions, models
+from odoo import _, fields, models
+from odoo.osv import expression
 
 
 class VerticalLiftOperationPut(models.Model):
@@ -9,27 +10,227 @@ class VerticalLiftOperationPut(models.Model):
     _inherit = "vertical.lift.operation.transfer"
     _description = "Vertical Lift Operation Put"
 
-    def _domain_move_lines_to_do(self):
-        # TODO check domain
-        domain = [
-            ("state", "=", "assigned"),
-            ("location_dest_id", "child_of", self.location_id.id),
-        ]
-        return domain
+    operation_line_ids = fields.One2many(
+        comodel_name="vertical.lift.operation.put.line",
+        inverse_name="operation_id",
+        readonly=True,
+    )
+    current_operation_line_id = fields.Many2one(
+        comodel_name="vertical.lift.operation.put.line", readonly=True
+    )
+    current_move_line_id = fields.Many2one(
+        related="current_operation_line_id.move_line_id", readonly=True
+    )
+    # TODO think about moving the "steps" to the base model,
+    # integrate 'save' and 'release' in 'next_step()', use states
+    # in 'pick' as well
+    state = fields.Selection(
+        selection=[
+            ("scan_product", "Scan Product"),
+            ("scan_tray_type", "Scan Tray Type"),
+            ("save", "Save"),
+            ("release", "Release"),
+        ],
+        default="scan_product",
+    )
+
+    next_operation = object()
+
+    def _transitions(self):
+        return {
+            "scan_product": "scan_tray_type",
+            "scan_tray_type": "save",
+            "save": "release",
+            "release": self.next_operation,
+        }
+
+    # The steps cannot be in 'vertical.lift.operation.put.line' because the
+    # state has to be modified by on_barcode_scanned. As this method is an
+    # onchange underneath, it has to be on the same model.
+    def step(self):
+        return self.state
 
-    def _domain_move_lines_to_do_all(self):
-        shuttle_locations = self.env["stock.location"].search(
-            [("vertical_lift_kind", "=", "view")]
+    def next_step(self):
+        next_state = self._transitions().get(self.state)
+        if next_state is not self.next_operation:
+            self.state = next_state
+        self.update_step_description()
+
+    def step_description(self):
+        state_field = self._fields["state"]
+        return state_field.convert_to_export(self.state, self)
+
+    def reset_steps(self):
+        self.state = "scan_product"
+        self.update_step_description()
+
+    def count_move_lines_to_do(self):
+        """Count move lines to process in current shuttle"""
+        self.ensure_one()
+        return self.env["vertical.lift.operation.put.line"].search_count(
+            [("operation_id", "=", self.id)]
         )
-        domain = [
-            # TODO check state
-            ("state", "=", "assigned"),
-            ("location_dest_id", "child_of", shuttle_locations.ids),
-        ]
-        return domain
+
+    def count_move_lines_to_do_all(self):
+        """Count move lines to process in all shuttles"""
+        self.ensure_one()
+        return self.env["vertical.lift.operation.put.line"].search_count([])
+
+    def on_barcode_scanned(self, barcode):
+        self.ensure_one()
+        operation_line = self.current_operation_line_id
+        if operation_line:
+            if self.step() == "scan_product":
+                if self._check_product(barcode):
+                    self.next_step()
+            if self.step() == "scan_tray_type":
+                if self._check_tray_type(barcode):
+                    self.next_step()
+
+    def _check_product(self, barcode):
+        return barcode == self.current_move_line_id.product_id.barcode
+
+    def _check_tray_type(self, barcode):
+        location = self.current_move_line_id.location_dest_id
+        tray_type = location.cell_in_tray_type_id
+        return barcode == tray_type.code
+
+    def update_step_description(self):
+        if self.current_operation_line_id:
+            descr = self.step_description()
+        else:
+            descr = _("No operations")
+        self.operation_descr = descr
 
     def fetch_tray(self):
         self.current_move_line_id.fetch_vertical_lift_tray_dest()
 
     def process_current(self):
-        raise exceptions.UserError(_("Put workflow not implemented"))
+        self.current_operation_line_id.process()
+
+    def button_release(self):
+        self.write(
+            {"operation_line_ids": [(2, self.current_operation_line_id.id)]}
+        )
+        return super().button_release()
+
+    def button_save(self):
+        if not (self and self.current_operation_line_id):
+            return
+        self.ensure_one()
+        self.process_current()
+        self.next_step()
+
+    def on_screen_open(self):
+        """Called when the screen is open"""
+        if self.operation_line_ids:
+            self.select_next_move_line()
+        else:
+            return self.action_select_operations()
+
+    def select_next_move_line(self):
+        self.ensure_one()
+        next_operation = fields.first(self.operation_line_ids)
+        self.current_operation_line_id = next_operation
+        self.reset_steps()
+        if next_operation:
+            self.fetch_tray()
+
+    def action_select_operations(self):
+        self.ensure_one()
+        menu_xmlid = (
+            "stock_vertical_lift." "vertical_lift_operation_put_select_view"
+        )
+        select_model = self.env["vertical.lift.operation.put.select"]
+        select = select_model.create(
+            {
+                "operation_id": self.id,
+                "move_line_ids": [
+                    (6, 0, self.mapped("operation_line_ids.move_line_id.id"))
+                ],
+            }
+        )
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": "vertical.lift.operation.put.select",
+            "views": [[self.env.ref(menu_xmlid).id, "form"]],
+            "name": _("Scan Operations"),
+            "target": "new",
+            "res_id": select.id,
+        }
+
+
+class VerticalLiftOperationPutLine(models.Model):
+    _name = "vertical.lift.operation.put.line"
+    _description = "Vertical Lift Operation Put Line"
+
+    operation_id = fields.Many2one(
+        comodel_name="vertical.lift.operation.put",
+        required=True,
+        readonly=True,
+    )
+    move_line_id = fields.Many2one(
+        comodel_name="stock.move.line", readonly=True
+    )
+
+    def process(self):
+        line = self.move_line_id
+        if line.state != "done":
+            line.qty_done = line.product_qty
+            line.move_id._action_done()
+
+
+class VerticalLiftOperationPutSelect(models.TransientModel):
+    _name = "vertical.lift.operation.put.select"
+    _inherit = "barcodes.barcode_events_mixin"
+    _description = "Vertical Lift Operation Put Select"
+
+    operation_id = fields.Many2one(
+        comodel_name="vertical.lift.operation.put",
+        required=True,
+        readonly=True,
+    )
+    move_line_ids = fields.Many2many(comodel_name="stock.move.line")
+
+    def _sync_lines(self):
+        self.operation_id.operation_line_ids.unlink()
+        operation_line_model = self.env["vertical.lift.operation.put.line"]
+        operation_line_model.create(
+            [
+                {
+                    "operation_id": self.operation_id.id,
+                    "move_line_id": move_line.id,
+                }
+                for move_line in self.move_line_ids
+            ]
+        )
+        self.operation_id.select_next_move_line()
+
+    def action_validate(self):
+        self._sync_lines()
+        return {"type": "ir.actions.act_window_close"}
+
+    def _move_line_domain(self):
+        return [
+            ("state", "=", "assigned"),
+            ("location_dest_id", "child_of", self.operation_id.location_id.id),
+        ]
+
+    def action_add_all(self):
+        move_lines = self.env["stock.move.line"].search(
+            self._move_line_domain()
+        )
+        self.move_line_ids = move_lines
+        self._sync_lines()
+        return {"type": "ir.actions.act_window_close"}
+
+    def on_barcode_scanned(self, barcode):
+        self.ensure_one()
+        domain = self._move_line_domain()
+        domain = expression.AND(
+            [domain, [("product_id.barcode", "=", barcode)]]
+        )
+        move_lines = self.env["stock.move.line"].search(domain)
+        # note: on_barcode_scanned is called in an onchange, so 'self'
+        # is a NewID, we can't use 'write()' on it.
+        self.move_line_ids |= move_lines
diff --git a/stock_vertical_lift/security/ir.model.access.csv b/stock_vertical_lift/security/ir.model.access.csv
index 2a69468e4540..63741764a132 100644
--- a/stock_vertical_lift/security/ir.model.access.csv
+++ b/stock_vertical_lift/security/ir.model.access.csv
@@ -3,4 +3,5 @@ access_vertical_lift_shuttle_stock_user,access_vertical_lift_shuttle stock user,
 access_vertical_lift_shuttle_manager,access_vertical_lift_shuttle stock manager,model_vertical_lift_shuttle,stock.group_stock_manager,1,1,1,1
 access_vertical_lift_operation_pick_stock_user,access_vertical_lift_operation_pick stock user,model_vertical_lift_operation_pick,stock.group_stock_user,1,1,1,1
 access_vertical_lift_operation_put_stock_user,access_vertical_lift_operation_put stock user,model_vertical_lift_operation_put,stock.group_stock_user,1,1,1,1
+access_vertical_lift_operation_put_line_stock_user,access_vertical_lift_operation_put_line stock user,model_vertical_lift_operation_put_line,stock.group_stock_user,1,1,1,1
 access_vertical_lift_operation_inventory_stock_user,access_vertical_lift_operation_inventory stock user,model_vertical_lift_operation_inventory,stock.group_stock_user,1,1,1,1
diff --git a/stock_vertical_lift/static/src/scss/vertical_lift.scss b/stock_vertical_lift/static/src/scss/vertical_lift.scss
index 11678e055490..8cd7878aa5a2 100644
--- a/stock_vertical_lift/static/src/scss/vertical_lift.scss
+++ b/stock_vertical_lift/static/src/scss/vertical_lift.scss
@@ -109,7 +109,18 @@
         }
     }
 
-    .o_vlift_shuttle_manual_barcode {
+    .o_vlift_shuttle_popup {
+
+        table tr {
+            line-height: 3;
+            font-size: 1.1em;
+
+            .o_list_record_remove {
+                width: 50px;
+                text-align: center;
+            }
+        }
+
         .o_field_char {
             padding: 1em;
             font-size: 2em;
@@ -120,5 +131,12 @@
             font-size: 2em;
             text-transform: uppercase;
         }
+
+    }
+
+    footer .btn {
+        padding: 1em;
+        font-size: 2em;
+        text-transform: uppercase;
     }
 }
diff --git a/stock_vertical_lift/tests/__init__.py b/stock_vertical_lift/tests/__init__.py
index c73943e06e0c..48c0e7c45b49 100644
--- a/stock_vertical_lift/tests/__init__.py
+++ b/stock_vertical_lift/tests/__init__.py
@@ -1,2 +1,5 @@
 from . import test_location
+from . import test_inventory
+from . import test_pick
+from . import test_put
 from . import test_vertical_lift_shuttle
diff --git a/stock_vertical_lift/tests/common.py b/stock_vertical_lift/tests/common.py
index 811121caef61..f40456ffc1f5 100644
--- a/stock_vertical_lift/tests/common.py
+++ b/stock_vertical_lift/tests/common.py
@@ -1,6 +1,7 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from odoo import _
 from odoo.addons.stock_location_tray.tests import common
 
 
@@ -14,6 +15,9 @@ def setUpClass(cls):
         cls.product_socks = cls.env.ref(
             'stock_vertical_lift.product_running_socks'
         )
+        cls.product_recovery = cls.env.ref(
+            'stock_vertical_lift.product_recovery_socks'
+        )
         cls.vertical_lift_loc = cls.env.ref(
             'stock_vertical_lift.stock_location_vertical_lift'
         )
@@ -47,3 +51,51 @@ def _create_simple_picking_out(cls, product, quantity):
                 ],
             }
         )
+
+    @classmethod
+    def _create_simple_picking_in(cls, product, quantity, dest_location):
+        supplier_loc = cls.env.ref('stock.stock_location_suppliers')
+        picking_type = cls.env.ref('stock.picking_type_in')
+        partner = cls.env.ref('base.res_partner_1')
+        return cls.env['stock.picking'].create(
+            {
+                'picking_type_id': picking_type.id,
+                'partner_id': partner.id,
+                'location_id': supplier_loc.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': picking_type.id,
+                            'location_id': supplier_loc.id,
+                            'location_dest_id': dest_location.id,
+                        },
+                    )
+                ],
+            }
+        )
+
+    def _test_button_release(self, move_line):
+        # for the test, we'll consider our last line has been delivered
+        move_line.qty_done = move_line.product_qty
+        move_line.move_id._action_done()
+        # release, no further operation in queue
+        operation = self.shuttle._operation_for_mode()
+        result = operation.button_release()
+        self.assertFalse(operation.current_move_line_id)
+        self.assertEqual(operation.operation_descr, _("No operations"))
+        expected_result = {
+            "effect": {
+                "fadeout": "slow",
+                "message": _("Congrats, you cleared the queue!"),
+                "img_url": "/web/static/src/img/smile.svg",
+                "type": "rainbow_man",
+            }
+        }
+        self.assertEqual(result, expected_result)
diff --git a/stock_vertical_lift/tests/test_inventory.py b/stock_vertical_lift/tests/test_inventory.py
new file mode 100644
index 000000000000..864c022bab39
--- /dev/null
+++ b/stock_vertical_lift/tests/test_inventory.py
@@ -0,0 +1,31 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import unittest
+
+from .common import VerticalLiftCase
+
+
+class TestInventory(VerticalLiftCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.picking_out = cls.env.ref(
+            "stock_vertical_lift.stock_picking_out_demo_vertical_lift_1"
+        )
+        # we have a move line to pick created by demo picking
+        # stock_picking_out_demo_vertical_lift_1
+        cls.out_move_line = cls.picking_out.move_line_ids
+
+    def test_switch_inventory(self):
+        self.shuttle.switch_inventory()
+        self.assertEqual(self.shuttle.mode, "inventory")
+
+    @unittest.skip("Not implemented")
+    def test_inventory_count_move_lines(self):
+        pass
+
+    @unittest.skip("Not implemented")
+    def test_process_current_inventory(self):
+        # test to implement when the code is implemented
+        self.shuttle.switch_inventory()
diff --git a/stock_vertical_lift/tests/test_pick.py b/stock_vertical_lift/tests/test_pick.py
new file mode 100644
index 000000000000..653fa1dc0a40
--- /dev/null
+++ b/stock_vertical_lift/tests/test_pick.py
@@ -0,0 +1,211 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import unittest
+
+from odoo import _
+
+from .common import VerticalLiftCase
+
+
+class TestPick(VerticalLiftCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.picking_out = cls.env.ref(
+            "stock_vertical_lift.stock_picking_out_demo_vertical_lift_1"
+        )
+        # we have a move line to pick created by demo picking
+        # stock_picking_out_demo_vertical_lift_1
+        cls.out_move_line = cls.picking_out.move_line_ids
+
+    def test_switch_pick(self):
+        self.shuttle.switch_pick()
+        self.assertEqual(self.shuttle.mode, "pick")
+        self.assertEqual(
+            self.shuttle._operation_for_mode().current_move_line_id,
+            self.out_move_line,
+        )
+
+    # TODO same test for other modes
+    def test_pick_action_open_screen(self):
+        self.shuttle.switch_pick()
+        action = self.shuttle.action_open_screen()
+        operation = self.shuttle._operation_for_mode()
+        self.assertTrue(operation.current_move_line_id)
+        self.assertEqual(action["type"], "ir.actions.act_window")
+        self.assertEqual(action["res_model"], "vertical.lift.operation.pick")
+        self.assertEqual(action["res_id"], operation.id)
+
+    def test_pick_select_next_move_line(self):
+        self.shuttle.mode = "pick"
+        operation = self.shuttle._operation_for_mode()
+        operation.select_next_move_line()
+        self.assertEqual(operation.current_move_line_id, self.out_move_line)
+        self.assertEqual(
+            operation.operation_descr, _("Scan New Destination Location")
+        )
+
+    def test_pick_save(self):
+        self.shuttle.switch_pick()
+        operation = self.shuttle._operation_for_mode()
+        operation.current_move_line_id = self.out_move_line
+        operation.button_save()
+        self.assertEqual(operation.current_move_line_id.state, "done")
+        self.assertEqual(operation.operation_descr, _("Release"))
+
+    def test_pick_related_fields(self):
+        self.shuttle.switch_pick()
+        operation = self.shuttle._operation_for_mode()
+        ml = operation.current_move_line_id = self.out_move_line
+
+        # Trays related fields
+        # For pick, this is the source location, which is the cell where the
+        # product is.
+        self.assertEqual(operation.tray_location_id, ml.location_id)
+        self.assertEqual(
+            operation.tray_name,
+            # parent = tray
+            ml.location_id.location_id.name,
+        )
+        self.assertEqual(
+            operation.tray_type_id,
+            # the tray type is on the parent of the cell (on the tray)
+            ml.location_id.location_id.tray_type_id,
+        )
+        self.assertEqual(
+            operation.tray_type_code,
+            ml.location_id.location_id.tray_type_id.code,
+        )
+        self.assertEqual(operation.tray_x, ml.location_id.posx)
+        self.assertEqual(operation.tray_y, ml.location_id.posy)
+
+        # Move line related fields
+        self.assertEqual(operation.picking_id, ml.picking_id)
+        self.assertEqual(operation.picking_origin, ml.picking_id.origin)
+        self.assertEqual(
+            operation.picking_partner_id, ml.picking_id.partner_id
+        )
+        self.assertEqual(operation.product_id, ml.product_id)
+        self.assertEqual(operation.product_uom_id, ml.product_uom_id)
+        self.assertEqual(operation.product_uom_qty, ml.product_uom_qty)
+        self.assertEqual(operation.qty_done, ml.qty_done)
+        self.assertEqual(operation.lot_id, ml.lot_id)
+
+    def test_pick_count_move_lines(self):
+        product1 = self.env.ref("stock_vertical_lift.product_running_socks")
+        product2 = self.env.ref("stock_vertical_lift.product_recovery_socks")
+        # cancel the picking from demo data to start from a clean state
+        self.env.ref(
+            "stock_vertical_lift.stock_picking_out_demo_vertical_lift_1"
+        ).action_cancel()
+
+        # ensure that we have stock in some cells, we'll put product1
+        # in the first Shuttle and product2 in the second
+        cell1 = self.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x3y2"
+        )
+        self._update_quantity_in_cell(cell1, product1, 50)
+        cell2 = self.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_2a_x1y1"
+        )
+        self._update_quantity_in_cell(cell2, product2, 50)
+
+        # create pickings (we already have an existing one from demo data)
+        pickings = self.env["stock.picking"].browse()
+        pickings |= self._create_simple_picking_out(product1, 1)
+        pickings |= self._create_simple_picking_out(product1, 1)
+        pickings |= self._create_simple_picking_out(product1, 1)
+        pickings |= self._create_simple_picking_out(product1, 1)
+        pickings |= self._create_simple_picking_out(product2, 20)
+        pickings |= self._create_simple_picking_out(product2, 30)
+        # this one should be 'assigned', so should be included in the operation
+        # count
+        unassigned = self._create_simple_picking_out(product2, 1)
+        pickings |= unassigned
+        pickings.action_confirm()
+        # product1 will be taken from the shuttle1, product2 from shuttle2
+        pickings.action_assign()
+
+        shuttle1 = self.shuttle
+        operation1 = shuttle1._operation_for_mode()
+        shuttle2 = self.env.ref(
+            "stock_vertical_lift.stock_vertical_lift_demo_shuttle_2"
+        )
+        operation2 = shuttle2._operation_for_mode()
+
+        self.assertEqual(operation1.number_of_ops, 4)
+        self.assertEqual(operation2.number_of_ops, 2)
+        self.assertEqual(operation1.number_of_ops_all, 6)
+        self.assertEqual(operation2.number_of_ops_all, 6)
+
+        # Process a line, should change the numbers.
+        operation1.select_next_move_line()
+        operation1.process_current()
+        self.assertEqual(operation1.number_of_ops, 3)
+        self.assertEqual(operation2.number_of_ops, 2)
+        self.assertEqual(operation1.number_of_ops_all, 5)
+        self.assertEqual(operation2.number_of_ops_all, 5)
+
+        # add stock and make the last one assigned to check the number is
+        # updated
+        self._update_quantity_in_cell(cell2, product2, 10)
+        unassigned.action_assign()
+        self.assertEqual(operation1.number_of_ops, 3)
+        self.assertEqual(operation2.number_of_ops, 3)
+        self.assertEqual(operation1.number_of_ops_all, 6)
+        self.assertEqual(operation2.number_of_ops_all, 6)
+
+    @unittest.skip("Not implemented")
+    def test_on_barcode_scanned(self):
+        # test to implement when the code is implemented
+        pass
+
+    def test_button_release(self):
+        self.shuttle.switch_pick()
+        self._test_button_release(self.out_move_line)
+
+    def test_process_current_pick(self):
+        self.shuttle.switch_pick()
+        operation = self.shuttle._operation_for_mode()
+        operation.current_move_line_id = self.out_move_line
+        qty_to_process = self.out_move_line.product_qty
+        operation.process_current()
+        self.assertEqual(self.out_move_line.state, "done")
+        self.assertEqual(self.out_move_line.qty_done, qty_to_process)
+
+    def test_matrix(self):
+        self.shuttle.switch_pick()
+        operation = self.shuttle._operation_for_mode()
+        operation.current_move_line_id = self.out_move_line
+        location = self.out_move_line.location_id
+        # offset by -1 because the fields are for humans
+        expected_x = location.posx - 1
+        expected_y = location.posy - 1
+        self.assertEqual(
+            operation.tray_matrix,
+            {
+                "selected": [expected_x, expected_y],
+                # fmt: off
+                'cells': [
+                    [0, 0, 0, 0, 0, 0, 0, 0],
+                    [0, 0, 1, 0, 0, 0, 0, 0],
+                ]
+                # fmt: on
+            },
+        )
+
+    def test_tray_qty(self):
+        cell = self.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x3y2"
+        )
+        self.out_move_line.location_id = cell
+        operation = self.shuttle._operation_for_mode()
+        operation.current_move_line_id = self.out_move_line
+        self._update_quantity_in_cell(cell, self.out_move_line.product_id, 50)
+        self.assertEqual(operation.tray_qty, 50)
+        self._update_quantity_in_cell(cell, self.out_move_line.product_id, -20)
+        self.assertEqual(operation.tray_qty, 30)
diff --git a/stock_vertical_lift/tests/test_put.py b/stock_vertical_lift/tests/test_put.py
new file mode 100644
index 000000000000..b9c8173a5f29
--- /dev/null
+++ b/stock_vertical_lift/tests/test_put.py
@@ -0,0 +1,184 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import unittest
+
+from .common import VerticalLiftCase
+
+
+class TestPut(VerticalLiftCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.picking_in = cls.env.ref(
+            "stock_vertical_lift.stock_picking_in_demo_vertical_lift_1"
+        )
+        cls.picking_in.action_confirm()
+        cls.in_move_line = cls.picking_in.move_line_ids
+        cls.location_1a_x1y1 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x1y1"
+        )
+        cls.location_1a_x2y1 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x2y1"
+        )
+        cls.location_1a_x3y1 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x3y1"
+        )
+        cls.location_1a_x1y2 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x1y2"
+        )
+        cls.in_move_line.location_dest_id = cls.location_1a_x3y1
+
+    def _select_move_lines(self, shuttle, move_lines=None):
+        select_model = self.env["vertical.lift.operation.put.select"]
+        operation = shuttle._operation_for_mode()
+        select = select_model.create({"operation_id": operation.id})
+        if move_lines:
+            select.move_line_ids = [(6, 0, move_lines.ids)]
+        else:
+            select.action_add_all()
+        select._sync_lines()
+
+    def test_switch_put(self):
+        self.shuttle.switch_put()
+        self.assertEqual(self.shuttle.mode, "put")
+        self.assertEqual(
+            self.shuttle._operation_for_mode().current_move_line_id,
+            self.env["stock.move.line"].browse(),
+        )
+
+    def test_select_from_barcode(self):
+        self.shuttle.switch_put()
+        self.picking_in.action_cancel()
+        put1 = self._create_simple_picking_in(
+            self.product_socks, 10, self.location_1a_x1y1
+        )
+        put1.action_confirm()
+        put2 = self._create_simple_picking_in(
+            self.product_recovery, 10, self.location_1a_x2y1
+        )
+        put2.action_confirm()
+        select_model = self.env["vertical.lift.operation.put.select"]
+        operation = self.shuttle._operation_for_mode()
+        select = select_model.create({"operation_id": operation.id})
+        select.on_barcode_scanned(self.product_socks.barcode)
+        self.assertRecordValues(
+            select, [{"move_line_ids": put1.move_line_ids.ids}]
+        )
+        select.on_barcode_scanned(self.product_recovery.barcode)
+        self.assertRecordValues(
+            select,
+            [{"move_line_ids": (put1.move_line_ids | put2.move_line_ids).ids}],
+        )
+        select.action_validate()
+        self.assertEqual(len(operation.operation_line_ids), 2)
+        self.assertRecordValues(
+            operation.mapped("operation_line_ids"),
+            [
+                {"move_line_id": put1.move_line_ids.id},
+                {"move_line_id": put2.move_line_ids.id},
+            ],
+        )
+
+    def test_no_select_from_barcode_outside_location(self):
+        self.shuttle.switch_put()
+        self.picking_in.action_cancel()
+        location = self.env.ref("stock.location_refrigerator_small")
+        put1 = self._create_simple_picking_in(self.product_socks, 10, location)
+        put1.action_confirm()
+        select_model = self.env["vertical.lift.operation.put.select"]
+        operation = self.shuttle._operation_for_mode()
+        select = select_model.create({"operation_id": operation.id})
+        select.on_barcode_scanned(self.product_socks.barcode)
+        # the move line is outside of the vertical lift, should not be
+        # selected
+        self.assertRecordValues(select, [{"move_line_ids": []}])
+
+    def test_put_count_move_lines(self):
+        self.shuttle.switch_put()
+        self.picking_in.action_cancel()
+        location_2a_x1y1 = self.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_2a_x1y1"
+        )
+        put1 = self._create_simple_picking_in(
+            self.product_socks, 10, self.location_1a_x1y1
+        )
+        put1.action_confirm()
+        put2 = self._create_simple_picking_in(
+            self.product_recovery, 10, self.location_1a_x2y1
+        )
+        put2.action_confirm()
+        put3 = self._create_simple_picking_in(
+            self.product_recovery, 10, location_2a_x1y1
+        )
+        put3.action_confirm()
+        operation = self.shuttle._operation_for_mode()
+        self._select_move_lines(self.shuttle)
+        shuttle2 = self.env.ref(
+            "stock_vertical_lift.stock_vertical_lift_demo_shuttle_2"
+        )
+        shuttle2.switch_put()
+        operation2 = shuttle2._operation_for_mode()
+        self._select_move_lines(shuttle2)
+
+        self.assertEqual(operation.number_of_ops, 2)
+        self.assertEqual(operation.number_of_ops_all, 3)
+        self.assertEqual(operation2.number_of_ops, 1)
+        self.assertEqual(operation2.number_of_ops_all, 3)
+
+    def test_process_current_put(self):
+        self.shuttle.switch_put()
+        operation = self.shuttle._operation_for_mode()
+        self._select_move_lines(self.shuttle, self.in_move_line)
+        self.assertEqual(operation.current_move_line_id, self.in_move_line)
+        qty_to_process = self.in_move_line.product_qty
+        operation.process_current()
+        self.assertEqual(self.in_move_line.state, "done")
+        self.assertEqual(self.in_move_line.qty_done, qty_to_process)
+
+    def test_transition_reset(self):
+        self.shuttle.switch_put()
+        operation = self.shuttle._operation_for_mode()
+        self._select_move_lines(self.shuttle, self.in_move_line)
+        operation.state = "scan_tray_type"
+        operation.reset_steps()
+        self.assertEqual(operation.step(), "scan_product")
+
+    def test_transition_scan_product(self):
+        self.shuttle.switch_put()
+        operation = self.shuttle._operation_for_mode()
+        self._select_move_lines(self.shuttle, self.in_move_line)
+        operation.state = "scan_product"
+        # wrong barcode, nothing happens
+        operation.on_barcode_scanned("foo")
+        # product scanned, move to next step
+        operation.on_barcode_scanned(self.product_socks.barcode)
+        self.assertEqual(operation.step(), "scan_tray_type")
+
+    def test_transition_scan_tray_type(self):
+        self.shuttle.switch_put()
+        operation = self.shuttle._operation_for_mode()
+        self._select_move_lines(self.shuttle, self.in_move_line)
+        operation.state = "scan_tray_type"
+        # wrong barcode, nothing happens
+        operation.on_barcode_scanned("foo")
+        # tray type scanned, move to next step
+        operation.on_barcode_scanned(operation.tray_type_id.code)
+        self.assertEqual(operation.step(), "save")
+
+    def test_transition_save(self):
+        self.shuttle.switch_put()
+        operation = self.shuttle._operation_for_mode()
+        self._select_move_lines(self.shuttle, self.in_move_line)
+        operation.state = "save"
+        operation.button_save()
+        self.assertEqual(operation.step(), "release")
+
+    def test_transition_button_release(self):
+        self.shuttle.switch_put()
+        self._test_button_release(self.in_move_line)
diff --git a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
index b80e46c1e0b4..f78871dfd08b 100644
--- a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
+++ b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
@@ -8,250 +8,3 @@
 from .common import VerticalLiftCase
 
 
-class TestVerticalLiftTrayType(VerticalLiftCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.picking_out = cls.env.ref(
-            "stock_vertical_lift.stock_picking_out_demo_vertical_lift_1"
-        )
-        # we have a move line to pick created by demo picking
-        # stock_picking_out_demo_vertical_lift_1
-        cls.out_move_line = cls.picking_out.move_line_ids
-
-    def test_switch_pick(self):
-        self.shuttle.switch_pick()
-        self.assertEqual(self.shuttle.mode, "pick")
-        self.assertEqual(
-            self.shuttle._operation_for_mode().current_move_line_id,
-            self.out_move_line,
-        )
-
-    def test_switch_put(self):
-        self.shuttle.switch_put()
-        self.assertEqual(self.shuttle.mode, "put")
-        # TODO check that we have an incoming move when switching
-        self.assertEqual(
-            self.shuttle._operation_for_mode().current_move_line_id,
-            self.env["stock.move.line"].browse(),
-        )
-
-    def test_switch_inventory(self):
-        self.shuttle.switch_inventory()
-        self.assertEqual(self.shuttle.mode, "inventory")
-
-    def test_pick_action_open_screen(self):
-        self.shuttle.switch_pick()
-        action = self.shuttle.action_open_screen()
-        operation = self.shuttle._operation_for_mode()
-        self.assertTrue(operation.current_move_line_id)
-        self.assertEqual(action["type"], "ir.actions.act_window")
-        self.assertEqual(action["res_model"], "vertical.lift.operation.pick")
-        self.assertEqual(action["res_id"], operation.id)
-
-    def test_pick_select_next_move_line(self):
-        self.shuttle.mode = "pick"
-        operation = self.shuttle._operation_for_mode()
-        operation.select_next_move_line()
-        self.assertEqual(operation.current_move_line_id, self.out_move_line)
-        self.assertEqual(
-            operation.operation_descr, _("Scan New Destination Location")
-        )
-
-    def test_pick_save(self):
-        self.shuttle.switch_pick()
-        operation = self.shuttle._operation_for_mode()
-        operation.current_move_line_id = self.out_move_line
-        operation.button_save()
-        self.assertEqual(operation.current_move_line_id.state, "done")
-        self.assertEqual(operation.operation_descr, _("Release"))
-
-    def test_pick_related_fields(self):
-        self.shuttle.switch_pick()
-        operation = self.shuttle._operation_for_mode()
-        ml = operation.current_move_line_id = self.out_move_line
-
-        # Trays related fields
-        # For pick, this is the source location, which is the cell where the
-        # product is.
-        self.assertEqual(operation.tray_location_id, ml.location_id)
-        self.assertEqual(
-            operation.tray_name,
-            # parent = tray
-            ml.location_id.location_id.name,
-        )
-        self.assertEqual(
-            operation.tray_type_id,
-            # the tray type is on the parent of the cell (on the tray)
-            ml.location_id.location_id.tray_type_id,
-        )
-        self.assertEqual(
-            operation.tray_type_code,
-            ml.location_id.location_id.tray_type_id.code,
-        )
-        self.assertEqual(operation.tray_x, ml.location_id.posx)
-        self.assertEqual(operation.tray_y, ml.location_id.posy)
-
-        # Move line related fields
-        self.assertEqual(operation.picking_id, ml.picking_id)
-        self.assertEqual(operation.picking_origin, ml.picking_id.origin)
-        self.assertEqual(
-            operation.picking_partner_id, ml.picking_id.partner_id
-        )
-        self.assertEqual(operation.product_id, ml.product_id)
-        self.assertEqual(operation.product_uom_id, ml.product_uom_id)
-        self.assertEqual(operation.product_uom_qty, ml.product_uom_qty)
-        self.assertEqual(operation.qty_done, ml.qty_done)
-        self.assertEqual(operation.lot_id, ml.lot_id)
-
-    def test_pick_count_move_lines(self):
-        product1 = self.env.ref("stock_vertical_lift.product_running_socks")
-        product2 = self.env.ref("stock_vertical_lift.product_recovery_socks")
-        # cancel the picking from demo data to start from a clean state
-        self.env.ref(
-            "stock_vertical_lift.stock_picking_out_demo_vertical_lift_1"
-        ).action_cancel()
-
-        # ensure that we have stock in some cells, we'll put product1
-        # in the first Shuttle and product2 in the second
-        cell1 = self.env.ref(
-            "stock_vertical_lift."
-            "stock_location_vertical_lift_demo_tray_1a_x3y2"
-        )
-        self._update_quantity_in_cell(cell1, product1, 50)
-        cell2 = self.env.ref(
-            "stock_vertical_lift."
-            "stock_location_vertical_lift_demo_tray_2a_x1y1"
-        )
-        self._update_quantity_in_cell(cell2, product2, 50)
-
-        # create pickings (we already have an existing one from demo data)
-        pickings = self.env["stock.picking"].browse()
-        pickings |= self._create_simple_picking_out(product1, 1)
-        pickings |= self._create_simple_picking_out(product1, 1)
-        pickings |= self._create_simple_picking_out(product1, 1)
-        pickings |= self._create_simple_picking_out(product1, 1)
-        pickings |= self._create_simple_picking_out(product2, 20)
-        pickings |= self._create_simple_picking_out(product2, 30)
-        # this one should be 'assigned', so should be included in the operation
-        # count
-        unassigned = self._create_simple_picking_out(product2, 1)
-        pickings |= unassigned
-        pickings.action_confirm()
-        # product1 will be taken from the shuttle1, product2 from shuttle2
-        pickings.action_assign()
-
-        shuttle1 = self.shuttle
-        operation1 = shuttle1._operation_for_mode()
-        shuttle2 = self.env.ref(
-            "stock_vertical_lift.stock_vertical_lift_demo_shuttle_2"
-        )
-        operation2 = shuttle2._operation_for_mode()
-
-        self.assertEqual(operation1.number_of_ops, 4)
-        self.assertEqual(operation2.number_of_ops, 2)
-        self.assertEqual(operation1.number_of_ops_all, 6)
-        self.assertEqual(operation2.number_of_ops_all, 6)
-
-        # Process a line, should change the numbers.
-        operation1.select_next_move_line()
-        operation1.process_current()
-        self.assertEqual(operation1.number_of_ops, 3)
-        self.assertEqual(operation2.number_of_ops, 2)
-        self.assertEqual(operation1.number_of_ops_all, 5)
-        self.assertEqual(operation2.number_of_ops_all, 5)
-
-        # add stock and make the last one assigned to check the number is
-        # updated
-        self._update_quantity_in_cell(cell2, product2, 10)
-        unassigned.action_assign()
-        self.assertEqual(operation1.number_of_ops, 3)
-        self.assertEqual(operation2.number_of_ops, 3)
-        self.assertEqual(operation1.number_of_ops_all, 6)
-        self.assertEqual(operation2.number_of_ops_all, 6)
-
-    @unittest.skip("Not implemented")
-    def test_put_count_move_lines(self):
-        pass
-
-    @unittest.skip("Not implemented")
-    def test_inventory_count_move_lines(self):
-        pass
-
-    @unittest.skip("Not implemented")
-    def test_on_barcode_scanned(self):
-        # test to implement when the code is implemented
-        pass
-
-    def test_button_release(self):
-        # for the test, we'll consider our last line has been delivered
-        self.out_move_line.qty_done = self.out_move_line.product_qty
-        self.out_move_line.move_id._action_done()
-        # release, no further operation in queue
-        operation = self.shuttle._operation_for_mode()
-        result = operation.button_release()
-        self.assertFalse(operation.current_move_line_id)
-        self.assertEqual(operation.operation_descr, _("No operations"))
-        expected_result = {
-            "effect": {
-                "fadeout": "slow",
-                "message": _("Congrats, you cleared the queue!"),
-                "img_url": "/web/static/src/img/smile.svg",
-                "type": "rainbow_man",
-            }
-        }
-        self.assertEqual(result, expected_result)
-
-    def test_process_current_pick(self):
-        self.shuttle.switch_pick()
-        operation = self.shuttle._operation_for_mode()
-        operation.current_move_line_id = self.out_move_line
-        qty_to_process = self.out_move_line.product_qty
-        operation.process_current()
-        self.assertEqual(self.out_move_line.state, "done")
-        self.assertEqual(self.out_move_line.qty_done, qty_to_process)
-
-    def test_process_current_put(self):
-        # test to implement when the code is implemented
-        self.shuttle.switch_put()
-        operation = self.shuttle._operation_for_mode()
-        with self.assertRaises(exceptions.UserError):
-            operation.process_current()
-
-    def test_process_current_inventory(self):
-        # test to implement when the code is implemented
-        self.shuttle.switch_inventory()
-
-    def test_matrix(self):
-        self.shuttle.switch_pick()
-        operation = self.shuttle._operation_for_mode()
-        operation.current_move_line_id = self.out_move_line
-        location = self.out_move_line.location_id
-        # offset by -1 because the fields are for humans
-        expected_x = location.posx - 1
-        expected_y = location.posy - 1
-        self.assertEqual(
-            operation.tray_matrix,
-            {
-                "selected": [expected_x, expected_y],
-                # fmt: off
-                'cells': [
-                    [0, 0, 0, 0, 0, 0, 0, 0],
-                    [0, 0, 1, 0, 0, 0, 0, 0],
-                ]
-                # fmt: on
-            },
-        )
-
-    def test_tray_qty(self):
-        cell = self.env.ref(
-            "stock_vertical_lift."
-            "stock_location_vertical_lift_demo_tray_1a_x3y2"
-        )
-        self.out_move_line.location_id = cell
-        operation = self.shuttle._operation_for_mode()
-        operation.current_move_line_id = self.out_move_line
-        self._update_quantity_in_cell(cell, self.out_move_line.product_id, 50)
-        self.assertEqual(operation.tray_qty, 50)
-        self._update_quantity_in_cell(cell, self.out_move_line.product_id, -20)
-        self.assertEqual(operation.tray_qty, 30)
diff --git a/stock_vertical_lift/views/vertical_lift_operation_base_views.xml b/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
index 876e6012a7a6..60457ce93512 100644
--- a/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
@@ -40,7 +40,7 @@
                     </div>
                 </div>
                 <div class="o_shuttle_actions">
-                    <div class="o_shuttle_content">
+                    <div class="o_shuttle_content o_shuttle_content_left">
                         <button name="action_menu" type="object"
                                 class="btn-secondary o_shuttle_icon_btn"
                                 string="" icon="fa-bars"
diff --git a/stock_vertical_lift/views/vertical_lift_operation_put_views.xml b/stock_vertical_lift/views/vertical_lift_operation_put_views.xml
index 0043870d0266..3cdaca1ebb76 100644
--- a/stock_vertical_lift/views/vertical_lift_operation_put_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_operation_put_views.xml
@@ -23,6 +23,63 @@
             <form position="attributes">
                 <attribute name="string">Put-Away Screen</attribute>
             </form>
+            <xpath expr="//div[hasclass('o_shuttle_actions')]/div[hasclass('o_shuttle_content_left')]"
+                   position="inside" >
+                <button name="action_select_operations" type="object"
+                        class="btn-primary"
+                        string="Select Operations"
+                        aria-label="Select Operations"
+                        title="Select Operations"/>
+            </xpath>
+            <field name="_barcode_scanned" position="before">
+                <!-- these fields have to be in the view otherwise they
+                     would be empty in the record sent to the _barcode_scanned
+                     onchange method
+                -->
+                <field name="state" invisible="1"/>
+                <field name="current_operation_line_id" invisible="1"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="vertical_lift_operation_put_select_view" model="ir.ui.view">
+        <field name="name">vertical.lift.operation.put.select.view</field>
+        <field name="model">vertical.lift.operation.put.select</field>
+        <field name="arch" type="xml">
+            <form string="Select" class="o_vlift_shuttle_popup">
+                <field name="move_line_ids">
+                    <tree create="0" edit="0">
+                        <field name="product_id" />
+                    </tree>
+                    <form>
+                        <group>
+                            <field name="product_id" readonly="1" />
+                            <field name="product_uom_qty" readonly="1" />
+                            <field name="qty_done" readonly="1" />
+                        </group>
+                    </form>
+                </field>
+                <!-- this field has to be in the view otherwise it
+                     would be empty in the record sent to the _barcode_scanned
+                     onchange method
+                -->
+                <field name="operation_id" invisible="1" />
+                <field name="_barcode_scanned" widget="barcode_handler"/>
+                <footer>
+                    <button name="action_validate"
+                            string="Validate"
+                            type="object"
+                            class="btn-primary"/>
+                    <button string="Cancel"
+                            class="btn-secondary"
+                            special="cancel" />
+                    <button name="action_add_all"
+                            string="Add all"
+                            type="object"
+                            groups="base.group_no_one"
+                            class="btn-secondary"/>
+                </footer>
+            </form>
         </field>
     </record>
 
diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index 97169a43cca3..c8d7cb639341 100644
--- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -37,7 +37,7 @@
     <field name="model">vertical.lift.shuttle.manual.barcode</field>
     <field name="arch" type="xml">
       <form string="Shuttle">
-        <div class="row o_vlift_shuttle_manual_barcode">
+        <div class="row o_vlift_shuttle_popup">
           <div class="col-8">
             <field name="barcode"/>
           </div>

From 68412a3bd00082c07392ef63a895f03cf309bbc9 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Mon, 14 Oct 2019 15:08:02 +0200
Subject: [PATCH 42/50] fixup! Add Put-Away workflow

---
 stock_vertical_lift/tests/test_pick.py | 16 ++++++++++------
 stock_vertical_lift/tests/test_put.py  | 10 ++++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/stock_vertical_lift/tests/test_pick.py b/stock_vertical_lift/tests/test_pick.py
index 653fa1dc0a40..894eb5fa69ed 100644
--- a/stock_vertical_lift/tests/test_pick.py
+++ b/stock_vertical_lift/tests/test_pick.py
@@ -1,8 +1,6 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import unittest
-
 from odoo import _
 
 from .common import VerticalLiftCase
@@ -27,7 +25,6 @@ def test_switch_pick(self):
             self.out_move_line,
         )
 
-    # TODO same test for other modes
     def test_pick_action_open_screen(self):
         self.shuttle.switch_pick()
         action = self.shuttle.action_open_screen()
@@ -158,10 +155,17 @@ def test_pick_count_move_lines(self):
         self.assertEqual(operation1.number_of_ops_all, 6)
         self.assertEqual(operation2.number_of_ops_all, 6)
 
-    @unittest.skip("Not implemented")
     def test_on_barcode_scanned(self):
-        # test to implement when the code is implemented
-        pass
+        self.shuttle.switch_pick()
+        operation = self.shuttle._operation_for_mode()
+        move_line = operation.current_move_line_id
+        current_destination = move_line.location_dest_id
+        stock_location = self.env.ref("stock.stock_location_stock")
+        self.assertEqual(
+            current_destination, self.env.ref("stock.stock_location_customers")
+        )
+        operation.on_barcode_scanned(stock_location.barcode)
+        self.assertEqual(move_line.location_dest_id, stock_location)
 
     def test_button_release(self):
         self.shuttle.switch_pick()
diff --git a/stock_vertical_lift/tests/test_put.py b/stock_vertical_lift/tests/test_put.py
index b9c8173a5f29..f13038906d52 100644
--- a/stock_vertical_lift/tests/test_put.py
+++ b/stock_vertical_lift/tests/test_put.py
@@ -1,8 +1,6 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import unittest
-
 from .common import VerticalLiftCase
 
 
@@ -43,6 +41,14 @@ def _select_move_lines(self, shuttle, move_lines=None):
             select.action_add_all()
         select._sync_lines()
 
+    def test_put_action_open_screen(self):
+        self.shuttle.switch_put()
+        action = self.shuttle.action_open_screen()
+        operation = self.shuttle._operation_for_mode()
+        self.assertEqual(action["type"], "ir.actions.act_window")
+        self.assertEqual(action["res_model"], "vertical.lift.operation.put")
+        self.assertEqual(action["res_id"], operation.id)
+
     def test_switch_put(self):
         self.shuttle.switch_put()
         self.assertEqual(self.shuttle.mode, "put")

From c6ebd357d3d0bf957652103c8df95a30c99f6f00 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 15 Oct 2019 15:39:05 +0200
Subject: [PATCH 43/50] Implement inventory screen

---
 stock_vertical_lift/models/__init__.py        |   1 +
 stock_vertical_lift/models/stock_inventory.py |  27 ++
 .../models/vertical_lift_operation_base.py    |  84 +++---
 .../vertical_lift_operation_inventory.py      | 259 +++++++++++++++++-
 stock_vertical_lift/readme/ROADMAP.rst        |  11 +-
 stock_vertical_lift/tests/common.py           |  60 ++++
 stock_vertical_lift/tests/test_inventory.py   | 113 ++++++--
 stock_vertical_lift/tests/test_put.py         |  22 +-
 .../vertical_lift_operation_base_views.xml    |   8 +-
 ...ertical_lift_operation_inventory_views.xml |  62 ++++-
 10 files changed, 565 insertions(+), 82 deletions(-)
 create mode 100644 stock_vertical_lift/models/stock_inventory.py

diff --git a/stock_vertical_lift/models/__init__.py b/stock_vertical_lift/models/__init__.py
index 839f0488889b..87a31d40b36e 100644
--- a/stock_vertical_lift/models/__init__.py
+++ b/stock_vertical_lift/models/__init__.py
@@ -3,6 +3,7 @@
 from . import vertical_lift_operation_pick
 from . import vertical_lift_operation_put
 from . import vertical_lift_operation_inventory
+from . import stock_inventory
 from . import stock_location
 from . import stock_move
 from . import stock_move_line
diff --git a/stock_vertical_lift/models/stock_inventory.py b/stock_vertical_lift/models/stock_inventory.py
new file mode 100644
index 000000000000..8e87e556e224
--- /dev/null
+++ b/stock_vertical_lift/models/stock_inventory.py
@@ -0,0 +1,27 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class InventoryLine(models.Model):
+    _inherit = "stock.inventory.line"
+
+    vertical_lift_done = fields.Boolean(default=False)
+    # Field used to sort lines by tray on the inventory scan screen, so entire
+    # trays are processed one after the other
+    vertical_lift_tray_id = fields.Many2one(
+        comodel_name="stock.location",
+        compute="_compute_vertical_lift_tray_id",
+        readonly=True,
+        store=True,
+    )
+
+    @api.depends("location_id.vertical_lift_kind")
+    def _compute_vertical_lift_tray_id(self):
+        for line in self:
+            if line.location_id.vertical_lift_kind == "cell":
+                # The parent of the cell is the tray.
+                line.vertical_lift_tray_id = line.location_id.location_id
+            else:
+                line.vertical_lift_tray_id = False
diff --git a/stock_vertical_lift/models/vertical_lift_operation_base.py b/stock_vertical_lift/models/vertical_lift_operation_base.py
index 8d0656cbcaab..5c1d09e75486 100644
--- a/stock_vertical_lift/models/vertical_lift_operation_base.py
+++ b/stock_vertical_lift/models/vertical_lift_operation_base.py
@@ -19,6 +19,13 @@ class VerticalLiftOperationBase(models.AbstractModel):
     location_id = fields.Many2one(
         related="shuttle_id.location_id", readonly=True
     )
+    number_of_ops = fields.Integer(
+        compute="_compute_number_of_ops", string="Number of Operations"
+    )
+    number_of_ops_all = fields.Integer(
+        compute="_compute_number_of_ops_all",
+        string="Number of Operations in all shuttles",
+    )
     mode = fields.Selection(related="shuttle_id.mode", readonly=True)
     operation_descr = fields.Char(
         string="Operation", default="...", readonly=True
@@ -32,6 +39,16 @@ class VerticalLiftOperationBase(models.AbstractModel):
         )
     ]
 
+    @api.depends()
+    def _compute_number_of_ops(self):
+        for record in self:
+            record.number_of_ops = 0
+
+    @api.depends()
+    def _compute_number_of_ops_all(self):
+        for record in self:
+            record.number_of_ops_all = 0
+
     def on_barcode_scanned(self, barcode):
         self.ensure_one()
         # to implement in sub-classes
@@ -51,6 +68,35 @@ def action_menu(self):
     def action_manual_barcode(self):
         return self.shuttle_id.action_manual_barcode()
 
+    def button_save(self):
+        """Process the action (pick, put, ...)"""
+        raise NotImplementedError
+
+    def button_release(self):
+        """Release the operation, go to the next"""
+        raise NotImplementedError
+
+    def _render_product_packagings(self, product):
+        values = {
+            "packagings": [
+                {"name": pkg.name, "qty": pkg.qty, "unit": product.uom_id.name}
+                for pkg in product.packaging_ids
+            ]
+        }
+        content = self.env["ir.qweb"].render(
+            "stock_vertical_lift.packagings", values
+        )
+        return content
+
+    def _get_tray_qty(self, product, location):
+        quants = self.env["stock.quant"].search(
+            [
+                ("location_id", "=", location.id),
+                ("product_id", "=", product.id),
+            ]
+        )
+        return sum(quants.mapped("quantity"))
+
 
 class VerticalLiftOperationTransfer(models.AbstractModel):
     """Base model for shuttle pick and put operations"""
@@ -63,14 +109,6 @@ class VerticalLiftOperationTransfer(models.AbstractModel):
         comodel_name="stock.move.line", readonly=True
     )
 
-    number_of_ops = fields.Integer(
-        compute="_compute_number_of_ops", string="Number of Operations"
-    )
-    number_of_ops_all = fields.Integer(
-        compute="_compute_number_of_ops_all",
-        string="Number of Operations in all shuttles",
-    )
-
     tray_location_id = fields.Many2one(
         comodel_name="stock.location",
         compute="_compute_tray_data",
@@ -137,21 +175,10 @@ def on_barcode_scanned(self, barcode):
     def _compute_product_packagings(self):
         for record in self:
             if not record.current_move_line_id:
+                record.product_packagings = ""
                 continue
             product = record.current_move_line_id.product_id
-            values = {
-                "packagings": [
-                    {
-                        "name": pkg.name,
-                        "qty": pkg.qty,
-                        "unit": product.uom_id.name,
-                    }
-                    for pkg in product.packaging_ids
-                ]
-            }
-            content = self.env["ir.qweb"].render(
-                "stock_vertical_lift.packagings", values
-            )
+            content = self._render_product_packagings(product)
             record.product_packagings = content
 
     @api.depends()
@@ -168,17 +195,12 @@ def _compute_number_of_ops_all(self):
     def _compute_tray_qty(self):
         for record in self:
             if not (record.tray_location_id and record.current_move_line_id):
+                record.tray_qty = 0.
                 continue
             product = record.current_move_line_id.product_id
-            quants = self.env["stock.quant"].search(
-                [
-                    ("location_id", "=", record.tray_location_id.id),
-                    ("product_id", "=", product.id),
-                ]
-            )
-            record.tray_qty = sum(quants.mapped("quantity"))
-
-    # depends of the quantity so we can't have all triggers
+            location = record.tray_location_id
+            record.tray_qty = self._get_tray_qty(product, location)
+
     @api.depends("current_move_line_id")
     def _compute_tray_data(self):
         for record in self:
@@ -245,4 +267,4 @@ def button_save(self):
         self.operation_descr = _("Release")
 
     def fetch_tray(self):
-        return
+        raise NotImplementedError
diff --git a/stock_vertical_lift/models/vertical_lift_operation_inventory.py b/stock_vertical_lift/models/vertical_lift_operation_inventory.py
index 17fd732cda98..d1a6088ed071 100644
--- a/stock_vertical_lift/models/vertical_lift_operation_inventory.py
+++ b/stock_vertical_lift/models/vertical_lift_operation_inventory.py
@@ -1,10 +1,261 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import models
+from odoo import _, api, fields, models
+from odoo.addons.base_sparse_field.models.fields import Serialized
+from odoo.tools import float_compare
+
+# TODO handle autofocus + easy way to validate for the input field
 
 
 class VerticalLiftOperationInventory(models.Model):
-    _name = 'vertical.lift.operation.inventory'
-    _inherit = 'vertical.lift.operation.base'
-    _description = 'Vertical Lift Operation Inventory'
+    _name = "vertical.lift.operation.inventory"
+    _inherit = "vertical.lift.operation.base"
+    _description = "Vertical Lift Operation Inventory"
+
+    current_inventory_line_id = fields.Many2one(
+        comodel_name="stock.inventory.line", readonly=True
+    )
+
+    quantity_input = fields.Float()
+    # if the quantity is wrong, user has to write 2 times
+    # the same quantity to really confirm it's correct
+    last_quantity_input = fields.Float()
+    state = fields.Selection(
+        selection=[
+            ("quantity", "Inventory, please enter the amount"),
+            (
+                "confirm_wrong_quantity",
+                "The quantity does not match, are you sure?",
+            ),
+            ("save", "Save"),
+        ],
+        default="quantity",
+    )
+
+    tray_location_id = fields.Many2one(
+        comodel_name="stock.location",
+        compute="_compute_tray_data",
+        string="Tray Location",
+    )
+    tray_name = fields.Char(compute="_compute_tray_data", string="Tray Name")
+    tray_type_id = fields.Many2one(
+        comodel_name="stock.location.tray.type",
+        compute="_compute_tray_data",
+        string="Tray Type",
+    )
+    tray_type_code = fields.Char(
+        compute="_compute_tray_data", string="Tray Code"
+    )
+    tray_x = fields.Integer(string="X", compute="_compute_tray_data")
+    tray_y = fields.Integer(string="Y", compute="_compute_tray_data")
+    tray_matrix = Serialized(string="Cells", compute="_compute_tray_data")
+    tray_qty = fields.Float(
+        string="Stock Quantity", compute="_compute_tray_qty"
+    )
+
+    # current operation information
+    inventory_id = fields.Many2one(
+        related="current_inventory_line_id.inventory_id", readonly=True
+    )
+    product_id = fields.Many2one(
+        related="current_inventory_line_id.product_id", readonly=True
+    )
+    product_uom_id = fields.Many2one(
+        related="current_inventory_line_id.product_uom_id", readonly=True
+    )
+    product_qty = fields.Float(
+        related="current_inventory_line_id.product_qty", readonly=True
+    )
+    product_packagings = fields.Html(
+        string="Packaging", compute="_compute_product_packagings"
+    )
+    package_id = fields.Many2one(
+        related="current_inventory_line_id.package_id", readonly=True
+    )
+    lot_id = fields.Many2one(
+        related="current_inventory_line_id.prod_lot_id", readonly=True
+    )
+
+    @api.depends("current_inventory_line_id")
+    def _compute_tray_data(self):
+        for record in self:
+            location = record.current_inventory_line_id.location_id
+            tray_type = location.location_id.tray_type_id
+            # this is the current cell
+            record.tray_location_id = location.id
+            # name of the tray where the cell is
+            record.tray_name = location.location_id.name
+            record.tray_type_id = tray_type.id
+            record.tray_type_code = tray_type.code
+            record.tray_x = location.posx
+            record.tray_y = location.posy
+            record.tray_matrix = location.tray_matrix
+
+    @api.depends("current_inventory_line_id.product_id.packaging_ids")
+    def _compute_product_packagings(self):
+        for record in self:
+            if not record.current_inventory_line_id:
+                record.product_packagings = ""
+                continue
+            product = record.current_inventory_line_id.product_id
+            content = self._render_product_packagings(product)
+            record.product_packagings = content
+
+    @api.depends("tray_location_id", "current_inventory_line_id.product_id")
+    def _compute_tray_qty(self):
+        for record in self:
+            if not (
+                record.tray_location_id and record.current_inventory_line_id
+            ):
+                record.tray_qty = 0.
+                continue
+            product = record.current_inventory_line_id.product_id
+            location = record.tray_location_id
+            record.tray_qty = self._get_tray_qty(product, location)
+
+    def _compute_number_of_ops(self):
+        for record in self:
+            line_model = self.env["stock.inventory.line"]
+            record.number_of_ops = line_model.search_count(
+                self._domain_inventory_lines_to_do()
+            )
+
+    def _compute_number_of_ops_all(self):
+        for record in self:
+            line_model = self.env["stock.inventory.line"]
+            record.number_of_ops_all = line_model.search_count(
+                self._domain_inventory_lines_to_do_all()
+            )
+
+    def _domain_inventory_lines_to_do(self):
+        return [
+            ("location_id", "child_of", self.location_id.id),
+            ("state", "=", "confirm"),
+            ("vertical_lift_done", "=", False),
+        ]
+
+    def _domain_inventory_lines_to_do_all(self):
+        shuttle_locations = self.env["stock.location"].search(
+            [("vertical_lift_kind", "=", "view")]
+        )
+        return [
+            ("location_id", "child_of", shuttle_locations.ids),
+            ("state", "=", "confirm"),
+            ("vertical_lift_done", "=", False),
+        ]
+
+    def on_screen_open(self):
+        """Called when the screen is open"""
+        self.select_next_inventory_line()
+
+    def reset(self):
+        self.write(
+            {
+                "quantity_input": 0.,
+                "last_quantity_input": 0.,
+                "state": "quantity",
+            }
+        )
+        self.update_step_description()
+
+    def step(self):
+        return self.state
+
+    def step_to(self, state):
+        self.state = state
+        self.update_step_description()
+
+    def step_description(self):
+        state_field = self._fields["state"]
+        return state_field.convert_to_export(self.state, self)
+
+    def update_step_description(self):
+        if self.current_inventory_line_id:
+            descr = self.step_description()
+        else:
+            descr = _("No operations")
+        self.operation_descr = descr
+
+    def button_save(self):
+        if not self.current_inventory_line_id:
+            return
+        self.ensure_one()
+        self.process_current()
+        if self.step() == "save":
+            self.select_next_inventory_line()
+            if not self.current_inventory_line_id:
+                # sorry not sorry
+                return {
+                    "effect": {
+                        "fadeout": "slow",
+                        "message": _("Congrats, you cleared the queue!"),
+                        "img_url": "/web/static/src/img/smile.svg",
+                        "type": "rainbow_man",
+                    }
+                }
+
+    def button_release(self):
+        raise NotImplementedError
+
+    def _has_identical_quantity(self):
+        line = self.current_inventory_line_id
+        return (
+            float_compare(
+                line.theoretical_qty,
+                self.quantity_input,
+                precision_rounding=line.product_uom_id.rounding,
+            )
+            == 0
+        )
+
+    def _process_quantity(self):
+        if self.step() == "quantity":
+            if self._has_identical_quantity():
+                self.step_to("save")
+                return True
+            else:
+                self.last_quantity_input = self.quantity_input
+                self.quantity_input = 0.
+                self.step_to("confirm_wrong_quantity")
+                return False
+        if self.step() == "confirm_wrong_quantity":
+            if self.quantity_input == self.last_quantity_input:
+                # confirms the previous input
+                self.step_to("save")
+                return True
+            else:
+                # cycle back to the first quantity check
+                self.step_to("quantity")
+                return self._process_quantity()
+
+    def process_current(self):
+        line = self.current_inventory_line_id
+        if self._process_quantity() and not line.vertical_lift_done:
+            line.vertical_lift_done = True
+            if self.quantity_input != line.product_qty:
+                line.product_qty = self.quantity_input
+            inventory = line.inventory_id
+            if all(line.vertical_lift_done for line in inventory.line_ids):
+                inventory.action_validate()
+
+    def fetch_tray(self):
+        location = self.current_inventory_line_id.location_id
+        location.fetch_vertical_lift_tray()
+
+    def select_next_inventory_line(self):
+        self.ensure_one()
+        next_line = self.env["stock.inventory.line"].search(
+            self._domain_inventory_lines_to_do(),
+            limit=1,
+            order="vertical_lift_tray_id, location_id, id",
+        )
+        previous_line = self.current_inventory_line_id
+        self.current_inventory_line_id = next_line
+        self.reset()
+        if (
+            next_line
+            and previous_line.vertical_lift_tray_id
+            != next_line.vertical_lift_tray_id
+        ):
+            self.fetch_tray()
diff --git a/stock_vertical_lift/readme/ROADMAP.rst b/stock_vertical_lift/readme/ROADMAP.rst
index c56a030779b4..84079ec4c6b4 100644
--- a/stock_vertical_lift/readme/ROADMAP.rst
+++ b/stock_vertical_lift/readme/ROADMAP.rst
@@ -1,3 +1,8 @@
-* Complete Pick screen and workflow (currently enough for a demo, not for production)
-* Implement Put-away screen and workflow
-* Implement Inventory screen and workflow
+* Complete screen workflows (currently enough for a demo, not for production)
+* Inventory: find a way to have a nice autofocus for quantity, still compatible
+  with barcode scanner (Odoo disables the autofocus when using barcode, which
+  makes sense)
+* Put-away: handle packages
+* Handle "multi-shuttle" put-away
+* Create glue module for product_expiry
+* Challenge the save + release buttons and workflow
diff --git a/stock_vertical_lift/tests/common.py b/stock_vertical_lift/tests/common.py
index f40456ffc1f5..0a6b613bc278 100644
--- a/stock_vertical_lift/tests/common.py
+++ b/stock_vertical_lift/tests/common.py
@@ -21,6 +21,47 @@ def setUpClass(cls):
         cls.vertical_lift_loc = cls.env.ref(
             'stock_vertical_lift.stock_location_vertical_lift'
         )
+        cls.location_1a = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a"
+        )
+        cls.location_1a_x1y1 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x1y1"
+        )
+        cls.location_1a_x2y1 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x2y1"
+        )
+        cls.location_1a_x3y1 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x3y1"
+        )
+        cls.location_1a_x1y2 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1a_x1y2"
+        )
+        cls.location_1b_x1y1 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1b_x1y1"
+        )
+        cls.location_1b_x1y2 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_1b_x1y2"
+        )
+        cls.location_2a = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_2a"
+        )
+        cls.location_2a_x1y1 = cls.env.ref(
+            "stock_vertical_lift."
+            "stock_location_vertical_lift_demo_tray_2a_x1y1"
+        )
+
+    def _update_qty_in_location(self, location, product, quantity):
+        self.env["stock.quant"]._update_available_quantity(
+            product, location, quantity
+        )
 
     @classmethod
     def _create_simple_picking_out(cls, product, quantity):
@@ -81,6 +122,25 @@ def _create_simple_picking_in(cls, product, quantity, dest_location):
             }
         )
 
+    @classmethod
+    def _create_inventory(self, products):
+        """Create a draft inventory
+
+        Products is a list of tuples (bin location, product).
+        """
+        values = {
+            'name': 'Test Inventory',
+            'filter': 'partial',
+            'line_ids': [(0, 0, {
+                'product_id': product.id,
+                'product_uom_id': product.uom_id.id,
+                'location_id': location.id
+            }) for location, product in products]
+        }
+        inventory = self.env['stock.inventory'].create(values)
+        inventory.action_start()
+        return inventory
+
     def _test_button_release(self, move_line):
         # for the test, we'll consider our last line has been delivered
         move_line.qty_done = move_line.product_qty
diff --git a/stock_vertical_lift/tests/test_inventory.py b/stock_vertical_lift/tests/test_inventory.py
index 864c022bab39..68caaf6096b2 100644
--- a/stock_vertical_lift/tests/test_inventory.py
+++ b/stock_vertical_lift/tests/test_inventory.py
@@ -1,31 +1,110 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import unittest
-
+from odoo import _
 from .common import VerticalLiftCase
 
 
 class TestInventory(VerticalLiftCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.picking_out = cls.env.ref(
-            "stock_vertical_lift.stock_picking_out_demo_vertical_lift_1"
-        )
-        # we have a move line to pick created by demo picking
-        # stock_picking_out_demo_vertical_lift_1
-        cls.out_move_line = cls.picking_out.move_line_ids
-
     def test_switch_inventory(self):
         self.shuttle.switch_inventory()
         self.assertEqual(self.shuttle.mode, "inventory")
+        self.assertEqual(
+            self.shuttle._operation_for_mode().current_inventory_line_id,
+            self.env["stock.inventory.line"].browse(),
+        )
+
+    def test_inventory_action_open_screen(self):
+        self.shuttle.switch_inventory()
+        action = self.shuttle.action_open_screen()
+        operation = self.shuttle._operation_for_mode()
+        self.assertEqual(action["type"], "ir.actions.act_window")
+        self.assertEqual(
+            action["res_model"], "vertical.lift.operation.inventory"
+        )
+        self.assertEqual(action["res_id"], operation.id)
+
+    def test_inventory_count_ops(self):
+        self._update_qty_in_location(
+            self.location_1a_x1y1, self.product_socks, 10
+        )
+        self._update_qty_in_location(
+            self.location_1a_x2y1, self.product_recovery, 10
+        )
+        self._create_inventory(
+            [
+                (self.location_1a_x1y1, self.product_socks),
+                (self.location_1a_x2y1, self.product_recovery),
+            ]
+        )
+        self._update_qty_in_location(
+            self.location_2a_x1y1, self.product_socks, 10
+        )
+        self._create_inventory([(self.location_2a_x1y1, self.product_socks)])
 
-    @unittest.skip("Not implemented")
-    def test_inventory_count_move_lines(self):
-        pass
+        self.shuttle.switch_inventory()
+        operation = self.shuttle._operation_for_mode()
+        self.assertEqual(operation.number_of_ops, 2)
+        self.assertEqual(operation.number_of_ops_all, 3)
 
-    @unittest.skip("Not implemented")
     def test_process_current_inventory(self):
-        # test to implement when the code is implemented
+        self._update_qty_in_location(
+            self.location_1a_x1y1, self.product_socks, 10
+        )
+        inventory = self._create_inventory(
+            [(self.location_1a_x1y1, self.product_socks)]
+        )
+        self.shuttle.switch_inventory()
+        operation = self.shuttle._operation_for_mode()
+        self.assertEqual(
+            operation.current_inventory_line_id, inventory.line_ids
+        )
+        # test the happy path, quantity is correct
+        operation.quantity_input = 10.0
+        result = operation.button_save()
+        # state is reset
+        self.assertEqual(operation.state, "quantity")
+        self.assertFalse(operation.current_inventory_line_id)
+        self.assertEqual(operation.operation_descr, _("No operations"))
+        self.assertTrue(inventory.line_ids.vertical_lift_done)
+        self.assertEqual(inventory.state, "done")
+        expected_result = {
+            "effect": {
+                "fadeout": "slow",
+                "message": _("Congrats, you cleared the queue!"),
+                "img_url": "/web/static/src/img/smile.svg",
+                "type": "rainbow_man",
+            }
+        }
+        self.assertEqual(result, expected_result)
+
+    def test_wrong_quantity(self):
+        self._update_qty_in_location(
+            self.location_1a_x1y1, self.product_socks, 10
+        )
+        inventory = self._create_inventory(
+            [(self.location_1a_x1y1, self.product_socks)]
+        )
         self.shuttle.switch_inventory()
+        operation = self.shuttle._operation_for_mode()
+        line = operation.current_inventory_line_id
+        self.assertEqual(line, inventory.line_ids)
+
+        operation.quantity_input = 12.0
+        operation.button_save()
+        self.assertEqual(operation.last_quantity_input, 12.0)
+        self.assertEqual(operation.quantity_input, 0.0)
+        self.assertEqual(operation.state, "confirm_wrong_quantity")
+        self.assertEqual(operation.current_inventory_line_id, line)
+        self.assertEqual(
+            operation.operation_descr,
+            _("The quantity does not match, are you sure?"),
+        )
+
+        # entering the same quantity a second time validates
+        operation.quantity_input = 12.0
+        operation.button_save()
+        self.assertFalse(operation.current_inventory_line_id)
+
+        self.assertTrue(inventory.line_ids.vertical_lift_done)
+        self.assertEqual(inventory.state, "done")
diff --git a/stock_vertical_lift/tests/test_put.py b/stock_vertical_lift/tests/test_put.py
index f13038906d52..d3f3911007d9 100644
--- a/stock_vertical_lift/tests/test_put.py
+++ b/stock_vertical_lift/tests/test_put.py
@@ -13,22 +13,6 @@ def setUpClass(cls):
         )
         cls.picking_in.action_confirm()
         cls.in_move_line = cls.picking_in.move_line_ids
-        cls.location_1a_x1y1 = cls.env.ref(
-            "stock_vertical_lift."
-            "stock_location_vertical_lift_demo_tray_1a_x1y1"
-        )
-        cls.location_1a_x2y1 = cls.env.ref(
-            "stock_vertical_lift."
-            "stock_location_vertical_lift_demo_tray_1a_x2y1"
-        )
-        cls.location_1a_x3y1 = cls.env.ref(
-            "stock_vertical_lift."
-            "stock_location_vertical_lift_demo_tray_1a_x3y1"
-        )
-        cls.location_1a_x1y2 = cls.env.ref(
-            "stock_vertical_lift."
-            "stock_location_vertical_lift_demo_tray_1a_x1y2"
-        )
         cls.in_move_line.location_dest_id = cls.location_1a_x3y1
 
     def _select_move_lines(self, shuttle, move_lines=None):
@@ -107,10 +91,6 @@ def test_no_select_from_barcode_outside_location(self):
     def test_put_count_move_lines(self):
         self.shuttle.switch_put()
         self.picking_in.action_cancel()
-        location_2a_x1y1 = self.env.ref(
-            "stock_vertical_lift."
-            "stock_location_vertical_lift_demo_tray_2a_x1y1"
-        )
         put1 = self._create_simple_picking_in(
             self.product_socks, 10, self.location_1a_x1y1
         )
@@ -120,7 +100,7 @@ def test_put_count_move_lines(self):
         )
         put2.action_confirm()
         put3 = self._create_simple_picking_in(
-            self.product_recovery, 10, location_2a_x1y1
+            self.product_recovery, 10, self.location_2a_x1y1
         )
         put3.action_confirm()
         operation = self.shuttle._operation_for_mode()
diff --git a/stock_vertical_lift/views/vertical_lift_operation_base_views.xml b/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
index 60457ce93512..fa665be90571 100644
--- a/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_operation_base_views.xml
@@ -37,6 +37,9 @@
                         <field name="mode" readonly="1"/>
                     </div>
                     <div class="o_shuttle_header_right o_shuttle_header_content">
+                        <label for="number_of_ops"/>
+                        <field name="number_of_ops" readonly="1"/> /
+                        <field name="number_of_ops_all" readonly="1"/>
                     </div>
                 </div>
                 <div class="o_shuttle_actions">
@@ -86,11 +89,6 @@
         <field name="inherit_id" ref="vertical_lift_operation_base_screen_view"/>
         <field name="mode">primary</field>
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('o_shuttle_header_right')]" position="inside" >
-                <label for="number_of_ops"/>
-                <field name="number_of_ops" readonly="1"/> /
-                <field name="number_of_ops_all" readonly="1"/>
-            </xpath>
             <xpath expr="//div[hasclass('o_shuttle_data')]" position="attributes" >
                 <attribute name="attrs" >{'invisible': [('current_move_line_id', '=', False)]}</attribute>
             </xpath>
diff --git a/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml b/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
index b6ae1de6a4d3..27ebe31fd13f 100644
--- a/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_operation_inventory_views.xml
@@ -23,8 +23,68 @@
             <form position="attributes">
                 <attribute name="string">Inventory Screen</attribute>
             </form>
+
+            <form position="inside">
+                <field name="state" invisible="1"/>
+            </form>
+
+            <button name="button_release" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </button>
+
+            <xpath expr="//div[hasclass('o_shuttle_data')]" position="attributes" >
+                <attribute name="attrs" >{'invisible': [('current_inventory_line_id', '=', False)]}</attribute>
+            </xpath>
             <xpath expr="//div[hasclass('o_shuttle_data')]" position="inside" >
-                <span>Not implemented</span>
+                <!-- on the left of the screen -->
+                <div class="o_shuttle_data_content o_shuttle_move">
+                    <div>
+                        <group>
+                            <field name="current_inventory_line_id" invisible="1"/>
+                            <div>
+                                <div>
+                                    <field name="inventory_id" options="{'no_open': True}" class="mr8"/>
+                                </div>
+                            </div>
+                            <label for="product_id"/>
+                            <div colspan="2" class="oe_title">
+                                <h1>
+                                    <field name="product_id" options="{'no_open': True}"/>
+                                </h1>
+                            </div>
+                            <div colspan="2">
+                                <field name="product_packagings"/>
+                            </div>
+                            <field name="lot_id"/>
+                            <field name="package_id"/>
+                            <label for="quantity_input" string="Quantity" class="ml32"/>
+                            <div colspan="2" class="ml32">
+                                <h1 class="bg-primary o_shuttle_highlight">
+                                    <field name="quantity_input"
+                                           default_focus="1"
+                                           class="oe_inline"/>
+                                    <field name="product_uom_id" options="{'no_open': True}" class="oe_inline ml8 text-white"/>
+                                </h1>
+                            </div>
+                        </group>
+                    </div>
+                </div>
+                <!-- on the right of the screen -->
+                <div class="o_shuttle_data_content o_shuttle_tray">
+                    <group col="1">
+                        <field name="tray_name"/>
+                        <field name="tray_type_code"/>
+                        <field name="tray_y"/>
+                        <field name="tray_x"/>
+                    </group>
+                    <group>
+                        <div>
+                            <field name="tray_matrix"
+                                   widget="location_tray_matrix"
+                            />
+                        </div>
+                    </group>
+                </div>
             </xpath>
         </field>
     </record>

From 848f39ee025cd20c5acbce06e0cef50aeab82707 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 15 Oct 2019 16:24:30 +0200
Subject: [PATCH 44/50] Fix 'fetch' buttons on move lines

There is no such action as 'ir.actions.do_nothing', it kinda works,
until you look into the js console and stares at the errors.

There is a nice OCA module that serves this purpose (more or less,
because it reloads the window, this is not an issue).
---
 stock_vertical_lift/__manifest__.py           | 1 +
 stock_vertical_lift/models/stock_move_line.py | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/stock_vertical_lift/__manifest__.py b/stock_vertical_lift/__manifest__.py
index 7d97d1741d11..11edb3846d23 100644
--- a/stock_vertical_lift/__manifest__.py
+++ b/stock_vertical_lift/__manifest__.py
@@ -13,6 +13,7 @@
         'base_sparse_field',
         'stock_location_tray',  # OCA/stock-logistics-warehouse
         'web_notify',  # OCA/web
+        'web_ir_actions_act_view_reload',  # OCA/web
     ],
     'website': 'https://github.com/OCA/stock-logistics-warehouse',
     'demo': [
diff --git a/stock_vertical_lift/models/stock_move_line.py b/stock_vertical_lift/models/stock_move_line.py
index a26873c0aeb2..433d6f33da6d 100644
--- a/stock_vertical_lift/models/stock_move_line.py
+++ b/stock_vertical_lift/models/stock_move_line.py
@@ -10,9 +10,12 @@ class StockMoveLine(models.Model):
     def fetch_vertical_lift_tray_source(self):
         self.ensure_one()
         self.location_id.fetch_vertical_lift_tray()
-        return {"type": "ir.actions.do_nothing"}
+        # We reload mainly because otherwise, it would close
+        # the popup. This action is provided by the OCA module
+        # web_ir_actions_act_view_reload
+        return {"type": "ir.actions.act_view_reload"}
 
     def fetch_vertical_lift_tray_dest(self):
         self.ensure_one()
         self.location_dest_id.fetch_vertical_lift_tray()
-        return {"type": "ir.actions.do_nothing"}
+        return {"type": "ir.actions.act_view_reload"}

From c3cc49e2d6c95ff529d236767ca6051fd0178986 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 15 Oct 2019 16:40:47 +0200
Subject: [PATCH 45/50] Remove useless file

---
 stock_vertical_lift/tests/__init__.py                  |  1 -
 .../tests/test_vertical_lift_shuttle.py                | 10 ----------
 2 files changed, 11 deletions(-)
 delete mode 100644 stock_vertical_lift/tests/test_vertical_lift_shuttle.py

diff --git a/stock_vertical_lift/tests/__init__.py b/stock_vertical_lift/tests/__init__.py
index 48c0e7c45b49..dd10460b3947 100644
--- a/stock_vertical_lift/tests/__init__.py
+++ b/stock_vertical_lift/tests/__init__.py
@@ -2,4 +2,3 @@
 from . import test_inventory
 from . import test_pick
 from . import test_put
-from . import test_vertical_lift_shuttle
diff --git a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py b/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
deleted file mode 100644
index f78871dfd08b..000000000000
--- a/stock_vertical_lift/tests/test_vertical_lift_shuttle.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2019 Camptocamp SA
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-import unittest
-
-from odoo import _, exceptions
-
-from .common import VerticalLiftCase
-
-

From dbc01b2bb0ea0a46100adb1f77352399ef63fe27 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 15 Oct 2019 16:50:35 +0200
Subject: [PATCH 46/50] Add button on locations to fetch the tray

---
 stock_vertical_lift/models/stock_location.py       | 6 ++++++
 stock_vertical_lift/views/stock_location_views.xml | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index 93e02cf6513b..dd457322817f 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -154,3 +154,9 @@ def fetch_vertical_lift_tray(self, cell_location=None):
                 % (self.name,)
             )
         return True
+
+    def button_fetch_vertical_lift_tray(self):
+        self.ensure_one()
+        if self.vertical_lift_kind in ("cell", "tray"):
+            self.fetch_vertical_lift_tray()
+        return True
diff --git a/stock_vertical_lift/views/stock_location_views.xml b/stock_vertical_lift/views/stock_location_views.xml
index 62c6e2996d0b..c884825ef3bc 100644
--- a/stock_vertical_lift/views/stock_location_views.xml
+++ b/stock_vertical_lift/views/stock_location_views.xml
@@ -6,6 +6,15 @@
         <field name="model">stock.location</field>
         <field name="inherit_id" ref="stock_location_tray.view_location_form"/>
         <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button name="button_fetch_vertical_lift_tray"
+                        string="Fetch Shuttle Tray"
+                        type="object"
+                        groups="stock.group_stock_manager"
+                        class="oe_stat_button"
+                        icon="fa-hand-paper-o"
+                        attrs="{'invisible': [('vertical_lift_kind', 'not in', ('tray', 'cell'))]}"/>
+            </div>
             <field name="return_location" position="after">
                 <field name="vertical_lift_location"
                        attrs="{'invisible': [('vertical_lift_kind', '!=', False), ('vertical_lift_kind', '!=', 'view')]}"

From a3da5f2d98f3bb1a69b01bea82251b85ddb343ad Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Mon, 4 Nov 2019 15:03:03 +0100
Subject: [PATCH 47/50] [IMP] abstract communication with shuttle

---
 stock_vertical_lift/models/stock_location.py  | 13 ++-
 .../models/vertical_lift_shuttle.py           | 91 +++++++++++++++++++
 .../views/vertical_lift_shuttle_views.xml     | 19 ++--
 .../models/stock_location.py                  | 36 +++++++-
 .../models/vertical_lift_shuttle.py           | 17 ++++
 5 files changed, 163 insertions(+), 13 deletions(-)

diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index dd457322817f..14c1977ced88 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -71,7 +71,12 @@ def _compute_vertical_lift_shuttle_id(self):
             location.vertical_lift_shuttle_id = shuttle
 
     def _hardware_vertical_lift_tray(self, cell_location=None):
-        """Send instructions to the vertical lift hardware
+        payload = self._hardware_vertical_lift_tray_payload(cell_location)
+        res = self.vertical_lift_shuttle_id._hardware_send_message(payload)
+        return res
+
+    def _hardware_vertical_lift_tray_payload(self, cell_location=None):
+        """Prepare the message to be sent to the vertical lift hardware
 
         Private method, this is where the implementation actually happens.
         Addons can add their instructions based on the hardware used for
@@ -120,9 +125,9 @@ def _hardware_vertical_lift_tray(self, cell_location=None):
                     from_left,
                     from_bottom,
                 )
-            self.env.user.notify_info(
-                message=message, title=_("Lift Simulation")
-            )
+            return message
+        else:
+            return super()._hardware_vertical_lift_tray_payload(cell_location)
 
     def fetch_vertical_lift_tray(self, cell_location=None):
         """Send instructions to the vertical lift hardware
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index d3271acb297c..a7e0f35c502e 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -1,8 +1,13 @@
 # Copyright 2019 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+import logging
+import socket
+import ssl
 
 from odoo import _, api, fields, models
 
+_logger = logging.getLogger(__name__)
+
 
 class VerticalLiftShuttle(models.Model):
     _name = "vertical.lift.shuttle"
@@ -26,6 +31,13 @@ class VerticalLiftShuttle(models.Model):
     hardware = fields.Selection(
         selection="_selection_hardware", default="simulation", required=True
     )
+    server = fields.Char(help="hostname or IP address of the server")
+    port = fields.Integer(
+        help="network port of the server on which to send the message"
+    )
+    use_tls = fields.Boolean(
+        help="set this if the server expects TLS wrapped communication"
+    )
 
     _sql_constraints = [
         (
@@ -64,6 +76,85 @@ def _screen_view_for_mode(self):
             ),
         }
 
+    def _hardware_send_message(self, payload):
+        """default implementation for message sending
+
+        If in hardware is 'simulation' then display a simple message.
+        Otherwise defaults to connecting to server:port using a TCP socket
+        (optionnally wrapped with TLS) and sending the payload, then waiting
+        for a response and disconnecting.
+
+        :param payload: a bytes object containing the payload
+
+        """
+        self.ensure_one()
+        _logger.info('send %r', payload)
+        if self.hardware == "simulation":
+            self.env.user.notify_info(message=payload,
+                                      title=_("Lift Simulation"))
+            return True
+        else:
+            conn = self._hardware_get_server_connection()
+            try:
+                offset = 0
+                while True:
+                    size = conn.send(payload[offset:])
+                    offset += size
+                    if offset >= len(payload) or not size:
+                        break
+                response = self._hardware_recv_response(conn)
+                _logger.info('recv %r', response)
+                return self._check_server_response(payload, response)
+            finally:
+                self._hardware_release_server_connection(conn)
+
+    def _hardware_recv_response(self, conn):
+        """Default implementation expects the remote server to close()
+        the socket after sending the reponse.
+        Override to match the protocol implemented by the hardware.
+
+        :param conn: a socket connected to the server
+        :return: the response sent by the server, as a bytes object
+        """
+        response = b''
+        chunk = True
+        while chunk:
+            chunk = conn.recv(1024)
+            response += chunk
+        return response
+
+    def _check_server_response(self, payload, response):
+        """Use this to check if the response is a success or a failure
+
+        :param payload: the payload sent
+        :param response: the response received
+        :return: True if the response is a succes, False otherwise
+        """
+        return True
+
+    def _hardware_release_server_connection(self, conn):
+        conn.close()
+
+    def _hardware_get_server_connection(self):
+        """This implementation will yield a new connection to the server
+        and close() it when exiting the context.
+        Override to match the communication protocol of your hardware"""
+        conn = socket.create_connection((self.server, self.port))
+        if self.use_tls:
+            ctx = ssl.create_default_context()
+            self._hardware_update_tls_context(ctx)
+            conntls = ctx.wrap_socket(conn, server_hostname=self.server)
+            return conntls
+        else:
+            return conn
+
+    def _hardware_update_tls_context(self, context):
+        """Update the TLS context, e.g. to add a client certificate.
+
+        This method does nothing, override to match your communication
+        protocol."""
+        pass
+
     def _operation_for_mode(self):
         model = self._model_for_mode[self.mode]
         record = self.env[model].search([("shuttle_id", "=", self.id)])
diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index c8d7cb639341..0a33ad98d43b 100644
--- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -58,12 +58,19 @@
     <field name="model">vertical.lift.shuttle</field>
     <field name="arch" type="xml">
       <form string="Operations">
-        <group>
-          <field name="name"/>
-          <field name="mode"/>
-          <field name="location_id"/>
-          <field name="hardware"/>
-        </group>
+          <group name="main">
+              <group name="left">
+                  <field name="name"/>
+                  <field name="mode"/>
+                  <field name="location_id"/>
+                  <field name="hardware"/>
+              </group>
+              <group string="Network" name="network">
+                  <field name="server"/>
+                  <field name="port"/>
+                  <field name="use_tls"/>
+              </group>
+          </group>
       </form>
     </field>
   </record>
diff --git a/stock_vertical_lift_kardex/models/stock_location.py b/stock_vertical_lift_kardex/models/stock_location.py
index d1098d59a124..a7b8eb79e2eb 100644
--- a/stock_vertical_lift_kardex/models/stock_location.py
+++ b/stock_vertical_lift_kardex/models/stock_location.py
@@ -11,10 +11,40 @@ class StockLocation(models.Model):
     _inherit = 'stock.location'
 
     def _hardware_kardex_prepare_payload(self, cell_location=None):
-        return ""
+        message_template = ("{code}|{hostId}|{addr}|{carrier}|{carrierNext}|"
+                            "{x}|{y}|{boxType}|{Q}|{order}|{part}|{desc}|\r\n")
+        shuttle = self.vertical_lift_shuttle_id
+        if shuttle.mode == "pick":
+            code = "1"
+        elif shuttle.mode == "put":
+            code = "2"
+        elif shuttle.mode == "inventory":
+            code = "5"
+        else:
+            code = "61"  # ping
+        if cell_location:
+            x, y = cell_location.tray_cell_center_position()
+        else:
+            x, y = '', ''
+        subst = {
+            'code': code,
+            'hostId': 'odoo',
+            'addr': shuttle.name,
+            'carrier': self.name,
+            'carrierNext': '',
+            'x': x,
+            'y': y,
+            'boxType': '',
+            'Q': '',
+            'order': '',
+            'part': '',
+            'desc': '',
+        }
+        payload = message_template.format(subst)
+        return payload.encode('iso-8859-1', 'replace')
 
-    def _hardware_vertical_lift_tray(self, cell_location=None):
-        """Send instructions to the vertical lift hardware
+    def _hardware_vertical_lift_tray_payload(self, cell_location=None):
+        """Prepare the message to be sent to the vertical lift hardware
 
         Private method, this is where the implementation actually happens.
         Addons can add their instructions based on the hardware used for
diff --git a/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py b/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py
index cfd3c74b9dbf..67dc1131d5bc 100644
--- a/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py
@@ -12,3 +12,20 @@ def _selection_hardware(self):
         values = super()._selection_hardware()
         values += [('kardex', 'Kardex')]
         return values
+
+    def _hardware_recv_response(self, conn):
+        # the implementation uses messages delimited with \r\n
+        response = b''
+        chunk = True
+        while chunk:
+            chunk = conn.recv(1)
+            response += chunk
+            if response.endswith(b'\r\n'):
+                break
+        return response
+
+    def _check_server_response(self, payload, response):
+        payload = payload.decode('iso-8859-1')
+        response = response.decode('iso-8859-1')
+        code, sep, remaining = response.partition('|')
+        return code == "0"

From 60aed35b86f74a79ccc2e4444a4b6b06377f6c4b Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Fri, 8 Nov 2019 09:52:12 +0100
Subject: [PATCH 48/50] Fix super call

---
 stock_vertical_lift_kardex/models/stock_location.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stock_vertical_lift_kardex/models/stock_location.py b/stock_vertical_lift_kardex/models/stock_location.py
index a7b8eb79e2eb..e307aa21cbd1 100644
--- a/stock_vertical_lift_kardex/models/stock_location.py
+++ b/stock_vertical_lift_kardex/models/stock_location.py
@@ -83,4 +83,4 @@ def _hardware_vertical_lift_tray_payload(self, cell_location=None):
             payload = self._hardware_kardex_prepare_payload()
             _logger.debug("Sending to kardex: {}", payload)
             # TODO implement the communication with kardex
-        super()._hardware_vertical_lift_tray(cell_location=cell_location)
+        super()._hardware_vertical_lift_tray_payload(cell_location=cell_location)

From cef82cb608a6104ed1ff3bea01141d0b0129e709 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Fri, 8 Nov 2019 12:49:25 +0100
Subject: [PATCH 49/50] Add method to refresh a shuttle screen

Example of usage in an odoo shell, when a screen is open:

>>> self.env['vertical.lift.shuttle'].browse(1)._operation_for_mode().operation_descr = 'foo'
>>> self.env['vertical.lift.shuttle'].browse(1)._send_notification_refresh()
>>> env.cr.commit()

Provided the longpolling is correctly configured with a proxy, the
screen should immediately refresh with 'foo' as operation description.
---
 .../models/vertical_lift_operation_base.py    | 22 +++++++++
 .../models/vertical_lift_shuttle.py           | 14 ++++++
 .../static/src/js/vertical_lift.js            | 48 +++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/stock_vertical_lift/models/vertical_lift_operation_base.py b/stock_vertical_lift/models/vertical_lift_operation_base.py
index 5c1d09e75486..6108f7418ce0 100644
--- a/stock_vertical_lift/models/vertical_lift_operation_base.py
+++ b/stock_vertical_lift/models/vertical_lift_operation_base.py
@@ -97,6 +97,28 @@ def _get_tray_qty(self, product, location):
         )
         return sum(quants.mapped("quantity"))
 
+    def _send_notification_refresh(self):
+        """Send a refresh notification
+
+        Generally, you want to call the method
+        _send_notification_refresh() on VerticalLiftShuttle so you
+        don't need to know the id of the current operation.
+
+        Other notifications can be implemented, they have to be
+        added in static/src/js/vertical_lift.js and the message
+        must contain an "action" and "params".
+        """
+        self.ensure_one()
+        channel = "notify_vertical_lift_screen"
+        bus_message = {
+            "action": "refresh",
+            "params": {
+                "model": self._name,
+                "id": self.id,
+            }
+        }
+        self.env["bus.bus"].sendone(channel, bus_message)
+
 
 class VerticalLiftOperationTransfer(models.AbstractModel):
     """Base model for shuttle pick and put operations"""
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index a7e0f35c502e..013586eedc27 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -214,6 +214,20 @@ def switch_inventory(self):
         self.mode = "inventory"
         return self.action_open_screen()
 
+    def _send_notification_refresh(self):
+        """Send a refresh notification to the current opened screen
+
+        The form controller on the front-end side will instantaneously
+        refresh the form with the latest committed data.
+
+        It can be used for instance after a vertical lift hardware
+        event occurred to inform the user on their screen.
+
+        The method is private only to prevent xml/rpc calls to
+        interact with the screen.
+        """
+        self._operation_for_mode._send_notification_refresh()
+
 
 class VerticalLiftShuttleManualBarcode(models.TransientModel):
     _name = "vertical.lift.shuttle.manual.barcode"
diff --git a/stock_vertical_lift/static/src/js/vertical_lift.js b/stock_vertical_lift/static/src/js/vertical_lift.js
index 7c0e5d6f4ff1..542a06079376 100644
--- a/stock_vertical_lift/static/src/js/vertical_lift.js
+++ b/stock_vertical_lift/static/src/js/vertical_lift.js
@@ -5,6 +5,7 @@ var core = require('web.core');
 var KanbanRecord = require('web.KanbanRecord');
 var basicFields = require('web.basic_fields');
 var field_registry = require('web.field_registry');
+var FormController = require('web.FormController');
 var FieldInteger = basicFields.FieldInteger;
 
 KanbanRecord.include({
@@ -44,6 +45,53 @@ var ExitButton = FieldInteger.extend({
             clear_breadcrumbs: true,
         });
     },
+
+});
+
+
+FormController.include({
+    init: function (parent, model, renderer, params) {
+        this._super.apply(this, arguments);
+        if(this.modelName.startsWith('vertical.lift.operation.')) {
+            this.call('bus_service', 'addChannel', 'notify_vertical_lift_screen');
+            this.call(
+                'bus_service', 'on', 'notification',
+                this, this.vlift_bus_notification
+            );
+            this.call('bus_service', 'startPolling');
+        }
+    },
+    vlift_bus_notification: function (notifications) {
+        var self = this;
+        _.each(notifications, function (notification) {
+            var channel = notification[0];
+            var message = notification[1];
+            if(channel === 'notify_vertical_lift_screen') {
+                switch(message['action']) {
+                case 'refresh':
+                    self.vlift_bus_action_refresh(message['params']);
+                    break;
+                }
+            }
+        });
+    },
+    vlift_bus_action_refresh: function(params) {
+        var selectedIds = this.getSelectedIds();
+        if(!selectedIds.length){
+            return;
+        }
+        var currentId = selectedIds[0];
+        if(params['id'] === currentId && params['model'] == this.modelName){
+            this.reload();
+        }
+    },
+    destroy: function () {
+        if(this.modelName.startsWith('vertical.lift.operation.')) {
+            this.call('bus_service', 'deleteChannel', 'notify_vertical_lift_screen');
+        }
+        this._super.apply(this, arguments);
+    }
+
 });
 
 field_registry.add('vlift_shuttle_exit_button', ExitButton);

From ff501e9294b3ea289918ea744d89067de29cd378 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Thu, 14 Nov 2019 10:57:42 +0100
Subject: [PATCH 50/50] [IMP] add a proxy to communicate with the kardex server

---
 stock_vertical_lift/__init__.py               |   1 +
 stock_vertical_lift/__manifest__.py           |   1 +
 stock_vertical_lift/controllers/__init__.py   |   1 +
 stock_vertical_lift/controllers/main.py       |  20 ++
 stock_vertical_lift/data/ir_sequence.xml      |  12 ++
 stock_vertical_lift/models/__init__.py        |   1 +
 stock_vertical_lift/models/stock_location.py  |   2 +-
 .../models/vertical_lift_command.py           |  50 +++++
 .../models/vertical_lift_shuttle.py           |  45 ++---
 .../security/ir.model.access.csv              |   1 +
 .../views/vertical_lift_shuttle_views.xml     |  12 ++
 stock_vertical_lift_kardex/__manifest__.py    |   3 +-
 stock_vertical_lift_kardex/models/__init__.py |   1 +
 .../models/stock_location.py                  |  12 +-
 .../models/vertical_lift_shuttle.py           |  62 +++++--
 .../proxy/kardex-proxy.py                     | 175 ++++++++++++++++++
 .../proxy/requirements.txt                    |   1 +
 stock_vertical_lift_kardex/proxy/test.py      | 102 ++++++++++
 stock_vertical_lift_kardex/requirements.txt   |   1 +
 19 files changed, 459 insertions(+), 44 deletions(-)
 create mode 100644 stock_vertical_lift/controllers/__init__.py
 create mode 100644 stock_vertical_lift/controllers/main.py
 create mode 100644 stock_vertical_lift/data/ir_sequence.xml
 create mode 100644 stock_vertical_lift/models/vertical_lift_command.py
 create mode 100644 stock_vertical_lift_kardex/proxy/kardex-proxy.py
 create mode 100644 stock_vertical_lift_kardex/proxy/requirements.txt
 create mode 100644 stock_vertical_lift_kardex/proxy/test.py
 create mode 100644 stock_vertical_lift_kardex/requirements.txt

diff --git a/stock_vertical_lift/__init__.py b/stock_vertical_lift/__init__.py
index 0650744f6bc6..f7209b171002 100644
--- a/stock_vertical_lift/__init__.py
+++ b/stock_vertical_lift/__init__.py
@@ -1 +1,2 @@
 from . import models
+from . import controllers
diff --git a/stock_vertical_lift/__manifest__.py b/stock_vertical_lift/__manifest__.py
index 11edb3846d23..04b5c529285f 100644
--- a/stock_vertical_lift/__manifest__.py
+++ b/stock_vertical_lift/__manifest__.py
@@ -34,6 +34,7 @@
         'views/stock_vertical_lift_templates.xml',
         'views/shuttle_screen_templates.xml',
         'security/ir.model.access.csv',
+        'data/ir_sequence.xml',
     ],
     'installable': True,
     'development_status': 'Alpha',
diff --git a/stock_vertical_lift/controllers/__init__.py b/stock_vertical_lift/controllers/__init__.py
new file mode 100644
index 000000000000..12a7e529b674
--- /dev/null
+++ b/stock_vertical_lift/controllers/__init__.py
@@ -0,0 +1 @@
+from . import main
diff --git a/stock_vertical_lift/controllers/main.py b/stock_vertical_lift/controllers/main.py
new file mode 100644
index 000000000000..a03af98354ef
--- /dev/null
+++ b/stock_vertical_lift/controllers/main.py
@@ -0,0 +1,20 @@
+import logging
+import os
+
+from odoo import http
+from odoo.http import request
+
+_logger = logging.getLogger(__name__)
+
+
+class VerticalLiftController(http.Controller):
+    @http.route(['/vertical-lift'], type='http', auth='public', csrf=False)
+    def vertical_lift(self, answer, secret):
+        if secret == os.environ.get('VERTICAL_LIFT_SECRET', ''):
+            rec = request.env['vertical.lift.command'].sudo().record_answer(
+                answer
+            )
+            return str(rec.id)
+        else:
+            _logger.error('secret mismatch: %r != %r', secret, os.environ.get('VERTICAL_LIFT_SECRET', ''))
+            raise http.AuthenticationError()
diff --git a/stock_vertical_lift/data/ir_sequence.xml b/stock_vertical_lift/data/ir_sequence.xml
new file mode 100644
index 000000000000..9b231ed34283
--- /dev/null
+++ b/stock_vertical_lift/data/ir_sequence.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record model="ir.sequence" id="sequence_kardex_command">
+            <field name="name">Vertical Lift Commands</field>
+            <field name="code">vertical.lift.command</field>
+            <field name="prefix">L</field>
+            <field name="padding">6</field>
+            <field name="company_id" eval="False"/>
+        </record>
+    </data>
+</odoo>
diff --git a/stock_vertical_lift/models/__init__.py b/stock_vertical_lift/models/__init__.py
index 87a31d40b36e..1db85b28e286 100644
--- a/stock_vertical_lift/models/__init__.py
+++ b/stock_vertical_lift/models/__init__.py
@@ -8,3 +8,4 @@
 from . import stock_move
 from . import stock_move_line
 from . import stock_quant
+from . import vertical_lift_command
diff --git a/stock_vertical_lift/models/stock_location.py b/stock_vertical_lift/models/stock_location.py
index 14c1977ced88..052bb6456479 100644
--- a/stock_vertical_lift/models/stock_location.py
+++ b/stock_vertical_lift/models/stock_location.py
@@ -127,7 +127,7 @@ def _hardware_vertical_lift_tray_payload(self, cell_location=None):
                 )
             return message
         else:
-            return super()._hardware_vertical_lift_tray_payload(cell_location)
+            raise NotImplemented()
 
     def fetch_vertical_lift_tray(self, cell_location=None):
         """Send instructions to the vertical lift hardware
diff --git a/stock_vertical_lift/models/vertical_lift_command.py b/stock_vertical_lift/models/vertical_lift_command.py
new file mode 100644
index 000000000000..7c25b7f1f5ee
--- /dev/null
+++ b/stock_vertical_lift/models/vertical_lift_command.py
@@ -0,0 +1,50 @@
+# Copyright 2019 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+import logging
+
+from odoo import api, exceptions, fields, models
+
+_logger = logging.getLogger(__name__)
+
+
+class VerticalLiftCommand(models.Model):
+    _name = 'vertical.lift.command'
+    _order = 'shuttle_id, name desc'
+    _description = "commands sent to the shuttle"
+
+    @api.model
+    def _default_name(self):
+        return self.env['ir.sequence'].next_by_code('vertical.lift.command')
+
+    name = fields.Char(
+        'Name', default=_default_name, required=True, index=True
+    )
+    command = fields.Char(required=True)
+    answer = fields.Char()
+    error = fields.Char()
+    shuttle_id = fields.Many2one('vertical.lift.shuttle', required=True)
+
+    @api.model
+    def record_answer(self, answer):
+        name = self._get_key(answer)
+        record = self.search([('name', '=', name)], limit=1)
+        if not record:
+            _logger.error('unable to match answer to a command: %r', answer)
+            raise exceptions.UserError('Unknown record %s' % name)
+        record.answer = answer
+        record.shuttle_id._hardware_response_callback(record)
+        return record
+
+    def _get_key(self, answer):
+        key = answer.split('|')[1]
+        return key
+
+    @api.model_create_multi
+    @api.returns('self', lambda value: value.id)
+    def create(self, vals_list):
+        for values in vals_list:
+            if "name" not in values:
+                name = self._get_key(values.get('command'))
+                if name:
+                    values["name"] = name
+        return super().create(vals_list)
diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index 013586eedc27..d8b584fe153e 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -38,7 +38,10 @@ class VerticalLiftShuttle(models.Model):
     use_tls = fields.Boolean(
         help="set this if the server expects TLS wrapped communication"
     )
-
+    command_ids = fields.One2many(
+        'vertical.lift.command', 'shuttle_id',
+        string="Hardware commands"
+    )
     _sql_constraints = [
         (
             "location_id_unique",
@@ -81,14 +84,21 @@ def _hardware_send_message(self, payload):
 
         If in hardware is 'simulation' then display a simple message.
         Otherwise defaults to connecting to server:port using a TCP socket
-        (optionnally wrapped with TLS) and sending the payload, then waiting
-        for a response and disconnecting.
+        (optionnally wrapped with TLS) and sending the payload.
 
         :param payload: a bytes object containing the payload
 
         """
         self.ensure_one()
         _logger.info('send %r', payload)
+        command_values = {
+            'shuttle_id': self.id,
+            'command': payload.decode(),
+        }
+
+        self.env['vertical.lift.command'].sudo().create(
+            command_values
+        )
         if self.hardware == "simulation":
             self.env.user.notify_info(message=payload,
                                       title=_("Lift Simulation"))
@@ -102,28 +112,18 @@ def _hardware_send_message(self, payload):
                     offset += size
                     if offset >= len(payload) or not size:
                         break
-                response = self._hardware_recv_response(conn)
-                _logger.info('recv %r', response)
-                return self._check_server_response(payload, response)
             finally:
                 self._hardware_release_server_connection(conn)
 
-    def _hardware_recv_response(self, conn):
-        """Default implementation expects the remote server to close()
-        the socket after sending the reponse.
-        Override to match the protocol implemented by the hardware.
+    def _hardware_response_callback(self, command):
+        """should be called when a response is received from the hardware
 
-        :param conn: a socket connected to the server
-        :return: the response sent by the server, as a bytes object
+        :param response: a string
         """
-        response = b''
-        chunk = True
-        while chunk:
-            chunk = conn.recv(1024)
-            response += chunk
-        return response
-
-    def _check_server_response(self, payload, response):
+        success = self._check_server_response(command)
+        self._send_notification_refresh(success)
+
+    def _check_server_response(self, command):
         """Use this to check if the response is a success or a failure
 
         :param payload: the payload sent
@@ -214,7 +214,7 @@ def switch_inventory(self):
         self.mode = "inventory"
         return self.action_open_screen()
 
-    def _send_notification_refresh(self):
+    def _send_notification_refresh(self, success):
         """Send a refresh notification to the current opened screen
 
         The form controller on the front-end side will instantaneously
@@ -226,7 +226,8 @@ def _send_notification_refresh(self):
         The method is private only to prevent xml/rpc calls to
         interact with the screen.
         """
-        self._operation_for_mode._send_notification_refresh()
+        # XXX do we want to do something special in the notification?
+        self._operation_for_mode()._send_notification_refresh()
 
 
 class VerticalLiftShuttleManualBarcode(models.TransientModel):
diff --git a/stock_vertical_lift/security/ir.model.access.csv b/stock_vertical_lift/security/ir.model.access.csv
index 63741764a132..180158ce4847 100644
--- a/stock_vertical_lift/security/ir.model.access.csv
+++ b/stock_vertical_lift/security/ir.model.access.csv
@@ -5,3 +5,4 @@ access_vertical_lift_operation_pick_stock_user,access_vertical_lift_operation_pi
 access_vertical_lift_operation_put_stock_user,access_vertical_lift_operation_put stock user,model_vertical_lift_operation_put,stock.group_stock_user,1,1,1,1
 access_vertical_lift_operation_put_line_stock_user,access_vertical_lift_operation_put_line stock user,model_vertical_lift_operation_put_line,stock.group_stock_user,1,1,1,1
 access_vertical_lift_operation_inventory_stock_user,access_vertical_lift_operation_inventory stock user,model_vertical_lift_operation_inventory,stock.group_stock_user,1,1,1,1
+access_vertical_lift_command,vertical_lift_command,model_vertical_lift_command,base.group_user,1,0,0,0
diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
index 0a33ad98d43b..2f81f5d30a1f 100644
--- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
+++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml
@@ -71,6 +71,18 @@
                   <field name="use_tls"/>
               </group>
           </group>
+          <group groups="base.group_no_one">
+              <label for="command_ids"/>
+              <field name="command_ids">
+                  <tree>
+                      <field name="name"/>
+                      <field name="command"/>
+                      <field name="answer"/>
+                      <field name="error"/>
+                      <field name="create_date"/>
+                  </tree>
+              </field>
+          </group>
       </form>
     </field>
   </record>
diff --git a/stock_vertical_lift_kardex/__manifest__.py b/stock_vertical_lift_kardex/__manifest__.py
index 35670055d868..8ccd05222861 100644
--- a/stock_vertical_lift_kardex/__manifest__.py
+++ b/stock_vertical_lift_kardex/__manifest__.py
@@ -11,7 +11,8 @@
         'stock_vertical_lift',
     ],
     'website': 'https://www.camptocamp.com',
-    'data': [],
+    'data': [
+    ],
     'installable': True,
     'development_status': 'Alpha',
 }
diff --git a/stock_vertical_lift_kardex/models/__init__.py b/stock_vertical_lift_kardex/models/__init__.py
index 51a3830f6e9a..5a191bac8b4e 100644
--- a/stock_vertical_lift_kardex/models/__init__.py
+++ b/stock_vertical_lift_kardex/models/__init__.py
@@ -1,2 +1,3 @@
 from . import stock_location
 from . import vertical_lift_shuttle
+
diff --git a/stock_vertical_lift_kardex/models/stock_location.py b/stock_vertical_lift_kardex/models/stock_location.py
index e307aa21cbd1..39d66fc28e54 100644
--- a/stock_vertical_lift_kardex/models/stock_location.py
+++ b/stock_vertical_lift_kardex/models/stock_location.py
@@ -28,10 +28,10 @@ def _hardware_kardex_prepare_payload(self, cell_location=None):
             x, y = '', ''
         subst = {
             'code': code,
-            'hostId': 'odoo',
+            'hostId': self.env['ir.sequence'].next_by_code('vertical.lift.command'),
             'addr': shuttle.name,
-            'carrier': self.name,
-            'carrierNext': '',
+            'carrier': self.level,
+            'carrierNext': '0',
             'x': x,
             'y': y,
             'boxType': '',
@@ -40,7 +40,7 @@ def _hardware_kardex_prepare_payload(self, cell_location=None):
             'part': '',
             'desc': '',
         }
-        payload = message_template.format(subst)
+        payload = message_template.format(**subst)
         return payload.encode('iso-8859-1', 'replace')
 
     def _hardware_vertical_lift_tray_payload(self, cell_location=None):
@@ -83,4 +83,6 @@ def _hardware_vertical_lift_tray_payload(self, cell_location=None):
             payload = self._hardware_kardex_prepare_payload()
             _logger.debug("Sending to kardex: {}", payload)
             # TODO implement the communication with kardex
-        super()._hardware_vertical_lift_tray_payload(cell_location=cell_location)
+        else:
+            payload = super()._hardware_vertical_lift_tray_payload(cell_location=cell_location)
+        return payload
diff --git a/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py b/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py
index 67dc1131d5bc..256439d35a41 100644
--- a/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift_kardex/models/vertical_lift_shuttle.py
@@ -4,6 +4,24 @@
 from odoo import api, models
 
 
+JMIF_STATUS = {
+    0: 'success',
+    101: 'common error',
+    102: 'sequence number invalid',
+    103: 'machine busy',
+    104: 'timeout',
+    105: 'max retry reached',
+    106: 'carrier in use or undefined',
+    107: 'cancelled',
+    108: 'invalid user input data',
+    201: 'request accepted and queued',
+    202: 'request processing started / request active',
+    203: 'carrier arrived, maybe overwritten by code 0',
+    301: 'AO occupied with other try on move back (store / put)',
+    302: 'AO occupied with other try on fetch (pick)',
+}
+
+
 class VerticalLiftShuttle(models.Model):
     _inherit = 'vertical.lift.shuttle'
 
@@ -13,19 +31,33 @@ def _selection_hardware(self):
         values += [('kardex', 'Kardex')]
         return values
 
-    def _hardware_recv_response(self, conn):
-        # the implementation uses messages delimited with \r\n
-        response = b''
-        chunk = True
-        while chunk:
-            chunk = conn.recv(1)
-            response += chunk
-            if response.endswith(b'\r\n'):
-                break
-        return response
-
-    def _check_server_response(self, payload, response):
-        payload = payload.decode('iso-8859-1')
-        response = response.decode('iso-8859-1')
+    def _check_server_response(self, command):
+        response = command.answer
         code, sep, remaining = response.partition('|')
-        return code == "0"
+        code = int(code)
+        if code == 0:
+            return True
+        elif 1 <= code <= 99:
+            command.error = 'interface error %d' % code
+            return False
+        elif code in JMIF_STATUS and code < 200:
+            command.error = '%d: %s' % (code, JMIF_STATUS[code])
+            return False
+        elif code in JMIF_STATUS and code < 300:
+            command.error = '%d: %s' % (code, JMIF_STATUS[code])
+            return True
+        elif code in JMIF_STATUS:
+            command.error = '%d: %s' % (code, JMIF_STATUS[code])
+        elif 501 <= code <= 999:
+            command.error = '%d: %s' % (code, 'MM260 Error')
+        elif 1000 <= code <= 32767:
+            command.error = '%d: %s' % (
+                code, 'C2000TCP/C3000CGI machine error'
+            )
+        elif 0xFF0 <= code == 0xFFF:
+            command.error = '%x: %s' % (
+                code, 'C3000CGI machine error (global short)'
+            )
+        elif 0xFFF < code:
+            command.error = '%x: %s' % (code, 'C3000CGI machine error (long)')
+        return False
diff --git a/stock_vertical_lift_kardex/proxy/kardex-proxy.py b/stock_vertical_lift_kardex/proxy/kardex-proxy.py
new file mode 100644
index 000000000000..6a60cca26b7a
--- /dev/null
+++ b/stock_vertical_lift_kardex/proxy/kardex-proxy.py
@@ -0,0 +1,175 @@
+#!/usr/bin/python3
+import argparse
+import asyncio
+import logging
+import os
+import ssl
+import time
+
+import aiohttp
+
+_logger = logging.getLogger(__name__)
+
+
+class KardexProxyProtocol(asyncio.Protocol):
+    def __init__(self, loop, queue, args):
+        _logger.info("Proxy created")
+        self.transport = None
+        self.buffer = b""
+        self.queue = queue
+        self.loop = loop
+        self.args = args
+
+    def connection_made(self, transport):
+        _logger.info("Proxy incoming cnx")
+        self.transport = transport
+        self.buffer = b""
+
+    def data_received(self, data):
+        self.buffer += data
+        _logger.info("Proxy: received %s", data)
+        if len(self.buffer) > 65535:
+            # prevent buffer overflow
+            self.transport.close()
+
+    def eof_received(self):
+        _logger.info("Proxy: received EOF")
+        if self.buffer[-1] != b"\n":
+            # bad format -> close
+            self.transport.close()
+        data = (
+            self.buffer.replace(b"\r\n", b"\n")
+            .replace(b"\n", b"\r\n")
+            .decode("iso-8859-1", "replace")
+        )
+        self.loop.create_task(self.queue.put(data))
+        self.buffer = b""
+
+    def connection_lost(self, exc):
+        self.transport = None
+        self.buffer = b""
+
+
+class KardexClientProtocol(asyncio.Protocol):
+    def __init__(self, loop, queue, args):
+        _logger.info("started kardex client")
+        self.loop = loop
+        self.queue = queue
+        self.args = args
+        self.transport = None
+        self.buffer = b""
+
+    def connection_made(self, transport):
+        self.transport = transport
+        _logger.info("connected to kardex server %r", transport)
+
+    async def keepalive(self):
+        while True:
+            t = int(time.time())
+            msg = "61|ping%d|SH1-1|0|0||||||||\r\n" % t
+            await self.send_message(msg)
+            await asyncio.sleep(20)
+
+    async def send_message(self, message):
+        _logger.info("SEND %r", message)
+        message = message.encode("iso-8859-1")
+        self.transport.write(message)
+
+    async def process_queue(self):
+        while True:
+            message = await self.queue.get()
+            await self.send_message(message)
+
+    def data_received(self, data):
+        data = data.replace(b"\0", b"")
+        _logger.info("RECV %s", data)
+        self.buffer += data
+        if b"\r\n" in self.buffer:
+            msg, sep, rem = self.buffer.partition(b"\r\n")
+            self.buffer = rem
+            msg = msg.decode('iso-8859-1', 'replace').strip()
+            if msg.startswith('0|ping'):
+                _logger.info('ping ok')
+            else:
+                _logger.info('notify odoo: %s', msg)
+                self.loop.create_task(self.notify_odoo(msg))
+
+    def connection_lost(self, exc):
+        self.loop.stop()
+
+    async def notify_odoo(self, msg):
+        url = args.odoo_url + "/vertical-lift"
+        async with aiohttp.ClientSession() as session:
+            params = {'answer': msg, 'secret': self.args.secret}
+            async with session.post(url, data=params) as resp:
+                resp_text = await resp.text()
+                _logger.info(
+                    'Reponse from Odoo: %s %s', resp.status, resp_text
+                )
+
+
+def main(args, ssl_context=None):
+    logging.basicConfig(
+        level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
+    )
+    loop = asyncio.get_event_loop()
+    queue = asyncio.Queue(loop=loop)
+    # create the main server
+    coro = loop.create_server(
+        lambda: KardexProxyProtocol(loop, queue, args),
+        host=args.host,
+        port=args.port
+    )
+    loop.run_until_complete(coro)
+
+    # create the connection to the JMIF client
+    if args.kardex_use_tls:
+        if ssl_context is None:
+            ssl_context = ssl.create_default_context()
+    else:
+        ssl_context = None
+    coro = loop.create_connection(
+        lambda: KardexClientProtocol(loop, queue, args),
+        host=args.kardex_host,
+        port=args.kardex_port,
+        ssl=ssl_context,
+    )
+    transport, client = loop.run_until_complete(coro)
+    loop.create_task(client.keepalive())
+    loop.create_task(client.process_queue())
+    loop.run_forever()
+    loop.close()
+
+
+def make_parser():
+    listen_address = os.environ.get("INTERFACE", "0.0.0.0")
+    listen_port = int(os.environ.get("PORT", "7654"))
+    secret = os.environ.get("ODOO_CALLBACK_SECRET", "")
+    odoo_url = os.environ.get("ODOO_URL", "http://localhost:8069")
+    odoo_db = os.environ.get("ODOO_DB", "odoodb")
+    kardex_host = os.environ.get("KARDEX_HOST", "kardex")
+    kardex_port = int(os.environ.get("KARDEX_PORT", "9600"))
+    kardex_use_tls = (
+        False
+        if os.environ.get("KARDEX_TLS", "") in ("", "0", "False", "FALSE")
+        else True
+    )
+    parser = argparse.ArgumentParser()
+    arguments = [
+        ("--host", listen_address, str),
+        ("--port", listen_port, int),
+        ("--odoo-url", odoo_url, str),
+        ("--odoo-db", odoo_db, str),
+        ("--secret",  secret, str),
+        ("--kardex-host", kardex_host, str),
+        ("--kardex-port", kardex_port, str),
+        ("--kardex-use-tls", kardex_use_tls, bool),
+    ]
+    for name, default, type_ in arguments:
+        parser.add_argument(name, default=default, action="store", type=type_)
+    return parser
+
+if __name__ == "__main__":
+    parser = make_parser()
+    args = parser.parse_args()
+    main(args)
diff --git a/stock_vertical_lift_kardex/proxy/requirements.txt b/stock_vertical_lift_kardex/proxy/requirements.txt
new file mode 100644
index 000000000000..ee4ba4f3d739
--- /dev/null
+++ b/stock_vertical_lift_kardex/proxy/requirements.txt
@@ -0,0 +1 @@
+aiohttp
diff --git a/stock_vertical_lift_kardex/proxy/test.py b/stock_vertical_lift_kardex/proxy/test.py
new file mode 100644
index 000000000000..5b6ad518890b
--- /dev/null
+++ b/stock_vertical_lift_kardex/proxy/test.py
@@ -0,0 +1,102 @@
+import socket
+import asyncio
+import logging
+import time
+
+_logger = logging.getLogger('kardex.proxy')
+logging.basicConfig(level=logging.DEBUG)
+
+
+class KardexProxyProtocol(asyncio.Protocol):
+    def __init__(self, loop, queue):
+        _logger.info('Proxy created')
+        self.transport = None
+        self.buffer = b''
+        self.queue = queue
+        self.loop = loop
+
+    def connection_made(self, transport):
+        _logger.info('Proxy incoming cnx')
+        self.transport = transport
+        self.buffer = b''
+
+    def data_received(self, data):
+        self.buffer += data
+        _logger.info('Proxy: received %s', data)
+        if len(self.buffer) > 65535:
+            # prevent buffer overflow
+            self.transport.close()
+
+    def eof_received(self):
+        _logger.info('Proxy: received EOF')
+        if self.buffer[-1] != b'\n':
+            # bad format -> close
+            self.transport.close()
+        data = self.buffer.replace(b'\r\n', b'\n').replace(b'\n', b'\r\n').decode('iso-8859-1', 'replace')
+        task = self.loop.create_task(self.queue.put(data))
+        self.buffer = b''
+        print('toto', task)
+
+    def connection_lost(self, exc):
+        self.transport = None
+        self.buffer = b''
+
+
+class KardexClientProtocol(asyncio.Protocol):
+    def __init__(self, loop, queue):
+        _logger.info('started kardex client')
+        self.loop = loop
+        self.queue = queue
+        self.transport = None
+        self.buffer = b''
+
+    def connection_made(self, transport):
+        self.transport = transport
+        _logger.info('connected to kardex server %r', transport)
+
+    async def keepalive(self):
+        while True:
+            t = int(time.time())
+            msg = '61|ping%d|SH1-1|0|0||||||||\r\n' % t
+            await self.send_message(msg)
+            await asyncio.sleep(5)
+
+    async def send_message(self, message):
+        _logger.info('SEND %s', message)
+        message = message.encode('iso-8859-1').ljust(1024, b'\0')
+        self.transport.write(message)
+
+    async def process_queue(self):
+        while True:
+            message = await self.queue.get()
+            await self.send_message(message)
+
+    def data_received(self, data):
+        data = data.replace(b'\0', b'')
+        _logger.info('RECV %s', data)
+        self.buffer += data
+
+    def connection_lost(self, exc):
+        self.loop.stop()
+
+
+if __name__ == '__main__':
+    _logger.info('starting')
+    loop = asyncio.get_event_loop()
+    loop.set_debug(1)
+    queue = asyncio.Queue(loop=loop)
+    coro = loop.create_server(
+        lambda: KardexProxyProtocol(loop, queue),
+        port=3000,
+        family=socket.AF_INET
+    )
+    server = loop.run_until_complete(coro)
+    coro = loop.create_connection(lambda: KardexClientProtocol(loop, queue),
+                                  'localhost', 9600)
+    transport, client = loop.run_until_complete(coro)
+    print('%r' % transport)
+    loop.create_task(client.keepalive())
+    loop.create_task(client.process_queue())
+    _logger.info('run loop')
+    loop.run_forever()
+    loop.close()
diff --git a/stock_vertical_lift_kardex/requirements.txt b/stock_vertical_lift_kardex/requirements.txt
new file mode 100644
index 000000000000..ee4ba4f3d739
--- /dev/null
+++ b/stock_vertical_lift_kardex/requirements.txt
@@ -0,0 +1 @@
+aiohttp