[MOD/IMP]hr_*:changes in hr manager dashboard and hr evaluation wizard

bzr revid: amp@tinyerp.com-20100920131505-myjiiyu89afxbkt9

addons/hr_evaluation/hr_evaluation.py

@@ -284,6 +284,7 @@ survey_request()
 class hr_evaluation_interview(osv.osv):
     _name = 'hr.evaluation.interview'
     _inherits = {'survey.request': 'request_id'}
+    _rec_name = 'request_id'
     _description = 'Evaluation Interview'
     _columns = {
         'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade', required=True),
@@ -293,7 +294,19 @@ class hr_evaluation_interview(osv.osv):
     _defaults = {
         'is_evaluation': True,
     }
-
+    
+    def name_get(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if not len(ids):
+            return []
+        reads = self.browse(cr, uid, ids, context=context)
+        res = []
+        for record in reads:
+            name = record.request_id.survey_id.title
+            res.append((record['id'], name))
+        return res
+    
     def survey_req_waiting_answer(self, cr, uid, ids, context=None):
         if context is None:
             context = {}

addons/hr_evaluation/wizard/hr_evaluation_mail.py

@@ -25,7 +25,7 @@ class hr_evaluation_reminder(osv.osv_memory):
     _name = "hr.evaluation.reminder"
     _description = "Sends Reminders to employess to fill the evaluations"
     _columns = {
-        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluations', required=True)
+        'evaluation_id': fields.many2one('hr.evaluation.interview', 'Interview', required=True)
     }
 
     def send_mail(self, cr, uid, ids, context=None):

addons/hr_expense/board_hr_expense_manager_view.xml

@@ -6,7 +6,7 @@
             <field name="name">All Employee Expenses</field>
             <field name="res_model">hr.expense.expense</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','in',('draft', 'confirm'))]</field>
+            <field name="domain">[('state','=','accepted')]</field>
             <field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
         </record>
         

addons/hr_holidays/board_hr_manager_holidays_view.xml

@@ -8,6 +8,7 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','in',('confirm', 'validate'))]</field>
             <field name="view_id" ref="hr_holidays.view_holiday_allocation_tree"/>
         </record>