=== modified file 'account_management/model/account_partner.py'
--- account_management/model/account_partner.py	2012-03-05 19:58:31 +0000
+++ account_management/model/account_partner.py	2012-05-10 21:38:23 +0000
@@ -398,18 +398,21 @@
         previous_accounts={}
         if context.get('previous_accounts',False):
             previous_accounts=context['previous_accounts']
-        
+            
         rpa = self.pool.get('res.partner.account')
         
         if self._check_unique(cr,uid,ids,k,vals,context=context):
             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')
-            self.pool.get('account.account').write(cr,uid,[previous_accounts[__ACC__[k][0]]],{'parent_id':parent_id,'auto':True,'name':name})
+            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:                        
-            vals[__ACC__[k][0]] = rpa._get_account(cr, uid, vals.get(__ACC__[k][1],False), vals['name'], vals[k])
+            vals[__ACC__[k][0]] = rpa._get_account(cr, uid, vals.get(__ACC__[k][1],False), vals['name'], vals[k],context=context)
             self._switch_accounts(cr,uid,ids,k,vals,context=context)
             self._unlink_account(cr,uid,ids,k,vals,context=context)