[MERGE] merge with latest trunk.

bzr revid: amb@tinyerp.com-20131126091004-vfzynh766ueesq9z

diff --cc addons/hr_recruitment/hr_recruitment.py
index 04feba2,9d94b07..499cad5
--- 1/addons/hr_recruitment/hr_recruitment.py
--- 2/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@@ -52,9 -52,10 +52,11 @@@ class hr_recruitment_stage(osv.osv)
          'name': fields.char('Name', size=64, required=True, translate=True),
          'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
          'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."),
-         'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
          'requirements': fields.text('Requirements'),
-         'template_id': fields.many2one('email.template', 'Use template', help="Use this email template, so that an email will be sent to applicant if application stage is changed to this stage.")
++        'template_id': fields.many2one('email.template', 'Use template', help="Use this email template, so that an email will be sent to applicant if application stage is changed to this stage."),
+         'fold': fields.boolean('Folded in Kanban View',
+                                help='This stage is folded in the kanban view when'
+                                'there are no records in that stage to display.'),
      }
      _defaults = {
          'sequence': 1,

diff --cc addons/hr_recruitment/hr_recruitment_data.xml
index 1ac494d,219f364..1675b09
--- 1/addons/hr_recruitment/hr_recruitment_data.xml
--- 2/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@@ -114,9 -76,9 +115,10 @@@
      <record model="hr.recruitment.stage" id="stage_job6">
          <field name="name">Refused</field>
          <field name="sequence">6</field>
 +        <field name="template_id" ref="email_template_refuse_applicant"/>
          <field name="fold" eval="True"/>
      </record>
+ 
      <record id="survey_job_0" model="survey">
          <field name="title">Job Survey</field>
          <field name="max_response_limit">20</field>

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