diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-08-31 16:30:00 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-08-31 16:30:00 +0530 |
| commit | d32908a359dcba66b032ee4dcfca7dd2142b94d6 (patch) | |
| tree | 79ebc90431d34fdaa0c6af1ef1743210df2ae298 /addons | |
| parent | 3d70ff5398ceab00c2fe5ed913153cc2dad2a0c0 (diff) | |
[IMP]make changes for the calcelled state into event
bzr revid: rma@tinyerp.com-20120831110000-cd022yy58aken0iw
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/event/event.py | 4 | ||||
| -rw-r--r-- | addons/event/event_data.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/event/event.py b/addons/event/event.py index c3284695ab9..feb0aed9d46 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -269,7 +269,7 @@ class event_event(osv.osv): def button_cancel_send_note(self, cr, uid, ids, context=None): message = _("Event has been <b>cancelled</b>.") - self.message_post(cr, uid, ids, body=message, subtype="cancel", context=context) + self.message_post(cr, uid, ids, body=message, subtype="cancelled", context=context) return True def button_draft_send_note(self, cr, uid, ids, context=None): @@ -366,7 +366,7 @@ class event_registration(osv.osv): return True def button_reg_cancel(self, cr, uid, ids, context=None, *args): - self.message_post(cr, uid, ids, body=_('State set to Cancel'), subtype="cancel", context=context) + self.message_post(cr, uid, ids, body=_('State set to Cancel'), subtype="cancelled", context=context) return self.write(cr, uid, ids, {'state': 'cancel'}) def mail_user(self, cr, uid, ids, context=None): diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml index 65713628de9..bc16fc08aee 100644 --- a/addons/event/event_data.xml +++ b/addons/event/event_data.xml @@ -21,8 +21,8 @@ <field name="name">close</field> <field name="model_ids" eval="[(4,ref('event.model_event_event')),(4,ref('event.model_event_registration'))]"/> </record> - <record id="mail.mail_subtype_cancel" model="mail.message.subtype"> - <field name="name">cancel</field> + <record id="mail.mail_subtype_cancelled" model="mail.message.subtype"> + <field name="name">cancelled</field> <field name="model_ids" eval="[(4,ref('event.model_event_event')),(4,ref('event.model_event_registration'))]"/> <field name="default" eval="False"/> </record> |