pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merged vba's branch lp:~openerp-dev/openobject-addons/trunk-hr-recruitment-vba

Browse Source 
bzr revid: bde@tinyerp.com-20121109130450-ijxbfo1y1vmbchnr
This commit is contained in:
Bharat Devnani (OpenERP)
2012-11-09 18:34:50 +05:30
parent 77c90a73ae 0ef8e543d9
commit 53fdee00ce
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/hr.py
+1 -1
View File
@@ -116,7 +116,7 @@ class hr_job(osv.osv):
help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."),
}
_defaults = {
'expected_employees': 1,
'expected_employees': 0.00,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c),
'state': 'open',
}
addons/hr_recruitment/hr_recruitment_view.xml
+10 -6
View File
@@ -107,10 +107,12 @@
<form string="Jobs - Recruitment Form" version="7.0">
<header>
<button name="case_close_with_emp" string="Hire" type="object"
states="draft,open,pending,done" class="oe_highlight"/>
class="oe_highlight"
attrs="{'invisible':['|',('emp_id','!=',False), ('state','=','cancel')]}"/>
<button name="case_cancel" string="Refuse" type="object"
states="draft,open,pending" class="oe_highlight"/>
<field name="stage_id" widget="statusbar" clickable="True"/>
<field name="emp_id" invisible="1"/>
</header>
<sheet>
<div class="oe_right oe_button_box">
@@ -145,7 +147,8 @@
<field name="user_id"/>
<label for="title_action"/>
<div>
<field name="date_action"/> -
<field name="date_action"/>
<span class="oe_edit_only"> - </span>
<field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
</div>
<field name="priority"/>
@@ -166,12 +169,14 @@
<group string="Contract">
<label for="salary_expected"/>
<div>
<field name="salary_expected" class="oe_inline"/>,
<field name="salary_expected" class="oe_inline"/>
<span class="oe_inline" attrs="{'invisible':[('salary_expected_extra','=',False)]}">, </span>
<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" class="oe_inline"/>
<span class="oe_inline" attrs="{'invisible':[('salary_proposed_extra','=',False)]}">, </span>
<field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
</div>
</group>
@@ -281,7 +286,6 @@
<div class="oe_dropdown_toggle oe_dropdown_kanban">
<span class="oe_e">i</span>
<ul class="oe_dropdown_menu">
<t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
<t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
<li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
@@ -433,7 +437,7 @@
<form string="Degree" version="7.0">
<group>
<field name="name"/>
<field name="sequence"/>
<field name="sequence" groups="base.group_no_one"/>
</group>
</form>
</field>