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: prompt user to select company for shift & attendance report creation #2461

Merged
merged 2 commits into from
Dec 4, 2024

Conversation

AyshaHakeem
Copy link
Contributor

@AyshaHakeem AyshaHakeem commented Nov 27, 2024

Alert the user to select a company to create and view the Shift & Attendance report. Previously, missing the company filter resulted in an error message since this is a mandatory filter. This is if global default company is not set.

Before:
Screenshot 2024-11-29 at 1 08 43 PM

After:
Screenshot 2024-11-29 at 1 08 31 PM

@ruchamahabal ruchamahabal merged commit 3776c60 into frappe:develop Dec 4, 2024
6 checks passed
mergify bot pushed a commit that referenced this pull request Dec 4, 2024
…tion (#2461)

Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit 3776c60)
mergify bot pushed a commit that referenced this pull request Dec 4, 2024
…tion (#2461)

Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit 3776c60)
ruchamahabal added a commit that referenced this pull request Dec 4, 2024
ruchamahabal added a commit that referenced this pull request Dec 4, 2024
frappe-pr-bot pushed a commit that referenced this pull request Dec 9, 2024
## [14.35.3](v14.35.2...v14.35.3) (2024-12-09)

### Bug Fixes

* Apply system precision value while validating leave balance (backport [#2482](#2482)) ([#2490](#2490)) ([8d9f676](8d9f676))
* prompt user to select company for shift & attendance report creation (backport [#2461](#2461)) ([#2474](#2474)) ([9ef4001](9ef4001))
frappe-pr-bot pushed a commit that referenced this pull request Dec 9, 2024
# [15.36.0](v15.35.3...v15.36.0) (2024-12-09)

### Bug Fixes

* Apply system precision value while validating leave balance (backport [#2482](#2482)) ([#2489](#2489)) ([4d2c5f6](4d2c5f6))
* prompt user to select company for shift & attendance report creation (backport [#2461](#2461)) ([#2475](#2475)) ([2bfd0b0](2bfd0b0))
* render correct date in job listing web view (backport [#2464](#2464)) ([#2478](#2478)) ([4e2b6ea](4e2b6ea))
* **Salary Assignment:** skip warning for missing opening entries in the absence of tax components (backport [#2472](#2472)) ([#2477](#2477)) ([531d16b](531d16b))

### Features

* add Absent Days column to salary register (backport [#2485](#2485)) ([#2493](#2493)) ([67077ee](67077ee))
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.

2 participants