[MERGE]
authorFabien Pinckaers <fp@openerp.com>
Wed, 10 Oct 2012 19:04:38 +0000 (21:04 +0200)
committerFabien Pinckaers <fp@openerp.com>
Wed, 10 Oct 2012 19:04:38 +0000 (21:04 +0200)
commit7813f13442f2173157bd6e8d1f5614c7cf883014
tree2dc6e564551b7745d363e8108132790379679f41
parente86e8433cdea8e3ac5f03c70a2ea89e7b52dc730
parenteb9a49718fca71296965fdc58e821f11d6ad7733
[MERGE]

bzr revid: fp@openerp.com-20121010190438-x2o6jhuoknexa67k
addons/mrp/procurement.py
addons/project_mrp/project_procurement.py
addons/purchase/purchase.py
addons/stock_location/procurement_pull.py