[MERGE] stock: fix of return picking wizard
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 24 Jan 2014 09:47:34 +0000 (10:47 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 24 Jan 2014 09:47:34 +0000 (10:47 +0100)
bzr revid: qdp-launchpad@openerp.com-20140124094734-am1el12zuhnoq714

1  2 
addons/stock/stock.py

Simple merge