[IMP]:survey,hr_evaluation;Improved hr_evaluation for Evaluation for employees and also improved survey module.

bzr revid: apa@tinyerp.com-20100305122131-aqhic51otmx8p9ne

addons/hr_evaluation/hr_evaluation.py

@@ -22,6 +22,8 @@
 import time
 from osv import fields, osv
 from mx import DateTime as dt
+import tools
+from tools.translate import _
 
 class hr_evaluation_plan(osv.osv):
     _name = "hr_evaluation.plan"
@@ -76,9 +78,9 @@ class hr_employee(osv.osv):
     _inherit="hr.employee"
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'),
-        'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation",readonly=True),
+        'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation"),
     }
-    
+
     def onchange_evaluation_plan_id(self,cr,uid,ids,evaluation_plan_id,context={}):
         evaluation_date = self.browse(cr, uid, ids)[0].evaluation_date or ''
         evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
@@ -91,21 +93,6 @@ class hr_employee(osv.osv):
         return {'value': {'evaluation_date':evaluation_date}}
 hr_employee()
 
-class hr_evaluation_interview(osv.osv):
-    _name = "hr.evaluation.interview"
-    _inherit = "survey.request"
-    
-    def default_get(self, cr, uid, fields, context={}):
-        data = super(hr_evaluation_interview, self).default_get(cr, uid, fields, context)
-        if context.has_key('phase_id'):
-            data['survey_id'] =self.pool.get('hr_evaluation.plan.phase').browse(cr, uid, context['phase_id']).survey_id.id
-        return data
-
-    _columns = {
-        'user_to_review_id': fields.many2one('hr.employee', 'Employee'),
-    }
-hr_evaluation_interview()
-
 class hr_evaluation(osv.osv):
     _name = "hr_evaluation.evaluation"
     _description = "Employee Evaluation"
@@ -124,11 +111,7 @@ class hr_evaluation(osv.osv):
             ('3','Exceeds expectations'),
             ('4','Significantly exceeds expectations'),
         ], "Overall Rating", help="This is the overall rating on that summarize the evaluation"),
-        'survey_request_ids': fields.many2many('hr.evaluation.interview',
-            'hr_evaluation_evaluation_requests',
-            'evaluation_id',
-            'survey_id',
-            'Appraisal Forms'),
+        'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
             ('draft','Draft'),
@@ -137,19 +120,80 @@ class hr_evaluation(osv.osv):
             ('done','Done'),
             ('cancel','Cancelled'),
         ], 'State', required=True,readonly=True),
-        'date_close': fields.date('Ending Date')
+        'date_close': fields.date('Ending Date'),
+        'progress' : fields.float("Progress"),
     }
     _defaults = {
-        'date' : lambda *a: time.strftime('%Y-%m-%d'),
+        'date' : lambda *a: (dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d'),
         'state' : lambda *a: 'draft',
     }
 
+    def onchange_employee_id(self,cr,uid,ids,employee_id,context={}):
+        employee_obj=self.pool.get('hr.employee')
+        evaluation_plan_id=''
+        if employee_id:
+            for employee in employee_obj.browse(cr,uid,[employee_id]):
+                if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
+                    evaluation_plan_id=employee.evaluation_plan_id.id
+                employee_ids=employee_obj.search(cr,uid,[('parent_id','=',employee.id)])
+        return {'value': {'plan_id':evaluation_plan_id}}
+
     def button_plan_in_progress(self,cr, uid, ids, context):
+        employee_obj = self.pool.get('hr.employee')
+        hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
+        survey_request_obj = self.pool.get('survey.request')
+        curr_employee=self.browse(cr,uid, ids)[0].employee_id
+        child_employees=employee_obj.browse(cr,uid, employee_obj.search(cr,uid,[('parent_id','=',curr_employee.id)]))
+        manager_employee=curr_employee.parent_id
+        for evaluation in self.browse(cr,uid,ids):
+            if evaluation and evaluation.plan_id:
+                apprai_id = []
+                for phase in evaluation.plan_id.phase_ids:
+                    if phase.action == "bottom-up":
+                        for child in child_employees:
+                            if child.user_id:
+                                user = child.user_id.id
+                            id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id ,'user_id' : user,'survey_id' : phase.survey_id.id, 'user_to_review_id' : child.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')})
+                            if not phase.wait:
+                                hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context)
+                            apprai_id.append(id)
+                    elif phase.action == "top-down":
+                        if manager_employee:
+                            user = False
+                            if manager_employee.user_id:
+                                user = manager_employee.user_id.id
+                            id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id,'user_id': user ,'survey_id' : phase.survey_id.id, 'user_to_review_id' :manager_employee.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')})
+                            if not phase.wait:
+                                hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context)
+                            apprai_id.append(id)
+                    elif phase.action == "self":
+                        if curr_employee:
+                            user = False
+                            if curr_employee.user_id:
+                                user = curr_employee.user_id.id
+                            id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id,'user_id' : user, 'survey_id' : phase.survey_id.id, 'user_to_review_id' :curr_employee.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')})
+                            if not phase.wait:
+                                hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context)
+                            apprai_id.append(id)
+                    elif phase.action == "final":
+                        if manager_employee:
+                            user = False
+                            if manager_employee.user_id:
+                                user = manager_employee.user_id.id
+                            id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id,'user_id' : user, 'survey_id' : phase.survey_id.id, 'user_to_review_id' :manager_employee.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')})
+                            if not phase.wait:
+                                hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context)
+                            apprai_id.append(id)
+                self.write(cr, uid, evaluation.id, {'survey_request_ids':[[6, 0, apprai_id]]})
         self.write(cr,uid,ids,{'state':'wait'})
         return True
 
     def button_final_validation(self,cr, uid, ids, context):
         self.write(cr,uid,ids,{'state':'progress'})
