X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fhr_recruitment%2Fhr_recruitment_view.xml;h=ff20f18c1bd8b9b003e3844812194b8b07c65ceb;hb=ec5f2fe5d34ee2400c010afd73d1cfc6671fb3c9;hp=59d9207cb5145966b3291ad973eff0ac757fb5a9;hpb=98955baf7345416ee967878e07a889f62eaad2d6;p=odoo%2Fodoo.git

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 59d9207..ff20f18 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -1,36 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <menuitem
-            id="menu_hr_recruitment_recruitment"
-            name="Recruitment"
-            parent="hr.menu_hr_configuration"
-            sequence="40" />
 
-        <act_window
-            domain="[('applicant_id', '=', active_id)]"
-            id="act_hr_applicant_to_meeting"
-            name="Meetings"
-            res_model="crm.meeting"
-            src_model="hr.applicant"
-            view_mode="tree,form,calendar,graph"
-            view_type="form"/>
+    <menuitem name="Recruitment"
+        id="menu_hr_recruitment_recruitment"
+        parent="hr.menu_hr_configuration"
+        sequence="40"/>
 
-    # ------------------------------------------------------
-    # Job Categories
-    # ------------------------------------------------------
+    <act_window
+        id="act_hr_applicant_to_meeting"
+        name="Meetings"
+        res_model="crm.meeting"
+        src_model="hr.applicant"
+        view_mode="tree,form,calendar,graph"
+        view_type="form"/>
 
-    <record id="hr_job_categ_action" model="ir.actions.act_window">
-        <field name="name">Applicant Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
-        <field name="context" eval="{'object_id': ref('model_hr_applicant')}"/>
-    </record>
-    # ------------------------------------------------------
-    # Stage
-    # ------------------------------------------------------
+    <!-- Stage -->
     <record id="hr_job_stage_act" model="ir.actions.act_window">
         <field name="name">Recruitment / Applicants Stages</field>
         <field name="res_model">hr.recruitment.stage</field>
@@ -41,9 +26,43 @@
     </record>
 
 
-    # ------------------------------------------------------
-    # Jobs
-    # ------------------------------------------------------
+    <!-- Jobs -->
+    <!-- Applicant Read/Unread actions -->
+    <record id="actions_server_applicant_unread" model="ir.actions.server">
+        <field name="name">Mark unread</field>
+        <field name="condition">True</field>
+        <field name="type">ir.actions.server</field>
+        <field name="model_id" ref="model_hr_applicant"/>
+        <field name="state">code</field>
+        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+    </record>
+    <record id="action_applicant_unread" model="ir.values">
+        <field name="name">action_project_unread</field>
+        <field name="action_id" ref="actions_server_applicant_unread"/>
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_unread'))"/>
+        <field name="key">action</field>
+        <field name="model_id" ref="model_hr_applicant"/>
+        <field name="model">hr.applicant</field>
+        <field name="key2">client_action_multi</field>
+    </record>
+
+    <record id="actions_server_applicant_read" model="ir.actions.server">
+        <field name="name">Mark read</field>
+        <field name="condition">True</field>
+        <field name="type">ir.actions.server</field>
+        <field name="model_id" ref="model_hr_applicant"/>
+        <field name="state">code</field>
+        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+    </record>
+    <record id="action_applicant_read" model="ir.values">
+        <field name="name">action_project_read</field>
+        <field name="action_id" ref="actions_server_applicant_read"/>
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_read'))"/>
+        <field name="key">action</field>
+        <field name="model_id" ref="model_hr_applicant"/>
+        <field name="model">hr.applicant</field>
+        <field name="key2">client_action_multi</field>
+    </record>
 
     <record model="ir.ui.view" id="crm_case_tree_view_job">
         <field name="name">Applicants</field>
@@ -79,88 +98,95 @@
         <field name="model">hr.applicant</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+          <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
-                        states="open,pending"/>
+                        states="open,pending" class="oe_highlight"/>
                 <button name="case_open" string="Open" type="object"
-                        states="draft,pending"/>
-                <button name="case_pending" string="Pending" 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"/>
+                        states="draft,open,pending" class="oe_highlight"/>
                 <button name="stage_previous" string="Previous" type="object"
-                        states="open" icon="gtk-go-back"/>
+                        states="open"/>
                 <button name="stage_next" string="Next" type="object"
