From c2b1f5202658cd0efb366b4114bfad503c9d109e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 5 Dec 2011 15:02:57 +0100
Subject: [PATCH] [REM] form view in mail message o2ms

bzr revid: xmo@openerp.com-20111205140257-1h0dnuly3tqdqsnb
---
 addons/crm/crm_lead_view.xml                  | 61 +------------------
 addons/crm_claim/crm_claim_view.xml           | 28 +--------
 .../crm_fundraising/crm_fundraising_view.xml  | 28 +--------
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 28 +--------
 addons/event/event_view.xml                   | 28 +--------
 addons/hr_recruitment/hr_recruitment_view.xml | 28 +--------
 addons/mail/mail_thread_view.xml              | 21 +------
 addons/project_issue/project_issue_view.xml   | 28 +--------
 .../project_mailgate_view.xml                 | 24 +-------
 .../project_messages_view.xml                 |  9 ---
 10 files changed, 10 insertions(+), 273 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6527fa4cf25..e9c77b3bdc6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -147,7 +147,7 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                    <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                         <tree string="History">
                             <field name="display_text" string="History Information"/>
                             <field name="email_from" invisible="1"/>
@@ -157,35 +157,6 @@
                                 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">
-                                <group col="2" colspan="2" attrs="{'invisible': [('email_from', '=', False)]}">
-                                    <field name="email_from"/>
-                                    <field name="email_to" size="512"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                    <field name="date"/>
-                                    <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
-                                </group>
-                                <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
-                                <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
-                            </group>
-                            <notebook colspan="4">
-                                <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
-                                    <field name="body_text" colspan="4" nolabel="1"/>
-                                    <group attrs="{'invisible': [('email_from', '=', False)]}">
-                                        <button colspan="4" string="Reply"
-                                            name="%(mail.action_email_compose_message_wizard)d"
-                                            context="{'mail.compose.message.mode':'reply'}"
-                                            icon="terp-mail-replied" type="action"/>
-                                        </group>
-
-                                </page>
-                                <page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
-                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                </page>
-                                </notebook>
-                        </form>
                     </field>
                     <button string="Add Internal Note"
                         name="%(crm.action_crm_add_note)d"
@@ -578,7 +549,7 @@
                   <group colspan="4">
                       <field colspan="4" name="email_cc" widget="char" size="512"/>
                   </group>
-                   <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                   <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                        <tree string="History">
                            <field name="display_text" string="History Information"/>
                            <field name="email_from" invisible="1"/>
@@ -588,34 +559,6 @@
                                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">
-                               <group col="2" colspan="2" attrs="{'invisible': [('email_from', '=', False)]}">
-                                   <field name="email_from"/>
-                                   <field name="email_to" size="512"/>
-                               </group>
-                               <group col="2" colspan="2">
-                                   <field name="date"/>
-                                   <field name="email_cc" size="512" attrs="{'invisible': [('email_from', '=', False)]}"/>
-                               </group>
-                               <field name="subject" colspan="4" widget="char" attrs="{'invisible': [('email_from', '=', False)]}" size="512"/>
-                               <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
-                           </group>
-                           <notebook colspan="4">
-                               <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
-                                   <field name="body_text" colspan="4" nolabel="1"/>
-                                   <group attrs="{'invisible': [('email_from', '=', False)]}">
-                                       <button colspan="4" string="Reply"
-                                           name="%(mail.action_email_compose_message_wizard)d"
-                                           context="{'mail.compose.message.mode':'reply'}"
-                                           icon="terp-mail-replied" type="action"/>
-                                       </group>
-                                </page>
-                               <page string="Attachments" attrs="{'invisible': [('email_from', '=', False)]}">
-                                   <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                               </page>
-                               </notebook>
-                       </form>
                    </field>
                    <button string="Add Internal Note"
                        name="%(crm.action_crm_add_note)d"
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7ec18da18eb..08237d06094 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -151,7 +151,7 @@
                                 <group colspan="4">
                                     <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                                 </group>
-                                <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                                <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                                     <tree string="History">
                                         <field name="display_text" string="History Information"/>
                                         <field name="email_from" invisible="1"/>
@@ -161,32 +161,6 @@
                                             context="{'mail.compose.message.mode':'reply'}"
                                             icon="terp-mail-replied" type="action" />
                                     </tree>
-                                    <form string="Communication &amp; History">
-                                        <group col="4" colspan="4">
-                                            <field name="email_from"/>
-                                            <field name="date"/>
-                                            <field name="email_to" widget="char" size="512"/>
-                                            <field name="email_cc" widget="char" size="512"/>
-                                            <field name="subject" colspan="4" widget="char" size="512"/>
-                                        </group>
-                                        <notebook colspan="4">
-                                            <page string="Details">
-                                                <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': [('email_from', '!=', False)]}">
-                                                    <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                                </group>
-                                            </page>
-                                            <page string="Attachments">
-                                                <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                            </page>
-                                        </notebook>
-                                    </form>
                                 </field>
                                 <button string="Add Internal Note"
                                     name="%(crm.action_crm_add_note)d"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 67f82bddd22..cc58b793c17 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -136,7 +136,7 @@
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="email_from" invisible="1"/>
@@ -146,32 +146,6 @@
                                         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">
-                                        <field name="email_from"/>
-                                        <field name="date"/>
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="subject" colspan="4" widget="char" size="512"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <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': [('email_from', '!=', False)]}">
-                                                <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                            </group>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                </form>
                             </field>
                              <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 4b0ec72166b..3d48a3b88ac 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -96,7 +96,7 @@
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="email_from" invisible="1"/>
@@ -106,32 +106,6 @@
                                         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">
