From 46d143e483f2177dc37784f3411787c109b3c230 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 18 Feb 2011 17:23:30 +0530
Subject: [PATCH 1/2] [FIX]hr_timesheet:Different names for the same object :
 Timesheet Lines vs Working hour

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

bzr revid: ara@tinyerp.com-20110218115330-7v6nw6yf8ez2996o
---
 addons/hr_timesheet/hr_timesheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 131148f373a..21aa716cd39 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -84,7 +84,7 @@
         </record>
 
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
-            <field name="name">Working Hours</field>
+            <field name="name">Timesheet Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>

From 55ae3a8683877d0b998f97ce2493c79d69b73d3d Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 22 Feb 2011 12:21:49 +0530
Subject: [PATCH 2/2] [IMP]hr_timesheet_sheet:Rename o2m on Timesheets/My
 Timesheets with Timesheet lines

bzr revid: ron@tinyerp.com-20110222065149-edzz6q2h7eyeplhl
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 2409b3d86b3..349f0f45657 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -96,7 +96,7 @@
                             <field name="state_attendance"/>
                             <field name="total_attendance_day" widget="float_time"/>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
-                                <tree editable="top" string="Timesheet">
+                                <tree editable="top" string="Timesheet Lines">
                                     <field invisible="1" name="date"/>
                                     <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                                     <field name="name"/>
@@ -109,7 +109,7 @@
                                     <field invisible="1" name="general_account_id"/>
                                     <field invisible="1" name="user_id" required="1"/>
                                 </tree>
-                                <form string="Timesheet">
+                                <form string="Timesheet Lines">
                                     <field name="date"/>
                                     <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                                     <field name="name"/>