fix(Leave Application): calendar view by barredterra [frappe] PR#1424

Bot Dokosrequested to merge
ft-pr-1424 into develop

From: https://github.com/frappe/hrms/pull/1424
Date: 2024-03-14 14:58:28+05:30

  • chore: add comment
  • fix: use get_single_value instead of get_value
  • fix: remove employee_name and leave_type before checking in events
  • refactor: use get_list instead of sql and simplify date range condition
  • fix: half day
  • fix: set employee before company
  • refactor: use 1 instead of True
  • fix: convert datetime to date
  • fix: get blocked days in the correct order
  • fix: remove unused whitelisting from get_applicable_block_dates
  • fix: show blocked dates as "allDay"
  • fix(Leave Application): calendar view


Diagnostics

pre-commit failed for source commit: c2699b67308628258e3f97a9c4f8f92dd92fb263
Trim Trailing Whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing hrms/hr/doctype/leave_block_list/leave_block_list.py


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-1424

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-1424

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports