Merge lp:~openerp-dev/openobject-addons/trunk-bug-730562-xrg into lp:openobject-addons

[xrg]

[qdp (OpenERP) (qdp)]

as discussed with xrg, i'm rejecting this merge proposal that have been done only for testing purpose.

=== modified file 'account/invoice.py'
--- account/invoice.py	2011-03-03 17:07:00 +0000
+++ account/invoice.py	2011-03-07 14:23:34 +0000
@@ -547,7 +547,10 @@
                 if r[1] == 'journal_id' and r[2] in journal_ids:
                     val['journal_id'] = r[2]
             if not val.get('journal_id', False):
-                raise osv.except_osv(_('Configuration Error !'), (_('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (journal_type)))
+                raise osv.except_osv(_('Configuration Error !'), 
+                        (_('Can\'t find any account journal of %s type for this company.\n\n'
+                            'You can create one in the menu: \nConfiguration/Financial Accounting/Accounts/Journals.') % \
+                                    (journal_type)))
             dom = {'journal_id':  [('id', 'in', journal_ids)]}
         else:
             journal_ids = obj_journal.search(cr, uid, [])