Merge lp:~fabien-morin/unifield-server/fm-us-1796 into lp:unifield-server

[jftempo]

[Jeff Allen (jr.allen)]

Is this a common pattern? Could there be other examples of this? How would we be able to tell and fix them now instead of later?

=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_import.py'
--- bin/addons/account_hq_entries/wizard/hq_entries_import.py	2016-11-18 11:07:47 +0000
+++ bin/addons/account_hq_entries/wizard/hq_entries_import.py	2017-02-28 16:08:03 +0000
@@ -265,10 +265,10 @@
                         " %s (posting) / %s (account) / %s (amount) / %s (3rd party) /" \
                         " %s (%s)")
             raise osv.except_osv(_('Error'), pattern % (
-                description, reference, document_date, date,
-                account_description, booking_amount,
+                ustr(description), ustr(reference), document_date, date,
+                ustr(account_description), booking_amount,
                 ustr(third_party),
-                emp_cc_id and emp_cc_id.name or cost_center,
+                emp_cc_id and ustr(emp_cc_id.name) or ustr(cost_center),
                 emp_cc_id and 'Emp default CC' or 'CC'
             ))