Merge lp:~savoirfairelinux-openerp/openobject-addons/crossovered_unicode_1292245-trunk into lp:openobject-addons

[Sandy Carter (http://www.savoirfairelinux.com)]

This fixes bug lp:1292245

Makes sure that the budget name is a unicode to avoid UnicodeEncodeError which happens when budget name contains UFT-8 characters.

[lp:~savoirfairelinux-openerp/openobject-addons/crossovered_unicode_1292245-trunk]

9213. By Sandy Carter (http://www.savoirfairelinux.com) on 2014-03-18

[FIX] Assures budget name is taken as unicode instead of str

Unmerged revisions

9213. By Sandy Carter (http://www.savoirfairelinux.com) on 2014-03-18

[FIX] Assures budget name is taken as unicode instead of str

=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2013-10-27 12:31:04 +0000
+++ account_budget/account_budget.py	2014-03-18 13:55:32 +0000
@@ -22,6 +22,7 @@
 import datetime
 
 from openerp.osv import fields, osv
+from openerp.tools import ustr
 from openerp.tools.translate import _
 
 import openerp.addons.decimal_precision as dp
@@ -114,7 +115,7 @@
         for line in self.browse(cr, uid, ids, context=context):
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
             if not acc_ids:
-                raise osv.except_osv(_('Error!'),_("The Budget '%s' has no accounts!") % str(line.general_budget_id.name))
+                raise osv.except_osv(_('Error!'),_("The Budget '%s' has no accounts!") % ustr(line.general_budget_id.name))
             date_to = line.date_to
             date_from = line.date_from
             if context.has_key('wizard_date_from'):