From 820b36a272cee1814aaed420bf1f476bf9ca1958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Fri, 28 Jun 2013 18:20:26 +0200 Subject: [PATCH 1/2] [FIX] stock.ui: load the correct stock picking bzr revid: fva@openerp.com-20130628162026-rts4e350um9z1j5n --- addons/stock/static/src/js/widgets.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js index a8dc6143c69..96ed15580ac 100644 --- a/addons/stock/static/src/js/widgets.js +++ b/addons/stock/static/src/js/widgets.js @@ -123,7 +123,12 @@ function openerp_picking_widgets(instance){ if(picking_id){ var picking = new instance.web.Model('stock.picking.in').call('read',[[picking_id], []]); }else{ - var picking = new instance.web.Model('stock.picking.in').query().first(); + var picking = new instance.web.Model('stock.picking.in') + .call('_get_picking_for_packing_ui') + .then(function(picking_id){ + console.log('Provided Picking Id:',picking_id); + return new instance.web.Model('stock.picking.in').call('read',[[picking_id],[]]); + }); } var loaded = picking.then(function(picking){ From a5f4747b198dbc09ed1ab4027ed0ea6990f205a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Fri, 28 Jun 2013 18:31:52 +0200 Subject: [PATCH 2/2] [IMP] stock.ui: rename the + - buttons to 'copy' 'delete' bzr revid: fva@openerp.com-20130628163152-fjdbhfk06nm2fucs --- addons/stock/static/src/css/picking.css | 10 ++++------ addons/stock/static/src/xml/picking.xml | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/stock/static/src/css/picking.css b/addons/stock/static/src/css/picking.css index 61f3fe559fb..2b1ecd26b1c 100644 --- a/addons/stock/static/src/css/picking.css +++ b/addons/stock/static/src/css/picking.css @@ -125,13 +125,11 @@ } .oe_pick_widget .oe_row_button{ display: inline-block; - background: rgb(255, 255, 255); - width: 16px; - height: 16px; + background: rgb(238, 237, 248); + padding: 2px 4px; line-height: 14px; - color: rgb(102, 98, 133); - font-weight: bold; - border-radius: 9px; + color: rgb(137, 127, 173); + border-radius: 3px; border: solid 1px rgba(0, 0, 0, 0.09); cursor: pointer; } diff --git a/addons/stock/static/src/xml/picking.xml b/addons/stock/static/src/xml/picking.xml index 68148336e8c..c90d8a6e520 100644 --- a/addons/stock/static/src/xml/picking.xml +++ b/addons/stock/static/src/xml/picking.xml @@ -142,8 +142,8 @@ - + - - + copy + delete