odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

improve_hr_evaluation 

bzr revid: fp@tinyerp.com-20100305175147-jgl1cz7zblmc260a
This commit is contained in:
Fabien Pinckaers 2010-03-05 18:51:47 +01:00
parent f5cee58d2d
commit 9a80a32a9a
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr/hr.py
View File

@ -98,7 +98,7 @@ class hr_employee(osv.osv):
'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
'bank_account': fields.char('Bank Account', size=56),
'partner_id' : fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
'department_id':fields.many2one('hr.department','Department'),
'address_id': fields.many2one('res.partner.address', 'Working Address'),
'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone'),

10
addons/hr/hr_view.xml
View File

@ -64,7 +64,8 @@
<group col="2" colspan="2">
<separator string="Position" colspan="2"/>
<field name="job_id" select="1"/>
<field name="job_id" widget="selection"/>
<field name="department_id" widget="selection"/>
<separator string="Managers" colspan="2"/>
<field name="parent_id" select="1"/>
<field name="coach_id" select="1"/>
@ -86,9 +87,10 @@
<field name="arch" type="xml">
<tree string="Employees">
<field name="name"/>
<field name="job_id"/>
<field name="work_phone"/>
<field name="work_email"/>
<field name="address_id"/>
<field name="department_id"/>
<field name="parent_id"/>
</tree>
</field>
@ -101,7 +103,9 @@
<search string="Employees">
<group col='6' colspan='2'>
<field name="name"/>
<field name="parent_id" widget="selection">
<field name="job_id" widget="selection"/>
<field name="department_id" widget="selection"/>
<field name="parent_id">
<filter icon="terp-partner" domain="[('parent_id','child_of',uid)]" help="Employees under me"/>
</field>
</group>

2
addons/hr_contract/hr_contract.py
View File

@ -82,7 +82,7 @@ class hr_contract(osv.osv):
_columns = {
'name' : fields.char('Contract Reference', size=30, required=True),
'employee_id' : fields.many2one('hr.employee', "Employee", required=True),
'department_id' : fields.related('employee_id','department_id', "Department", readonly=True),
'department_id' : fields.related('employee_id','department_id', string="Department", readonly=True),
'type_id' : fields.many2one('hr.contract.type', "Contract Type"),
'job_id' : fields.many2one('hr.job', 'Job Title'),
'date_start' : fields.date('Start Date', required=True),

16
addons/hr_evaluation/hr_evaluation_view.xml
View File

@ -175,9 +175,9 @@
<!--field name="create_date"/-->
<field name="employee_id"/>
<field name="plan_id"/>
<field name="rating"/>
<field name="date"/>
<field name="progress" widget="progressbar"/>
<field name="rating"/>
<field name="state"/>
</tree>
</field>
@ -190,9 +190,9 @@
<field name="arch" type="xml">
<search string="Search Evaluation">
<group col='10' colspan='4'>
<filter icon="terp-hr" string="Draft" domain="[('state','=','draft')]"/>
<filter icon="terp-crm" string="Plan In progress" domain="[('state','=','wait')]"/>
<filter icon="terp-mrp" string="Final Validation" domain="[('state','=','progress')]"/>
<filter icon="terp-hr" string="Draft" domain="[('state','=','draft')]"/>
<filter icon="terp-crm" string="In progress" domain="[('state','=','wait')]"/>
<filter icon="terp-mrp" string="Final Step" domain="[('state','=','progress')]"/>
<filter icon="terp-stock" string="Done" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="employee_id" widget="selection" select="1"/>
@ -214,7 +214,7 @@
id="menu_open_view_hr_evaluation_tree"
action="open_view_hr_evaluation_tree"/>
<record model="ir.ui.view" id="view_hr_evaluation_interview_form">
<record model="ir.ui.view" id="view_hr_evaluation_interview_form">
<field name="name">hr_evaluation.interview.form</field>
<field name="model">hr.evaluation.interview</field>
<field name="type">form</field>
@ -238,8 +238,8 @@
<newline/>
<separator string="State" colspan="4"/>
<group colspan="4" col="6">
<field name="state"/>
<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
<field name="state"/>
<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
<button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
<button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
<button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
@ -262,7 +262,7 @@
icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
<button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="waiting_answer,done,cancel"
icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
<field name="state"/>
<field name="state"/>
</tree>
</field>
</record>