[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Fri, 28 Jun 2013 14:43:15 +0000 (16:43 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 28 Jun 2013 14:43:15 +0000 (16:43 +0200)
commitb5df6d25e1faaf7ec96e4fb7112e47594bf5fd02
tree6b16f66f225b7b8e90016dee1ad39043099866ab
parent28d5958a41d118a3e46d4de8d215af8e31e9cf2b
parent81f2ccde092a234f01592fae0821a0a9660fa74c
[MERGE] from upstream

bzr revid: fva@openerp.com-20130628144300-abhgsg7w7qrn1vli
bzr revid: fva@openerp.com-20130628144315-kivd21cvsp57rlp3
addons/stock/static/src/js/widgets.js