[MERGE]:trunk
authorAmit Patel <apa@tinyerp.com>
Tue, 30 Oct 2012 04:49:18 +0000 (10:19 +0530)
committerAmit Patel <apa@tinyerp.com>
Tue, 30 Oct 2012 04:49:18 +0000 (10:19 +0530)
bzr revid: apa@tinyerp.com-20121030044918-islk9i91tdr85usx

1  2 
addons/stock/stock.py
addons/stock/stock_view.xml

Simple merge
Simple merge