diff --git a/addons/stock/static/src/css/barcode.css b/addons/stock/static/src/css/barcode.css index 046baeaa23d..dff02b2ef4e 100644 --- a/addons/stock/static/src/css/barcode.css +++ b/addons/stock/static/src/css/barcode.css @@ -1,3 +1,6 @@ +.oe_picking { + cursor: pointer; +} .oe_kanban.oe_picking { min-height: 80px; margin-bottom: 10px; diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js index 8fc5c73e4fb..0a1427d553d 100644 --- a/addons/stock/static/src/js/widgets.js +++ b/addons/stock/static/src/js/widgets.js @@ -31,14 +31,14 @@ function openerp_picking_widgets(instance){ var model = this.getParent(); var rows = []; - _.each( model.movelines, function(moveline){ + _.each( model.packoplines, function(packopline){ rows.push({ - cols: { product: moveline.product_id[1], - qty: moveline.product_uom_qty, - rem: moveline.remaining_qty, - uom: moveline.product_uom[1], - loc: moveline.location_id[1], - id: moveline.product_id[0], + cols: { product: packopline.product_id[1], + qty: packopline.product_uom_qty, + rem: packopline.remaining_qty, + uom: packopline.product_uom[1], + loc: packopline.location_id[1], + id: packopline.product_id[0], }, classes: (moveline.qty_remaining < 0 ? 'danger' : '') }); @@ -301,7 +301,7 @@ function openerp_picking_widgets(instance){ this.picking = null; this.pickings = []; - this.movelines = null; + this.packoplines = null; this.operations = null; this.selected_operation = { id: null, picking_id: null}; this.packages = null; @@ -374,9 +374,9 @@ function openerp_picking_widgets(instance){ return loaded_picking.then(function(){ - return new instance.web.Model('stock.move').call('read',[self.picking.move_lines, [], new instance.web.CompoundContext()]); - }).then(function(movelines){ - self.movelines = movelines; + return new instance.web.Model('stock.pack.operation').call('read',[self.picking.pack_operation_ids, [], new instance.web.CompoundContext()]); + }).then(function(packoplines){ + self.packoplines = packoplines; return new instance.web.Model('stock.pack.operation').call('read',[self.picking.pack_operation_ids, [], new instance.web.CompoundContext()]); }).then(function(operations){ diff --git a/addons/stock/static/src/xml/picking.xml b/addons/stock/static/src/xml/picking.xml index b9fd8ac834b..2f24c1f0d86 100644 --- a/addons/stock/static/src/xml/picking.xml +++ b/addons/stock/static/src/xml/picking.xml @@ -49,17 +49,20 @@

- Operations To Process + Operations Informations

- + - - - - + + + + + + + @@ -67,10 +70,14 @@ + - + - + + + + @@ -212,39 +219,34 @@ -
ProductQtyRemUoMLocationTotal QtyQty doneSource LocationDestination LocationLotPack Scan
➔