[MERGE] bug fix 720631

bzr revid: tfr@openerp.com-20110218110057-orsu81f30qxnu6z3
This commit is contained in:
Thibault Francois
2011-02-18 12:00:57 +01:00
+5 -1
View File
@@ -230,6 +230,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',
@@ -356,7 +357,10 @@ 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):
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):