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: color and leave type in leave application calendar #27246

Merged

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Aug 30, 2021

Previously, a calendar event looked like this:

Bildschirmfoto 2021-08-30 um 22 23 06

Everything is shown in blue, the color field in Leave Application was useless. Also you couldn't see the Leave Type.

Now it looks like this:

Bildschirmfoto 2021-08-30 um 22 22 02

Leaves are shown in the color defined in Leave Application. Leave type is shown in parentheses after the employee.

no-docs

@barredterra barredterra added the backport develop instructs mergify to frontport PR to develop branch label Aug 30, 2021
@pateljannat pateljannat added the HR label Aug 31, 2021
@pateljannat pateljannat merged commit 366eb86 into frappe:version-13-hotfix Aug 31, 2021
frappe-pr-bot pushed a commit to frappe-pr-bot/erpnext that referenced this pull request Aug 31, 2021
* feat: color and leave type in leave application calendar

* fix: sider + use cstring

(cherry picked from commit 366eb86)
@barredterra barredterra deleted the leave-application-calendar branch August 31, 2021 11:35
pateljannat pushed a commit that referenced this pull request Aug 31, 2021
…7255)

* feat: color and leave type in leave application calendar

* fix: sider + use cstring

(cherry picked from commit 366eb86)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
… (frappe#27255)

* feat: color and leave type in leave application calendar

* fix: sider + use cstring

(cherry picked from commit 6fd6482)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport develop instructs mergify to frontport PR to develop branch HR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants