diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2010-12-29 17:58:24 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2010-12-29 17:58:24 +0100 |
| commit | 2aa75f76c9b60350e7ecfb318ecb38da45302566 (patch) | |
| tree | 7a9f4a7797444e3076913196d4b261da21a8ae88 | |
| parent | 65b33b9489c8561a1ea1426cace8911f5b6a05bd (diff) | |
fix
bzr revid: fp@tinyerp.com-20101229165824-d4xn579hw7lzdbiy
| -rw-r--r-- | addons/hr_evaluation/hr_evaluation.py | 2 | ||||
| -rw-r--r-- | addons/hr_evaluation/hr_evaluation_view.xml | 21 |
2 files changed, 21 insertions, 2 deletions
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 160105a69ad..68e658f87b9 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -281,7 +281,7 @@ class hr_evaluation_interview(osv.osv): _columns = { 'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade', required=True), 'user_to_review_id': fields.many2one('hr.employee', 'Employee to Interview'), - 'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Type'), + 'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Form'), } _defaults = { 'is_evaluation': True, diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index d8d69610d25..b4a3b305ca5 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -170,7 +170,26 @@ </group> <notebook colspan="4"> <page string="Appraisal"> - <field name="survey_request_ids" context="{'phase_id': phase_id}" nolabel="1" colspan="4" widget="one2many"/> + <field name="survey_request_ids" context="{'phase_id': phase_id}" nolabel="1" colspan="4" widget="one2many"> + <form string="Interview Evaluation"> + <group col="4" colspan="4"> + <field name="survey_id"/> + <group col="2" colspan="2"> + <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" 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="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" /> + </group> + <field name="date_deadline"/> + <field name="response" readonly="1"/> + <field name="user_to_review_id"/> + <field name="user_id" string="Interviewer"/> + </group> + <newline/> + <separator string="State" colspan="4"/> + <group colspan="4" col="6"> + <field name="state"/> + </group> + </form> + </field> </page> <page string="Internal Notes"> <field name="note_action" colspan="4" nolabel="1" |