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.

Sign up for GitHub

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

Jump to bottom

fix(Leave Application): half day date picker rendering #1643

Merged
merged 2 commits into from
May 1, 2024
Merged

fix(Leave Application): half day date picker rendering #1643

merged 2 commits into from
May 1, 2024

Conversation

krantheman
Copy link
Collaborator

  • Render Half Day Datepicker only when From Date and To Date have been selected
  • Validate From Date and To Date during selection

@ruchamahabal ruchamahabal merged commit 0137c2b into frappe:develop May 1, 2024
4 checks passed
mergify bot pushed a commit that referenced this pull request May 1, 2024
@krantheman @mergify
fix(Leave Application): half day date picker rendering (#1643)
7414ec9 
(cherry picked from commit 0137c2b)

# Conflicts:
#	hrms/hr/doctype/leave_application/leave_application.js
#	hrms/hr/doctype/leave_application/leave_application.json
mergify bot pushed a commit that referenced this pull request May 1, 2024
@krantheman @mergify
fix(Leave Application): half day date picker rendering (#1643)
4163ac1 
(cherry picked from commit 0137c2b)

# Conflicts:
#	hrms/hr/doctype/leave_application/leave_application.js
#	hrms/hr/doctype/leave_application/leave_application.json
This was referenced May 1, 2024
Merged
Merged
ruchamahabal added a commit that referenced this pull request May 1, 2024
@mergify @krantheman @ruchamahabal
fix(Leave Application): half day date picker rendering (backport #1643)…
cba9824 
… (#1730)

* fix(Leave Application): half day date picker rendering (#1643)

(cherry picked from commit 0137c2b)

# Conflicts:
#	hrms/hr/doctype/leave_application/leave_application.js
#	hrms/hr/doctype/leave_application/leave_application.json

* chore: fix conflicts

---------

Co-authored-by: Akash  Tom <61287991+krantheman@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
ruchamahabal added a commit that referenced this pull request May 1, 2024
@mergify @krantheman @ruchamahabal
fix(Leave Application): half day date picker rendering (backport #1643)…
9ff1f14 
… (#1731)

* fix(Leave Application): half day date picker rendering (#1643)

(cherry picked from commit 0137c2b)

# Conflicts:
#	hrms/hr/doctype/leave_application/leave_application.js
#	hrms/hr/doctype/leave_application/leave_application.json

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: Akash  Tom <61287991+krantheman@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request May 1, 2024
@frappe-bot
chore(release): Bumped to Version 15.20.2
d82a184 
## [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
@frappe-bot
chore(release): Bumped to Version 14.27.0
7883518 
# [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))
@krantheman krantheman deleted the fix-half-day-date-picker branch May 2, 2024 05:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruchamahabal ruchamahabal ruchamahabal approved these changes

Assignees
No one assigned
Labels
backport version-14-hotfix backport version-15-hotfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@krantheman @ruchamahabal