[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552...
authorChristophe Simonis <chs@openerp.com>
Wed, 7 May 2014 15:33:48 +0000 (17:33 +0200)
committerChristophe Simonis <chs@openerp.com>
Wed, 7 May 2014 15:33:48 +0000 (17:33 +0200)
commit1953aa442fb2f6cc4d0e64bbfcc1f9a461f14a02
tree2626e151517478690ff6033d70e5070407b6894b
parentada19d175d530b616f88e7c3d81ec194f7ad6a0d
parente0fb0a643429cb85f8f0e920460d0c3d810c772a
[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi

bzr revid: chs@openerp.com-20140507153348-g2qw61dkxvps13br
addons/account/account_move_line.py
addons/hr/hr.py
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/mail/mail_thread.py
addons/mail/res_config.py
addons/stock/stock.py
addons/warning/warning.py