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

[MERGE] Merge bug fix lp:710558

Browse Source 
bzr revid: sbh@tinyerp.com-20110203050110-yf4l2b49sk8sbgqo
This commit is contained in:
Sbh (OpenERP)
2011-02-03 10:31:10 +05:30
parent 621f6e4ff1 3969a98446
commit a117201fee
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/wizard/crm_add_note_view.xml
+1 -1
View File
@@ -30,7 +30,7 @@
<separator string="" colspan="6"/>
<group colspan="6" col="4" >
<field name="state" />
<button string="_Cancel" icon="gtk-cancel" special="cancel" />
<button string="_Cancel" icon="gtk-close" special="cancel" />
<button name="action_add" type="object" string="_Add" icon="gtk-ok" />
</group>
</form>
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: