[REVERT] incorrect substitution, also causing duplicate fields in form, r.5073

Revision 5073 has revid fp@tinyerp.com-20110917153740-pbzrq432ilbi5pb5

bzr revid: odo@openerp.com-20110925021339-l6546pvwhr65j0da

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a72d709..d631e37 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="body_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
+                                <field name="display_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
                             </group>
                             <notebook colspan="4">
                                 <page string="Details" attrs="{'invisible': [('email_from', '=', False)]}">
@@ -580,7 +580,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="body_text" colspan="4" attrs="{'invisible': [('email_from', '!=', False)]}"/>
+                               <field name="display_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 6c2c91a..8dd5e17 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -172,7 +172,7 @@
                                                 icon="terp-mail-replied" type="action"/>
                                         </group>
                                         <group attrs="{'invisible': [('email_from', '!=', False)]}">
-                                            <field name="body_text" colspan="4" nolabel="1"  height="250"/>
+                                            <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                         </group>
                                     </page>
                                     <page string="Attachments">

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e2434d7..544606a 100644 (file)
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -124,7 +124,7 @@
                                                     icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('email_from', '!=', False)]}">
-                                                <field name="body_text" colspan="4" nolabel="1"  height="250"/>
+                                                <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                             </group>
                                         </page>
                                         <page string="Attachments">