[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538...
authorChristophe Simonis <chs@openerp.com>
Thu, 24 Apr 2014 13:45:33 +0000 (15:45 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 24 Apr 2014 13:45:33 +0000 (15:45 +0200)
commit7a7d7febf8d51cdc693e77678fc9eaee3864b3b2
treed2bb635b1441f04267727e39a4bfbd219a4b7b6b
parent96b9d8b9d59dc7b240a096e6c6775c7a45ac88c4
parent52cfc16c2e2f33395a53b255825a8153ec80ce40
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1

bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
24 files changed:
addons/account/account.py
addons/account/account_invoice_view.xml
addons/account_analytic_analysis/account_analytic_analysis.py
addons/account_analytic_analysis/account_analytic_analysis_view.xml
addons/calendar/calendar.py
addons/crm/crm_lead_view.xml
addons/email_template/email_template.py
addons/email_template/tests/test_mail.py
addons/email_template/wizard/mail_compose_message.py
addons/event_sale/event_sale.py
addons/gamification/data/badge.xml
addons/gamification/data/goal_base.xml
addons/gamification/models/challenge.py
addons/gamification_sale_crm/sale_crm_goals.xml
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/mail/mail_mail_view.xml
addons/note/note.py
addons/project_issue/project_issue_view.xml
addons/sale/sale_view.xml
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js
addons/website/views/website_templates.xml
addons/website_event_sale/views/website_event_sale.xml
addons/website_mail/views/snippets.xml