From c6fc91b3182d1651c0326ba2f491f659457b4497 Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Wed, 17 Feb 2016 11:44:03 +0100
Subject: [PATCH] [IMP] stock, barcodes: make barcode operations more mobile
friendly
We want to properly support devices like the Symbol MC3200. This is a
handheld computer running a modern operating system like Android or
Windows with an integrated barcode scanner. After installation of a
modern web browser and configuration of the integrated barcode scanner
Odoo works as well as it does anywhere else.
The main issue with these types of devices is that the displays (and
their resolution) are very small (3" @ 320x320 for Symbol
MC3200). Because of this a lot of tree views become awkward to use
because they require vertical scrolling. A Kanban view however scales
nicely on these displays.
This implements Kanban views for both the picking.form view and the
stock.inventory form view because those are the views typically used
when using a barcode scanner.
Doing this alone is not enough, because the barcodes module does not
work with Kanban views. Small changes where made to
barcodes.FormViewBarcodeHandler to make it work with both List views and
Kanban views.
---
.../src/js/form_view_barcode_handler.js | 18 ++++
addons/stock/stock_view.xml | 93 ++++++++++++++++++-
2 files changed, 109 insertions(+), 2 deletions(-)
diff --git a/addons/barcodes/static/src/js/form_view_barcode_handler.js b/addons/barcodes/static/src/js/form_view_barcode_handler.js
index 788a512dc159..ac5a74e554c1 100644
--- a/addons/barcodes/static/src/js/form_view_barcode_handler.js
+++ b/addons/barcodes/static/src/js/form_view_barcode_handler.js
@@ -6,9 +6,22 @@ var utils = require('web.utils');
var common = require('web.form_common');
var BarcodeEvents = require('barcodes.BarcodeEvents');
var BarcodeHandlerMixin = require('barcodes.BarcodeHandlerMixin');
+var KanbanRecord = require('web_kanban.Record');
var _t = core._t;
+// web_kanban.Record and web.list_common.Record do not implement the
+// same interface and are thus inherently incompatible with each
+// other. Luckily barcodes keeps things pretty simple when it comes to
+// the records it wants to use. So if we give the KanbanRecord a get()
+// function that behaves like the one of web.list.Record, everything
+// is fine.
+KanbanRecord.include({
+ get: function (key) {
+ return this.values[key] && this.values[key].value;
+ },
+});
+
var FormViewBarcodeHandler = common.AbstractField.extend(BarcodeHandlerMixin, {
start: function() {
this._super();
@@ -71,6 +84,11 @@ var FormViewBarcodeHandler = common.AbstractField.extend(BarcodeHandlerMixin, {
});
}
},
+
+ _get_records: function(field) {
+ return field.viewmanager.active_view.controller.records || // tree view
+ field.viewmanager.active_view.controller.widgets; // kanban view
+ },
});
core.form_widget_registry.add('barcode_handler', FormViewBarcodeHandler);
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 398c0b32da6c..ce6bf7fd1832 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -114,7 +114,7 @@
<notebook attrs="{'invisible':[('state','=','draft')]}">
<page string="Inventory Details" >
<button name="reset_real_qty" states="confirm" string="⇒ Set quantities to 0" type="object" class="oe_link oe_right" groups="stock.group_stock_user"/>
- <field name="line_ids" string="Inventory Details" context="{'default_location_id': location_id, 'default_product_id': product_id, 'default_prod_lot_id': lot_id, 'default_package_id': package_id, 'default_partner_id': partner_id}">
+ <field name="line_ids" string="Inventory Details" context="{'default_location_id': location_id, 'default_product_id': product_id, 'default_prod_lot_id': lot_id, 'default_package_id': package_id, 'default_partner_id': partner_id}" mode="tree,kanban">
<tree string="Inventory Details" editable="bottom" decoration-info="product_qty != theoretical_qty" decoration-danger="theoretical_qty < 0">
<field name="product_id" domain="[('type','=','product')]" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
<field name="product_uom_id" groups="product.group_uom" string="UoM" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
@@ -126,6 +126,48 @@
<field name="product_qty" string="Real Quantity"/>
<field name="state" invisible="True"/>
</tree>
+ <kanban class="o_kanban_mobile">
+ <field name="product_id" domain="[('type','=','product')]" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+ <field name="product_uom_id" groups="product.group_uom" string="UoM" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+ <field name="location_id" domain="[('id', 'child_of', parent.location_id)]" groups="stock.group_locations" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+ <field name="prod_lot_id" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" groups="stock.group_production_lot"/>
+ <field name="package_id" domain="['|', ('location_id','=', False), ('location_id', '=', location_id)]" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" groups="stock.group_tracking_lot"/>
+ <field name="partner_id" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" groups="stock.group_tracking_owner"/>
+ <field name="theoretical_qty" readonly="1"/>
+ <field name="product_qty" string="Real Quantity"/>
+ <field name="state" invisible="True"/>
+
+ <templates>
+ <t t-name="kanban-box">
+ <div t-attf-class="oe_kanban_global_click_edit
+ #{record.product_qty.raw_value!=record.theoretical_qty.raw_value ? 'oe_kanban_color_6' : ''}
+ #{record.theoretical_qty.raw_value<0 ? 'oe_kanban_color_2' : ''}">
+ <div class="row">
+ <div class="col-xs-12">
+ <strong>
+ <field name='product_id'/>
+ </strong>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-xs-12 text-muted">
+ <span><t t-esc='record.location_id.string'/>: <t t-esc='record.location_id.value'/></span>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-xs-12 text-muted">
+ <span><t t-esc='record.theoretical_qty.string'/>: <t t-esc='record.theoretical_qty.value'/></span>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-xs-12 text-muted">
+ <span><t t-esc='record.product_qty.string'/>: <t t-esc='record.product_qty.value'/></span>
+ </div>
+ </div>
+ </div>
+ </t>
+ </templates>
+ </kanban>
</field>
<p></p>
<h3 class="oe_grey">Notes</h3>
@@ -840,7 +882,7 @@
<button name="do_prepare_partial" type="object" string="Recompute" attrs="{'invisible': [('recompute_pack_op','=', False)]}"/>
<field name="recompute_pack_op" invisible="1"/>
<field name="pack_operation_ids" invisible="1"/>
- <field name="pack_operation_product_ids" options="{'reload_on_button': True}" context="{'default_picking_id': id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}">
+ <field name="pack_operation_product_ids" options="{'reload_on_button': True}" context="{'default_picking_id': id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id}" mode="tree,kanban">
<tree editable="bottom" decoration-muted="result_package_id" decoration-danger="qty_done>product_qty" decoration-success="qty_done==product_qty and state!='done' and not result_package_id">
<field name="package_id" groups="stock.group_tracking_lot" invisible="1"/>
<field name="product_id" on_change="product_id_change(product_id, product_uom_id, product_qty)" required="1" attrs="{'readonly': [('fresh_record', '=', False)]}"/>
@@ -861,6 +903,53 @@
<button name="show_details" string="Modify" type="object" icon="fa-pencil" groups="stock.group_locations"
states="confirmed,assigned,waiting,partially_available"/>
</tree>
+ <kanban class="o_kanban_mobile">
+ <field name="package_id" groups="stock.group_tracking_lot" invisible="1"/>
+ <field name="product_id" on_change="product_id_change(product_id, product_uom_id, product_qty)" required="1" attrs="{'readonly': [('fresh_record', '=', False)]}"/>
+ <field name="fresh_record" invisible="1"/>
+ <field name="product_uom_id" attrs="{'readonly': [('fresh_record', '=', False)]}" groups="product.group_uom"/>
+ <field name="lots_visible" invisible="1"/>
+ <field name="owner_id" groups="stock.group_tracking_owner"/>
+ <field name="location_id" domain="[('id', 'child_of', parent.location_id)]" invisible="1"/>
+ <field name="location_dest_id" domain="[('id', 'child_of', parent.location_dest_id)]" invisible="1"/>
+ <field name="from_loc" groups="stock.group_locations,stock.group_tracking_lot"/>
+ <field name="to_loc" groups="stock.group_locations,stock.group_tracking_lot"/>
+ <field name="result_package_id" groups="stock.group_tracking_lot" context="{'location_id': location_dest_id}" invisible="1"/>
+ <field name="state" invisible="1"/>
+ <field name="product_qty" readonly="1" attrs="{'required': [('product_id', '!=', False)]}"/>
+ <field name="qty_done" attrs="{'readonly': [('lots_visible', '=', True)]}"/>
+ <templates>
+ <t t-name="kanban-box">
+ <div t-attf-class="oe_kanban_card oe_kanban_global_click
+ #{record.qty_done.raw_value>record.product_qty.raw_value ? 'oe_kanban_color_2' : ''}
+ #{record.qty_done.raw_value==record.product_qty.raw_value && record.state.raw_value!='done' && ! record.result_package_id.raw_value ? 'oe_kanban_color_3' : ''}">
+ <div class="row">
+ <div class="col-xs-12">
+ <strong><span><t t-esc="record.product_id.value"/></span></strong>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-xs-6 text-muted">
+ <span><t t-esc="record.from_loc.string"/>: <t t-esc="record.from_loc.value"/></span>
+ </div>
+ <div class="col-xs-6 text-muted">
+ <span><t t-esc="record.to_loc.string"/>: <t t-esc="record.to_loc.value"/></span>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-xs-6 text-muted">
+ <span><t t-esc="record.product_qty.string"/>: <t t-esc="record.product_qty.value"/></span>
+ </div>
+ <div class="col-xs-6 text-muted">
+ <span>
+ <t t-esc="record.qty_done.string"/>: <t t-esc="record.qty_done.value"/>
+ </span>
+ </div>
+ </div>
+ </div>
+ </t>
+ </templates>
+ </kanban>
</field>
<field name="picking_type_entire_packs" invisible="1"/>
<field name="pack_operation_pack_ids" options="{'reload_on_button': True}" attrs="{'invisible': [('pack_operation_pack_ids', '=', []), ('picking_type_entire_packs', '=', False)]}" context="{'default_picking_id': id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id, 'default_picking_id': id}" groups="stock.group_tracking_lot">
--
GitLab