[MRG] merge with lp;Openobject-addons

bzr revid: tpa@tinyerp.com-20131204090847-pv3lvxn9cqqdn31e

diff --cc addons/hr_recruitment/hr_recruitment_demo.xml
index 65cdf4d,8e14356..465fed0
--- 1/addons/hr_recruitment/hr_recruitment_demo.xml
--- 2/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@@ -16,10 -15,9 +15,9 @@@
      </record>
      <record id="hr_case_traineemca0" model="hr.applicant">
          <field name="name">Trainee - MCA</field>
 -        <field name="job_id" ref="hr.job_developer"/>
 +        <field name="job_id" ref="hr.job_trainee"/>
          <field name="type_id" ref="degree_bac5"/>
          <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
-         <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
          <field name="user_id" ref="base.user_demo"/>
          <field name="priority">3</field>
          <field name="partner_name">Marie Justine</field>
@@@ -45,10 -42,9 +42,9 @@@
      </record>
      <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
          <field name="name">Marketing Job</field>
 -        <field name="job_id" ref="hr.job_developer"/>
 +        <field name="job_id" ref="hr.job_trainee"/>
          <field name="type_id" ref="degree_bac5"/>
          <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
-         <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
          <field name="user_id" ref="base.user_root"/>
          <field name="partner_name">John Bruno</field>
          <field name="stage_id" ref="stage_job5"/>
@@@ -69,10 -64,9 +64,9 @@@
      </record>
      <record id="hr_case_financejob0" model="hr.applicant">
          <field name="name">Finance Job</field>
 -        <field name="job_id" ref="hr.job_developer"/>
 +        <field name="job_id" ref="hr.job_trainee"/>
          <field name="type_id" ref="degree_licenced"/>
          <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
-         <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
          <field name="user_id" ref="base.user_root"/>
          <field name="priority">4</field>
          <field name="partner_name">David Armstrong</field>
@@@ -83,10 -77,9 +77,9 @@@
      </record>
      <record id="hr_case_traineemca1" model="hr.applicant">
          <field name="name">Trainee - MCA</field>
 -        <field name="job_id" ref="hr.job_developer"/>
 +        <field name="job_id" ref="hr.job_trainee"/>
          <field name="type_id" ref="degree_bac5"/>
          <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
-         <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
          <field name="partner_name">Tina Augustie</field>
          <field name="partner_mobile">9898745745</field>
          <field name="stage_id" ref="stage_job4"/>
@@@ -124,15 -115,6 +115,15 @@@
  
      <record id="hr.job_developer" model="hr.job">
          <field name="survey_id" ref="survey_job_0"/>
 +        <field name="state">recruit</field>
 +        <field name="no_of_recruitment">7</field>
 +        <field name="no_of_hired_employee">2</field>
      </record>
 +
 +    <record id="hr.job_trainee" model="hr.job">
 +        <field name="state">recruit</field>
 +        <field name="no_of_recruitment">5</field>
 +    </record>
 +
    </data>
- </openerp>
+ </openerp>

diff --cc addons/mail/mail_thread.py
Simple merge