[IMP] added mail alias under depedancy of the mail,group

bzr revid: jam@tinyerp.com-20120622052557-xmzgdsk85nyv1668

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 4c31333..f06b453 100644 (file)
--- 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 0a8677d..e468654 100644 (file)
--- 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)