summaryrefslogtreecommitdiff
path: root/addons/mail/res_users.py
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2014-07-06 16:44:26 +0200
committerAntony Lesuisse <al@openerp.com>2014-07-06 17:05:41 +0200
commitcbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch)
treed6ff62b719fce32392397783c961b734b1e4c50e /addons/mail/res_users.py
parentd78192c489d3be66cd6487b39f5ce7ba4733a187 (diff)
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from bzr to git was not correctly done. The git history contains irrelevant blobs and commits. This branch brings a lot of changes and fixes, too many to list exhaustively. - New orm api, objects are now used instead of ids - Environements to encapsulates cr uid context while maintaining backward compatibility - Field compute attribute is a new object oriented way to define function fields - Shared browse record cache - New onchange protocol - Optional copy flag on fields - Documentation update - Dead code cleanup - Lots of fixes
Diffstat (limited to 'addons/mail/res_users.py')
-rw-r--r--addons/mail/res_users.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index e218ea85927..a4b4e68942b 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -39,7 +39,7 @@ class res_users(osv.Model):
_columns = {
'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
help="Email address internally associated with this user. Incoming "\
- "emails will appear in the user's notifications."),
+ "emails will appear in the user's notifications.", copy=False),
'display_groups_suggestions': fields.boolean("Display Groups Suggestions"),
}