+        request_obj = self.pool.get('hr.evaluation.interview')
+        for id in self.browse(cr, uid ,ids):
+            if len(id.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', id.id),('state', '=', 'done')])):
+                raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal in waiting answer or draft state"))
         return True
 
     def button_done(self,cr, uid, ids, context):
@@ -162,3 +206,63 @@ class hr_evaluation(osv.osv):
 
 hr_evaluation()
 
+class survey_request(osv.osv):
+    _inherit="survey.request"
+    _columns = {
+        'is_evaluation':fields.boolean('Is Evaluation?'),
+    }
+survey_request()
+
+class hr_evaluation_interview(osv.osv):
+    _name='hr.evaluation.interview'
+    _inherits={'survey.request':'request_id'}
+    _description='Evaluation Interview'
+    _columns = {
+
+        'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade'),
+        'user_to_review_id': fields.many2one('hr.employee', 'Employee'),
+        'evaluation_id' : fields.many2one('hr_evaluation.evaluation', 'Evaluation'),
+        }
+    _defaults = {
+        'is_evaluation': lambda *a: True,
+        }
+
+    def survey_req_waiting_answer(self, cr, uid, ids, context):
+        self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
+#        for id in self.browse(cr, uid, ids):
+#            if id.user_id and id.user_id.address_id and id.user_id.address_id and id.user_id.address_id.email:
+#                msg = " Hello %s, \n\n We are inviting you for %s survey. \n\n Thanks,"  %(id.user_id.name, id.survey_id.title)
+#                tools.email_send(tools.config['email_from'], [id.user_id.address_id.email],\
+#                                              'Invite to fill up Survey', msg)
+        return True
+
+    def survey_req_done(self, cr, uid, ids, context):
+        self.write(cr, uid, ids, { 'state' : 'done'})
+        hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
+        for id in self.browse(cr, uid, ids):
+            flag = False
+            wating_id = 0
+            tot_done_req = 0
+            records = self.pool.get("hr_evaluation.evaluation").browse(cr, uid, [id.evaluation_id.id])[0].survey_request_ids
+            for child in records:
+                if child.state == "draft" :
+                    wating_id = child.id
+                    continue
+                if child.state != "done":
+                    flag = True
+                else :
+                    tot_done_req += 1
+            if not flag and wating_id:
+                self.survey_req_waiting_answer(cr, uid, [wating_id], context)
+            hr_eval_obj.write(cr, uid, [id.evaluation_id.id], {'progress' :tot_done_req * 100 / len(records)})
+
+        return True
+    def survey_req_draft(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'draft'})
+        return True
+
+    def survey_req_cancel(self, cr, uid, ids, context):
+        self.write(cr, uid, ids, { 'state' : 'cancel'})
+        return True
+
+hr_evaluation_interview()

addons/hr_evaluation/hr_evaluation_data.xml

@@ -1499,15 +1499,15 @@ Once the form had been filled, the employee send it to his supervisor.
     </data>
 
 
-    <data noupdate="1">
-        <record id="survey_request_1" model="survey.request">
-            <field name="state">waiting_answer</field>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="email">fp@tinyerp.com</field>
-            <field name="date_deadline">2010-02-21</field>
-        </record>
-    </data>
+<!--    <data noupdate="1">-->
+<!--        <record id="survey_request_1" model="survey.request">-->
+<!--            <field name="state">waiting_answer</field>-->
+<!--            <field name="survey_id" ref="hr_evaluation.survey_2"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="email">fp@tinyerp.com</field>-->
+<!--            <field name="date_deadline">2010-02-21</field>-->
+<!--        </record>-->
+<!--    </data>-->
     <data noupdate="1">
         <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
             <field eval="1" name="active"/>
@@ -1578,27 +1578,27 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
     
-    <data noupdate="1">
-        <record id="hr_evaluation_interview_1" model="hr.evaluation.interview">
-            <field name="state">waiting_answer</field>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="email">fp@tinyerp.com</field>
-            <field name="date_deadline">2010-02-21</field>
-        </record>
-    </data>
-    <data noupdate="1">
-        <record id="hr_evaluation_evaluation_0" model="hr_evaluation.evaluation">
-            <field name="rating">0</field>
-            <field name="employee_id" ref="hr.employee1"/>
-            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
-            <field name="state">draft</field>
-            <field eval="[(6,0,[ref('hr_evaluation_interview_1')])]" name="survey_request_ids"/>
-            <field name="date">2010-01-21</field>
-            <field name="phase_id" ref="hr_evaluation_plan_phase_sendtomanagers0"/>
-            <field name="manager_id" ref="base.user_root"/>
-        </record>
-    </data>
+<!--    <data noupdate="1">-->
+<!--        <record id="hr_evaluation_interview_1" model="survey.request">-->
+<!--            <field name="state">waiting_answer</field>-->
+<!--            <field name="survey_id" ref="hr_evaluation.survey_2"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="email">fp@tinyerp.com</field>-->
+<!--            <field name="date_deadline">2010-02-21</field>-->
+<!--        </record>-->
+<!--    </data>-->
+<!--    <data noupdate="1">-->
+<!--        <record id="hr_evaluation_evaluation_0" model="hr_evaluation.evaluation">-->
+<!--            <field name="rating">0</field>-->
+<!--            <field name="employee_id" ref="hr.employee1"/>-->
+<!--            <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>-->
+<!--            <field name="state">draft</field>-->
+<!--            <field eval="[(6,0,[ref('hr_evaluation_interview_1')])]" name="survey_request_ids"/>-->
+<!--            <field name="date">2010-01-21</field>-->
+<!--            <field name="phase_id" ref="hr_evaluation_plan_phase_sendtomanagers0"/>-->
+<!--            <field name="manager_id" ref="base.user_root"/>-->
+<!--        </record>-->
+<!--    </data>-->
 
 
 </openerp>

addons/hr_evaluation/hr_evaluation_view.xml

@@ -44,7 +44,7 @@
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/>
         <!--menuitem name="HR Responsible" parent="menu_eval_hr" id="menu_resp_hr"/-->
         <menuitem
-            name="Evaluation Plan" parent="menu_eval_hr"
+            name="Periodic Evaluations" parent="hr.menu_hr_configuration"
             id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
@@ -63,7 +63,7 @@
                     <group col="4" colspan="4">
                         <separator string="Action to Perform" colspan="4"/>
                         <field name="action"/>
-                        <field name="survey_id" widget="selection"/>
+                        <field name="survey_id"/>
                     </group>
                     <group col="4" colspan="4">
                         <group col="4" colspan="2">
@@ -93,7 +93,7 @@
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="action"/>
-                    <field name="survey_id" widget="selection"/>
+                    <field name="survey_id"/>
                     <field name="wait"/>
                 </tree>
             </field>
