diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py index 08d3db01703..6e182082aeb 100644 --- a/addons/document_ftp/wizard/ftp_browse.py +++ b/addons/document_ftp/wizard/ftp_browse.py @@ -47,7 +47,7 @@ class document_ftp_browse(osv.osv_memory): url = url[:-1] else: url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT) - res['url'] = 'ftp://%s@%s/%s'%(current_user.login, url, cr.dbname) + res['url'] = 'ftp://%s@%s'%(current_user.login, url) return res def browse_ftp(self, cr, uid, ids, context=None): diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py index 72b32f7db68..99dfa3b4d5a 100644 --- a/addons/project/wizard/project_task_delegate.py +++ b/addons/project/wizard/project_task_delegate.py @@ -53,17 +53,17 @@ class project_task_delegate(osv.osv_memory): if 'name' in fields: if task_name.startswith(_('CHECK: ')): - newname = str(task_name).replace(_('CHECK: '), '') + newname = tools.ustr(task_name).replace(_('CHECK: '), '') else: - newname = task_name or '' + newname = tools.ustr(task_name or '') res.update({'name': newname}) if 'planned_hours' in fields: res.update({'planned_hours': task.remaining_hours or 0.0}) if 'prefix' in fields: if task_name.startswith(_('CHECK: ')): - newname = str(task_name).replace(_('CHECK: '), '') + newname = tools.ustr(task_name).replace(_('CHECK: '), '') else: - newname = task_name or '' + newname = tools.ustr(task_name or '') prefix = _('CHECK: ') + newname res.update({'prefix': prefix}) if 'new_task_description' in fields: