[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20130701091520-tdkxicwr7psc6ig4

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

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
index e07124f,9cbfd45..7390349
--- 1/addons/hr_recruitment/hr_recruitment_view.xml
--- 2/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@@ -341,95 -333,6 +341,95 @@@
          </field>
      </record>
  
 +     <record id="view_hr_job_kanban" model="ir.ui.view">
 +            <field name="name">hr.job.kanban</field>
 +            <field name="model">hr.job</field>
 +            <field name="arch" type="xml">
 +                <kanban version="7.0" class="oe_background_grey">
 +                    <field name="name"/>
 +                    <field name="department_id"/>
 +                    <field name="no_of_recruitment"/>
 +                    <field name="color"/>
 +                    <field name="application_count"/>
 +                    <field name="no_of_hired_employee"/>
 +                    <field name="manager_id"/>
 +                    <field name="survey_id"/>
 +                    <field name="state"/>
 +                    <templates>
 +                        <t t-name="kanban-box">
 +                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_job oe_kanban_card oe_kanban_global_click">
 +                                <div class="oe_dropdown_toggle oe_dropdown_kanban oe_custom">
 +                                    <span class="oe_e">í</span>
 +                                    <ul class="oe_dropdown_menu">
 +                                        <t t-if="widget.view.is_action_enabled('edit')">
 +                                            <li><a type="edit">Edit...</a></li>
 +                                        </t>
 +                                        <t t-if="widget.view.is_action_enabled('delete')">
 +                                            <li><a type="delete">Delete</a></li>
 +                                        </t>
 +                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
 +                                    </ul>
 +                                </div>
 +                                <div class = "oe_kanban_content">
 +                                    <t t-if="record.manager_id.raw_value">
 +                                        <img t-att-src="kanban_image('hr.employee', 'image_medium', record.manager_id.raw_value[0])" class="oe_kanban_avatar oe_job_avatar"/>
 +                                    </t>
 +                                    <t t-if="record.manager_id.raw_value === false">
 +                                        <img t-att-src='_s + "/base/static/src/img/avatar.png"' class="oe_kanban_avatar oe_job_avatar"/>
 +                                    </t>
 +                                    <div class="oe_job_detail">
 +                                        <div class="oe_job oe_name oe_kanban_ellipsis">
 +                                            <field name="name"/>
 +                                        </div>
 +                                        <div class="oe_job_alias oe_kanban_ellipsis" t-if=" record.alias_id.value">
 +                                            <span class="oe_e">%%</span><small><field name="alias_id"/></small>
 +                                        </div>
 +                                        <div class="oe_job oe_department">
 +                                            <field name="department_id"/>
 +                                            <span t-if="record.manager_id.value" class="oe_manager_name">
 +                                                (<t t-esc="record.manager_id.value"/>)
 +                                            </span>
 +                                        </div>
 +                                        
 +                                    </div>
 +                                    <t t-if="record.state.raw_value == 'recruit'">
 +                                        <div class="oe_applications">
 +                                            <a name="%(action_hr_job_applications)d" type="action">
 +                                                <span t-if="record.application_count.value gt 1"><field name="application_count"/> Applications</span>
 +                                                <span t-if="record.application_count.value lt 2"><field name="application_count"/> Application</span>
 +                                            </a>
 +                                        </div>
 +                                        <field state="recruit" name="no_of_recruitment" widget="justgage" options="{'label_field': 'no_of_hired_employee', 'action_change': 'action_employee_to_hire'}">Forecast</field>
 +                                    </t>
 +                                    <t t-if="record.state.raw_value == 'open'">
 +                                        <div class="oe_start_recruitment">
 +                                            <p>To start the recruitment, <b>click here</b></p>
-                                             <img src="/hr_recruitment/static/src/img/down1.png"/>
++                                            <img src="/hr_recruitment/images/down1.png"/>
 +                                        </div>
 +                                    </t>
 +                                    <div class="oe_launch_recruitment">
 +                                        <a t-if="record.survey_id.raw_value" data-name="action_print_survey" data-type="object" class="oe_kanban_action">Print Interview</a>
 +                                        <a t-if="record.survey_id.raw_value"> | </a>
 +                                        <a t-if="record.state.raw_value == 'open'" data-name="job_recruitment" data-type="object" class="oe_kanban_action">Launch Recruitment</a>
 +                                        <a t-if="record.state.raw_value == 'recruit'" data-name="job_open" data-type="object" class="oe_kanban_action">Recruitment Done</a>
 +                                    </div>
 +                                </div>
 +                            </div>
 +                        </t>
 +                    </templates>
 +                </kanban>
 +            </field>
 +    </record>
 +
 +        <!-- hr related job position menu action -->
 +         <record model="ir.actions.act_window" id="action_hr_job">
 +            <field name="name">Job Positions</field>
 +            <field name="res_model">hr.job</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">kanban,tree,form</field>
 +            <field name="context">{'search_default_in_recruitment': 1}</field>
 +        </record>
 +
      <!-- Stage Tree View -->
      <record model="ir.ui.view" id="hr_recruitment_stage_tree">
          <field name="name">hr.recruitment.stage.tree</field>