From bfc4d87f3145fe93f2918edaea31197b10a9576c Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Fri, 9 Nov 2012 11:40:28 +0530
Subject: [PATCH 1/6] [IMP] move Email Notification on Answer boolean below
 Type field

bzr revid: hip@tinyerp.com-20121109061028-9suru2afitw4wf57
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index f6920c68d34..36d6fb08b3a 100644
--- a/addons/survey/survey_view.xml
+++ b/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="send_response" attrs="{'readonly':[('state','=','close')]}"/>
                             <field name="type" attrs="{'readonly':[('state','=','close')]}"/>
+                            <field name="send_response" attrs="{'readonly':[('state','=','close')]}"/>
                         </group>
                         <group>
                             <field name="max_response_limit" attrs="{'readonly':[('state','=','close')]}"/>

From b15100587788448da36b8acb1201e013acc02106 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Fri, 9 Nov 2012 11:52:30 +0530
Subject: [PATCH 2/6] [IMP] Resize Type field to fit Responsible field

bzr revid: hip@tinyerp.com-20121109062230-yspb3pivwwggulm6
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 36d6fb08b3a..3c2e6055416 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -45,7 +45,7 @@
                         <group>
                             <field name="id" invisible="1"/>
                             <field name="responsible_id" class="oe_inline" attrs="{'readonly':[('state','=','close')]}"/>
-                            <field name="type" attrs="{'readonly':[('state','=','close')]}"/>
+                            <field name="type" attrs="{'readonly':[('state','=','close')]}" class="oe_inline"/>
                             <field name="send_response" attrs="{'readonly':[('state','=','close')]}"/>
                         </group>
                         <group>

From 33eca6f1d64528ea6aec40194c109f163f68de12 Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Fri, 9 Nov 2012 12:49:47 +0530
Subject: [PATCH 3/6] [IMP] Answer Survey action button should be red after
 sending a request

bzr revid: hip@tinyerp.com-20121109071947-i25qvwx118iqn8p2
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e0978847acb..d2cb0bd8ee5 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/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"

From 8f7be56b02eb4f6d8aecb9e3baa270f650829d40 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Fri, 9 Nov 2012 15:56:17 +0530
Subject: [PATCH 4/6] [IMP] Improve hr recruitment view.

bzr revid: vba@tinyerp.com-20121109102617-yus6cne4784zlbx0
---
 addons/hr/hr.py                               |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index d57fcf49ab2..60ba3939bf3 100644
--- a/addons/hr/hr.py
+++ b/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',
     }
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 03561da569e..3fafc3391f8 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/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)]}"/>
                 <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_edit_only">,</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_edit_only">,</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>

From 27885ecc73a00c324e279e3ae4b6623b39ea0ea3 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Fri, 9 Nov 2012 17:20:26 +0530
Subject: [PATCH 5/6] [IMP] add a state in attrs.

bzr revid: vba@tinyerp.com-20121109115026-0sau6yio1h1hz5j5
---
 addons/hr_recruitment/hr_recruitment_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3fafc3391f8..d2992c3958a 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -108,7 +108,7 @@
             <header>
                 <button name="case_close_with_emp" string="Hire" type="object"
                         class="oe_highlight"
-                        attrs="{'invisible':[('emp_id','!=',False)]}"/>
+                        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"/>

From 0ef8e543d90f26efaae1f79d37bdee6723fb1cb1 Mon Sep 17 00:00:00 2001
From: Vijaykumar Baladaniya <vba@tinyerp.com>
Date: Fri, 9 Nov 2012 17:50:31 +0530
Subject: [PATCH 6/6] [IMP]Change a class and add a attrs in span

bzr revid: vba@tinyerp.com-20121109122031-i9whwzlnqpfhqejz
---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d2992c3958a..e17ebc1f891 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -170,13 +170,13 @@
                         <label for="salary_expected"/>
                         <div>
                             <field name="salary_expected" class="oe_inline"/>
-                            <span  class="oe_edit_only">,</span>
+                            <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"/>
-                            <span  class="oe_edit_only">,</span>
+                            <span class="oe_inline " attrs="{'invisible':[('salary_proposed_extra','=',False)]}">, </span>
                             <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
                     </group>