[MERGE] master
authorqdp-odoo <qdp@openerp.com>
Fri, 30 May 2014 14:52:03 +0000 (16:52 +0200)
committerqdp-odoo <qdp@openerp.com>
Fri, 30 May 2014 15:05:44 +0000 (17:05 +0200)
commit0fa755bc8943131ccc856a0c68c3a631dba6a2fe
tree3dad1c1611311db043eea292dcead884310cf26a
parent742cfe83e0b1f9fccc5770da32bddcb4dd89b7d2
parent8d822419e74969ff032db653a3797affeccace1b
[MERGE] master
addons/stock/product.py
addons/stock/product_view.xml
addons/stock/stock_view.xml