[MERGE] small fixes
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 7 May 2014 08:23:54 +0000 (10:23 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 7 May 2014 08:23:54 +0000 (10:23 +0200)
bzr revid: qdp-launchpad@openerp.com-20140507082354-v6til9vb0vwwzrh2

1  2 
addons/stock/static/src/js/widgets.js

Simple merge