[MERGE] forward port of branch saas-5 up to e4cb520
authorChristophe Simonis <chs@odoo.com>
Wed, 30 Jul 2014 18:52:14 +0000 (20:52 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 30 Jul 2014 18:52:14 +0000 (20:52 +0200)
commitfd4fd35e3239c771ab9d692f47f61770ae882965
tree5fc8d7d48196331f608189c01cdcb062efa41bf4
parent7b84dfb30222611a6d6a43e3804bef8dd301d289
parente4cb5202a056ba0ad666af0268861e672a2cdab3
[MERGE] forward port of branch saas-5 up to e4cb520
30 files changed:
addons/account/account_invoice_view.xml
addons/account/account_move_line.py
addons/account_voucher/account_voucher.py
addons/base_vat/base_vat.py
addons/delivery/delivery.py
addons/gamification/views/badge.xml
addons/hr_holidays/hr_holidays.py
addons/mail/mail_message.py
addons/mail/mail_thread.py
addons/project/report/project_report.py
addons/sale/res_config.py
addons/sale/sale.py
addons/sale/views/report_saleorder.xml
addons/stock/stock.py
addons/survey/controllers/main.py
addons/survey/survey.py
addons/survey/views/survey_result.xml
addons/survey/views/survey_templates.xml
addons/web/static/src/js/chrome.js
addons/web/static/src/js/views.js
addons/website/controllers/main.py
addons/website/models/ir_http.py
addons/website/static/src/js/website.editor.js
addons/website_blog/models/website_blog.py
addons/website_crm/controllers/main.py
addons/website_membership/controllers/main.py
openerp/addons/base/ir/ir_fields.py
openerp/addons/base/ir/ir_values.py
openerp/tools/safe_eval.py
openerp/tools/translate.py