diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-09-13 14:45:02 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-09-13 14:45:02 +0530 |
| commit | 18ceddcf2ee7086fe2e2d512e415064986febf9c (patch) | |
| tree | 8dc04bc1fd6e9423256ff5bbeba71e106d76fc86 | |
| parent | 9524b34e314511191fc2c2265a44e5c9594f645c (diff) | |
[IMP]minor changes
bzr revid: sgo@tinyerp.com-20120913091502-dvlpgoa3dr72km04
| -rw-r--r-- | addons/event/event_data.xml | 4 | ||||
| -rw-r--r-- | addons/mail/tests/test_mail.py | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml index 814fd0b179c..bc7f71ef664 100644 --- a/addons/event/event_data.xml +++ b/addons/event/event_data.xml @@ -16,24 +16,20 @@ <record id="mail.event_subtype_new" model="mail.message.subtype"> <field name="name">new</field> <field name="res_model">event.event</field> - <field name="model_ids" eval="[(4,ref('event.model_event_event')),(4,ref('event.model_event_registration'))]"/> <field name="default" eval="False"/> </record> <record id="mail.event_subtype_closed" model="mail.message.subtype"> <field name="name">closed</field> <field name="res_model">event.event</field> - <field name="model_ids" eval="[(4,ref('event.model_event_event')),(4,ref('event.model_event_registration'))]"/> </record> <record id="mail.event_subtype_cancelled" model="mail.message.subtype"> <field name="name">cancelled</field> <field name="res_model">event.event</field> - <field name="model_ids" eval="[(4,ref('event.model_event_event')),(4,ref('event.model_event_registration'))]"/> <field name="default" eval="False"/> </record> <record id="mail.event_subtype_confirmed" model="mail.message.subtype"> <field name="name">confirmed</field> <field name="res_model">event.event</field> - <field name="model_ids" eval="[(4,ref('event.model_event_event')),(4,ref('event.model_event_registration'))]"/> <field name="default" eval="False"/> </record> diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py index e3718d23855..9b0586d5d5c 100644 --- a/addons/mail/tests/test_mail.py +++ b/addons/mail/tests/test_mail.py @@ -636,7 +636,3 @@ class test_mail(common.TransactionCase): msg_id = self.mail_group.message_post(cr, uid, [self.group_pigs_id], body=_body1, subject=_subject, type='comment',subtype_xml_id='mail_subtype_comment') notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', msg_id)]) self.assertTrue(len(notif_ids) >= 1,"subtype is email and show notification on wall") - # New post: test automatic subject, signature in html, add a partner, email preference, parent_id previous message -# msg_id2 = self.mail_group.message_post(cr, uid, [self.group_pigs_id], body=_body2,subject=_subject, type='email', subtype='other') -# notif_ids2 = self.mail_notification.search(cr, uid, [('message_id', '=', msg_id2)]) -# self.assertTrue(len(notif_ids2) == 0,"subtype is false cannot show notification on wall") |