diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-09-10 14:48:03 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-09-10 14:48:03 +0200 |
| commit | 3fa90321e11d28df4e2b874ddfa450dc73e8e0af (patch) | |
| tree | 91546d220e866fa6fb1807f1e8b44c5c28a6bc76 /addons/mail/res_users.py | |
| parent | 4327e09a55e74e59e6c0ae41883951d41e7146e5 (diff) | |
| parent | 546a191f0a790415317c55f41e30ced88bfc143b (diff) | |
[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
Diffstat (limited to 'addons/mail/res_users.py')
| -rw-r--r-- | addons/mail/res_users.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 7bc39c438d1..ac1d406c29a 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -36,7 +36,7 @@ class res_users(osv.Model): _inherits = {'mail.alias': 'alias_id'} _columns = { - 'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, + '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."), 'display_groups_suggestions': fields.boolean("Display Groups Suggestions"), |