Merge lp:~openerp-dev/openobject-addons/6.0-opw-573311-rgo into lp:openobject-addons/6.0

[Ravi Gohil (OpenERP)]

Hello,

System throws Traceback when we import a coda file that has accented characters.

This fix fixes the issue. Kindly review it.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

5181. By Ravi Gohil (OpenERP) on 2012-04-03

[FIX] account_coda: When importing a coda file having accented characters in it, a traceback is caused: (Maintenance Case : 573311)

=== modified file 'account_coda/wizard/account_coda_import.py'
--- account_coda/wizard/account_coda_import.py	2011-01-14 00:11:01 +0000
+++ account_coda/wizard/account_coda_import.py	2012-04-03 10:57:19 +0000
@@ -22,6 +22,7 @@
 
 import time
 import base64
+import tools
 
 from osv import fields, osv
 from tools.translate import _
@@ -90,6 +91,7 @@
         recordlist = base64.decodestring(codafile).split('\n')
         recordlist.pop()
         for line in recordlist:
+            line = tools.ustr(line)
             if line[0] == '0':
                 # header data
 
@@ -108,7 +110,7 @@
                 bank_statement["balance_start"]= bal_start
                 bank_statement["acc_number"]=line[5:17]
                 bank_statement["acc_holder"]=line[64:90]
-                bank_statement['name'] = journal_code + ' ' + str(line[2:5])
+                bank_statement['name'] = journal_code + ' ' + line[2:5]
 
             elif line[0]=='2':
                 # movement data record 2
@@ -149,7 +151,7 @@
                 elif line[1] == '3':
                     # movement data record 3.1
                     st_line_name = line[2:6]
-                    st_line_partner_acc = str(line[10:47]).strip()
+                    st_line_partner_acc = line[10:47].strip()
                     cntry_number=line[10:47].strip()
                     contry_name=line[47:125].strip()
                     bank_ids = partner_bank_obj.search(cr, uid, [('acc_number', '=', st_line_partner_acc)])