diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css index 4a380de6ed0..ddce4d479ef 100644 --- a/addons/stock/static/src/css/stock.css +++ b/addons/stock/static/src/css/stock.css @@ -67,9 +67,51 @@ margin: 2px 0; } -.oe_stock_scan_image { - opacity: 0.2 +.openerp .oe_kanban_view .oe_kanban_stock_picking_type { + width: 345px; + cursor: default; + min-height: 250px !important; } -.oe_stock_scan_image:hover { +.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; +} +.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.py b/addons/stock/stock.py index 2eef74c02df..08ec525f816 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2143,19 +2143,22 @@ class stock_picking_type(osv.osv): result[tid]['rate_picking_backorders'] = 0 return result + #TODO: not returning valus in required format to show in sparkline library,just added latest_picking_waiting need to add proper logic. def _get_picking_history(self, cr, uid, ids, field_names, arg, context=None): obj = self.pool.get('stock.picking') result = {} for id in ids: result[id] = { 'latest_picking_late': [], - 'latest_picking_backorders': [] + 'latest_picking_backorders': [], + 'latest_picking_waiting': [] } for type_id in ids: pick_ids = obj.search(cr, uid, [('state', '=','done'), ('picking_type_id','=',type_id)], limit=12, order="date desc", context=context) for pick in obj.browse(cr, uid, pick_ids, context=context): result[type_id]['latest_picking_late'] = cmp(pick.date[:10], time.strftime('%Y-%m-%d')) result[type_id]['latest_picking_backorders'] = bool(pick.backorder_id) + result[type_id]['latest_picking_waiting'] = cmp(pick.date[:10], time.strftime('%Y-%m-%d')) return result _columns = { @@ -2192,6 +2195,8 @@ class stock_picking_type(osv.osv): type='string', multi='_get_picking_history'), 'latest_picking_backorders': fields.function(_get_picking_history, type='string', multi='_get_picking_history'), + 'latest_picking_waiting': fields.function(_get_picking_history, + type='string', multi='_get_picking_history'), } diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 47ccb92d1f9..718e9d24e5f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1238,6 +1238,7 @@ + @@ -1252,19 +1253,17 @@