From 2efe98059827748fea2365c24c124b82263d1c9f Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 17 Mar 2020 11:02:38 +0100 Subject: [PATCH] run pre-commit with new prettiers --- stock_vertical_lift/data/ir_sequence.xml | 4 +- stock_vertical_lift/demo/product_demo.xml | 17 +- .../demo/stock_inventory_demo.xml | 29 +-- .../demo/stock_location_demo.xml | 96 +++++----- .../demo/stock_picking_demo.xml | 59 +++--- .../demo/vertical_lift_shuttle_demo.xml | 12 +- .../static/src/js/vertical_lift.js | 65 +++---- .../static/src/scss/vertical_lift.scss | 5 +- .../views/shuttle_screen_templates.xml | 20 ++- .../views/stock_location_views.xml | 42 ++--- .../views/stock_move_line_views.xml | 37 ++-- .../views/stock_vertical_lift_templates.xml | 21 ++- .../vertical_lift_operation_base_views.xml | 170 +++++++++++------- ...ertical_lift_operation_inventory_views.xml | 75 ++++---- .../vertical_lift_operation_pick_views.xml | 9 +- .../vertical_lift_operation_put_views.xml | 61 ++++--- .../views/vertical_lift_shuttle_views.xml | 119 +++++++----- 17 files changed, 482 insertions(+), 359 deletions(-) diff --git a/stock_vertical_lift/data/ir_sequence.xml b/stock_vertical_lift/data/ir_sequence.xml index 1345e7e39f76..384d6561c2ee 100644 --- a/stock_vertical_lift/data/ir_sequence.xml +++ b/stock_vertical_lift/data/ir_sequence.xml @@ -1,10 +1,10 @@ - + Vertical Lift Commands vertical.lift.command L 6 - + diff --git a/stock_vertical_lift/demo/product_demo.xml b/stock_vertical_lift/demo/product_demo.xml index e372bb10050e..779d09713312 100644 --- a/stock_vertical_lift/demo/product_demo.xml +++ b/stock_vertical_lift/demo/product_demo.xml @@ -1,32 +1,29 @@ - + - RS200 4491673293664 Running Socks product - + 30.0 20.0 1.0 none - - + + - RS300 2779891103531 Recovery Socks product - + 30.0 20.0 1.0 none - - + + - diff --git a/stock_vertical_lift/demo/stock_inventory_demo.xml b/stock_vertical_lift/demo/stock_inventory_demo.xml index 18b0664201fb..9c9e4a4cd107 100644 --- a/stock_vertical_lift/demo/stock_inventory_demo.xml +++ b/stock_vertical_lift/demo/stock_inventory_demo.xml @@ -1,23 +1,30 @@ - + - Starting Vertical Lift Inventory - - - - + + + 30.0 - + - - + - + - diff --git a/stock_vertical_lift/demo/stock_location_demo.xml b/stock_vertical_lift/demo/stock_location_demo.xml index 9b352e76bc11..be6afec8f250 100644 --- a/stock_vertical_lift/demo/stock_location_demo.xml +++ b/stock_vertical_lift/demo/stock_location_demo.xml @@ -1,6 +1,5 @@ - + - Vertical Lift - + internal - + - Shuttle 1 - + internal - Tray 1A T1A - - + + internal - Tray 1B T1B - - + + internal - Tray 1C T1C - - + + internal - Shuttle 2 - + internal - Tray 2A T2A - - + + internal - Tray 2B T2B - - + + internal - Tray 2C T2C - - + + internal - Tray 2D T2D - - + + internal - Shuttle 3 - + internal - Tray 3A T3A - - + + internal - Tray 3B T3B - - + + internal - - + stock_vertical_lift - diff --git a/stock_vertical_lift/demo/stock_picking_demo.xml b/stock_vertical_lift/demo/stock_picking_demo.xml index c41583590b34..206170bf63f8 100644 --- a/stock_vertical_lift/demo/stock_picking_demo.xml +++ b/stock_vertical_lift/demo/stock_picking_demo.xml @@ -1,14 +1,16 @@ - + - - + Outgoing shipment from Vertical Lift (demo) - - - - - + + + + + })]" + /> - - + - - + - - + Incoming shipment from Vertical Lift (demo) - - - - - + + + + + })]" + /> - - + - diff --git a/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml b/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml index 13cab7bcda1d..c4e8ff582de9 100644 --- a/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml +++ b/stock_vertical_lift/demo/vertical_lift_shuttle_demo.xml @@ -1,22 +1,18 @@ - + - Shuttle 1 - + pick - Shuttle 2 - + pick - Shuttle 3 - + pick - diff --git a/stock_vertical_lift/static/src/js/vertical_lift.js b/stock_vertical_lift/static/src/js/vertical_lift.js index 28853f2b3058..8efae2985593 100644 --- a/stock_vertical_lift/static/src/js/vertical_lift.js +++ b/stock_vertical_lift/static/src/js/vertical_lift.js @@ -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': - self.vlift_bus_action_refresh(message.params); - break; + 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 {}; - }); diff --git a/stock_vertical_lift/static/src/scss/vertical_lift.scss b/stock_vertical_lift/static/src/scss/vertical_lift.scss index 5421618db826..9ace6b616148 100644 --- a/stock_vertical_lift/static/src/scss/vertical_lift.scss +++ b/stock_vertical_lift/static/src/scss/vertical_lift.scss @@ -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 { diff --git a/stock_vertical_lift/views/shuttle_screen_templates.xml b/stock_vertical_lift/views/shuttle_screen_templates.xml index 5d017220a9f3..a34365026f08 100644 --- a/stock_vertical_lift/views/shuttle_screen_templates.xml +++ b/stock_vertical_lift/views/shuttle_screen_templates.xml @@ -1,17 +1,27 @@ - - diff --git a/stock_vertical_lift/views/stock_location_views.xml b/stock_vertical_lift/views/stock_location_views.xml index c884825ef3bc..b3de33086758 100644 --- a/stock_vertical_lift/views/stock_location_views.xml +++ b/stock_vertical_lift/views/stock_location_views.xml @@ -1,27 +1,31 @@ - + - stock.location.form.vertical.lift stock.location - +
-
- + + - - @@ -31,17 +35,15 @@
- stock.location.search.vertical.lift stock.location - + - - + + -
diff --git a/stock_vertical_lift/views/stock_move_line_views.xml b/stock_vertical_lift/views/stock_move_line_views.xml index 5dab678aa9fc..56b8c535f7bf 100644 --- a/stock_vertical_lift/views/stock_move_line_views.xml +++ b/stock_vertical_lift/views/stock_move_line_views.xml @@ -1,30 +1,35 @@ - + - stock.move.line.operations.tree.vertical.lift stock.move.line - + - diff --git a/stock_vertical_lift/views/stock_vertical_lift_templates.xml b/stock_vertical_lift/views/stock_vertical_lift_templates.xml index 11f1a3cf5e18..b312668890ab 100644 --- a/stock_vertical_lift/views/stock_vertical_lift_templates.xml +++ b/stock_vertical_lift/views/stock_vertical_lift_templates.xml @@ -1,11 +1,20 @@ - + - -