-                        states="open" icon="gtk-go-forward"/>
-                <field name="stage_id" widget="statusbar" domain="['|',('department_id','=',department_id),('department_id','=',False)]"/>
+                        states="open"/>
+                <field name="stage_id" widget="statusbar"/>
             </header>
-            <sheet string="Jobs - Recruitment Form" layout="auto">
-                <group colspan="4" col="10">
-                    <h1><field name="name" colspan="4" nolabel="1"/></h1>
-					<h1><button name="action_makeMeeting" type="object" colspan="2" string="Schedule Interview" icon="gtk-index" help="Schedule interview with this applicant"/>
-					<button name="%(survey.action_view_survey_question_message)d" string="Start Interview" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'invisible':[('survey','=',False)]}" help="Answer related job question"/>
-					<button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'invisible':[('survey','=',False)]}" help="Print interview report"/></h1>
-				</group>
-				<field name="type_id" nolabel="1" placeholder="Degree"/>
-				<group colspan="4" col="4">
-                        <field name="partner_name"/>
-                        <field name="job_id" on_change="onchange_job(job_id)"/>
-						<field name="user_id"/>
-						<field name="priority" string="Appreciation"/>
-						<field name="title_action"/>
-						<field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-						<field name="date_action"/>
+            <sheet>
+                <div class="oe_right oe_button_box">
+                    <button name="action_makeMeeting" type="object"
+                        string="Schedule Interview" icon="gtk-index" help="Schedule interview with this applicant"/>
+                    <button name="%(survey.action_view_survey_question_message)d" type="action"
+                        string="Start Interview" icon="gtk-execute" help="Answer related job question"
+                        context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
+                        attrs="{'invisible':[('survey','=',False)]}"/>
+                    <button name="action_print_survey" type="object"
+                        string="Print Interview" icon="gtk-print" help="Print interview report"
+                        attrs="{'invisible':[('survey','=',False)]}"/>
+                </div>
+                <div class="oe_title">
+                    <label for="name" class="oe_edit_only"/>
+                    <h1><field name="name"/></h1>
+                    <label for="partner_name" class="oe_edit_only"/>
+                    <h2>
+                        <field name="partner_name" class="oe_inline"/>
+                    </h2>
+                </div>
+                <group>
+                    <group>
+                        <field name="partner_id"
+                                on_change="onchange_partner_id(partner_id, email_from)"/>
+                        <field name="email_from" widget="email"/>
+                        <field name="partner_phone"/>
+                        <field name="partner_mobile"/>
+                        <field name="type_id" placeholder="Degree"/>
+                    </group>
+                    <group>
+                        <field name="user_id"/>
+                        <label for="title_action"/>
+                        <div>
+                            <field name="date_action"/> -
+                            <field name="title_action" class="oe_inline" placeholder="Call for proposal"/>
+                        </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"/>
                         <field name="response" invisible="1"/>
+                        <field name="job_id" on_change="onchange_job(job_id)"/>
+                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <label for="availability"/>
+                        <div>
+                            <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
+                        </div>
+                    </group>
+                    <group string="Contract">
+                        <label for="salary_expected"/>
+                        <div>
+                            <field name="salary_expected" class="oe_inline"/>,
+                            <field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
+                        </div>
+                        <label for="salary_proposed"/>
+                        <div>
+                            <field name="salary_proposed" class="oe_inline"/>,
+                            <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
+                        </div>
+                    </group>
                 </group>
-                <field name="state" groups="base.group_no_one"/>
-                <notebook colspan="4">
-                    <page string="Application">
-                        <group col="12" colspan="6">
-                            <group col="3" colspan="4" class="oe_form_group_label_border">
-                                <separator colspan="4" string="Contact"/>
-                                <field name="partner_id" colspan="1"
-                                       on_change="onchange_partner_id(partner_id, email_from)"/>
-                                <button string="Create Contact"
-                                        name="%(action_hr_recruitment_partner_create)d"
-                                        icon="gtk-index" 
-                                        type="action" colspan="1"
-                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                                <field name="email_from" colspan="1"/>
-                                <button string="Mail" 
-                                        name="%(mail.action_email_compose_message_wizard)d" 
-                                        icon="terp-mail-message-new" 
-                                        type="action" colspan="1"
-                                        attrs="{'invisible':[('email_from','=',False)]}"/>
-                                <field name="partner_phone" colspan="3"/>
-                                <field name="partner_mobile" colspan="3"/>
-                            </group>
-                            <group col="2" colspan="4" class="oe_form_group_label_border">
-                                <separator colspan="2" string="Reference"/>
-                                <field name="source_id"/>
-                                <field name="reference"/>
-                            </group>
-                            <group col="3" colspan="4" class="oe_form_group_label_border">
-                                <separator colspan="3" string="Contracts"/>
-                                <field name="availability" colspan="3"/>
-                                <field name="salary_expected"/>
-                                <field name="salary_expected_extra" nolabel="1"/>
-                                <field name="salary_proposed"/>
-                                <field name="salary_proposed_extra" nolabel="1"/>
-                            </group>
-                        </group>
-                        <separator colspan="3" string="Details"/>
-                        <field name="description" nolabel="1" colspan="4"/>
-                   </page>
-                </notebook>
+                <separator string="Application Summary"/>
+                <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
-            <div class="oe_form_bottom">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+            <div class="oe_chatter">
+                <field name="message_ids" widget="mail_thread"/>
             </div>
