[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 19 Jun 2012 05:43:03 +0000 (11:13 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Tue, 19 Jun 2012 05:43:03 +0000 (11:13 +0530)
commiteca7b76fca0149ee00161518a08529d76aaf17fc
treea780ad231761323630626d75e9b0ff2fd991c74d
parent99d951319d9f9faa52e77581157eaae5f925814e
parentc9c27a2432dca8a23656659b07dbe77382307500
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20120619054303-cjssjdtkp7mmzl3o
addons/purchase/purchase_view.xml
addons/purchase/res_config_view.xml
addons/stock/stock_view.xml