Merge lp:~vauxoo/account-management/bug-999199 into lp:account-management

[Juan Márquez]

Unmerged revisions

407. By Juan Márquez on 2012-05-21

[FIX] BUG 999199

=== modified file 'account_management/model/account_partner.py'
--- account_management/model/account_partner.py	2012-05-14 14:52:27 +0000
+++ account_management/model/account_partner.py	2012-05-21 20:57:30 +0000
@@ -168,7 +168,7 @@
         return u'%s %s'%(code, name)
 
     def create(self, cr, uid, vals, context=None):
-        self._check(cr, uid, vals,context)
+        self._check(cr, uid, vals)
         return super(res_partner_account, self).create(cr, uid, vals, context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -410,7 +410,10 @@
             rpa_brw = rpa.browse(cr,uid,vals[__ACC__[k][1]])
             parent_id = getattr(rpa_brw,'property_account_partner').id
             parent_name = getattr(rpa_brw,'property_account_partner').name
-            name = str(u'%s - %s'%(parent_name.decode('utf-8').upper(), vals['name'].decode('utf-8').upper())).encode('utf-8')
+            try:
+                name = str(u'%s - %s'%(parent_name.decode('utf-8').upper(), vals['name'].decode('utf-8').upper())).encode('utf-8')
+            except:    
+                name = '%s - %s'%(parent_name, vals['name'])
             self.pool.get('account.account').write(cr,uid,[previous_accounts[__ACC__[k][0]]],{'parent_id':parent_id,'auto':True,'name':name},context)
             vals[__ACC__[k][0]]=previous_accounts[__ACC__[k][0]]
         else: