diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py index bce9bd4d3ce9ecf5c0dbf9a85546caf05289c207..d0715b4b66da8dee0c063795b4dc9f5263926f60 100644 --- a/addons/hr_attendance/report/bymonth.py +++ b/addons/hr_attendance/report/bymonth.py @@ -65,7 +65,7 @@ class report_custom(report_rml): where att.name between %s and %s and emp.id = %s order by att.name ''' - cr.execute(sql, (today, tomor, employee_id)) + cr.execute(sql, (today.strftime('%Y-%m-%d %H:%M:%S'), tomor.strftime('%Y-%m-%d %H:%M:%S'), employee_id)) attendences = cr.dictfetchall() wh = 0 # Fake sign ins/outs at week ends, to take attendances across week ends into account diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py index 7e2a14ade623503dce3a53e041cd35cdb98d087f..feec7743370ed14fbb72cb82966134defcc4585c 100644 --- a/addons/hr_attendance/report/timesheet.py +++ b/addons/hr_attendance/report/timesheet.py @@ -75,7 +75,7 @@ class report_custom(report_rml): order by att.name ''' for idx in range(7): - cr.execute(sql, (monday, monday + DateTime.RelativeDateTime(days=idx+1), employee_id)) + cr.execute(sql, (monday.strftime('%Y-%m-%d %H:%M:%S'), (monday + DateTime.RelativeDateTime(days=idx+1)).strftime('%Y-%m-%d %H:%M:%S'), employee_id)) attendances = cr.dictfetchall() week_wh = {} # Fake sign ins/outs at week ends, to take attendances across week ends into account diff --git a/addons/hr_attendance/wizard/print_bymonth.py b/addons/hr_attendance/wizard/print_bymonth.py index 0261d94f594b9ec019b9902ed86125a9cb6d556e..4e28055bcdc002c5a470c41bc36b8e64d4f584a6 100644 --- a/addons/hr_attendance/wizard/print_bymonth.py +++ b/addons/hr_attendance/wizard/print_bymonth.py @@ -31,15 +31,26 @@ _date_form = '''<?xml version="1.0"?> </form>''' _date_fields = { - 'month' : {'string' : 'Month', 'type' : 'selection', 'selection' : [(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')], 'required':True }, - 'year' : {'string' : 'Year', 'type' : 'integer', 'required':True, 'default' : lambda *a: time.gmtime()[0]}, + 'month' : { + 'string' : 'Month', + 'type' : 'selection', + 'selection' : [(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')], + 'required':True, + 'default' : lambda * a: time.gmtime()[1] + }, + 'year' : { + 'string' : 'Year', + 'type' : 'integer', + 'required':True, + 'default' : lambda * a: time.gmtime()[0] + }, } class wiz_bymonth(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print','Print Timesheet'),('end','Cancel')]} + 'result': {'type': 'form', 'arch':_date_form, 'fields':_date_fields, 'state':[('print', 'Print Timesheet'), ('end', 'Cancel')]} }, 'print': { 'actions': [],