[MERGE] forward port of branch 7.0 up to 6e96ffd
authorChristophe Simonis <chs@odoo.com>
Thu, 10 Jul 2014 20:02:01 +0000 (22:02 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 10 Jul 2014 20:02:01 +0000 (22:02 +0200)
commita35aec2a0b5993874bd80c9b897633468fa86ae2
tree21168ff12617ddb895b27be468ba6e801727665b
parent4d6b89105b482e55b146d6de419a0bd89e0ef599
parent6e96ffd44c4f10e2ac926b42e6fba8d1902bfe24
[MERGE] forward port of branch 7.0 up to 6e96ffd
addons/email_template/email_template.py
addons/hr_holidays/report/holidays_summary_report.py
openerp/addons/base/ir/ir_model.py
openerp/osv/orm.py
openerp/tools/config.py