Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-mail-bde
into lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-mail-bde/+merge/110332
Hello Sir,
I have applied sheet tag for mail module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-mail-bde/+merge/110332
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-mail-bde
into lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp.
=== modified file 'mail/mail_group_view.xml'
--- mail/mail_group_view.xml 2012-06-14 10:48:02 +0000
+++ mail/mail_group_view.xml 2012-06-14 13:31:38 +0000
@@ -51,28 +51,28 @@
<field name="priority" eval="10"/>
<field name="arch" type="xml">
<form string="Group" version="7.0">
- <sheet>
- <group colspan="4" col="8">
- <group colspan="6" col="4">
- <separator string="General Information" colspan="4"/>
- <field name="name" colspan="2"/>
- <field name="responsible_id" colspan="2"/>
- <newline/>
- <field name="description" colspan="4"/>
- </group>
- <group colspan="1" col="2">
- <separator string="Group Image" colspan="2"/>
- <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
- </group>
- <group colspan="1" col="2">
- <separator string="Privacy Settings" colspan="2"/>
- <field name="public" nolabel="1"/>
- <label string="This group is visible by non members" colspan="2"/>
- </group>
- </group>
- <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
- options='{"thread_level": 1}'/>
- </sheet>
+ <sheet>
+ <group colspan="4" col="8">
+ <group colspan="6" col="4">
+ <separator string="General Information" colspan="4"/>
+ <field name="name" colspan="2"/>
+ <field name="responsible_id" colspan="2"/>
+ <newline/>
+ <field name="description" colspan="4"/>
+ </group>
+ <group colspan="1" col="2">
+ <separator string="Group Image" colspan="2"/>
+ <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
+ </group>
+ <group colspan="1" col="2">
+ <separator string="Privacy Settings" colspan="2"/>
+ <field name="public" nolabel="1"/>
+ <label string="This group is visible by non members" colspan="2"/>
+ </group>
+ </group>
+ <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
+ options='{"thread_level": 1}'/>
+ </sheet>
</form>
</field>
</record>
=== modified file 'mail/mail_message_view.xml'
--- mail/mail_message_view.xml 2012-06-09 21:56:28 +0000
+++ mail/mail_message_view.xml 2012-06-14 13:31:38 +0000
@@ -26,20 +26,22 @@
<field name="priority">20</field>
<field name="arch" type="xml">
<form string="Message" version="7.0">
- <group>
- <group>
- <field name="subject"/>
- <field name="date"/>
- <field name="type"/>
- <field name="body_text"/>
- </group>
- <group>
- <field name="user_id" string="User"/>
- <field name="model"/>
- <field name="res_id"/>
- <field name="parent_id"/>
- </group>
- </group>
+ <sheet>
+ <group>
+ <group>
+ <field name="subject"/>
+ <field name="date"/>
+ <field name="type"/>
+ <field name="body_text"/>
+ </group>
+ <group>
+ <field name="user_id" string="User"/>
+ <field name="model"/>
+ <field name="res_id"/>
+ <field name="parent_id"/>
+ </group>
+ </group>
+ </sheet>
</form>
</field>
</record>
@@ -79,57 +81,59 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Email message" version="7.0">
- <label for="subject" class="oe_form_readonly_hidden"/>
- <h1><field name="subject"/></h1>
- <label for="user_id"/>
- <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
- <group col="4">
- <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
- <field name="type"/>
- </group>
- <notebook colspan="4">
- <page string="Details">
- <group string="Recipients">
- <field name="email_from"/>
- <field name="email_to"/>
- <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
- <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
- <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
- </group>
- <group col="4" string="Message Details">
- <field name="model"/>
- <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
- <field name="res_id"/>
- <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
- <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
- </group>
- <notebook>
- <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
- <field name="body_html" widget="text_html"/>
- </page>
- <page string="Body (Plain)">
- <field name="body_text" widget="text"/>
- </page>
- </notebook>
- <group col="5">
- <field name="state" colspan="2"/>
- <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
- <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
- context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
- </group>
- </page>
- <page string="Attachments">
- <field name="attachment_ids"/>
- </page>
- <page string="Advanced" groups="base.group_no_one">
- <group col="2" colspan="4">
- <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
- <field name="auto_delete"/>
- <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
- <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
- </group>
- </page>
- </notebook>
+ <sheet>
+ <label for="subject" class="oe_form_readonly_hidden"/>
+ <h1><field name="subject"/></h1>
+ <label for="user_id"/>
+ <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
+ <group col="4">
+ <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
+ <field name="type"/>
+ </group>
+ <notebook colspan="4">
+ <page string="Details">
+ <group string="Recipients">
+ <field name="email_from"/>
+ <field name="email_to"/>
+ <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
+ <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
+ <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
+ </group>
+ <group col="4" string="Message Details">
+ <field name="model"/>
+ <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
+ <field name="res_id"/>
+ <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+ <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
+ </group>
+ <notebook>
+ <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
+ <field name="body_html" widget="text_html"/>
+ </page>
+ <page string="Body (Plain)">
+ <field name="body_text" widget="text"/>
+ </page>
+ </notebook>
+ <group col="5">
+ <field name="state" colspan="2"/>
+ <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
+ <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+ context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+ </group>
+ </page>
+ <page string="Attachments">
+ <field name="attachment_ids"/>
+ </page>
+ <page string="Advanced" groups="base.group_no_one">
+ <group col="2" colspan="4">
+ <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
+ <field name="auto_delete"/>
+ <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
+ <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
+ </group>
+ </page>
+ </notebook>
+ </sheet>
</form>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