@@ -121,9 +121,10 @@
                 <form string="Evaluation">
                     <group col="4" colspan="3">
                         <separator string="Evaluation Data" colspan="4"/>
-                        <field name="employee_id"/>
+                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
                         <field name="plan_id"/>
                         <field name="date"/>
+                        <field name="progress" widget="progressbar"/>
                     </group>
                     <group col="2" colspan="1">
                         <separator string="Ending Summary" colspan="2"/>
@@ -173,36 +174,57 @@
                 <tree string="Evaluation">
                     <!--field name="create_date"/-->
                     <field name="employee_id"/>
-                    <!-- field name="progress"/ -->
                     <field name="plan_id"/>
                     <field name="rating"/>
                     <field name="date"/>
+                    <field name="progress" widget="progressbar"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
+
+       <record id="hr_evaluation.evaluation_search" model="ir.ui.view">
+            <field name="name">hr_evaluation.evaluation_search</field>
+            <field name="model">hr_evaluation.evaluation</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Evaluation">
+                   <group col='10' colspan='4'>
+                   		<filter icon="terp-hr" string="Draft" domain="[('state','=','draft')]"/>
+                        <filter icon="terp-crm" string="Plan In progress" domain="[('state','=','wait')]"/>
+                        <filter icon="terp-mrp" string="Final Validation" domain="[('state','=','progress')]"/>
+                        <filter icon="terp-stock" string="Done" domain="[('state','=','done')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="employee_id" widget="selection" select="1"/>
+                        <field name="plan_id" widget="selection" select="1"/>
+                        <field name="rating"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="open_view_hr_evaluation_tree">
             <field name="res_model">hr_evaluation.evaluation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
         </record>
         <menuitem
             name="Evaluation" parent="menu_eval_hr"
             id="menu_open_view_hr_evaluation_tree"
             action="open_view_hr_evaluation_tree"/>
 
-
-        <record model="ir.ui.view" id="view_hr_evaluation_interview_form">
+		<record model="ir.ui.view" id="view_hr_evaluation_interview_form">
             <field name="name">hr_evaluation.interview.form</field>
             <field name="model">hr.evaluation.interview</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey Request">
+                <form string="Interview Evaluation">
                     <group col="4" colspan="4">
-                        <field name="survey_id" widget="selection" colspan="3"/>
+                        <field name="survey_id"  colspan="3"/>
                         <group  colspan="1">
                             <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
-                                icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                icon="gtk-execute" 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 name="%(survey.survey_browse_response)d" string="Print Interview" type="action"
                                 icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                         </group>
@@ -215,39 +237,62 @@
                     </group>
                     <newline/>
                     <separator string="State" colspan="4"/>
-                    <group colspan="4" col="5">
-                        <field name="state"/>
-                        <button name="survey_req_waiting_answer" string="Set to Watting Answer" states="cancel,done" type="object" icon="gtk-new"/>
+                    <group colspan="4" col="6">
+                     	<field name="state"/>
+                     	<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
+                        <button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
                         <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                         <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_hr_evaluation_interview_tree">
             <field name="name">hr_evaluation.interview.tree</field>
             <field name="model">hr.evaluation.interview</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Evaluation Plan Phase">
+                <tree string="Interview Evaluation">
                     <field name="date_deadline"/>
-                    <field name="survey_id" widget="selection"/>
+                    <field name="survey_id"/>
                     <field name="user_to_review_id"/>
-
                     <field name="response" readonly="1" invisible="True"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
-                        icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                        icon="gtk-execute" 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 name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="waiting_answer,done,cancel"
-                        icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','!=',True),('survey_id','!=',True)]}" />
-                    <field name="state" />
+                        icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
+                 	<field name="state"/>
                 </tree>
             </field>
         </record>
 
+       <record id="view_hr_evaluation_interview_search" model="ir.ui.view">
+            <field name="name">view_hr_evaluation_interview_search</field>
+            <field name="model">hr.evaluation.interview</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Evaluation">
+                   <group col='10' colspan='4'>
+                        <filter icon="terp-crm" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="survey_id" widget="selection" select="1"/>
+                        <field name="email" select="1"/>
+                        <field name="user_id" select="1" widget="selection" default="1">
+                        <filter string="MY" icon="terp-partner" domain="[('user_id','=',uid)]"/>
+                        </field>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="action_hr_evaluation_interview_tree">
             <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('is_evaluation' ,'=', True)]</field>
