[MERGE] forward port of branch saas-5 up to adf07a9
authorChristophe Simonis <chs@odoo.com>
Thu, 19 Jun 2014 14:23:32 +0000 (16:23 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 19 Jun 2014 14:23:32 +0000 (16:23 +0200)
commiteef6330c55bc7d829359fbb733a1adc4c149309b
tree11dede8d58d1db5d3f2998e79b3ecd9dd0e76776
parentdc4178a9624e49b6bad7dc924206b22fc23d435e
parentadf07a9490436211d16da8b1355c3bae4448a54a
[MERGE] forward port of branch saas-5 up to adf07a9
21 files changed:
addons/account/account_invoice.py
addons/account_voucher/voucher_sales_purchase_view.xml
addons/gamification/models/challenge.py
addons/hr/hr.py
addons/hr/hr_view.xml
addons/mail/mail_thread.py
addons/mass_mailing/views/mass_mailing.xml
addons/product/product.py
addons/stock/stock_view.xml
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js
addons/website/static/src/js/website.editor.js
addons/website_forum/controllers/main.py
addons/website_mail_group/views/website_mail_group.xml
addons/website_sale/views/templates.xml
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/ir/ir_actions.xml
openerp/osv/fields.py
openerp/osv/orm.py