[MERGE] forward port of branch 7.0 up to af37b30

temmink · Sep 26, 2014 · fe8106f · fe8106f
2 parents 0305010 + af37b30
commit fe8106f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py
@@ -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):

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
@@ -369,6 +369,12 @@ def copy(self, cr, uid, id, default=None, context=None):
             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)