[MERGE] forward port of branch 7.0 up to 39f3e40
authorChristophe Simonis <chs@odoo.com>
Wed, 30 Jul 2014 16:55:31 +0000 (18:55 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 30 Jul 2014 16:55:31 +0000 (18:55 +0200)
commit310d3fe4c44019174a0acd1d325b67daa849e282
tree5f32f7ebe18542448ad8966d34a4348b21b55f08
parentc6f91facbb44336de5d2278983b0a006ed3e014f
parent39f3e403293e51f1e6e544638831dd090bcc0847
[MERGE] forward port of branch 7.0 up to 39f3e40
addons/account_voucher/account_voucher.py
addons/mail/mail_message.py
addons/project_long_term/project_long_term.py
addons/sale/res_config.py
addons/sale/sale.py
addons/stock/stock.py
openerp/tools/translate.py