[MERGE]

[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 9dc2f52..ca61479 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -8,7 +8,6 @@
             sequence="40" />
 
         <act_window
-            domain="[('applicant_id', '=', active_id)]"
             id="act_hr_applicant_to_meeting"
             name="Meetings"
             res_model="crm.meeting"
@@ -106,21 +105,11 @@
         <field name="arch" type="xml">
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
-                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
+                <button name="case_close_with_emp" string="Hire" type="object"
                         states="open,pending" class="oe_highlight"/>
-                <button name="case_open" string="Open" type="object"
-                        states="draft,pending" class="oe_highlight"/>
-                <button name="case_pending" string="Pending" type="object" invisible="1"
-                        states="open"/>
-                <button name="case_reset" string="Reset to New" type="object"
-                        states="done,cancel"/>
                 <button name="case_cancel" string="Refuse" type="object"
                         states="draft,open,pending" class="oe_highlight"/>
-                <button name="stage_previous" string="Previous" type="object"
-                        states="open"/>
-                <button name="stage_next" string="Next" type="object"
-                        states="open"/>
-                <field name="stage_id" widget="statusbar"/>
+                <field name="stage_id" widget="statusbar" clickable="True" on_change="onchange_stage_id(stage_id)"/>
             </header>
             <sheet>
                 <div class="oe_right oe_button_box">
@@ -143,7 +132,7 @@
                     </h2>
                 </div>
                 <group>
-                    <group string="Contact Details">
+                    <group>
                         <field name="partner_id"
                                 on_change="onchange_partner_id(partner_id, email_from)"/>
                         <field name="email_from" widget="email"/>
@@ -151,7 +140,7 @@
                         <field name="partner_mobile"/>
                         <field name="type_id" placeholder="Degree"/>
                     </group>
-                    <group string="Application Followup">
+                    <group>
                         <field name="user_id"/>
                         <label for="title_action"/>
                         <div>
@@ -160,6 +149,8 @@
                         </div>
                         <field name="priority"/>
                         <field name="state" invisible="1"/>
+                        <field name="source_id"/>
+                        <field name="reference"/>
                     </group>
                     <group string="Job">
                         <field name="survey" invisible="1"/>
@@ -183,17 +174,13 @@
                             <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
                     </group>
-                    <group string="Reference">
-                        <field name="source_id"/>
-                        <field name="reference"/>
-                    </group>
                 </group>
                 <separator string="Application Summary"/>
                 <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
-            <footer>
+            <div class="oe_chatter">
                 <field name="message_ids" widget="mail_thread"/>
-            </footer>
+            </div>
           </form>
         </field>
     </record>
@@ -505,17 +492,5 @@
             action="hr_recruitment_source_action"
             sequence="10" groups="base.group_no_one"/>
 
-    <record model="ir.ui.view" id="view_crm_meeting_form">
-        <field name="name">CRM - Meetings Form</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
-        <field name="arch" type="xml">
-            <field name="partner_id" position="before">
-                <field name="applicant_id" attrs="{'invisible': [('categ_id','!=',%(hr_recruitment.categ_meet_interview)d)]}"/>
-            </field>
-        </field>
-    </record>
-
     </data>
 </openerp>