[MERGE] Merged with mail-state-tde branch, recently udpated with trunk.

bzr revid: tde@openerp.com-20120615084006-krv0lotdahcrx1ga

diff --cc addons/crm/crm_lead_view.xml
index e8e9f9f,89c38d7..d8a1929
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -78,9 -97,18 +97,19 @@@
                              on_change="onchange_stage_id(stage_id)"/>
                  </header>
                  <sheet>
+                     <div class="oe_right oe_form_button_box" name="buttons">
+                         <button type="action"
+                             name="%(act_crm_opportunity_crm_meeting_new)d"
+                             string="Meetings" />
+ 
+                         <button type="action"
+                             name="%(act_crm_opportunity_crm_phonecall_new)d"
+                             string="Phone Calls" />
+                     </div>
+ 
                      <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
                      <h1><field name="name" placeholder="Describe the lead..."/></h1>
 +                    <newline/>
                      <field name="message_thread_read"/>
                      <newline/>
                      <group>

diff --cc addons/hr_recruitment/hr_recruitment_data.xml
index 4a3b999,13436be..9230171
--- 1/addons/hr_recruitment/hr_recruitment_data.xml
--- 2/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@@ -5,28 -5,13 +5,35 @@@
  -->
  <data>
  
 +        <record id="outgoing_test" model="ir.mail_server">
 +            <field name="smtp_host">smtp.openerp.com</field>
 +            <field name="name">smtp.openerp.com</field>
 +            <field name="smtp_encryption">starttls</field>
 +            <field name="smtp_port">2525</field>
 +            <field name="smtp_user">tde</field>
 +            <field name="sequence">9</field>
 +        </record>
 +
 +
 +        <record id="fetchmail_hr_applicant_test" model="fetchmail.server">
 +            <field name="object_id" ref="hr_recruitment.model_hr_applicant"/>
 +            <field name="attach" eval="True"/>
 +            <field name="original" eval="False"/>
 +            <field name="server">imap.openerp.com</field>
 +            <field name="name">imap.openerp.com</field>
 +            <field name="user">tde</field>
 +            <field name="is_ssl">True</field>
 +            <field name="port">993</field>
 +            <field name="type">imap</field>
 +        </record>
 +
+     <!-- Case category (for interview meetings) -->
+     <record model="crm.case.categ" id="categ_meet_interview">
+         <field name="name">Interview</field>
+         <field name="section_id" ref="crm.section_sales_department"/>
+         <field name="object_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
+     </record>
+ 
          <!--    HR Recruitment Source        -->
  
      <record model="hr.recruitment.source" id="source_linkedin">