[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517...
authorChristophe Simonis <chs@openerp.com>
Thu, 20 Feb 2014 16:38:15 +0000 (17:38 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 20 Feb 2014 16:38:15 +0000 (17:38 +0100)
commit4b72678bc74906e552ebc8cace7161901571d2c1
treed4965fd90f45af167c6a34eec3caad111a309f12
parent65db3c635eea5324676c8f85d13e0058d66ce1b9
parentd5106a4d34a9b7c52a1ecad7c65331f1fda2e231
[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr

bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
22 files changed:
addons/account/account_view.xml
addons/account_analytic_analysis/account_analytic_analysis.py
addons/calendar/calendar_view.xml
addons/crm/crm_case_section_view.xml
addons/crm/crm_lead.py
addons/gamification/i18n.moved/gamification.pot
addons/hw_escpos/controllers/main.py
addons/mail/mail_thread.py
addons/point_of_sale/point_of_sale.py
addons/sale/sale_view.xml
addons/sale_crm/sale_crm_view.xml
addons/website/controllers/main.py
addons/website/models/website.py
addons/website/static/src/css/snippets.css
addons/website/static/src/css/snippets.sass
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website/static/src/js/website.tour.banner.js
addons/website/static/src/js/website.tour.js
addons/website/views/snippets.xml
addons/website/views/website_templates.xml
addons/website_sale/views/website_sale.xml