[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Wed, 3 Oct 2012 10:52:12 +0000 (16:22 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Wed, 3 Oct 2012 10:52:12 +0000 (16:22 +0530)
commit319ba65bb8c8c385db2b878e7321ec443ea0e3f7
tree35fa63393e57b13e7c6dfc5b159ce4f23edccf8c
parent9c2ca851e23d5f93b59668e633618a6c3cd9f678
parent2d3d4787848d346c1c2e2c5241bce7d7ce48e651
[MERGE]

bzr revid: hmo@tinyerp.com-20121003105212-651698je5ye1zpuz
addons/mrp/mrp_view.xml
addons/mrp/procurement.py
addons/procurement/procurement.py
addons/project_mrp/project_procurement.py
addons/purchase/purchase.py