[MERGE] Merge parents

bzr revid: rim@openerp.com-20140107094428-h59k5y31u28tjsfe

diff --cc addons/hr_evaluation/hr_evaluation.py
Simple merge

diff --cc addons/hr_recruitment/hr_recruitment.py
Simple merge

diff --cc addons/hr_recruitment/hr_recruitment_data.xml
Simple merge

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
index b9872a6,3ff73c9..c52dc8c
--- 1/addons/hr_recruitment/hr_recruitment_view.xml
--- 2/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@@ -118,9 -119,10 +119,10 @@@
                      </group>
                      <group string="Job">
                          <field name="survey" invisible="1"/>
 -                        <field name="response" invisible="1"/>
 +                        <field name="response_id" invisible="1"/>
                          <field name="job_id" on_change="onchange_job(job_id)"/>
                          <field name="department_id" on_change="onchange_department_id(department_id, stage_id)"/>
+                         <field name="company_id" />
                          <label for="availability"/>
                          <div>
                              <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>

diff --cc addons/website/views/website_templates.xml
Simple merge