[MERGE]with parent branch

bzr revid: pna@tinyerp.com-20121112055726-37edozvmfnp9feyk

addons/hr/hr.py

@@ -116,7 +116,7 @@ class hr_job(osv.osv):
             help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."),
     }
     _defaults = {
-        'expected_employees': 1,
+        'expected_employees': 0.00,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c),
         'state': 'open',
     }

addons/hr_evaluation/hr_evaluation_view.xml

@@ -290,7 +290,7 @@
                         <button string="Send Request" name="survey_req_waiting_answer" type="object"
                             states="draft" class="oe_highlight"/>
                         <button string="Answer Survey" name="%(survey.action_view_survey_question_message)d" type="action"
-                            states="waiting_answer"
+                            states="waiting_answer" class="oe_highlight"
                             context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}"
                             attrs="{'readonly':[('survey_id','=',False)]}"/>
                         <button string="Done" name="survey_req_done" type="object"

addons/hr_recruitment/hr_recruitment_view.xml

@@ -107,10 +107,12 @@
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="case_close_with_emp" string="Hire" type="object"
-                        states="draft,open,pending,done" class="oe_highlight"/>
+                        class="oe_highlight"
+                        attrs="{'invisible':['|',('emp_id','!=',False), ('state','=','cancel')]}"/>
                 <button name="case_cancel" string="Refuse" type="object"
                         states="draft,open,pending" class="oe_highlight"/>
                 <field name="stage_id" widget="statusbar" clickable="True"/>
+                <field name="emp_id" invisible="1"/>
             </header>
             <sheet>
                 <div class="oe_right oe_button_box">
@@ -145,7 +147,8 @@
                         <field name="user_id"/>
                         <label for="title_action"/>
                         <div>
-                            <field name="date_action"/> -
+                            <field name="date_action"/>
+                            <span class="oe_edit_only"> - </span>
                             <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
                         </div>
                         <field name="priority"/>
@@ -166,12 +169,14 @@
                     <group string="Contract">
                         <label for="salary_expected"/>
                         <div>
-                            <field name="salary_expected" class="oe_inline"/>,
+                            <field name="salary_expected" class="oe_inline"/>
+                            <span class="oe_inline" attrs="{'invisible':[('salary_expected_extra','=',False)]}">, </span>
                             <field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
                         <label for="salary_proposed"/>
                         <div>
-                            <field name="salary_proposed" class="oe_inline"/>,
+                            <field name="salary_proposed" class="oe_inline"/>
+                            <span class="oe_inline" attrs="{'invisible':[('salary_proposed_extra','=',False)]}">, </span>
                             <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
                     </group>
@@ -281,7 +286,6 @@
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">i</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><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
@@ -433,7 +437,7 @@
             <form string="Degree" version="7.0">
                 <group>
                     <field name="name"/>
-                    <field name="sequence"/>
+                    <field name="sequence" groups="base.group_no_one"/>
                 </group>
             </form>
         </field>

addons/survey/survey_view.xml

@@ -45,8 +45,8 @@
                         <group>
                             <field name="id" invisible="1"/>
                             <field name="responsible_id" class="oe_inline" attrs="{'readonly':[('state','=','close')]}"/>
+                            <field name="type" attrs="{'readonly':[('state','=','close')]}" class="oe_inline"/>
                             <field name="send_response" attrs="{'readonly':[('state','=','close')]}"/>
-                            <field name="type" attrs="{'readonly':[('state','=','close')]}"/>
                         </group>
                         <group>
                             <field name="max_response_limit" attrs="{'readonly':[('state','=','close')]}"/>