From b92702c9aa4c86a1a79e3db6abad515682c5ae0b Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Mon, 1 Nov 2010 15:26:38 +0530
Subject: [PATCH 1/2] [FIX] hr_timesheet_sheet: Fixed overlapping error of
 timesheet

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

bzr revid: pso@tinyerp.com-20101101095638-2wsfuilu01almz6l
---
 .../hr_timesheet_sheet/hr_timesheet_sheet_demo.xml   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index a4b4b434da6..daaa55fc6a1 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="sheet0" model="hr_timesheet_sheet.sheet">
-            <field name="name">Sheet 0</field>
+        
+        <record id="sheet1" model="hr_timesheet_sheet.sheet">
+            <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="employee_id" ref="hr.employee1" />
             <field eval="time.strftime('%Y-%m-01', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_from"/>
@@ -10,12 +11,5 @@
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
         </record>
 
-        <record id="sheet1" model="hr_timesheet_sheet.sheet">
-            <field name="name">Sheet 1</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="employee_id" ref="hr.employee1" />
-            <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
-        </record>
-
     </data>
 </openerp>

From 4f1ddce0fb8afff4f8d128dcfbd352acdbbadfe2 Mon Sep 17 00:00:00 2001
From: pso <pso@tinyerp.com>
Date: Tue, 2 Nov 2010 15:44:27 +0530
Subject: [PATCH 2/2] [FIX] hr_timesheet_sheet: Fixed overlapping error of
 timesheet

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

bzr revid: pso@tinyerp.com-20101102101427-gpjgxlj6fuo8q3pf
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index daaa55fc6a1..3ffa2cf0d1a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -6,9 +6,7 @@
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="employee_id" ref="hr.employee1" />
-            <field eval="time.strftime('%Y-%m-01', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_from"/>
-            <field eval="time.strftime('%Y-%m-15', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_current"/>
-            <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
         </record>
 
     </data>