[MERGE] from upstream

bzr revid: fva@openerp.com-20130628100137-dvysizsq6735q680

diff --cc addons/stock/static/src/js/widgets.js
index ac6bf88,320cd8e..0cf6b01
--- 1/addons/stock/static/src/js/widgets.js
--- 2/addons/stock/static/src/js/widgets.js
+++ b/addons/stock/static/src/js/widgets.js
@@@ -36,16 -36,17 +36,16 @@@ function openerp_picking_widgets(instan
          template: 'PackageEditorWidget',
          get_header: function(){
              var model = this.getParent();
 -            var current_package_id = instance.session.user_context.current_package_id;
 -            return current_package_id ? 'Current Operations for package: ' + current_package_id[1] : 'Current Operations';
 +            var current_package = model.get_selected_package();
 +            return current_package ? 'Operations for Package: ' + current_package.name : 'Current Operations';
          },
          get_rows: function(){
 -            var current_package_id = instance.session.user_context.current_package_id;
              var model = this.getParent();
-             var current_package = model.get_selected_package();
              var rows = [];
 -              console.log('package id',current_package_id)
++            var current_package_id = instance.session.user_context.current_package_id;
              
              _.each( model.operations, function(op){
-                 if(current_package && op.package_id !== current_package.id){
+                 if((typeof current_package_id !== 'undefined') && op.result_package_id !== current_package_id){
                      return;
                  }
                  rows.push({