[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 1 Oct 2012 08:55:10 +0000 (14:25 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 1 Oct 2012 08:55:10 +0000 (14:25 +0530)
commitc570078c02057984da49841b3512e344e94841de
tree118c24d097345b55b673dcb51390be3ad6239133
parentb44ab86f775e60be5a4da72165aaccac8b70dd57
parent3686a01df372b01dcec9a5438ba9b16256895c5e
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20121001085510-49lb2zuhf2i41mkk
addons/stock/stock.py
addons/stock/stock_view.xml