[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 3 Oct 2012 04:42:56 +0000 (10:12 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 3 Oct 2012 04:42:56 +0000 (10:12 +0530)
commitdb7926bc703a6c0e884d3cd2477bf40161ac0b9a
treee251f26b38836e4c78203d99bff0bf45b71b724a
parentc570078c02057984da49841b3512e344e94841de
parentfc3edda719365fa9fc895acb5f90bc668a70e87f
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20121003044256-aw7p8dw64gzbjj08
addons/stock/stock.py
addons/stock/stock_view.xml