-            </form>
+          </form>
         </field>
     </record>
 
@@ -183,43 +209,29 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
-               <filter icon="terp-document-new" string="New" name="filter_new" 
-                   domain="[('state','=','draft')]"
-                   help="All Initial Jobs"
-               />
-               <filter icon="terp-camera_test" string="In Progress" name="filter_inprogress"
-                   domain="[('state','=','open')]"
-                   help="Open Jobs"
-               />
-               <filter icon="terp-gtk-media-pause" string="Pending"
-                   domain="[('state','=','pending')]"
-                   help="Pending Jobs"
-               />
-               <separator orientation="vertical"/>
-               <filter icon="terp-gtk-jump-to-ltr" string="Next Actions"
-                    context="{'invisible_next_action':False, 'invisible_next_date':False}"
-                    domain="[('date_action','&lt;&gt;',False)]"
-                    help="Filter and view on next actions and date"/>
-               <separator orientation="vertical"/>
-               <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-               <field name="job_id" widget="selection"/>
-               <field name="user_id">
-                    <filter domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-" />
-               </field>
-               <newline/>
+                <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <separator/>
+                <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
+                <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
+                <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
+                <separator/>
+                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
+                <separator/>
+                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
+                    domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
+                <field name="job_id"/>
+                <field name="user_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                     <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
                     <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
                     <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
-                    <separator orientation="vertical" groups="base.group_no_one"/>
                     <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
            </search>
@@ -227,7 +239,6 @@
     </record>
 
     <!-- CRM Lead Calendar View -->
-
     <record model="ir.ui.view" id="hr_applicant_calendar_view">
         <field name="name">Hr Applicants Calendar</field>
         <field name="model">hr.applicant</field>
@@ -236,23 +247,21 @@
         <field name="arch" type="xml">
             <calendar string="Applicants"
                 date_start="date_action" color="user_id">
-                <field name="name" />
-                <field name="partner_name" />
+                <field name="name"/>
+                <field name="partner_name"/>
                 <field name="title_action"/>
             </calendar>
         </field>
     </record>
 
-    <!-- hr Applicant Kanban View -->
-
- <record model="ir.ui.view" id="hr_kanban_view_applicant">
+    <!-- Hr Applicant Kanban View -->
+    <record model="ir.ui.view" id="hr_kanban_view_applicant">
         <field name="name">Hr Applicants kanban</field>
         <field name="model">hr.applicant</field>
         <field name="type">kanban</field>
         <field name="arch" type="xml">
             <kanban default_group_by="stage_id">
                 <field name="color"/>
-                <field name="state" groups="base.group_no_one"/>
                 <field name="priority"/>
                 <field name="survey"/>
                 <field name="user_id"/>
@@ -260,86 +269,81 @@
                 <field name="partner_name"/>
                 <field name="type_id"/>
                 <field name="job_id"/>
-                 <field name="title_action"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <t t-if="record.priority.raw_value == '1'" t-set="border">oe_kanban_color_green</t>
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height">
-                                <a class="oe_kanban_menuaction oe_i">B</a>
-                                <ul class="oe_kanban_menu">
+                <field name="title_action"/>
+                <field name="department_id"/>
+                <templates>
+                    <t t-name="kanban-tooltip">
+                        <ul class="oe_kanban_tooltip">
+                            <li t-if="record.type_id.raw_value"><b>Degree:</b> <field name="type_id"/></li>
+                            <li t-if="record.partner_id.raw_value"><b>Contact:</b> <field name="partner_id"/></li>
+                            <li t-if="record.department_id.raw_value"><b>Departement:</b> <field name="department_id"/></li>
+                        </ul>
+                    </t>
+                    <t t-name="kanban-box">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <span class="oe_e">i</span>
+                                <ul class="oe_dropdown_menu">
                                     <li><a type="edit">Edit...</a></li>
                                     <li><a type="delete">Delete</a></li>
