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 Assignment): type error while comparing dates during computation of previous/next shift (backport #1839) #1882

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 11, 2024

Closes: #1832

Fixes: TypeError: can't compare datetime.datetime to datetime.date

Regression from: #1703


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

…ation of previous/next shift (#1839)

* fix(Shift Assignment): type error while comparing dates during computation of previous/next shift

* fix: use getdate to handle all cases

---------

Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit 06e1d94)
@mergify mergify bot requested a review from ruchamahabal as a code owner June 11, 2024 12:04
@ruchamahabal ruchamahabal merged commit 37578e6 into version-14-hotfix Jun 11, 2024
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1839 branch June 11, 2024 12:22
frappe-pr-bot pushed a commit that referenced this pull request Jun 12, 2024
## [14.28.5](v14.28.4...v14.28.5) (2024-06-12)

### Bug Fixes

* calculate leaves for months passed even when policy assignment is based on custom range (backport [#1697](#1697)) ([#1884](#1884)) ([4b2312d](4b2312d))
* **Salary Slip:** remove company filter from employee (backport [#1873](#1873)) ([#1876](#1876)) ([e9dc0b1](e9dc0b1))
* **Salary Structure Assignment:** Preview Salary Slip date (backport [#1869](#1869)) ([#1878](#1878)) ([f735482](f735482))
* **Shift Assignment:** type error while comparing dates during computation of previous/next shift (backport [#1839](#1839)) ([#1882](#1882)) ([37578e6](37578e6))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.28.5 🎉

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.

3 participants