[MRG] merge lp:~openerp-dev/openobject-addons/trunk-job-positions-improve-ssh
bzr revid: tpa@tinyerp.com-20131122085126-am3ilmuthlyzbh0a
This commit is contained in:
Turkesh Patel (Open ERP)
@@ -485,7 +485,12 @@ class hr_job(osv.osv):
|
||||
"create new applicants for this job position."),
|
||||
'application_count': fields.function(_application_count, type='integer', string="Total Applications"),
|
||||
'manager_id': fields.related('department_id', 'manager_id', type='many2one', string='Department Manager', relation='hr.employee', readonly=True, store=True),
|
||||
'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
|
||||
'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int'),
|
||||
'user_id': fields.many2one('hr.employee', 'Recruitment Responsible'),
|
||||
}
|
||||
|
||||
_defaults = {
|
||||
'alias_name':lambda self,cr,uid,c: self.pool.get('hr.config.settings').get_default_alias_prefix(cr,uid,uid,c)['alias_prefix']
|
||||
}
|
||||
|
||||
def _auto_init(self, cr, context=None):
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
</record>
|
||||
<record id="hr_case_traineemca0" model="hr.applicant">
|
||||
<field name="name">Trainee - MCA</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="job_id" ref="hr.job_trainee"/>
|
||||
<field name="type_id" ref="degree_bac5"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
|
||||
@@ -45,7 +45,7 @@
|
||||
</record>
|
||||
<record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
|
||||
<field name="name">Marketing Job</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="job_id" ref="hr.job_trainee"/>
|
||||
<field name="type_id" ref="degree_bac5"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
|
||||
@@ -69,7 +69,7 @@
|
||||
</record>
|
||||
<record id="hr_case_financejob0" model="hr.applicant">
|
||||
<field name="name">Finance Job</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="job_id" ref="hr.job_trainee"/>
|
||||
<field name="type_id" ref="degree_licenced"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
|
||||
@@ -96,7 +96,7 @@
|
||||
</record>
|
||||
<record id="hr_case_programmer" model="hr.applicant">
|
||||
<field name="name">Programmer</field>
|
||||
<field name="job_id" ref="hr.job_developer"/>
|
||||
<field name="job_id" ref="hr.job_trainee"/>
|
||||
<field name="type_id" ref="degree_bac5"/>
|
||||
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
|
||||
<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
|
||||
@@ -133,6 +133,6 @@
|
||||
<field name="state">recruit</field>
|
||||
<field name="no_of_recruitment">5</field>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
@@ -344,7 +344,7 @@
|
||||
</div>
|
||||
</group>
|
||||
<xpath expr="//field[@name='department_id']" position="after">
|
||||
<label for="alias_name" string="Email Alias" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
||||
<label for="alias_name" string="Specific Email Address" attrs="{'invisible': [('alias_domain', '=', False)]}" help ="Define a specific contact address for this job position. If you keep it empty, the default email address will be used which is in human resources settings"/>
|
||||
<div name="alias_def" attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||
<field name="alias_id" class="oe_read_only oe_inline"
|
||||
string="Email Alias" required="0"/>
|
||||
@@ -353,6 +353,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='department_id']" position="after">
|
||||
<field name="user_id" class="oe_inline"/>
|
||||
</xpath>
|
||||
<div name="buttons" position="inside">
|
||||
<button string="Applications" name="%(action_hr_job_applications)d" type="action"/>
|
||||
<button name="attachment_tree_view" string="Documents" type="object"/>
|
||||
@@ -391,10 +394,10 @@
|
||||
</ul>
|
||||
</div>
|
||||
<div class = "oe_kanban_content">
|
||||
<t t-if="record.manager_id.raw_value">
|
||||
<img t-att-src="kanban_image('hr.employee', 'image_medium', record.manager_id.raw_value[0])" t-att-title="record.manager_id.value" class="oe_kanban_avatar oe_job_avatar"/>
|
||||
<t t-if="record.user_id.raw_value">
|
||||
<img t-att-src="kanban_image('hr.employee', 'image_medium', record.user_id.raw_value[0])" t-att-title="record.user_id.value" class="oe_kanban_avatar oe_job_avatar"/>
|
||||
</t>
|
||||
<t t-if="record.manager_id.raw_value === false">
|
||||
<t t-if="record.user_id.raw_value === false">
|
||||
<img t-att-src='_s + "/base/static/src/img/avatar.png"' class="oe_kanban_avatar oe_job_avatar"/>
|
||||
</t>
|
||||
<div class="oe_job_detail">
|
||||
@@ -402,7 +405,7 @@
|
||||
<field name="name"/>
|
||||
</div>
|
||||
<div class="oe_job oe_department oe_kanban_ellipsis">
|
||||
<field name="department_id"/>
|
||||
<field name="user_id"/>
|
||||
<span t-if="record.manager_id.value" class="oe_manager_name">
|
||||
(<t t-esc="record.manager_id.value"/>)
|
||||
</span>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
</div>
|
||||
<xpath expr="//div[@name='hr_recruitment']" position="after">
|
||||
<div attrs="{'invisible': ['|',('module_hr_recruitment','=',False),('alias_domain', '=', False)]}">
|
||||
<label string="Your job email address"/>
|
||||
<label string="Default job email address"/>
|
||||
<field name="alias_prefix" class="oe_inline" attrs="{'required': [('alias_domain', '!=', False)]}"/>
|
||||
@
|
||||
<field name="alias_domain" class="oe_inline" readonly="1"/>
|
||||
|
||||
Reference in New Issue
Block a user