[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Fri, 12 Oct 2012 05:05:13 +0000 (10:35 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Fri, 12 Oct 2012 05:05:13 +0000 (10:35 +0530)
commitec271479fa7a8942ece470f84131dc885bee1129
treeb54104913509c2db999dd0dcde759302a7f31271
parenta324e70fc5976ce889b154bdded124cece5b3165
parentf830a534d67cd34dc4b98f9207cbaab6fd80e966
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20121012050513-9pogrlr28f130jsf
addons/purchase/purchase_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml