diff options
| author | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-06-22 10:55:57 +0530 |
|---|---|---|
| committer | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-06-22 10:55:57 +0530 |
| commit | ae8f2af54240238829dd10e884c1d923b03b1301 (patch) | |
| tree | 448852423ee71020ed8767db41eb254f663ff270 | |
| parent | ef377f1ce6f566aa4f0c4dbf03cebb28f29c2072 (diff) | |
[IMP] added mail alias under depedancy of the mail,group
bzr revid: jam@tinyerp.com-20120622052557-xmzgdsk85nyv1668
| -rw-r--r-- | addons/mail/__init__.py | 2 | ||||
| -rw-r--r-- | addons/mail/mail_group.py | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py index 4c313338ceb..f06b4536040 100644 --- a/addons/mail/__init__.py +++ b/addons/mail/__init__.py @@ -19,11 +19,11 @@ # ############################################################################## +import mail_alias import mail_message import mail_thread import mail_group import mail_subscription -import mail_alias import res_users import res_partner import report diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py index 0a8677d7862..e46865473f6 100644 --- a/addons/mail/mail_group.py +++ b/addons/mail/mail_group.py @@ -48,7 +48,7 @@ class mail_group(osv.osv): _description = 'Discussion group' _name = 'mail.group' _inherit = ['mail.thread'] - + _inherits = {'mail.alias': 'alias_id'} def action_group_join(self, cr, uid, ids, context={}): return self.message_subscribe(cr, uid, ids, context=context); @@ -129,6 +129,7 @@ class mail_group(osv.osv): 'member_count': fields.function(get_member_ids, type='integer', string='Member count', multi='get_member_ids'), 'is_subscriber': fields.function(get_member_ids, type='boolean', string='Joined', multi='get_member_ids'), 'last_month_msg_nbr': fields.function(get_last_month_msg_nbr, type='integer', string='Messages count for last month'), + 'alias_id': fields.many2one('mail.alias', 'Mail Alias') } _defaults = { @@ -136,3 +137,8 @@ class mail_group(osv.osv): 'responsible_id': (lambda s, cr, uid, ctx: uid), 'photo': _get_default_photo, } + + def create(self, cr, uid, vals, context=None): + model_pool = self.pool.get('ir.model.data') + #TODO find the model id and pass and finish the all mail alias needs + return super( mail_group, self).create(cr, uid, vals, context) |