[MERGE] forward port of branch 7.0 up to revid 9535 odo@openerp.com-20131021124748...

bzr revid: chs@openerp.com-20131021141431-5bdk9waai17julkb

diff --cc addons/account/test/account_fiscalyear_close.yml
index b80cfd0,73e34f2..cc683ca
--- 1/addons/account/test/account_fiscalyear_close.yml
--- 2/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@@ -28,9 -24,12 +24,9 @@@
          price_unit: 15.00
          name: Bying stuff
  -
-   I validate it the invoice
+   I validate the invoice
  -
 -  !python {model: account.invoice}: |
 -    import netsvc
 -    wf_service = netsvc.LocalService("workflow")
 -    wf_service.trg_validate(uid, 'account.invoice', ref('account.account_invoice_current1'), 'invoice_open', cr)
 +  !workflow {model: account.invoice, action: invoice_open, ref: account.account_invoice_current1}
  -
    I made modification in journal so it can move entries
  -

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