fix

bzr revid: fp@tinyerp.com-20110917153740-pbzrq432ilbi5pb5

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 8811cea..118bf11 100644 (file)
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -195,7 +195,7 @@
                                     <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)]}"/>
+                                <field name="body_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
                             </group>
                             <notebook colspan="4">
                                 <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
@@ -581,7 +581,7 @@
                                    <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)]}"/>
+                               <field name="body_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
                            </group>
                            <notebook colspan="4">
                                <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index fad6874..fce5297 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -148,11 +148,11 @@
                             <tree string="History">
                                 <field name="display_text" string="History Information"/>
                                 <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" />
+                                <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">
@@ -166,13 +166,13 @@
                                     <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"/>
+                                            <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"/>
+                                            <field name="body_text" colspan="4" nolabel="1"  height="250"/>
                                         </group>
                                     </page>
                                     <page string="Attachments">
@@ -185,9 +185,9 @@
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                           <button string="Send New Email"
-                               name="%(mail.action_email_compose_message_wizard)d"
-                               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>
                  <page string="Notes">
                      <field name="description" nolabel="1" colspan="4"/>

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ebd1896..db70d2d 100644 (file)
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -100,11 +100,11 @@
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <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" />
+                                    <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">
@@ -118,13 +118,13 @@
                                         <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"/>
+                                                <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"/>
+                                                <field name="body_text" colspan="4" nolabel="1"  height="250"/>
                                             </group>
                                         </page>
                                         <page string="Attachments">
@@ -138,9 +138,9 @@
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                                   <button string="Send New Email"
-                                       name="%(mail.action_email_compose_message_wizard)d"
-                                       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>
                            <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">