[MERGE] forward port of branch 7.0 up to de07c64
authorChristophe Simonis <chs@odoo.com>
Fri, 28 Nov 2014 14:16:38 +0000 (15:16 +0100)
committerChristophe Simonis <chs@odoo.com>
Fri, 28 Nov 2014 14:16:38 +0000 (15:16 +0100)
commitec30b2133680246d407ee75fd1fe8361100ca194
tree557d17e865adc6168a786c54a438fdfd02ed90fe
parente347011f24358e8fa4c2528b82e688169fbc1f69
parentde07c642b67d8dbca11086ad3f9cbaa9928c6077
[MERGE] forward port of branch 7.0 up to de07c64
addons/product/product.py
addons/product/product_data.xml
openerp/addons/base/res/res_partner.py