[MERGE] forward port of branch 7.0 up to bbb8d8f25a7a81c26965aa76b5085961a13132d6
authorDenis Ledoux <dle@odoo.com>
Tue, 29 Jul 2014 09:42:10 +0000 (11:42 +0200)
committerDenis Ledoux <dle@odoo.com>
Tue, 29 Jul 2014 09:42:10 +0000 (11:42 +0200)
commit88c022dfc80a9397c4c45bbdb145b63d4c248464
tree803831a801306bdc37e6930329dbfda9429b8e6e
parentd63ef168a85f2802c73532030aab215a58658c2d
[MERGE] forward port of branch 7.0 up to bbb8d8f25a7a81c26965aa76b5085961a13132d6
17 files changed:
addons/account/account_invoice_view.xml
addons/account/account_move_line.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_thread.py
addons/project/report/project_report.py
addons/purchase_analytic_plans/purchase_analytic_plans.py
addons/stock/stock.py
addons/web/static/src/js/views.js
addons/website/static/src/css/snippets.css
addons/website/static/src/css/snippets.sass
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