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(Employee Attendance Tool): 'On Leave' status showing as undefined in marked attendance summary #1712

Merged
merged 2 commits into from
May 1, 2024

Conversation

creative-paramu
Copy link
Contributor

@creative-paramu creative-paramu commented Apr 25, 2024

Employee Attendance Tool Marked Attendance On Leave Status showing in undefined ,
Closes: #1711
Before:
Screenshot from 2024-04-25 17-03-22
After:
Screenshot from 2024-04-25 17-13-58

@ruchamahabal ruchamahabal changed the title Employee Attendance Tool On Leave Status showing in undefined Change to On Leave fix(Employee Attendance Tool): 'On Leave' status showing as undefined in marked attendance summary May 1, 2024
@ruchamahabal ruchamahabal merged commit 7f60fda into frappe:develop May 1, 2024
5 of 6 checks passed
mergify bot pushed a commit that referenced this pull request May 1, 2024
… in marked attendance summary (#1712)

(cherry picked from commit 7f60fda)
mergify bot pushed a commit that referenced this pull request May 1, 2024
… in marked attendance summary (#1712)

(cherry picked from commit 7f60fda)
@ruchamahabal
Copy link
Member

@creative-paramu Thanks for the fix. Try sticking to conventional commit messages in your future commits: https://www.conventionalcommits.org/en/v1.0.0/

ruchamahabal pushed a commit that referenced this pull request May 1, 2024
… in marked attendance summary (backport #1712) (#1733)

(cherry picked from commit 7f60fda)

Co-authored-by: Parameshwari Palanisamy <101092028+creative-paramu@users.noreply.github.com>
ruchamahabal pushed a commit that referenced this pull request May 1, 2024
… in marked attendance summary (backport #1712) (#1732)

(cherry picked from commit 7f60fda)

Co-authored-by: Parameshwari Palanisamy <101092028+creative-paramu@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request May 1, 2024
## [15.20.2](v15.20.1...v15.20.2) (2024-05-01)

### Bug Fixes

* autofill skills on entering designation in Interview Round (backport [#1706](#1706)) ([#1735](#1735)) ([f3961b7](f3961b7))
* **Employee Advance:** selection of currency ([ee86b5d](ee86b5d))
* **Employee Attendance Tool:** 'On Leave' status showing as undefined in marked attendance summary (backport [#1712](#1712)) ([#1733](#1733)) ([34894c0](34894c0))
* **Leave Application:** half day date picker rendering (backport [#1643](#1643)) ([#1731](#1731)) ([9ff1f14](9ff1f14))
* merge conflicts ([29cbccd](29cbccd))
* ruff linting issues ([aa47352](aa47352))
* semgrep errors ([e77021a](e77021a))
frappe-pr-bot pushed a commit that referenced this pull request May 1, 2024
# [14.27.0](v14.26.2...v14.27.0) (2024-05-01)

### Bug Fixes

* autofill skills on entering designation in Interview Round (backport [#1706](#1706)) ([#1734](#1734)) ([fb5294a](fb5294a))
* **Employee Advance:** selection of currency ([68728db](68728db))
* **Employee Attendance Tool:** 'On Leave' status showing as undefined in marked attendance summary (backport [#1712](#1712)) ([#1732](#1732)) ([af1b2ba](af1b2ba))
* **Leave Application:** half day date picker rendering (backport [#1643](#1643)) ([#1730](#1730)) ([cba9824](cba9824))
* merge conflicts ([cccda2e](cccda2e))
* more ruff linting issues ([f268a10](f268a10))
* ruff linting issues ([7b2685d](7b2685d))
* ruff linting issues ([8141c89](8141c89))
* semgrep errors ([9773e85](9773e85))

### Features

* **Attendance Request:**  add 'Include Holidays' checkbox (backport [#1040](#1040)) ([#1727](#1727)) ([12ff8c7](12ff8c7))
@creative-paramu
Copy link
Contributor Author

@creative-paramu Thanks for the fix. Try sticking to conventional commit messages in your future commits: https://www.conventionalcommits.org/en/v1.0.0/

Ok Mam

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.

Employee Attendance Tool On Leave Status showing in undefined
2 participants