Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco
authorJosse Colpaert <jco@odoo.com>
Tue, 10 Jun 2014 08:32:36 +0000 (10:32 +0200)
committerJosse Colpaert <jco@odoo.com>
Tue, 10 Jun 2014 08:32:36 +0000 (10:32 +0200)
commit1c04f4d3d10b3d3280c6ac649da34c8ab80bac5d
treed4273405708c679a6f3bb11cb82bc538370f13cf
parent2b9735f83a4b693a552a153fa15c0bcb64c4708b
parentaa0e83162688e8b791beff3b275eb67ca2baf3ca
Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco
addons/procurement/procurement.py
addons/purchase/purchase.py
addons/stock/stock.py