[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

6 files changed, 55 insertions, 55 deletions

diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 720c49302d4..d2264568378 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,14 +20,14 @@
 ##############################################################################
 
 {
-    "name" : "HR Periodic Appraisals",
+    "name" : "Employee Appraisals",
     "version": "0.1",
     "author": "OpenERP SA",
     "category": "Human Resources",
     'complexity': "easy",
     "website": "http://www.openerp.com",
     "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"],
-    "depends": ["hr",'hr_recruitment','survey'],
+    "depends": ["hr","base_calendar","survey"],
     "description": """
 Ability to create employees evaluation.
 =======================================
@@ -54,6 +54,7 @@ in the form of pdf file. Implements a dashboard for My Current Evaluations
     "active": False,
     "installable": True,
     "certificate" : "00883207679172998429",
+    'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 7f6d3142db5..f25c669a973 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="act_hr_evaluation_tree" model="ir.actions.act_window">
-            <field name="name">My Evaluation Remaining</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr_evaluation.evaluation</field>
+        <record model="ir.actions.act_window" id="action_hr_evaluation_interview_board">
+            <field name="name">Interview Requests</field>
+            <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="domain">[('state','in',('wait', 'progress')),('create_uid','=',uid)]</field>
-            <field name="search_view_id" ref="hr_evaluation.view_hr_evaluation_tree"/>
+            <field name="domain">[('is_evaluation' ,'=', True), ('user_id', '=', uid),('state','=','waiting_answer')]</field>
+            <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
         <record id="board_hr_evaluation_form" model="ir.ui.view">
@@ -17,8 +16,8 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <xpath expr="/form/board/column" position="inside">
-                <action name="%(act_hr_evaluation_tree)d" string="My Evaluation Remaining"/>
+            <xpath expr="/form/board/column[1]" position="inside">
+                <action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
             </xpath>
             </field>
         </record>
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index 40ff397534e..ec4b46f8a62 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <record id="survey_2" model="survey">
-            <field name="title">Employee Evaluation</field>
+            <field name="title">Employee Appraisal</field>
             <field name="max_response_limit">20</field>
             <field eval="[(6,0,[])]" name="users"/>
             <field name="type" ref="survey.survey_type1"/>
@@ -11,7 +11,7 @@
             <field name="state">open</field>
         </record>
         <record id="survey_page_1" model="survey.page">
-            <field name="title">Employee Evaluation Form</field>
+            <field name="title">Employee Appraisal Form</field>
             <field name="survey_id" ref="survey_2"/>
             <field eval="1" name="sequence"/>
         </record>
@@ -128,7 +128,7 @@
             <field eval="0" name="is_require_answer"/>
             <field name="type">descriptive_text</field>
             <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field name="descriptive_text">* The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
+            <field name="descriptive_text">* The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-appraisal and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
 Once the form had been filled, the employee send it to his supervisor.
 
 * It is the primary responsibility of the supervisor to gather the necessary input from     the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
@@ -204,7 +204,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question">Subject</field>
             <field eval="0" name="is_require_answer"/>
             <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="column_name">Recommendations / Evaluations</field>
+            <field name="column_name">Recommendations / Appraisals</field>
             <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
             <field eval="0" name="make_comment_field"/>
             <field eval="0" name="in_visible_menu_choice"/>
@@ -227,7 +227,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="question">Supervisors only : </field>
             <field eval="0" name="is_require_answer"/>
             <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="column_name">Recommendations / Evaluations</field>
+            <field name="column_name">Recommendations / Appraisals</field>
             <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
             <field eval="0" name="make_comment_field"/>
             <field eval="0" name="in_visible_menu_choice"/>
@@ -1150,7 +1150,7 @@ Once the form had been filled, the employee send it to his supervisor.
         <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
             <field eval="1" name="active"/>
             <field eval="6" name="month_next"/>
-            <field name="name">Manager's Evaluation Plan</field>
+            <field name="name">Manager's Appraisal Plan</field>
             <field eval="3" name="month_first"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
@@ -1205,7 +1205,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="action">final</field>
             <field eval="0" name="send_anonymous_employee"/>
             <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_recruitment.survey_job_0"/>
+            <field name="survey_id" ref="hr_evaluation.survey_2"/>
             <field eval="0" name="send_answer_manager"/>
             <field eval="1" name="wait"/>
         </record>
@@ -1219,7 +1219,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
     <data>
         <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
-           <field name="name">Run Employee Evaluation</field>
+           <field name="name">Run Employee Appraisal</field>
            <field eval="True" name="active" />
            <field name="user_id" ref="base.user_root" />
            <field name="interval_number">1</field>
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
index 842363559a9..10e7773bc62 100644
--- a/addons/hr_evaluation/hr_evaluation_installer.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -2,11 +2,12 @@
 <openerp>
     <data>
         <record model="ir.actions.act_window" id="action_evaluation_plans_installer">
-            <field name="name">Review Evaluation Plans</field>
+            <field name="name">Review Appraisal Plans</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr_evaluation.plan</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="help">You can define appraisal plans (ex: first interview after 6 months, then every year). Then, each employee can be linked to an appraisal plan so that OpenERP can automatically generate interview requests to managers and/or subordinates.</field>
         </record>
 
         <record id="todo_evaluation_plans_installer" model="ir.actions.todo">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index d8dfa7e40ca..18f5bc1a023 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -365,7 +365,7 @@
         </record>
 
         <record id="view_evaluation_calendar" model="ir.ui.view">
-            <field name="name">Interview Request</field>
+            <field name="name">Interview Requests</field>
             <field name="model">hr.evaluation.interview</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
@@ -379,7 +379,7 @@
             <field name="name">Interview Requests</field>
             <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_hr_evaluation_interview_form"/>
+            <field name="view_id" eval="False"/>
             <field name="domain">[('is_evaluation' ,'=', True)]</field>
             <field name="context">{'default_is_evaluation': True, "search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 377098a6fe6..4304f78708a 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,34 +1,33 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
-"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
-"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,1,1,0
-"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1
-"access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
-"access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
-"access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
-"access_survey_page_hr_manager","survey.page","survey.model_survey_page","base.group_hr_manager",1,1,1,1
-"access_survey_question_hr_manager","survey.question","survey.model_survey_question","base.group_hr_manager",1,1,1,1
-"access_survey_question_column_heading_hr_manager","survey.question.column.heading","survey.model_survey_question_column_heading","base.group_hr_manager",1,1,1,1
-"access_survey_answer_hr_manager","survey.answer","survey.model_survey_answer","base.group_hr_manager",1,1,1,1
-"access_survey_response_hr_manager","survey.response","survey.model_survey_response","base.group_hr_manager",1,1,1,1
-"access_survey_response_line_hr_manager","survey.response.line","survey.model_survey_response_line","base.group_hr_manager",1,1,1,1
-"access_survey_tbl_column_heading_hr_manager","survey.tbl.column.heading","survey.model_survey_tbl_column_heading","base.group_hr_manager",1,1,1,1
-"access_survey_response_answer_hr_manager","survey.response.answer","survey.model_survey_response_answer","base.group_hr_manager",1,1,1,1
-"access_survey_request_hr_manager","survey.request","survey.model_survey_request","base.group_hr_manager",1,1,1,1
-"access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
-"access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
-"access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
-"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0
-"access_survey_page_hr_user","survey.page.hr.user","survey.model_survey_page","base.group_hr_user",1,1,1,1
-"access_survey_response_hr_user","survey.response.hr.user","survey.model_survey_response","base.group_hr_user",1,1,1,0
-"access_survey_history_hr_user","survey.history.hr.user","survey.model_survey_history","base.group_hr_user",1,1,1,0
-"access_survey_request_hr_user","survey.request.hr.user","survey.model_survey_request","base.group_hr_user",1,1,1,0
-"access_survey_request_hr_employee","survey.request.hr.employee","survey.model_survey_request","base.group_user",1,1,1,0
-"access_survey_question_column_heading_hr_user","survey.question.column.heading.hr.user","survey.model_survey_question_column_heading","base.group_hr_user",1,0,0,0
-"access_survey_response_line_hr_user","survey.response.line.hr.user","survey.model_survey_response_line","base.group_hr_user",1,1,1,0
-"access_survey_tbl_column_heading_hr_user","survey.tbl.column.heading.hr.user","survey.model_survey_tbl_column_heading","base.group_hr_user",1,1,1,0
-"access_base_calendar_attendee_survey_user","base.calendar.calendar.attendee.survey.user","base_calendar.model_calendar_attendee","base.group_survey_user",1,1,1,0
-"access_base_calendar_attendee_tool_user","base.calendar.calendar.attendee.tool.user","base_calendar.model_calendar_attendee","base.group_tool_user",1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_hr_evaluation_evaluation_user,hr_evaluation.evaluation.user,model_hr_evaluation_evaluation,base.group_hr_user,1,1,1,1

+access_hr_evaluation_evaluation_employee,hr_evaluation.evaluation.employee,model_hr_evaluation_evaluation,base.group_user,1,0,0,0

+access_hr_evaluation_plan_user,hr_evaluation.plan.user,model_hr_evaluation_plan,base.group_hr_user,1,1,1,1

+access_hr_evaluation_plan_phase_user,hr_evaluation.plan.phase.user,model_hr_evaluation_plan_phase,base.group_hr_user,1,1,1,1

+access_hr_evaluation_interview_user,hr.evaluation.interview.user,model_hr_evaluation_interview,base.group_hr_user,1,1,1,1

+access_hr_evaluation_interview_employee,hr.evaluation.interview.employee,model_hr_evaluation_interview,base.group_user,1,1,1,0

+access_hr_evaluation_report,hr.evaluation.report,model_hr_evaluation_report,base.group_hr_manager,1,1,1,1

+access_survey_type_hr_manager,survey.type,survey.model_survey_type,base.group_hr_manager,1,1,1,1

+access_survey_hr_manager,survey.hr.manager,survey.model_survey,base.group_hr_manager,1,1,1,1

+access_survey_history_manager,survey.history,survey.model_survey_history,base.group_hr_manager,1,1,1,1

+access_survey_question_hr_manager,survey.question,survey.model_survey_question,base.group_hr_manager,1,1,1,1

+access_survey_question_column_heading_hr_manager,survey.question.column.heading,survey.model_survey_question_column_heading,base.group_hr_manager,1,1,1,1

+access_survey_answer_hr_manager,survey.answer,survey.model_survey_answer,base.group_hr_manager,1,1,1,1

+access_survey_response_hr_manager,survey.response,survey.model_survey_response,base.group_hr_manager,1,1,1,1

+access_survey_response_line_hr_manager,survey.response.line,survey.model_survey_response_line,base.group_hr_manager,1,1,1,1

+access_survey_tbl_column_heading_hr_manager,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_hr_manager,1,1,1,1

+access_survey_response_answer_hr_manager,survey.response.answer,survey.model_survey_response_answer,base.group_hr_manager,1,1,1,1

+access_survey_request_hr_manager,survey.request,survey.model_survey_request,base.group_hr_manager,1,1,1,1

+access_survey_answer_hr_user,survey.answer.hr.user,survey.model_survey_answer,base.group_hr_user,1,1,1,0

+access_survey_response_answer_hr_user,survey.response.answer.hr.user,survey.model_survey_response_answer,base.group_hr_user,1,1,1,0

+access_survey_type_hr_user,survey.type.hr.user,survey.model_survey_type,base.group_hr_user,1,1,1,0

+access_survey_question_hr_user,survey.question.hr.user,survey.model_survey_question,base.group_hr_user,1,1,1,0

+access_survey_page_hr_user,survey.page.hr.user,survey.model_survey_page,base.group_hr_user,1,1,1,1

+access_survey_response_hr_user,survey.response.hr.user,survey.model_survey_response,base.group_hr_user,1,1,1,0

+access_survey_history_hr_user,survey.history.hr.user,survey.model_survey_history,base.group_hr_user,1,1,1,0

+access_survey_request_hr_user,survey.request.hr.user,survey.model_survey_request,base.group_hr_user,1,1,1,0

+access_survey_request_hr_employee,survey.request.hr.employee,survey.model_survey_request,base.group_user,1,1,1,0

+access_survey_question_column_heading_hr_user,survey.question.column.heading.hr.user,survey.model_survey_question_column_heading,base.group_hr_user,1,0,0,0

+access_survey_response_line_hr_user,survey.response.line.hr.user,survey.model_survey_response_line,base.group_hr_user,1,1,1,0

+access_survey_tbl_column_heading_hr_user,survey.tbl.column.heading.hr.user,survey.model_survey_tbl_column_heading,base.group_hr_user,1,1,1,0

+access_base_calendar_attendee_survey_user,base.calendar.calendar.attendee.survey.user,base_calendar.model_calendar_attendee,base.group_survey_user,1,1,1,0

+access_base_calendar_attendee_tool_user,base.calendar.calendar.attendee.tool.user,base_calendar.model_calendar_attendee,base.group_tool_user,1,1,1,0