[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrha@tinyerp.com <>
Tue, 11 Jan 2011 10:15:01 +0000 (15:45 +0530)
committerrha@tinyerp.com <>
Tue, 11 Jan 2011 10:15:01 +0000 (15:45 +0530)
commit8bf0e23a94a7825d0e0687d9ab8f502c694f8289
tree73fadf9a127d935d26db5ec704547440b65ce0d3
parente9f7a90ac82d9b5e2a84bcba94d989f098c044c4
parent3c64593b3e46bcf2081bb7a397147ee91558af9a
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: rha@tinyerp.com-20110111101501-aq97xcojue3coeje
addons/mrp/mrp_view.xml
addons/purchase/purchase.py