[MERGE] merge from lp:~openerp/openobject-addons/trunk/

[odoo/odoo.git] / addons / hr_recruitment / hr_recruitment_view.xml

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d07afd4..2e01823 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -150,29 +150,30 @@
                                 <field name="date"/>
                                 <field name="email"/>
                                 <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(crm.action_crm_reply_mail)d"
-                                       context="{'mail':'reply', 'model': 'hr.applicant'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="4" string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'hr.applicant'}"
-                               icon="gtk-go-forward" type="action" />
-                 </page>
+                                   string="Add a CC"
+                                   name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                   icon="gtk-add" type="action"/>
+                            </group>
+                            <newline/>
+                            <field name="description" colspan="4"
+                               nolabel="1" widget="text_tag" readonly="1" />
+                            <button colspan="4"
+                               string="Reply to Last Email"
+                               name="%(crm.action_crm_reply_mail)d"
+                               context="{'mail':'reply', 'model': 'hr.applicant'}" icon="gtk-undo"
+                               type="action" />
+                        </form>
+                        <tree string="Communication history">
+                           <field name="description"/>
+                           <field name="email"/>
+                           <field name="date"/>
+                        </tree>
+                    </field>
+                       <button colspan="4" string="Send New Email"
+                               name="%(crm.action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'hr.applicant'}" icon="gtk-go-forward"
+                               type="action" />
+                   </page>
                 </notebook>
             </form>
         </field>