+                                    <li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
-                                <div class="oe_kanban_content" >
-                                	<h3 class="oe_kanban_ellipsis"><field name="name"/>
-                                    </h3> 
-                                    <div style="margin-bottom:2;padding-top:5px;white-space: nowrap;" >                               
-                                	    <field name="partner_name"/>
-                                        <div class="oe_kanban_right">
-                                    	  <span class="oe_kanban_highlight">
-                                        	<t t-set="priority" t-value="record.priority.raw_value || 5"/>
-                                            <a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
-                                               <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['5']" t-if="priority lte 3">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['2']">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['1']">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                         </span>
-                                     </div>
-                                  </div>
-                                  <div style="white-space: nowrap;" >
-                                  		<div t-if="record.type_id.raw_value">
-                                    	  (<field name="type_id"/>)
-                                        </div>
-                                  </div>
-                                   <div style="padding-top:5px;white-space: nowrap;" >
-                                   	  <t t-if="record.job_id.raw_value">Applied for <field name="job_id" /></t> 
-                                   </div>
-                                   <div style="padding-top:5px;white-space: nowrap;" >
-                                   	  <t t-if="record.title_action.raw_value">
-                                          <field name="title_action" /> on 
-                                           <field name="date_action" />
-                                       </t>
-                                    </div>
-                                    <div align="left" width="22" style="padding-top:5px;white-space: nowrap;" >
-                                      <div align="right">
-                                           <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
-                                      </div>
-                                    </div>
+                            </div>
+                            <div class="oe_kanban_content" tooltip="kanban-tooltip">
+                                <div>
+                                    <b><field name="name"/></b><br/>
+                                    <field name="job_id"/><br/>
+                                    <t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
+                                    <t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
+                                    <field name="date_action"/>
+                                </div>
+                                <div class="oe_kanban_right">
+                                    <t t-set="priority" t-value="record.priority.raw_value || 5"/>
+                                    <a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
+                                        <img src="/web/static/src/img/icons/star-off.png" width="16" height="16" title="Good"/>
+                                    </a>
+                                    <a type="object" name="set_priority" args="['5']" t-if="priority lte 3">
+                                        <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16" title="Good"/>
+                                    </a>
+                                    <a type="object" name="set_priority" args="['2']">
+                                        <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16" title="Very Good"/>
+                                    </a>
+                                    <a type="object" name="set_priority" args="['1']">
+                                        <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16" title="Excellent"/>
+                                    </a>
+                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
                             </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-    # ------------------------------------------------------
-    # HR Job
-    # ------------------------------------------------------
+                            <div class="oe_clear"></div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
 
+    <!-- HR Job -->
     <record id="hr_job_survey" model="ir.ui.view">
         <field name="name">hr.job.form1</field>
         <field name="model">hr.job</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="expected_employees" position="after">
-                <field name="survey_id" />
-				<button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'invisible':[('survey_id','=',False)]}"/>
+            <field name="no_of_recruitment" version="7.0" position="after">
+                <label for="survey_id" groups="base.group_user"/>
+                <div groups="base.group_user">
+                    <field name="survey_id" class="oe_inline"/>
+                    <button class="oe_inline"
+                        string="Interview" icon="gtk-print"
+                        name="action_print_survey" type="object"
+                        attrs="{'invisible':[('survey_id','=',False)]}"/>
+                </div>
             </field>
         </field>
     </record>
 
-<!-- Stage Tree View -->
-
+    <!-- Stage Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_stage_tree">
         <field name="name">hr.recruitment.stage.tree</field>
         <field name="model">hr.recruitment.stage</field>
@@ -354,29 +358,26 @@
         </field>
     </record>
 
-<!-- Stage Form View -->
-
+    <!-- Stage Form View -->
     <record model="ir.ui.view" id="hr_recruitment_stage_form">
         <field name="name">hr.recruitment.stage.form</field>
         <field name="model">hr.recruitment.stage</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Stage">
