[MERGE] main trnk-wms branch
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 7 Feb 2014 08:59:46 +0000 (09:59 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 7 Feb 2014 08:59:46 +0000 (09:59 +0100)
commit860cdf9d34674770bdc5925848702516d9673c5f
tree6088383fe57904144e1306fb6a6c7cc3d515d45c
parent08cf92d5a8563cda711b47a73f390e2deaf936d6
parent38577e23f4851ad624c0b5b23a1c170a98ce8168
[MERGE] main trnk-wms branch

bzr revid: qdp-launchpad@openerp.com-20140207085946-iwwnyivpsl6r2af8
addons/sale/sale.py
addons/stock/procurement.py