[MERGE] Forward-port saas-5 up to 37ba23d
authorOlivier Dony <odo@openerp.com>
Sat, 2 Aug 2014 18:42:19 +0000 (20:42 +0200)
committerOlivier Dony <odo@openerp.com>
Sun, 3 Aug 2014 23:44:30 +0000 (01:44 +0200)
commitd706adba119803cb5a25df334b4c9d17921229c6
tree7d6173ebef4ea45034a2324b9634d1b0657d8956
parentdec73a43da9ac407c168ca40d065d5a9768ffdfa
parent37ba23d5538fcb466b69b0474974e4088bd84a1c
[MERGE] Forward-port saas-5 up to 37ba23d
addons/account/partner.py
addons/product_visible_discount/product_visible_discount.py
addons/website/views/website_templates.xml
openerp/addons/base/res/res_partner_view.xml
openerp/models.py