openerp-dev-web team mailing list archive

["Atul Patel\(OpenERP\)" <atp@xxxxxxxxxxx>]

Atul Patel(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  Bhumika (OpenERP) (sbh-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/48311

1) Fixed bug/710558

2) document_ftp: changed url for fixing db name. 

Thanks

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/48311
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp.

=== modified file 'crm/wizard/crm_add_note_view.xml'
--- crm/wizard/crm_add_note_view.xml	2011-01-14 00:11:01 +0000
+++ crm/wizard/crm_add_note_view.xml	2011-02-02 13:31:37 +0000
@@ -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>

=== modified file 'document_ftp/wizard/ftp_browse.py'
--- document_ftp/wizard/ftp_browse.py	2011-01-14 09:34:28 +0000
+++ document_ftp/wizard/ftp_browse.py	2011-02-02 13:31:37 +0000
@@ -47,7 +47,7 @@
                     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):

=== modified file 'project/wizard/project_task_delegate.py'
--- project/wizard/project_task_delegate.py	2011-01-14 00:11:01 +0000
+++ project/wizard/project_task_delegate.py	2011-02-02 13:31:37 +0000
@@ -53,17 +53,17 @@
 
         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: