pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]l FIXED bug/710558 and document_ftp url for db name.

Browse Source 
bzr revid: atp@tinyerp.com-20110202132429-vuhub4kyusnenaag
This commit is contained in:
Atul Patel (OpenERP)
2011-02-02 18:54:29 +05:30
parent afd6fbdd01
commit 3969a98446
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/document_ftp/wizard/ftp_browse.py
+1 -1
View File
@@ -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):
addons/project/wizard/project_task_delegate.py
+4 -4
View File
@@ -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: