[MERGE] Forward-port saas-5 up to d9cda97
authorOlivier Dony <odo@openerp.com>
Fri, 4 Jul 2014 23:45:45 +0000 (01:45 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 4 Jul 2014 23:45:45 +0000 (01:45 +0200)
commit34bfa1b44fab7a61a53d37ad81b9d72bb29cbba6
treefab757948cd9a743049034dbc97679c64bce64f1
parent27fa618882ca9fba1a1f3f2d7e993ad4d3d66f89
parentd9cda97cf47f78bff309aff2e6adff5808f9734d
[MERGE] Forward-port saas-5 up to d9cda97
12 files changed:
addons/document/document.py
addons/mail/static/src/css/mail.css
addons/mail/static/src/xml/mail.xml
addons/marketing_campaign/report/campaign_analysis_view.xml
addons/stock/stock.py
addons/survey/survey.py
addons/web_linkedin/web_linkedin.py
addons/website/models/website.py
addons/website/views/website_templates.xml
addons/website_event/controllers/main.py
openerp/addons/base/res/res_partner.py
openerp/addons/base/res/res_partner_view.xml