-                                        <field name="email_from"/>
-                                        <field name="date"/>
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="subject" colspan="4" widget="char" size="512"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <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': [('email_from', '!=', False)]}">
-                                                <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                            </group>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                </form>
                             </field>
                              <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6a057fe204d..31fb353c113 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -388,7 +388,7 @@
                             <group colspan="4">
                                  <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="email_from" invisible="1"/>
@@ -398,32 +398,6 @@
                                         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">
-                                        <field name="email_from"/>
-                                        <field name="date"/>
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="subject" colspan="4" widget="char" size="512"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <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': [('email_from', '!=', False)]}">
-                                                <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                            </group>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                </form>
                             </field>
                             <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 2fd82910a6d..01ca4991721 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,7 +145,7 @@
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                        </group>
-                       <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                       <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                             <tree string="History">
                                 <field name="display_text" string="History Information"/>
                                 <field name="email_from" invisible="1"/>
@@ -155,32 +155,6 @@
                                     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">
-                                    <field name="email_from"/>
-                                    <field name="date"/>
-                                    <field name="email_to" widget="char" size="512"/>
-                                    <field name="email_cc" widget="char" size="512"/>
-                                    <field name="subject" colspan="4" widget="char" size="512"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Details">
-                                        <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': [('email_from', '!=', False)]}">
-                                            <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                        </group>
-                                    </page>
-                                    <page string="Attachments">
-                                        <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
                         </field>
                         <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index bd10a72faf2..3a7ed8f46fe 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -8,29 +8,10 @@
             <field name="arch" type="xml">
                 <form string="Email Thread">
                     <separator string="Communication History" colspan="4"/>
-                    <field name="message_ids" nolabel="1" colspan="4" mode="tree,form">
+                    <field name="message_ids" nolabel="1" colspan="4" mode="tree">
                         <tree string="Communication History">
                             <field name="display_text"/>
                         </tree>
-                        <form string="Message">
-                            <field name="subject" widget="char"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                            <notebook colspan="4">
-                                <page string="Email Details">
-                                    <group col="4" colspan="4">
-                                        <separator string="Email Details" colspan="4"/>
-                                        <field name="email_from"/>
-                                        <field name="email_to"/>
-                                        <field name="email_cc"/>
-                                        <field name="email_bcc"/>
-                                   </group>
-                                </page>
-                                <page string="Attachments">
-                                    <field name="attachment_ids" nolabel="1" colspan="4" />
-                                </page>
-                            </notebook>
-                        </form>
                     </field>
                 </form>
             </field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2d61a599405..d50501279fd 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -96,7 +96,7 @@
                             <group colspan="4">
                             <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
                             </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="email_from" invisible="1"/>
@@ -106,32 +106,6 @@
                                         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">
-                                        <field name="email_from"/>
-                                        <field name="date"/>
-                                        <field name="email_to" widget="char" size="512"/>
-                                        <field name="email_cc" widget="char" size="512"/>
-                                        <field name="subject" colspan="4" widget="char" size="512"/>
-                                    </group>
-                                    <notebook colspan="4">
-                                        <page string="Details">
-                                            <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': [('email_from', '!=', False)]}">
-                                                <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-                                            </group>
-                                        </page>
-                                        <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-                                        </page>
-                                    </notebook>
-                                </form>
                             </field>
                            <separator colspan="4"/>
                             <button string="Add Internal Note"
diff --git a/addons/project_mailgate/project_mailgate_view.xml b/addons/project_mailgate/project_mailgate_view.xml
index c3cd4bf9db2..6bf9855f98a 100644
--- a/addons/project_mailgate/project_mailgate_view.xml
+++ b/addons/project_mailgate/project_mailgate_view.xml
@@ -9,32 +9,10 @@
 		            <field name="arch" type="xml">
 		                <xpath expr="/form/notebook/page[@string='Extra Info']" position="before">
 		                    <page string="History">
-	                        	<field name="message_ids" colspan="4" nolabel="1" mode="tree,form" readonly="1">
+	                        	<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
 			                        <tree string="History">
 			                            <field name="display_text" string="History Information"/>
 			                        </tree>
-			                        <form string="History">
-			                            <group col="4" colspan="4">
-			                                <field name="email_from"/>
-			                                <field name="date"/>
-			                                <field name="email_to" widget="char" size="512"/>
-			                                <field name="email_cc" widget="char" size="512"/>
-			                                <field name="subject" colspan="4" widget="char" size="512"/>
-			                            </group>
-			                            <notebook colspan="4">
-			                                <page string="Details">
-			                                    <group attrs="{'invisible': [('email_from', '=', False)]}">
-			                                        <field name="body_text" colspan="4" nolabel="1" height="250"/>
-			                                    </group>
-			                                    <group attrs="{'invisible': [('email_from', '!=', False)]}">
-			                                        <field name="display_text" colspan="4" nolabel="1"  height="250"/>
-			                                    </group>
-			                                </page>
-			                                <page string="Attachments">
-			                                    <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
-			                                </page>
-			                            </notebook>
-			                        </form>
 	                    		</field>
 	                        </page>
 		                </xpath>
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index f8c98d15785..85e2c02f8ff 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -15,15 +15,6 @@
 		                     	<field name="from_id"/>
 		                     	<field name="to_id"/>
                    			</tree>
-                   			<form>
-                   				<group>
-	                   				<field name="from_id"/>
-			                        <field name="to_id"/>
-			                        <newline/>
-			                        <separator colspan="4" string="Message"/>
-			                     	<field nolabel="1" name="message" colspan="4"/>
-		                     	</group>
-                   			</form>
                    		</field>
                    	</page>
                	</xpath>