Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
authorGéry Debongnie <ged@odoo.com>
Mon, 26 May 2014 08:06:31 +0000 (10:06 +0200)
committerGéry Debongnie <ged@odoo.com>
Mon, 26 May 2014 08:06:31 +0000 (10:06 +0200)
commit62900fe01b20b9bb19c3a91b1ca792e5dd1a9cd3
treec2e8cd93a3c5dd1a1d8dff77aca7580ea4c39841
parent6e6ae4cbf94e9ff8a4cccab3da2417aec3dfbc0c
parent576b00a196cd3a2f786cc660d636f4732f530484
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged

Conflicts:
addons/crm/crm_case_section_view.xml
15 files changed:
addons/crm/crm_lead_view.xml
addons/crm/report/crm_lead_report_view.xml
addons/crm/report/crm_phonecall_report_view.xml
addons/crm_claim/report/crm_claim_report_view.xml
addons/crm_partner_assign/report/crm_lead_report_view.xml
addons/crm_partner_assign/report/crm_partner_report_view.xml
addons/document/document_view.xml
addons/hr_holidays/hr_holidays_view.xml
addons/mail/mail_message_view.xml
addons/project_issue/report/project_issue_report_view.xml
addons/sale/report/sale_report_view.xml
addons/sale/sale_view.xml
addons/website_blog/views/website_blog_views.xml
addons/website_event_track/views/event_backend.xml
addons/website_forum/views/forum.xml