[MERGE] Forward-port 8.0 up to d706adb
authorOlivier Dony <odo@openerp.com>
Sat, 2 Aug 2014 19:13:41 +0000 (21:13 +0200)
committerOlivier Dony <odo@openerp.com>
Sun, 3 Aug 2014 23:47:07 +0000 (01:47 +0200)
commit407cb2292471c1dd11380c503ac2cec6999816b8
tree8de9bcd9bda58a42e3048eb70fe5d477b6e2235f
parentd7b33f18f0b7af723d14bb4d31099d2369b9214e
parentd706adba119803cb5a25df334b4c9d17921229c6
[MERGE] Forward-port 8.0 up to d706adb
addons/website/views/website_templates.xml
openerp/addons/base/res/res_partner_view.xml