Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Shift Type): mark Process Attendance After reqd if auto attendance is enabled #2526

Merged

Conversation

ruchamahabal
Copy link
Member

Auto attendance doesn't work if "Process Attendance After" field is not set

  • Mark Process Attendance After as mandatory if auto attendance is enabled
  • Default it to today's date

@ruchamahabal ruchamahabal merged commit 9824c00 into frappe:develop Dec 18, 2024
8 checks passed
mergify bot pushed a commit that referenced this pull request Dec 18, 2024
…e is enabled (#2526)

- default it to today's date

(cherry picked from commit 9824c00)

# Conflicts:
#	hrms/hr/doctype/shift_type/shift_type.json
mergify bot pushed a commit that referenced this pull request Dec 18, 2024
…e is enabled (#2526)

- default it to today's date

(cherry picked from commit 9824c00)
@ruchamahabal
Copy link
Member Author

accidentally pushed extra field. Removed here: 0faf93a

Fixed backports separately

ruchamahabal added a commit that referenced this pull request Dec 18, 2024
…e is enabled (backport #2526) (#2527)

* fix(Shift Type): mark Process Attendance After reqd if auto attendance is enabled (#2526)

- default it to today's date

(cherry picked from commit 9824c00)

# Conflicts:
#	hrms/hr/doctype/shift_type/shift_type.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <[email protected]>
ruchamahabal added a commit that referenced this pull request Dec 18, 2024
…e is enabled (backport #2526) (#2528)

* fix(Shift Type): mark Process Attendance After reqd if auto attendance is enabled (#2526)

- default it to today's date

(cherry picked from commit 9824c00)

* chore: remove auto_update_last_sync field

---------

Co-authored-by: Rucha Mahabal <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant