mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-21 22:19:18 +00:00
f208903250
* refactor: overlapping shifts validation - convert raw query to frappe.qb - check for overlapping timings if dates overlap - translation friendly error messages with link to overlapping doc * refactor: consider timeslots in `get_employee_shift` * fix: handle shift grace overlap while finding current shift * refactor: handle shifts spanning over 2 different days * fix: fetching shift on timing boundaries * refactor: rewrite docstrings and add type hints for functions * refactor: Allow multiple attendance records creation for different shifts * feat: auto attendance marking for multiple shifts on the same day * refactor: mark absent for employees with no attendance - break down into smaller functions - make it work with multiple shifts - this will mark employee as absent per shift, meaning employee can be present for one shift and absent for another on the same day * chore: sort imports, remove unused imports * refactor: Monthly Attendance Sheet - split into smaller functions - add type hints - get rid of unnecessary db calls and loops - add docstrings for functions * feat: add colors for attendance status to lessen the cognitive load - legend with colors and full form for status abbreviations * feat: show shift-wise attendance in monthly attendance sheet * test: monthly attendance sheet * style: format code with black * chore: ignore formatting changes in blame * test: fetching shifts in Employee Checkins * fix(test): make holiday list for shift and checkin tests * fix: tests * test: shift assignment creation * fix: attendance fixes - check half day attendance threshold before absent threshold to avoid half day getting marked as absent - round working hours to 2 digits for better accuracy - start and end dates for absent attendance marking * test: Shift Type with Auto Attendance setup and working fix test setups * refactor: Overlapping validation for Shift Request - commonify time overlap function between request and assignment - add tests for shift request overlap * chore: remove unused import * fix: add validation for overlapping shift attendance - skip auto attendance in case of overlapping shift attendance record - this case won't occur in case of shift assignment, since it will not allow overlapping shifts to be assigned - can happen if manual attendance records are created * test: validations for duplicate and overlapping shift attendance records * test: skip auto attendance * fix: skip validation for overlapping shift attendance if no shift is linked * test: add holiday related shift and attendance tests * test: add attendance sheet tests for employee filter, half days * fix: sider
31 lines
1.0 KiB
Plaintext
31 lines
1.0 KiB
Plaintext
# Since version 2.23 (released in August 2019), git-blame has a feature
|
|
# to ignore or bypass certain commits.
|
|
#
|
|
# This file contains a list of commits that are not likely what you
|
|
# are looking for in a blame, such as mass reformatting or renaming.
|
|
# You can set this file as a default ignore file for blame by running
|
|
# the following command.
|
|
#
|
|
# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
|
|
|
|
# Replace use of Class.extend with native JS class
|
|
1fe891b287a1b3f225d29ee3d07e7b1824aba9e7
|
|
|
|
# This commit just changes spaces to tabs for indentation in some files
|
|
5f473611bd6ed57703716244a054d3fb5ba9cd23
|
|
|
|
# Whitespace fix throughout codebase
|
|
4551d7d6029b6f587f6c99d4f8df5519241c6a86
|
|
b147b85e6ac19a9220cd1e2958a6ebd99373283a
|
|
|
|
# sort and cleanup imports
|
|
915b34391c2066dfc83e60a5813c5a877cebe7ac
|
|
|
|
# removing six compatibility layer
|
|
8fe5feb6a4372bf5f2dfaf65fca41bbcc25c8ce7
|
|
|
|
# bulk format python code with black
|
|
494bd9ef78313436f0424b918f200dab8fc7c20b
|
|
|
|
# bulk format python code with black
|
|
baec607ff5905b1c67531096a9cf50ec7ff00a5d |