run pre-commit with new prettiers

This commit is contained in:
Guewen Baconnier
2020-03-17 11:02:38 +01:00
committed by Hai Lang
parent 9ae58438ad
commit 98988078d5
17 changed files with 482 additions and 359 deletions

View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo 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"/>
<field name="company_id" eval="False" />
</record>
</odoo>

View File

@@ -1,32 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<?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="barcode">4491673293664</field>
<field name="name">Running Socks</field>
<field name="type">product</field>
<field name="categ_id" ref="product.product_category_6"/>
<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="uom_id" ref="uom.product_uom_unit" />
<field name="uom_po_id" ref="uom.product_uom_unit" />
</record>
<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"/>
<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="uom_id" ref="uom.product_uom_unit" />
<field name="uom_po_id" ref="uom.product_uom_unit" />
</record>
</odoo>

View File

@@ -1,23 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<?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_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"/>
<field
name="location_id"
ref="stock_location_vertical_lift_demo_tray_1b_x3y2"
/>
</record>
<function model="stock.inventory" name="_action_start">
<function eval="[[('state','=','draft'),('id', '=', ref('stock_vertical_lift.stock_inventory_vertical_lift_0'))]]" model="stock.inventory" name="search"/>
<function
eval="[[('state','=','draft'),('id', '=', ref('stock_vertical_lift.stock_inventory_vertical_lift_0'))]]"
model="stock.inventory"
name="search"
/>
</function>
<function model="stock.inventory" name="action_validate">
<function eval="[[('state','=','confirm'),('id', '=', ref('stock_vertical_lift.stock_inventory_vertical_lift_0'))]]" model="stock.inventory" name="search"/>
<function
eval="[[('state','=','confirm'),('id', '=', ref('stock_vertical_lift.stock_inventory_vertical_lift_0'))]]"
model="stock.inventory"
name="search"
/>
</function>
</odoo>

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?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.
@@ -8,108 +7,125 @@
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="location_id" ref="stock.stock_location_stock" />
<field name="usage">internal</field>
<field name="vertical_lift_location" eval="True"/>
<field name="vertical_lift_location" eval="True" />
</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"/>
<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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_small_8x"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_16x"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_32x"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_1" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_8x"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_4x"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_16x_2"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_small_8x"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_2" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_small_32x"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="tray_type_id" ref="stock_location_tray.stock_location_tray_type_large_32x"/>
<field name="location_id" ref="stock_location_vertical_lift_demo_shuttle_3" />
<field
name="tray_type_id"
ref="stock_location_tray.stock_location_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="[[('cell_in_tray_type_id', '!=', False)]]" 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>

View File

@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1">
<record id="stock_picking_out_demo_vertical_lift_1" model="stock.picking">
<field name="picking_type_id" ref="stock.picking_type_out"/>
<field name="picking_type_id" ref="stock.picking_type_out" />
<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, {
<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_vertical_lift.product_running_socks').name,
'product_id': ref('stock_vertical_lift.product_running_socks'),
'product_uom': ref('uom.product_uom_unit'),
@@ -16,25 +18,32 @@
'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_vertical_lift.stock_picking_out_demo_vertical_lift_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_vertical_lift.stock_picking_out_demo_vertical_lift_1').id]"/>
<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="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, {
<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'),
@@ -42,11 +51,13 @@
'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]"/>
<value
model="stock.picking"
eval="[obj().env.ref('stock_vertical_lift.stock_picking_in_demo_vertical_lift_1').id]"
/>
</function>
</odoo>

View File

@@ -1,22 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1">
<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="location_id" ref="stock_location_vertical_lift_demo_shuttle_1" />
<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="location_id" ref="stock_location_vertical_lift_demo_shuttle_2" />
<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="location_id" ref="stock_location_vertical_lift_demo_shuttle_3" />
<field name="mode">pick</field>
</record>
</odoo>

View File

@@ -1,56 +1,59 @@
odoo.define('stock_vertical_lift.vertical_lift', function (require) {
odoo.define("stock_vertical_lift.vertical_lift", function(require) {
"use strict";
var KanbanRecord = require('web.KanbanRecord');
var FormController = require('web.FormController');
var KanbanRecord = require("web.KanbanRecord");
var FormController = require("web.FormController");
KanbanRecord.include({
_openRecord: function () {
if (this.modelName === 'vertical.lift.shuttle' &&
this.$el.hasClass("open_shuttle_screen")) {
_openRecord: function() {
if (
this.modelName === "vertical.lift.shuttle" &&
this.$el.hasClass("open_shuttle_screen")
) {
var self = this;
this._rpc({
method: 'action_open_screen',
method: "action_open_screen",
model: self.modelName,
args: [self.id],
}).then(function (action) {
self.trigger_up('do_action', {action: action});
}).then(function(action) {
self.trigger_up("do_action", {action: action});
});
} else {
this._super.apply(this, arguments);
}
},
});
FormController.include({
init: function () {
init: function() {
this._super.apply(this, arguments);
if (this.modelName.startsWith('vertical.lift.operation.')) {
this.call('bus_service', 'addChannel', 'notify_vertical_lift_screen');
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,
"bus_service",
"on",
"notification",
this,
this.vlift_bus_notification
);
this.call('bus_service', 'startPolling');
this.call("bus_service", "startPolling");
}
},
vlift_bus_notification: function (notifications) {
vlift_bus_notification: function(notifications) {
var self = this;
_.each(notifications, function (notification) {
_.each(notifications, function(notification) {
var channel = notification[0];
var message = notification[1];
if (channel === 'notify_vertical_lift_screen') {
if (channel === "notify_vertical_lift_screen") {
switch (message.action) {
case 'refresh':
case "refresh":
self.vlift_bus_action_refresh(message.params);
break;
}
}
});
},
vlift_bus_action_refresh: function (params) {
vlift_bus_action_refresh: function(params) {
var selectedIds = this.getSelectedIds();
if (!selectedIds.length) {
return;
@@ -60,17 +63,17 @@ odoo.define('stock_vertical_lift.vertical_lift', function (require) {
this.reload();
}
},
destroy: function () {
if (this.modelName.startsWith('vertical.lift.operation.')) {
this.call('bus_service', 'deleteChannel',
'notify_vertical_lift_screen');
destroy: function() {
if (this.modelName.startsWith("vertical.lift.operation.")) {
this.call(
"bus_service",
"deleteChannel",
"notify_vertical_lift_screen"
);
}
this._super.apply(this, arguments);
},
});
return {};
});

View File

@@ -27,7 +27,7 @@
.o_shuttle_header_content {
display: flex;
flex-flow: row nowrap;
font-size: 2.0em;
font-size: 2em;
flex: 1 0 auto;
align-items: center;
width: 33%;
@@ -93,7 +93,6 @@
border-radius: 10px;
}
}
}
.o_vlift_shuttle_menu {
@@ -106,7 +105,6 @@
}
.o_vlift_shuttle_popup {
table tr {
line-height: 3;
font-size: 1.1em;
@@ -127,7 +125,6 @@
font-size: 2em;
text-transform: uppercase;
}
}
footer .btn {

View File

@@ -1,17 +1,27 @@
<odoo>
<template id="packagings">
<ul class="o_vlift_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
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']"/>
<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>

View File

@@ -1,27 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="view_location_form" model="ir.ui.view">
<field name="name">stock.location.form.vertical.lift</field>
<field name="model">stock.location</field>
<field name="inherit_id" ref="stock_location_tray.view_location_form"/>
<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"
<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'))]}"/>
attrs="{'invisible': [('vertical_lift_kind', 'not in', ('tray', 'cell'))]}"
/>
</div>
<field name="return_location" position="after">
<field name="vertical_lift_location"
<field
name="vertical_lift_location"
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 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">
@@ -31,17 +35,15 @@
</field>
</field>
</record>
<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_location_tray.view_location_search"/>
<field name="inherit_id" ref="stock_location_tray.view_location_search" />
<field name="arch" type="xml">
<field name="tray_type_id" position="after">
<field name="vertical_lift_kind"/>
<field name="vertical_lift_shuttle_id"/>
<field name="vertical_lift_kind" />
<field name="vertical_lift_shuttle_id" />
</field>
</field>
</record>
</odoo>

View File

@@ -1,24 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<?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.vertical.lift</field>
<field name="model">stock.move.line</field>
<field name="inherit_id" ref="stock_location_tray.view_stock_move_line_operation_tree" />
<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"
<button
name="fetch_vertical_lift_tray_source"
string="Fetch Source Tray"
type="object" icon="fa-hand-paper-o"
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"
<button
name="fetch_vertical_lift_tray_dest"
string="Fetch Destination Tray"
type="object" icon="fa-hand-paper-o"
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"
@@ -26,5 +32,4 @@
</button>
</field>
</record>
</odoo>

View File

@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="stock_vertical_lift_assets" name="stock.vertical.lift.assets" inherit_id="web.assets_backend">
<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>
<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"
/>
</xpath>
</template>
</odoo>

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?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
@@ -14,7 +13,8 @@
<field name="model">vertical.lift.operation.base</field>
<field name="arch" type="xml">
<form string="Operations" delete="0" create="0">
<button string="Reopen Screen"
<button
string="Reopen Screen"
name="action_open_screen"
type="object"
class="btn-primary"
@@ -22,7 +22,6 @@
</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>
@@ -30,109 +29,149 @@
<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"/>
<field name="name" readonly="1" />
</div>
<div class="o_shuttle_header_center o_shuttle_header_content">
<label for="mode"/>
<field name="mode" readonly="1"/>
<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"/>
<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 o_shuttle_content_left">
<button name="action_menu" type="object"
<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"
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"/>
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"
<button
name="button_save"
type="object"
string="Save"
icon="fa-check"
class="btn-primary"
barcode_trigger="save"/>
barcode_trigger="save"
/>
<!-- will react on barcode 'O-BTN.release -->
<button name="button_release"
<button
name="button_release"
type="object"
string="Release"
class="btn-primary"
barcode_trigger="release"/>
barcode_trigger="release"
/>
</div>
</div>
</div>
<div class="o_shuttle_operation bg-primary jumbotron jumbotron-fluid">
<div class="container">
<field name="operation_descr"/>
<field name="operation_descr" />
</div>
</div>
<div class="o_shuttle_data">
</div>
<field name="_barcode_scanned" widget="barcode_handler"/>
<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="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_data')]" position="attributes" >
<attribute name="attrs" >{'invisible': [('current_move_line_id', '=', False)]}</attribute>
<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" >
<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"/>
<field name="current_move_line_id" invisible="1" />
<label for="picking_id" />
<div>
<div>
<field name="picking_id" options="{'no_open': True}" class="mr8"/>
<field
name="picking_id"
options="{'no_open': True}"
class="mr8"
/>
<span>/</span>
<field name="picking_origin" class="oe_inline ml8"/>
<field
name="picking_origin"
class="oe_inline ml8"
/>
</div>
</div>
<label for="picking_partner_id"/>
<label for="picking_partner_id" />
<div>
<field name="picking_partner_id" options="{'no_open': True}"/>
<field
name="picking_partner_id"
options="{'no_open': True}"
/>
</div>
<!-- TODO change for pick and put? -->
<label for="location_dest_id"/>
<label for="location_dest_id" />
<div>
<field name="location_dest_id"
<field
name="location_dest_id"
class="bg-primary o_shuttle_highlight"
options="{'no_open': True}"/>
options="{'no_open': True}"
/>
</div>
<label for="product_id"/>
<label for="product_id" />
<div colspan="2" class="oe_title">
<h1>
<field name="product_id" options="{'no_open': True}"/>
<field
name="product_id"
options="{'no_open': True}"
/>
</h1>
</div>
<div colspan="2">
<field name="product_packagings"/>
<field name="product_packagings" />
</div>
<field name="lot_id"/>
<label for="product_uom_qty" string="Quantity" class="ml32"/>
<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"/>
<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>
@@ -141,27 +180,24 @@
<!-- 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"/>
<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"/>
<field name="tray_qty" />
</h1>
</div>
</group>
<group>
<div>
<field name="tray_matrix"
widget="location_tray_matrix"
/>
<field name="tray_matrix" widget="location_tray_matrix" />
</div>
</group>
</div>
</xpath>
</field>
</record>
</odoo>

View File

@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?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="inherit_id" ref="vertical_lift_operation_base_button_view" />
<field name="mode">primary</field>
<field name="arch" type="xml">
<form position="attributes">
@@ -12,58 +11,73 @@
</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="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">
<attribute name="string">Inventory Screen</attribute>
</form>
<form position="inside">
<field name="state" invisible="1"/>
<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 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" >
<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_inventory_line_id" invisible="1"/>
<field name="current_inventory_line_id" invisible="1" />
<div>
<div>
<field name="inventory_id" options="{'no_open': True}" class="mr8"/>
<field
name="inventory_id"
options="{'no_open': True}"
class="mr8"
/>
</div>
</div>
<label for="product_id"/>
<label for="product_id" />
<div colspan="2" class="oe_title">
<h1>
<field name="product_id" options="{'no_open': True}"/>
<field
name="product_id"
options="{'no_open': True}"
/>
</h1>
</div>
<div colspan="2">
<field name="product_packagings"/>
<field name="product_packagings" />
</div>
<field name="lot_id"/>
<field name="package_id"/>
<label for="quantity_input" string="Quantity" class="ml32"/>
<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"
<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"/>
class="oe_inline"
/>
<field
name="product_uom_id"
options="{'no_open': True}"
class="oe_inline ml8 text-white"
/>
</h1>
</div>
</group>
@@ -72,21 +86,18 @@
<!-- 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"/>
<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"
/>
<field name="tray_matrix" widget="location_tray_matrix" />
</div>
</group>
</div>
</xpath>
</field>
</record>
</odoo>

View File

@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?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="inherit_id" ref="vertical_lift_operation_base_button_view" />
<field name="mode">primary</field>
<field name="arch" type="xml">
<form position="attributes">
@@ -12,11 +11,10 @@
</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="inherit_id" ref="vertical_lift_operation_transfer_screen_view" />
<field name="priority">100</field>
<field name="mode">primary</field>
<field name="arch" type="xml">
@@ -25,5 +23,4 @@
</form>
</field>
</record>
</odoo>

View File

@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?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="inherit_id" ref="vertical_lift_operation_base_button_view" />
<field name="mode">primary</field>
<field name="arch" type="xml">
<form position="attributes">
@@ -12,36 +11,39 @@
</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="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-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"
<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"/>
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 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>
@@ -64,23 +66,24 @@
onchange method
-->
<field name="operation_id" invisible="1" />
<field name="_barcode_scanned" widget="barcode_handler"/>
<field name="_barcode_scanned" widget="barcode_handler" />
<footer>
<button name="action_validate"
<button
name="action_validate"
string="Validate"
type="object"
class="btn-primary"/>
<button string="Cancel"
class="btn-secondary"
special="cancel" />
<button name="action_add_all"
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"/>
class="btn-secondary"
/>
</footer>
</form>
</field>
</record>
</odoo>

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<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>
@@ -9,31 +8,38 @@
<form string="Shuttle">
<div class="row o_vlift_shuttle_menu">
<div class="col-6">
<button name="switch_pick"
<button
name="switch_pick"
type="object"
string="Pick"
class="btn-primary btn-block btn btn-lg"/>
<button name="switch_put"
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"
class="btn-primary btn-block btn btn-lg"
/>
<button
name="switch_inventory"
type="object"
string="Inventory"
class="btn-primary btn-block btn btn-lg"/>
class="btn-primary btn-block btn btn-lg"
/>
</div>
<div class="col-6">
<button name="action_back_to_settings"
<button
name="action_back_to_settings"
type="object"
string="Back to settings"
class="btn-danger btn-block btn-lg" />
class="btn-danger btn-block btn-lg"
/>
</div>
</div>
<footer></footer>
<footer />
</form>
</field>
</record>
<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>
@@ -41,20 +47,21 @@
<form string="Shuttle">
<div class="row o_vlift_shuttle_popup">
<div class="col-8">
<field name="barcode"/>
<field name="barcode" />
</div>
<div class="col-2">
<button name="button_save"
<button
name="button_save"
string="Confirm"
type="object"
class="btn-primary"/>
class="btn-primary"
/>
</div>
</div>
<footer></footer>
<footer />
</form>
</field>
</record>
<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>
@@ -62,58 +69,60 @@
<form string="Operations">
<group name="main">
<group name="left">
<field name="name"/>
<field name="mode"/>
<field name="location_id"/>
<field name="hardware"/>
<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"/>
<field name="server" />
<field name="port" />
<field name="use_tls" />
</group>
</group>
<group groups="base.group_no_one">
<label for="command_ids"/>
<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"/>
<field name="name" />
<field name="command" />
<field name="answer" />
<field name="error" />
<field name="create_date" />
</tree>
</field>
</group>
</form>
</field>
</record>
<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"/>
<field name="mode"/>
<field name="name" />
<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_shuttle_screen">
<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">
<div class="o_primary">
<strong class="o_kanban_record_title">
<span><t t-esc="record.name.value"/></span>
<span>
<t t-esc="record.name.value" />
</span>
</strong>
</div>
<div class="row">
<div class="col-8">
Mode:
<field name="mode"/>
<field name="mode" />
</div>
<!-- <div class="col-8"> -->
<!-- Operations: -->
@@ -126,15 +135,31 @@
</div>
</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
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>
<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>
@@ -142,17 +167,15 @@
</kanban>
</field>
</record>
<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="Shuttle">
<field name="name"/>
<field name="name" />
</tree>
</field>
</record>
<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>
@@ -167,11 +190,11 @@
</p>
</field>
</record>
<menuitem id="vertical_lift_shuttle"
<menuitem
id="vertical_lift_shuttle"
name="Vertical Lift Shuttles"
action="vertical_lift_shuttle_action"
parent="stock.menu_stock_warehouse_mgmt"
sequence="15"/>
sequence="15"
/>
</odoo>