[MERGE] master-wmsstaging-jco with fixes on WMS + new barcode reports
authorqdp-odoo <qdp@openerp.com>
Fri, 30 May 2014 16:09:05 +0000 (18:09 +0200)
committerqdp-odoo <qdp@openerp.com>
Fri, 30 May 2014 16:09:05 +0000 (18:09 +0200)

Trivial merge