-                <group colspan="4" col="6">
-                    <separator string="Stage Definition" colspan="6"/>
-                    <field name="name" select="1"/>
+            <form string="Stage" version="7.0">
+                <group string="Stage Definition">
+                    <field name="name"/>
                     <field name="department_id"/>
                     <field name="sequence"/>
                     <field name="state"/>
                 </group>
-                <separator string="Requirements" colspan="4"/>
-                <field name="requirements" nolabel="1" colspan="4"/>
+                <separator string="Requirements"/>
+                <field name="requirements"/>
             </form>
         </field>
     </record>
 
-<!-- Stage Action -->
-
+    <!-- Stage Action -->
     <record id="hr_recruitment_stage_act" model="ir.actions.act_window">
         <field name="name">Stages</field>
         <field name="res_model">hr.recruitment.stage</field>
@@ -392,8 +393,7 @@
         action="hr_recruitment_stage_act"
         sequence="1" groups="base.group_no_one"/>
 
-<!-- Degree Tree View -->
-
+    <!-- Degree Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_degree_tree">
         <field name="name">hr.recruitment.degree.tree</field>
         <field name="model">hr.recruitment.degree</field>
@@ -406,22 +406,22 @@
         </field>
     </record>
 
-<!-- Degree Form View -->
-
+    <!-- Degree Form View -->
     <record model="ir.ui.view" id="hr_recruitment_degree_form">
         <field name="name">hr.recruitment.degree.form</field>
         <field name="model">hr.recruitment.degree</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Degree">
-                    <field name="name" select="1"/>
+            <form string="Degree" version="7.0">
+                <group>
+                    <field name="name"/>
                     <field name="sequence"/>
+                </group>
             </form>
         </field>
     </record>
 
-<!-- Degree Action -->
-
+    <!-- Degree Action -->
     <record id="hr_recruitment_degree_action" model="ir.actions.act_window">
         <field name="name">Degree</field>
         <field name="res_model">hr.recruitment.degree</field>
@@ -436,8 +436,7 @@
             action="hr_recruitment_degree_action"
             sequence="5" groups="base.group_no_one"/>
 
-<!-- Source Tree View -->
-
+    <!-- Source Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_source_tree">
         <field name="name">hr.recruitment.source.tree</field>
         <field name="model">hr.recruitment.source</field>
@@ -464,206 +463,12 @@
         <field name="view_type">form</field>
     </record>
 
