diff options
| author | Vir (Open ERP) <vir@tinyerp.com> | 2010-11-24 10:31:16 +0530 |
|---|---|---|
| committer | Vir (Open ERP) <vir@tinyerp.com> | 2010-11-24 10:31:16 +0530 |
| commit | d528bc6f816464df74e33695968a2feda5f9fa7d (patch) | |
| tree | 659fb8a784c5ffe6936fc950921368e2f754afbc /bin/addons/base/res | |
| parent | 4acf094a47f31c9806c4f6a5e6a6497aac043536 (diff) | |
| parent | cb34b3f368dc7f1cae1856e517575ff4c35857a8 (diff) | |
[Merge]
bzr revid: vir@tinyerp.com-20101119044839-8cwlqycamcae42n6
bzr revid: vir@tinyerp.com-20101122044725-weeo06d2b5s2op3f
bzr revid: vir@tinyerp.com-20101123044335-es0ltyh2128liyea
bzr revid: vir@tinyerp.com-20101124050116-dd0n5f6ypvk58gtx
Diffstat (limited to 'bin/addons/base/res')
| -rw-r--r-- | bin/addons/base/res/partner/partner.py | 1 | ||||
| -rw-r--r-- | bin/addons/base/res/res_log.py | 8 | ||||
| -rw-r--r-- | bin/addons/base/res/res_user.py | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py index 2c7747b4fd7..8318a7602bf 100644 --- a/bin/addons/base/res/partner/partner.py +++ b/bin/addons/base/res/partner/partner.py @@ -23,7 +23,6 @@ import math from osv import fields,osv import tools -import ir import pooler from tools.translate import _ diff --git a/bin/addons/base/res/res_log.py b/bin/addons/base/res/res_log.py index 8ac53acae6b..0862a686aa8 100644 --- a/bin/addons/base/res/res_log.py +++ b/bin/addons/base/res/res_log.py @@ -50,6 +50,14 @@ class res_log(osv.osv): cr.execute('CREATE INDEX %s ON res_log (user_id, read)' % self._index_name) + def create(self, cr, uid, vals, context=None): + create_context = context and dict(context) or {} + if 'res_log_read' in create_context: + vals['read'] = create_context.pop('res_log_read') + if create_context and not vals.get('context'): + vals['context'] = create_context + return super(res_log, self).create(cr, uid, vals, context=context) + # TODO: do not return secondary log if same object than in the model (but unlink it) def get(self, cr, uid, context=None): unread_log_ids = self.search(cr, uid, diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py index 6f9cdad2518..543185530e3 100644 --- a/bin/addons/base/res/res_user.py +++ b/bin/addons/base/res/res_user.py @@ -265,7 +265,7 @@ class users(osv.osv): ] _sql_constraints = [ - ('login_key', 'UNIQUE (login)', _('You can not have two users with the same login !')) + ('login_key', 'UNIQUE (login)', 'You can not have two users with the same login !') ] def _get_email_from(self, cr, uid, ids, context=None): |