[MERGE] forward port of branch 7.0 up to 43db726
authorChristophe Simonis <chs@odoo.com>
Wed, 29 Oct 2014 18:05:43 +0000 (19:05 +0100)
committerChristophe Simonis <chs@odoo.com>
Wed, 29 Oct 2014 18:05:43 +0000 (19:05 +0100)
commit21b1203ee0f810cece33b1123998b1f0efe5b82c
treea306c1e107abc0dccb32c6cabefb0064df22108f
parent787147d52b85464588c046b2afaa0bab0796009b
parent43db7267c5051c9ad4877c27ce1220d446d7552d
[MERGE] forward port of branch 7.0 up to 43db726
addons/product/product.py
addons/stock/stock.py