From da004afcc8dfb68e1052092c964014e54c0425f0 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Fri, 18 Feb 2011 13:06:11 +0530 Subject: [PATCH 1/2] [BUG/FIX] lp:720631 lp bug: https://launchpad.net/bugs/720631 fixed bzr revid: jam@tinyerp.com-20110218073611-mj4db2k6fpk32nt5 --- addons/project/project.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index bff63746d9a..827b182da42 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -239,6 +239,7 @@ class project(osv.osv): start_date = date(*time.strptime(proj.date_start,'%Y-%m-%d')[:3]) end_date = date(*time.strptime(proj.date,'%Y-%m-%d')[:3]) new_date_end = (datetime(*time.strptime(new_date_start,'%Y-%m-%d')[:3])+(end_date-start_date)).strftime('%Y-%m-%d') + context.update({'copy':True}) new_id = project_obj.copy(cr, uid, proj.id, default = { 'name': proj.name +_(' (copy)'), 'state':'open', @@ -365,7 +366,9 @@ class task(osv.osv): default['active'] = True default['type_id'] = False if not default.get('name', False): - default['name'] = self.browse(cr, uid, id, context=context).name + default['name'] = self.browse(cr, uid, id, context=context).name or '' + if not context.get('copy',False): + default.update({'name':(default.get('name','')+_(" (copy)"))}) return super(task, self).copy_data(cr, uid, id, default, context) def _check_dates(self, cr, uid, ids, context=None): From e0c3812e01e4019ae9e4b074661bb94805b7f0c5 Mon Sep 17 00:00:00 2001 From: Jigar Amin Date: Fri, 18 Feb 2011 16:01:07 +0530 Subject: [PATCH 2/2] [FIX] project : improved the _() code for better translation bzr revid: jam@tinyerp.com-20110218103107-ayu4zzly3msnh3bd --- addons/project/project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index 827b182da42..6902ef20065 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -368,7 +368,8 @@ class task(osv.osv): if not default.get('name', False): default['name'] = self.browse(cr, uid, id, context=context).name or '' if not context.get('copy',False): - default.update({'name':(default.get('name','')+_(" (copy)"))}) + new_name = _("%s (copy)")%default.get('name','') + default.update({'name':new_name}) return super(task, self).copy_data(cr, uid, id, default, context) def _check_dates(self, cr, uid, ids, context=None):