From 8ffac40122e60587b3645c933fc1e779eb828a8d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 17 Feb 2011 10:56:05 +0530
Subject: [PATCH] [FIX] hr_evaluation: add draft button on evaluation form when
 it got canceled

lp bug: https://launchpad.net/bugs/720221 fixed

bzr revid: mra@mra-laptop-20110217052605-v6ni6uqw50xkguh9
---
 addons/hr_evaluation/hr_evaluation.py       |  4 +++
 addons/hr_evaluation/hr_evaluation_view.xml | 34 +++++++++++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 4a9a46920f5..0b0ebb92261 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -251,6 +251,10 @@ class hr_evaluation(osv.osv):
         self.write(cr, uid, ids,{'state':'cancel'}, context=context)
         return True
 
+    def button_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids,{'state': 'draft'}, context=context)
+        return True
+
     def write(self, cr, uid, ids, vals, context=None):
         if 'date' in vals:
             new_vals = {'date_deadline': vals.get('date')}
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 99f34f7cc7b..ac3f723ceb3 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -200,16 +200,18 @@
                         </page>
                     </notebook>
                     <newline/>
-                    <group col="6" colspan="4">
-                    <field name="state"/>
-                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
-                            icon="gtk-cancel"/>
-                    <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
-                            icon="gtk-execute"/>
-                    <button name="button_done" string="Done" states="progress" type="object"
-                            icon="gtk-jump-to"/>
-                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
-                            icon="gtk-go-forward"/>
+                    <group col="8" colspan="4">
+	                    <field name="state"/>
+	                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"
+	                            icon="gtk-cancel"/>
+	                    <button name="button_plan_in_progress" string="Start Evaluation" states="draft" type="object"
+	                            icon="gtk-execute"/>
+	                    <button name="button_done" string="Done" states="progress" type="object"
+	                            icon="gtk-jump-to"/>
+	                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object"
+	                            icon="terp-stock_effects-object-colorize"/>
+	                    <button name="button_final_validation" string="Validate Evaluation" states="wait" type="object"
+	                            icon="gtk-go-forward"/>
                     </group>
               </form>
             </field>
@@ -250,12 +252,12 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>                                       
+                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>
                     <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
-                    <separator orientation="vertical"/> 
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
@@ -405,11 +407,11 @@
            action="action_hr_evaluation_send_mail" sequence="45" groups="base.group_hr_manager"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
-      <act_window 
+      <act_window
       context="{'search_default_user_to_review_id': [active_id]}"
-      id="act_hr_employee_2_hr__evaluation_interview" 
-      name="Evaluation Interviews" 
-      res_model="hr.evaluation.interview" 
+      id="act_hr_employee_2_hr__evaluation_interview"
+      name="Evaluation Interviews"
+      res_model="hr.evaluation.interview"
       src_model="hr.employee"/>
 
     </data>