Skip to content

Commit

Permalink
[MIG] hr_timesheet_sheet_attendance: Migration to 15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JasminSForgeFlow committed Oct 27, 2023
1 parent 9821030 commit f85cb1c
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion hr_timesheet_sheet_attendance/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "HR Timesheet Sheet Attendance",
"version": "14.0.1.0.0",
"version": "15.0.1.0.0",
"category": "Human Resources",
"sequence": 80,
"license": "AGPL-3",
Expand Down
5 changes: 1 addition & 4 deletions hr_timesheet_sheet_attendance/models/hr_timesheet_sheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def _compute_attendance_time(self):

total_attendance = fields.Float(
compute="_compute_attendance_time",
string="Total Attendance",
)
total_difference = fields.Float(
compute="_compute_attendance_time",
Expand All @@ -57,9 +56,7 @@ def _compute_attendance_time(self):
attendance_state = fields.Selection(
related="employee_id.attendance_state", string="Current Status"
)
attendance_count = fields.Integer(
compute="_compute_attendance_count", string="Attendance Count"
)
attendance_count = fields.Integer(compute="_compute_attendance_count")

def attendance_action_change(self):
"""Call attendance_action_change to
Expand Down
2 changes: 1 addition & 1 deletion hr_timesheet_sheet_attendance/readme/INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This module relies on:

* The OCA module 'HR Timesheet Sheet', and can be downloaded from
Github: https://github.com/OCA/hr-timesheet/tree/12.0/hr_timesheet_sheet
Github: https://github.com/OCA/hr-timesheet/tree/15.0/hr_timesheet_sheet
1 change: 1 addition & 0 deletions hr_timesheet_sheet_attendance/readme/ROADMAP.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
By having Check-in/out button in the timesheet, there could perhaps be a case where the user does two clicks in a fast way, then the check-in and check-out times are the same and the attendance gets blocked as there is an Odoo standard check which verifies that the attendance check-in time is strictly minor than the check-out time
2 changes: 1 addition & 1 deletion hr_timesheet_sheet_attendance/readme/USAGE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
* Two smart buttons are present on top-right corner of timesheet form
- First one(with time icon) will take you list of your timesheets (by default filter timesheets related to current timesheet-sheet)
- Second one(labeled as Attendances) will take you to list of your attendances (by default filter ateendances related to current timesheet-sheet)
* It prevents to change in any attendance ralted to timesheet-sheet that already has submitted
* It prevents to change in any attendance related to timesheet-sheet that already has submitted
* It also prevents to submit such a timesheet-sheet not having equal number of checkin and checkout
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def _create_employee(self, user):
"department_id": self.env.ref("hr.dep_rd").id,
"job_id": self.env.ref("hr.job_developer").id,
"category_ids": [(6, 0, [self.env.ref("hr.employee_category_4").id])],
"work_location": "Building 1, Second Floor",
"work_location_id": self.env.ref("hr.work_location_1").id,
"work_email": "[email protected]",
"work_phone": "+3281813700",
}
Expand Down

0 comments on commit f85cb1c

Please sign in to comment.