[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Mon, 13 Dec 2010 05:07:45 +0000 (10:37 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Mon, 13 Dec 2010 05:07:45 +0000 (10:37 +0530)
commit03747735aeaa7faac68d1bed54910dfb2cf7d585
treefc0c3498dfd91e144cd1680843d1aedb550c08f0
parent1f693e0200beff343a16c947b6d991729fc47c61
parent4908975a6fce9538da382389866188eb9c566ba9
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: aag@tinyerp.co.in-20101210053101-unv8h44gej4nvoz6
bzr revid: aag@tinyerp.co.in-20101213050745-lzf3st41udjn66ai
addons/stock/stock.py
addons/stock/stock_view.xml