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: remove default from Employee Leave Balance report #2172

Merged
merged 3 commits into from
Sep 16, 2024
Merged

fix: remove default from Employee Leave Balance report #2172

merged 3 commits into from
Sep 16, 2024

Conversation

Nihantra-Patel
Copy link
Member

@Nihantra-Patel Nihantra-Patel commented Sep 12, 2024 •
edited
Loading

Version 15 and 14

  • There's no need to define the default value because it won’t work that way. Remove it, and if a leave period is created, it will be set in the onload event, which is already defined. So, remove the line below:
default: frappe.defaults.get_default("year_start_date"),

@Nihantra-Patel Nihantra-Patel changed the title fix: from/to date in Employee Leave Balance report fix: remove default from Employee Leave Balance report Sep 12, 2024
@ruchamahabal ruchamahabal merged commit 89ac696 into frappe:develop Sep 16, 2024
4 checks passed
mergify bot pushed a commit that referenced this pull request Sep 16, 2024
@Nihantra-Patel @mergify
fix: remove default from Employee Leave Balance report (#2172)
3e48fc8 
* fix: from/to date in Employee Leave Balance report

* fix: remove default from Employee Leave Balance report

* fix: remove default from Employee Leave Balance report

(cherry picked from commit 89ac696)
mergify bot pushed a commit that referenced this pull request Sep 16, 2024
@Nihantra-Patel @mergify
fix: remove default from Employee Leave Balance report (#2172)
fe70219 
* fix: from/to date in Employee Leave Balance report

* fix: remove default from Employee Leave Balance report

* fix: remove default from Employee Leave Balance report

(cherry picked from commit 89ac696)
ruchamahabal pushed a commit that referenced this pull request Sep 16, 2024
@mergify @Nihantra-Patel
fix: remove default from Employee Leave Balance report (backport #2172)…
967b4bd 
… (#2190)

* fix: from/to date in Employee Leave Balance report

* fix: remove default from Employee Leave Balance report

* fix: remove default from Employee Leave Balance report

(cherry picked from commit 89ac696)

Co-authored-by: Nihantra C. Patel <[email protected]>
ruchamahabal pushed a commit that referenced this pull request Sep 16, 2024
@mergify @Nihantra-Patel
fix: remove default from Employee Leave Balance report (backport #2172)…
028b1e1 
… (#2191)

* fix: from/to date in Employee Leave Balance report

* fix: remove default from Employee Leave Balance report

* fix: remove default from Employee Leave Balance report

(cherry picked from commit 89ac696)

Co-authored-by: Nihantra C. Patel <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Sep 18, 2024
@frappe-bot
chore(release): Bumped to Version 14.31.0
769fb41 
# [14.31.0](v14.30.1...v14.31.0) (2024-09-18)

### Bug Fixes

* expire_allocation api endpoint by fetching allocation object (backport [#1576](#1576)) ([#2194](#2194)) ([8e8380e](8e8380e))
* **Income Tax Computation:** consideration of new employees without prexisting salary slips ([ceb718f](ceb718f))
* **Monthly Attendance Sheet:** consideration of None values while grouping ([cdbce8e](cdbce8e))
* remove default from Employee Leave Balance report (backport [#2172](#2172)) ([#2190](#2190)) ([967b4bd](967b4bd))
* show shift for month full of leaves ([1a00af0](1a00af0))
* year_start_date in Employee Advance Summary (backport [#2165](#2165)) ([#2192](#2192)) ([51cb889](51cb889))

### Features

* **Monthly Attendance Sheet:** add Include Company Descendants filter ([bf0970c](bf0970c))
frappe-pr-bot pushed a commit that referenced this pull request Sep 18, 2024
@frappe-bot
chore(release): Bumped to Version 15.29.0
4d40958 
# [15.29.0](v15.28.3...v15.29.0) (2024-09-18)

### Bug Fixes

* expire_allocation api endpoint by fetching allocation object (backport [#1576](#1576)) ([#2195](#2195)) ([a0e8ddf](a0e8ddf))
* **Income Tax Computation:** consideration of new employees without prexisting salary slips ([a2033c1](a2033c1))
* mark translatable strings in setup fixtures (backport [#2129](#2129)) ([#2196](#2196)) ([a61d8cf](a61d8cf))
* **Monthly Attendance Sheet:** consideration of None values while grouping ([00e57e1](00e57e1))
* remove default from Employee Leave Balance report (backport [#2172](#2172)) ([#2191](#2191)) ([028b1e1](028b1e1))
* show shift for month full of leaves ([11223ca](11223ca))
* year_start_date in Employee Advance Summary (backport [#2165](#2165)) ([#2193](#2193)) ([94ca0c5](94ca0c5))

### Features

* **Monthly Attendance Sheet:** add Include Company Descendants filter ([93a0431](93a0431))
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.
2 participants
@Nihantra-Patel @ruchamahabal