-     <menuitem
-            id="menu_hr_recruitment_source"
-            parent="menu_hr_recruitment_recruitment"
-            action="hr_recruitment_source_action"
-            sequence="10" groups="base.group_no_one"/>
-<record model="ir.ui.view" id="crm_case_form_view_meet1">
-        <field name="name">CRM - Meetings Form</field>
-        <field name="model">crm.meeting</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Meetings" layout="manual">
-                <header>
-                    <button name="case_open" string="Confirm" type="object"
-                            states="draft"/>
-                    <button name="case_close" string="Done" type="object"
-                            states="open"/>
-                    <button name="case_reset" string="Reset to Unconfirmed" type="object"
-                            states="cancel,done"/>
-                    <button name="case_cancel" string="Cancel" type="object"
-                            states="draft,open"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </header>
-                <sheet layout="auto">
-                <group col="6" colspan="4">
-                    <field name="name" select="1" string="Title"
-                           required="1" />
-                    <field name="categ_id" widget="selection"
-                        string="Meeting Type"
-                        domain="[('object_id.model', '=', 'crm.meeting')]" />
-                    <field name="allday" on_change="onchange_dates(date,False,False,allday)" />
-                    <newline/>
-                    <field name="date" string="Start Date" required="1"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="duration" widget="float_time"
-                        on_change="onchange_dates(date,duration,False,allday)" />
-                    <field name="date_deadline" string="End Date" required="1"
-                        on_change="onchange_dates(date,False,date_deadline)" />
-                    <field name="location" />
-                    <field name="alarm_id" string="Reminder"
-                        widget="selection" />
-                    <group colspan="2" col="4" attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                           <field name="recurrency" string="Recurrence"/>
-                    </group>
-                </group>
-                <notebook colspan="4">
-                <page string="Meeting">
-                    <group col="6" colspan="4">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Assignment"/>
-                            <field name="user_id" />
-                            <field name="organizer"/>
-                            <field name="department_id" widget="selection"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Contacts"/>
-                            <field name="partner_id" string="Applciant"
-                                on_change="onchange_partner_id(partner_id)" />
-                            <field name="email_from"/>
-                        </group><group col="2" colspan="2">
-                            <separator colspan="2" string="Visibility"/>
-                            <field name="class" string="Privacy"/>
-                            <field name="show_as" string="Show Time as"/>
-                            <field name="rrule" invisible="1" readonly="1"/>
-                            <field name="recurrent_id" invisible="1"/>
-                            <field name="recurrent_uid" invisible="1"/>
-                        </group>
-                    </group>
-                    <separator string="Description" colspan="4" />
-                    <field name="description" nolabel="1" colspan="4" />
-                    </page>
-                    <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            attrs="{'readonly': [('state', '=', 'done')]}"
-                            context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
-                        <field name="attendee_ids" colspan="4"
-                            nolabel="1" widget="one2many" mode="tree,form">
-                            <tree string="Invitation details" editable="top">
-                                <field name="sent_by_uid" string="From"/>
-                                <field name="user_id" string="To"/>
-                                <field name="email" string="Mail To"/>
-                                <field name="role" select="1" />
-                                <field name="state" />
-                                <button name="do_tentative"
-                                    states="needs-action,declined,accepted"
-                                    string="Uncertain" type="object"
-                                    icon="terp-crm" />
-                                <button name="do_accept" string="Accept"
-                                    states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
-                                <button name="do_decline" string="Decline"
-                                    states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                            </tree>
-                            <form string="Invitation details">
-                                <notebook colspan="4">
-                                    <page string="Details">
-                                        <field name="email" />
-                                        <field name="rsvp" select="1" />
-                                        <field name="cutype" select="1" />
-                                        <field name="role" select="1" />
-                                        <separator colspan="4" string="" />
-                                        <group col="6" colspan="4">
-                                            <field name="state" />
-                                            <button name="do_tentative"
-                                                states="needs-action,declined,accepted"
-                                                string="Uncertain"
-                                                type="object"
-                                                icon="terp-crm" />
-                                            <button name="do_accept"
-                                                string="Accept"
-                                                states="needs-action,tentative,declined"
-                                                type="object"
-                                                icon="gtk-apply" />
-                                            <button name="do_decline"
-                                                string="Decline"
-                                                states="needs-action,tentative,accepted"
-                                                type="object"
-                                                icon="gtk-cancel" />
-                                            <button
-                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                string="Delegate"
-                                                type="action"
-                                                icon="gtk-sort-descending"
-                                                states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-                                        </group>
-                                    </page>
-                                    <page string="Other">
-                                        <field name="user_id"/>
-                                        <newline />
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Recurrence Options" attrs="{'invisible': [('recurrency','=',False)], 'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}">
-                        <group col="4" colspan="4" name="rrule">
-                            <group col="4" colspan="4">
-                                <field name="rrule_type" string=" Recurrence Pattern" />
-                                <field name="interval" />
-                                <separator string="End of Recurrence" colspan="4"/>
-                                <field name="end_type" />
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
-                                <label string=" " colspan="2" />
-                                <newline />
-                                <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}"/>
-                                <newline />
-
-
-                            </group>
-                            <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
-                                <separator string="Choose day where repeat the meeting" colspan="8"/>
-                                <field name="mo" colspan="1" />
-                                <field name="tu" colspan="1" />
-                                <field name="we" colspan="1" />
-                                <field name="th" colspan="1" />
-                                <newline/>
-                                <field name="fr" colspan="1" />
-                                <field name="sa" colspan="1"  />
-                                <field name="su" colspan="1"  />
-                                <newline />
-                            </group>
-                            <group col="10" colspan="4"
-                                attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
-                                <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
-                                <group col="2" colspan="1">
-                                    <field name="select1" />
-                                </group>
-                                <group col="2" colspan="1">
-                                    <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : [('select1','=','day')]}" />
-                                </group>
-                                <group col="3" colspan="1">
-                                    <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                    <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                </group>
-                            </group>
-                        </group>
-
-                    </page>
-                </notebook>
-                </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
-            </form>
-        </field>
-    </record>
+    <menuitem
+        id="menu_hr_recruitment_source"
+        parent="menu_hr_recruitment_recruitment"
+        action="hr_recruitment_source_action"
+        groups="base.group_no_one"
+        sequence="10"/>
 
     </data>
 </openerp>