From c7d50354fb880f01092be16ff8a99b66d97e89d5 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 20 Oct 2010 18:59:48 +0530
Subject: [PATCH] [FIX] hr_timesheet_sheet : date_from and date_to problem,
 hr_evaluation : date deadline problem fixed

bzr revid: vir@tinyerp.com-20101020132948-1ax61wd33j1ejj18
---
 addons/hr_evaluation/hr_evaluation.py                 | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py       | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3c5a150691e..4d8ef9d440f 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -124,7 +124,7 @@ class hr_employee(osv.osv):
             flag = False
             evaluation_plan =  evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
             if not evaluation_date:
-               evaluation_date=(parser.parse(datetime.date.today().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
+               evaluation_date=(parser.parse(datetime.now().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
                flag = True
             else:
                 if (parser.parse(evaluation_date) + relativedelta(months = int(evaluation_plan.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index b152e0112eb..6411bae7bc0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -319,7 +319,7 @@ class hr_timesheet_sheet(osv.osv):
         if r=='month':
             return time.strftime('%Y-%m-01')
         elif r=='week':
-            return (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
+            return (datetime.today() + relativedelta(weekday=0, weeks=-1)).strftime('%Y-%m-%d')
         elif r=='year':
             return time.strftime('%Y-01-01')
         return time.strftime('%Y-%m-%d')
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index dedac8377a7..a4b4b434da6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -10,11 +10,12 @@
             <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">
+        <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-->
+        </record>
 
     </data>
 </openerp>