diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-10-15 17:03:32 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-10-15 17:03:32 +0530 |
| commit | 287b9d09eb740f6adfafdbbc65265f2aecf515ba (patch) | |
| tree | d0d686830d71c964f03bc69f85c3ef26dec6f006 /addons/mail/wizard/mail_compose_message_view.xml | |
| parent | 3eb5cfb61b6bbb84043f4fa6b3fdefb0fbb320c7 (diff) | |
| parent | 7f23ad5de563eacfcae958d0011637800b097d4a (diff) | |
[MERGE]trunk.
bzr revid: vme@tinyerp.com-20121015113332-i8g3d8na27j08h3l
Diffstat (limited to 'addons/mail/wizard/mail_compose_message_view.xml')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message_view.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 0f384dc5a0d..7329992f8ed 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -16,13 +16,11 @@ <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..." context="{'force_email':True}" on_change="onchange_partner_ids(partner_ids)"/> + <field name="is_private" help="If this message is not private, this message will send to all your followers or all followers of the parented message."/> </group> <notebook> <page string="Body"> - <field name="body_text" nolabel="1" - attrs="{'invisible':[('content_subtype', '=', 'html')]}"/> - <field name="body" nolabel="1" - attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/> + <field name="body" nolabel="1"/> </page> <page string="Attachments"> <field name="attachment_ids" colspan="4" nolabel="1"/> @@ -32,10 +30,10 @@ <button string="Send" name="send_mail" type="object" class="oe_highlight" /> or <button string="Cancel" class="oe_link" special="cancel" /> - <div class="oe_right"> + <!--div class="oe_right"> <button string="" name="toggle_content_subtype" type="object" icon="/mail/static/src/img/formatting.png" help="Toggle advanced formatting mode"/> - </div> + </div--> </footer> </form> </field> @@ -68,6 +66,7 @@ context="{'force_email':True}" on_change="onchange_partner_ids(partner_ids)" class="oe_mail_compose_message_partner_ids"/> + <!--field name="is_private" help="If this message is not private, this message will send to all your followers or all followers of the parented message."/--> <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add attachments..." invisible="1" class="oe_mail_compose_message_attachment_ids"/> |