[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552...

[odoo/odoo.git] / addons / hr_timesheet_sheet / hr_timesheet_sheet.py

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index bb42768..83f74e4 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -402,6 +402,9 @@ class hr_attendance(osv.osv):
             employee = employee_obj.browse(cr, uid, employee_id, context=context)
             tz = employee.user_id.partner_id.tz
 
+        if not date:
+            date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
         att_tz = timezone(tz or 'utc')
 
         attendance_dt = datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT)