[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Thu, 9 Dec 2010 06:52:56 +0000 (12:22 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Thu, 9 Dec 2010 06:52:56 +0000 (12:22 +0530)
commit4041d4a015e9c4fda7e913be2925d9c508cd4169
treea1240ce7a37291de5d64969db81bf3f6c122a230
parent6bd5b4fb38e3bec20b75e522482d73b69b6896cd
parent4f62b6c9b8d400b88f7e99e6685ac01acd96bb10
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: aag@tinyerp.co.in-20101209065256-qv5jda3ta7mo6y9a
addons/purchase/purchase_view.xml
addons/stock/stock.py