[MERGE] forward port of branch 7.0 up to af37b30
This commit is contained in:
commit
fe8106fb85
|
@ -85,7 +85,6 @@ class ir_cron(osv.osv):
|
|||
'interval_type' : 'months',
|
||||
'numbercall' : 1,
|
||||
'active' : 1,
|
||||
'doall' : 1
|
||||
}
|
||||
|
||||
def _check_args(self, cr, uid, ids, context=None):
|
||||
|
|
|
@ -369,6 +369,12 @@ class res_users(osv.osv):
|
|||
default['login'] = _("%s (copy)") % user2copy['login']
|
||||
return super(res_users, self).copy(cr, uid, id, default, context)
|
||||
|
||||
def copy_data(self, cr, uid, ids, default=None, context=None):
|
||||
if default is None:
|
||||
default = {}
|
||||
default.update({'login_date': False})
|
||||
return super(res_users, self).copy_data(cr, uid, ids, default, context=context)
|
||||
|
||||
@tools.ormcache(skiparg=2)
|
||||
def context_get(self, cr, uid, context=None):
|
||||
user = self.browse(cr, SUPERUSER_ID, uid, context)
|
||||
|
|
Loading…
Reference in New Issue