diff options
| author | Bharat (OpenERP) <bde@tinyerp.com> | 2011-09-15 17:02:01 +0530 |
|---|---|---|
| committer | Bharat (OpenERP) <bde@tinyerp.com> | 2011-09-15 17:02:01 +0530 |
| commit | d72be842e320dfff08b7ad4b443740060dfd5a4e (patch) | |
| tree | fd8315220318e2abd672b4270a18a763c8564e9d /addons/event/event_view.xml | |
| parent | 1e767f0d14dfb0870767524bf16c9909bcaee995 (diff) | |
| parent | fbf6708d1041f84018bb9c13e997b705e6086648 (diff) | |
[MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg
Diffstat (limited to 'addons/event/event_view.xml')
| -rw-r--r-- | addons/event/event_view.xml | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 6eafd851559..41c328d8908 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -391,12 +391,12 @@ <field name="message_ids" colspan="4" nolabel="1" mode="tree,form"> <tree string="History"> <field name="display_text" string="History Information"/> - <field name="history" invisible="1"/> - <button - string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(crm.action_crm_send_mail)d" - context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}" - icon="terp-mail-replied" type="action" /> + <field name="email_from" invisible="1"/> + <button + string="Reply" attrs="{'invisible': [('email_from', '=', False)]}" + name="%(mail.action_email_compose_message_wizard)d" + context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" + icon="terp-mail-replied" type="action" /> </tree> <form string="History"> <group col="4" colspan="4"> @@ -404,20 +404,18 @@ <field name="date"/> <field name="email_to" widget="char" size="512"/> <field name="email_cc" widget="char" size="512"/> - <field name="name" colspan="4" widget="char" size="512"/> - <field name="history" invisible="1"/> + <field name="subject" colspan="4" widget="char" size="512"/> </group> <notebook colspan="4"> <page string="Details"> - <group attrs="{'invisible': [('history', '!=', True)]}"> - <field name="description" colspan="4" nolabel="1" height="250"/> - <button colspan="4" - string="Reply" - name="%(crm.action_crm_send_mail)d" - context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}" - icon="terp-mail-replied" type="action" /> + <group attrs="{'invisible': [('email_from', '=', False)]}"> + <field name="body_text" colspan="4" nolabel="1" height="250"/> + <button colspan="4" string="Reply" + name="%(mail.action_email_compose_message_wizard)d" + context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" + icon="terp-mail-replied" type="action"/> </group> - <group attrs="{'invisible': [('history', '=', True)]}"> + <group attrs="{'invisible': [('email_from', '!=', False)]}"> <field name="display_text" colspan="4" nolabel="1" height="250"/> </group> </page> @@ -427,14 +425,13 @@ </notebook> </form> </field> - <button string="Add Internal Note" + <button string="Add Internal Note" name="%(crm.action_crm_add_note)d" context="{'model': 'crm.lead' }" icon="terp-document-new" type="action" /> - <button string="Send New Email" - name="%(crm.action_crm_send_mail)d" - context="{'mail':'new', 'model': 'event.registration'}" - icon="terp-mail-message-new" type="action" /> + <button string="Send New Email" + name="%(mail.action_email_compose_message_wizard)d" + icon="terp-mail-message-new" type="action"/> </page> </notebook> </form> |