+            <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
         </record>
 
         <menuitem

addons/survey/survey.py

@@ -704,6 +704,8 @@ class survey_question_wiz(osv.osv_memory):
                 if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == - 1 :
                     if len(p_id) > sur_name_rec['page_no'] + 1 :
                         if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
+                            if sur_rec['state'] != "open" :
+                                raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
                             cr.execute('select count(id) from survey_history where user_id=%s\
                                                     and survey_id=%s' % (uid,survey_id))
                             res = cr.fetchone()[0]
@@ -1093,7 +1095,11 @@ class survey_question_wiz(osv.osv_memory):
             sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
             survey_obj.write(cr, uid, sur_name_read['survey_id'],  {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
             if context.has_key('cur_id'):
-                self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
+                if context.has_key('request') and context['request']:
+                    self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
+                    self.pool.get(context['object']).survey_req_done(cr, uid, [int(context['cur_id'])], context)
+                else:
+                    self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
 
         for key,val in sur_name_read['store_ans'].items():
             for field in vals:
@@ -1640,18 +1646,22 @@ class survey_request(osv.osv):
         'date_deadline' : fields.date("Deadline date"),
         'user_id' : fields.many2one("res.users", "User"),
         'email' : fields.char("E-mail", size=64),
-        'survey_id' : fields.many2one("survey", "Survey", required=1),
+        'survey_id' : fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
         'response' : fields.many2one('survey.response', 'Answer'),
         'state' : fields.selection([('draft','Draft'),('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
     }
     _defaults = {
-        'state' : lambda * a: 'waiting_answer',
+        'state' : lambda * a: 'draft',
         'date_deadline' : lambda * a :  (now() + RelativeDateTime(months=+1)).strftime("%Y-%m-%d %H:%M:%S")
     }
     def survey_req_waiting_answer(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
         return True
 
+    def survey_req_draft(self, cr, uid, ids, arg):
+        self.write(cr, uid, ids, { 'state' : 'draft'})
+        return True
+
     def survey_req_done(self, cr, uid, ids, arg):
         self.write(cr, uid, ids, { 'state' : 'done'})
         return True

addons/survey/survey_view.xml

@@ -1014,15 +1014,16 @@
             <field name="model">survey.request</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey Request">
+				<form string="Survey Request">
                     <field name="date_deadline"/>
-                    <field name="survey_id" widget="selection"/>
+                    <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>
-                    <field name="email"/>
-					<field name="response"/>
-                    <group colspan="4" col="5">
-                    	<field name="state"/>
-                        <button name="survey_req_waiting_answer" string="Set to Watting Answer" states="cancel,done" type="object" icon="gtk-new"/>
+<!--                    <field name="email"/>-->
+     				<field name="response" readonly="1"/>
+                    <group colspan="4" col="6">
+                     <field name="state"/>
+                     	<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
+                        <button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
                         <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
                         <button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
                     </group>
@@ -1035,21 +1036,43 @@
             <field name="model">survey.request</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Survey Request">
+                <tree string="Evaluation Plan Phase">
                     <field name="date_deadline"/>
-                    <field name="survey_id" widget="selection"/>
-                    <field name="email" />
+					<field name="user_id"/>
+                    <field name="survey_id"/>
+                    <field name="response" />
                     <field name="state" />
                 </tree>
             </field>
         </record>
 
+       <record id="survey_request_search" model="ir.ui.view">
+            <field name="name">survey_request_search</field>
+            <field name="model">survey.request</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Survey">
+                   <group col='10' colspan='4'>
+                        <filter icon="terp-crm" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
+                        <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
+                        <separator orientation="vertical"/>
+                        <field name="survey_id" widget="selection" select="1"/>
+                        <field name="email" select="1"/>
+                        <field name="user_id" select="1" widget="selection" default="1">
+                        <filter string="MY" icon="terp-partner" domain="[('user_id','=',uid)]"/>
+                        </field>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.actions.act_window" id="action_survey_request_tree">
             <field name="name">Survey Request</field>
             <field name="res_model">survey.request</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="survey_request_tree"></field>
+            <field name="search_view_id" ref="survey_request_search"/>
         </record>
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"