diff --git a/addons/stock/static/src/css/picking.css b/addons/stock/static/src/css/picking.css index accc3b32ebc..99957135cd8 100644 --- a/addons/stock/static/src/css/picking.css +++ b/addons/stock/static/src/css/picking.css @@ -67,6 +67,7 @@ } .oe_pick_widget .oe_pick_button.oe_disabled { cursor: default; + background-color: #5A5A5A; background: linear-gradient(#666666, #474747); border: solid 1px rgb(44, 44, 44); color: rgb(53, 53, 53); @@ -104,7 +105,11 @@ background: rgb(255, 226, 226); color: rgb(168, 6, 6); } - +.oe_pick_widget .oe_pick_app_header{ + font-size: 24px; + margin-left: 5px; + margin-bottom: 10px; +} .oe_pick_widget .oe_pick_app_title{ font-size: 20px; margin-top: 0px; diff --git a/addons/stock/static/src/js/widgets.js b/addons/stock/static/src/js/widgets.js index 583bbf444e0..7f5aadf9085 100644 --- a/addons/stock/static/src/js/widgets.js +++ b/addons/stock/static/src/js/widgets.js @@ -10,10 +10,6 @@ function openerp_picking_widgets(instance){ init: function(parent,options){ this._super(parent,options); }, - get_header: function(){ - var model = this.getParent(); - return 'Picking: '+model.picking.name; - }, get_rows: function(){ var model = this.getParent(); var rows = []; @@ -397,6 +393,8 @@ function openerp_picking_widgets(instance){ self.$('.js_pick_next').removeClass('oe_disabled'); } + self.$('.oe_pick_app_header').text(self.get_header()); + }); @@ -411,6 +409,7 @@ function openerp_picking_widgets(instance){ self.picking_editor.renderElement(); self.package_editor.renderElement(); self.package_selector.renderElement(); + if( self.picking.id === self.pickings[0]){ self.$('.js_pick_prev').addClass('oe_disabled'); }else{ @@ -422,8 +421,17 @@ function openerp_picking_widgets(instance){ }else{ self.$('.js_pick_next').removeClass('oe_disabled'); } + + self.$('.oe_pick_app_header').text(self.get_header()); }); }, + get_header: function(){ + if(this.picking){ + return _t('Picking:') +' '+this.picking.name; + }else{ + return _t('Picking:'); + } + }, menu: function(){ this.do_action({ type: 'ir.actions.client', diff --git a/addons/stock/static/src/xml/picking.xml b/addons/stock/static/src/xml/picking.xml index 69687ff1f1c..6ed8c180a47 100644 --- a/addons/stock/static/src/xml/picking.xml +++ b/addons/stock/static/src/xml/picking.xml @@ -48,7 +48,9 @@
-
+
+ Operations To Process +
@@ -123,7 +125,7 @@
-
+
@@ -251,6 +253,9 @@
+
+ +