[MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf...

bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1

diff --cc addons/account_voucher/account_voucher.py
Simple merge

diff --cc addons/account_voucher/test/sales_payment.yml
index 3679c34,cdef3cf..ed9305a
--- 1/addons/account_voucher/test/sales_payment.yml
--- 2/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.yml
@@@ -42,8 -37,11 +42,10 @@@
    I will create and post an account voucher of amount 450.0 for the partner Seagate.
  -
    !python {model: account.voucher}: |
 -    import netsvc
      vals = {}
      journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
+     voucher = self.recompute_voucher_lines(cr, uid, [], ref("base.res_partner_19"), journal_id, 450.0, ref('base.EUR'), 'receipt', False)
+     assert (voucher['value'].get('writeoff_amount') == 0.0), "Writeoff amount calculated by recompute_voucher_lines() is not 0.0"
      res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_19"), journal_id, 0.0, 1, ttype='receipt', date=False)
      vals = {
          'account_id': ref('account.cash'),
@@@ -64,8 -62,10 +66,9 @@@
      vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
      id = self.create(cr, uid, vals)
      voucher_id = self.browse(cr, uid, id)
+     assert (voucher_id.writeoff_amount == 0.0), "Writeoff amount is not 0.0"
      assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -    wf_service = netsvc.LocalService("workflow")
 -    wf_service.trg_validate(uid, 'account.voucher', voucher_id.id, 'proforma_voucher', cr)
 +    self.signal_proforma_voucher(cr, uid, [voucher_id.id])
  
  -
    Finally i will Confirm the state of the invoice is paid

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet.py
Simple merge

diff --cc addons/procurement/procurement.py
Simple merge

diff --cc addons/stock/stock.py
Simple merge