[MERGE] merge with parent branch
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Mon, 1 Oct 2012 08:58:21 +0000 (14:28 +0530)
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Mon, 1 Oct 2012 08:58:21 +0000 (14:28 +0530)
commit9890c1da13b083057b7e01627bc61fdd7df826be
treeef09344393835e9482e61916c2516f7e24d380eb
parentcd64e33d16b067847662e8f4c95221a9ec62bc15
parent3686a01df372b01dcec9a5438ba9b16256895c5e
[MERGE] merge with parent branch

bzr revid: rma@tinyerp.com-20121001085821-7c7g51mtgdp99qgl
addons/mrp/mrp_view.xml
addons/procurement/procurement.py
addons/procurement/procurement_view.xml
addons/product/product_view.xml
addons/purchase_requisition/purchase_requisition_view.xml