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)
1  2 
addons/procurement/procurement.py
addons/purchase/purchase.py
addons/stock/stock.py

Simple merge
Simple merge
Simple merge