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

feat(Shift Type): Auto update Last Sync of Checkin (backport #2513) #2800

Merged
merged 5 commits into from
Feb 20, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 20, 2025

Added setting to automatically update last sync of checkin in shift type:

image

When people checkin from a single biometric device/via mobile app, they have to manually update this timestamp or write a script to get auto attendance working. Added a bg job to do so

Docs: https://docs.frappe.io/hr/shift-type


This is an automatic backport of pull request #2513 done by Mergify.

(cherry picked from commit c94d780)

# Conflicts:
#	hrms/hr/doctype/shift_type/shift_type.json
- this might be set to a future date, until then the auto-update job won't update the checkin

(cherry picked from commit 24c5a90)
- the get_datetime comparison defaults to current date and condition will always be false

(cherry picked from commit f449498)
Copy link
Contributor Author

mergify bot commented Feb 20, 2025

Cherry-pick of c94d780 has failed:

On branch mergify/bp/version-15-hotfix/pr-2513
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit c94d7807.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/hooks.py
	modified:   hrms/hr/doctype/shift_type/shift_type.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/shift_type/shift_type.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal ruchamahabal merged commit bd74f2f into version-15-hotfix Feb 20, 2025
6 of 7 checks passed
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.40.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants