odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] from upstream 

bzr revid: fva@openerp.com-20130628144300-abhgsg7w7qrn1vli
bzr revid: fva@openerp.com-20130628144315-kivd21cvsp57rlp3
This commit is contained in:
Frédéric van der Essen 2013-06-28 16:43:15 +02:00
parent 28d5958a41 81f2ccde09
commit b5df6d25e1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/stock/static/src/js/widgets.js
View File

@ -44,7 +44,11 @@ function openerp_picking_widgets(instance){
var rows = [];
var current_package_id = instance.session.user_context.current_package_id;
_.each( model.operations, function(op){
if((typeof current_package_id !== 'undefined') && op.result_package_id[0] !== current_package_id){
if (!current_package_id){
if (op.result_package_id !== false){
return;
}
} else if(op.result_package_id[0] !== current_package_id){
return;
}
rows.push({