[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Tue, 24 Dec 2013 11:24:07 +0000 (12:24 +0100)
committerDenis Ledoux <dle@openerp.com>
Tue, 24 Dec 2013 11:24:07 +0000 (12:24 +0100)
commit1508c5dd00e7f05c0979bd358645bae96e29ab41
treeebe387f7a4245336b5425cb068c5023a733d01cd
parentabefabfa3e5f3efa523cc8b55fca9fb934c0891e
parentd1b4aa974d28cd919dd3675b62bc61077e02de4b
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb

bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
addons/account_check_writing/account_voucher.py
addons/account_payment/account_payment_view.xml
addons/account_voucher/account_voucher.py
addons/email_template/email_template.py
addons/email_template/tests/test_ir_actions.py
addons/email_template/tests/test_mail.py
addons/email_template/wizard/mail_compose_message.py
addons/hr_holidays/report/holidays_summary_report.py
addons/hr_payroll/hr_payroll.py
addons/hr_timesheet/report/users_timesheet.py
addons/project/project.py