From 89ae4ef2d3e7ae80661112580b9d87e0ff11da09 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 15 Sep 2010 19:20:27 +0530
Subject: [PATCH] [MOD] small modification

bzr revid: vir@tinyerp.com-20100915135027-ks0jpfuq24oa23da
---
 addons/hr_contract/hr_contract.py                    |  4 ++--
 addons/hr_evaluation/hr_evaluation.py                |  4 ++--
 .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml   |  2 +-
 .../wizard/hr_timesheet_current_view.xml             | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 6a3417791d3..1f9613a8733 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -100,8 +100,8 @@ class hr_contract(osv.osv):
         'job_id': fields.many2one('hr.job', 'Job Title'),
         'date_start': fields.date('Start Date', required=True),
         'date_end': fields.date('End Date'),
-        'trial_date_start': fields.date('Trial start Date'),
-        'trial_date_end': fields.date('Trial end Date'),
+        'trial_date_start': fields.date('Trial Start Date'),
+        'trial_date_end': fields.date('Trial End Date'),
         'working_hours': fields.many2one('resource.calendar','Working Schedule'),
         'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
         'wage': fields.float('Wage', digits=(16,2), required=True),
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 7d07e676a24..027aafa5d31 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -220,8 +220,8 @@ class hr_evaluation(osv.osv):
                 elif phase.action == "self":
                     childs = [evaluation.employee_id]
                 for child in childs:
-                    if not child.user_id:
-                        continue
+#                    if not child.user_id:
+#                        continue
 
                     int_id = hr_eval_inter_obj.create(cr, uid, {
                         'evaluation_id': evaluation.id,
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index dec14079bb9..d9b666cfbf1 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -204,7 +204,7 @@
         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
               sequence="5"/>
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-             sequence="1"/>
+             sequence="2"/>
 
         <!--
             Company inheritancy
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index ed78807b6ff..19eacdae472 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -6,26 +6,26 @@
         <field name="model">hr.timesheet.current.open</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Current Timesheet">
-               <separator string="It will open the users current timesheet" colspan="4" />
+            <form string="Current Timesheet">
+               <separator string="It will open the your current timesheet" colspan="4" />
                <group colspan="4" col="6">
                     <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button  icon="gtk-ok" name="open_timesheet" string="Open Timesheet" type="object"/>
+                    <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object"/>
                </group>
            </form>
         </field>
     </record>
 
     <record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
-        <field name="name">My Current Timesheet</field>
+        <field name="name">Current Timesheet</field>
         <field name="res_model">hr.timesheet.current.open</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_hr_timesheet_current_open"/>
         <field name="target">new</field>
-    </record> 
+    </record>
 
-    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="Current Timesheet of User" parent="hr_attendance.menu_hr_time_tracking" sequence="2"/>
+    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
     </data>
 </openerp>