odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch 7.0 up to af37b30

This commit is contained in:
Christophe Simonis 2014-09-26 12:33:17 +02:00
parent 0305010f2f af37b3022b
commit fe8106fb85
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openerp/addons/base/ir/ir_cron.py
View File

@ -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):

6
openerp/addons/base/res/res_users.py
View File

@ -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)