diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css index 39bc0b4a2df..ddce4d479ef 100644 --- a/addons/stock/static/src/css/stock.css +++ b/addons/stock/static/src/css/stock.css @@ -67,10 +67,51 @@ margin: 2px 0; } -.oe_stock_scan_image { +.openerp .oe_kanban_view .oe_kanban_stock_picking_type { + width: 345px; + cursor: default; + min-height: 250px !important; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list { + position: relative; + margin: 10px; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list div { + width: 160px; + height: 22px; + margin: 0 !important; + position: relative; + display: inline-block; + float: left; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list a:hover { + text-decoration: underline !important; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list div a:nth-child(2n) { + position: absolute; + left: 150px; + top: 0; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_items_list div:nth-child(2n) a:nth-child(2n) { + left: 150px; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_sparkline_bar { + height: 20px; + width: 66px !important; +} +.openerp .oe_kanban_view .oe_kanban_stock_picking_type .oe_center { + text-align: center; +} +.openerp .oe_kanban_view .oe_stock_justgage { + color: black; + display: inline-block; + bottom: 0px; + position: absolute; +} +.openerp .oe_stock_scan_image { opacity: 0.2; margin: 0 5px 0; } -.oe_stock_scan_image:hover { +.openerp .oe_stock_scan_image:hover { opacity: 1 } diff --git a/addons/stock/static/src/js/stock_picking_type.js b/addons/stock/static/src/js/stock_picking_type.js index 4c548eaad2c..7cfb3e1b77e 100644 --- a/addons/stock/static/src/js/stock_picking_type.js +++ b/addons/stock/static/src/js/stock_picking_type.js @@ -12,12 +12,12 @@ openerp.stock = function(openerp) { self.$el.sparkline(value, { type: type, barWidth: 5, - tooltipFormat: '{{offset:offset}} {{value}}', + tooltipFormat: '{{offset:offset}}: {{value}} Move(s)', tooltipValueLookups: { 'offset': tooltips }, }); - self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'}); + self.$el.tipsy({'delayIn': 3000, 'html': true, 'title': function(){return title}, 'gravity': 'n'}); }, 0); }, }); diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 7690a14de82..da392d5ddc0 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1245,7 +1245,6 @@