summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2013-02-11 13:57:51 +0100
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2013-02-11 13:57:51 +0100
commiteb08d79a6ccd05e8a8277787a90cb4cb5d91e2ba (patch)
tree7e6006ce943b36000d728adee7576a2c0b46a1c5
parent8652d0de701907d4997b75416dbb8add1b06df5a (diff)
parent7756bf806342ef699e80897badd290ef26e8643c (diff)
[MERGE] jco branch with fix in hr_recruitment
bzr revid: qdp-launchpad@openerp.com-20130211125751-6jmg1ihla1ervrh0
-rw-r--r--addons/hr_recruitment/hr_recruitment.py1
-rw-r--r--addons/hr_recruitment/hr_recruitment_view.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 92465c1b84e..5700a07f519 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -371,7 +371,6 @@ class hr_applicant(base_stage, osv.Model):
update_vals = {}
update_vals.update({
- 'description': msg.get('body'),
'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
})
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index f709a224a45..b6a0bdd4ccf 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -187,6 +187,8 @@
domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
<field name="job_id"/>
<field name="user_id"/>
+ <separator/>
+ <field name="categ_ids"/>
<group expand="0" string="Group By...">
<filter string="Responsible" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>