[MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf...
authorChristophe Simonis <chs@openerp.com>
Thu, 24 Apr 2014 12:35:38 +0000 (14:35 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 24 Apr 2014 12:35:38 +0000 (14:35 +0200)
commit52cfc16c2e2f33395a53b255825a8153ec80ce40
treefdfb9408f10fd7c75bc3d20b219ad4f554d589ae
parent7994fe09a320368d8e6c2fc978c82b83e6ce692e
parentc7565cd5407191c92f2f8589d5301ca7f42d41db
[MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz

bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1
addons/account_voucher/account_voucher.py
addons/account_voucher/test/sales_payment.yml
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/procurement/procurement.py
addons/stock/stock.py