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(UX): Option to exclude holidays while marking monthly attendance #29185

Merged
merged 2 commits into from
Jan 17, 2022

Conversation

ruchamahabal
Copy link
Member

@ruchamahabal ruchamahabal commented Jan 7, 2022

Problem:

While marking monthly Attendance in bulk for an employee from the attendance list view, the Attendance checklist includes all the days of the month for which attendance is not marked. The user has to manually uncheck holidays while doing so which is cumbersome.

holidays

Fix:

Add an option to Exclude Holidays while marking attendance in bulk.

exclude-holidays

Docs: https://docs.erpnext.com/docs/v13/user/manual/en/human-resources/attendance/edit?wiki_page_patch=8cd07a867b

@ruchamahabal ruchamahabal changed the title feat(UX): Ability to exclude holidays while marking monthly attendance feat(UX): Option to exclude holidays while marking monthly attendance Jan 7, 2022
@codecov
Copy link

codecov bot commented Jan 7, 2022

Codecov Report

Merging #29185 (72bf822) into develop (6bea91e) will decrease coverage by 0.16%.
The diff coverage is 42.85%.

@@             Coverage Diff             @@
##           develop   #29185      +/-   ##
===========================================
- Coverage    57.96%   57.79%   -0.17%     
===========================================
  Files         1110     1110              
  Lines        68083    68087       +4     
===========================================
- Hits         39466    39354     -112     
- Misses       28617    28733     +116     
Impacted Files Coverage Δ
erpnext/hr/doctype/attendance/attendance.py 40.54% <42.85%> (-1.52%) ⬇️
...unts/report/purchase_register/purchase_register.py 32.19% <0.00%> (-45.90%) ⬇️
...e_purchase_register/item_wise_purchase_register.py 58.00% <0.00%> (-20.00%) ⬇️
...em_wise_sales_register/item_wise_sales_register.py 51.36% <0.00%> (-10.00%) ⬇️
.../manufacturing/report/bom_explorer/bom_explorer.py 94.44% <0.00%> (-5.56%) ⬇️
...eport/item_variant_details/item_variant_details.py 84.33% <0.00%> (-3.62%) ⬇️
erpnext/assets/doctype/asset/depreciation.py 85.23% <0.00%> (-2.69%) ⬇️
...xt/stock/report/stock_analytics/stock_analytics.py 91.08% <0.00%> (-1.99%) ⬇️
...wise_balance_history/batch_wise_balance_history.py 91.37% <0.00%> (-1.73%) ⬇️
...r/doctype/leave_ledger_entry/leave_ledger_entry.py 90.16% <0.00%> (-1.64%) ⬇️
... and 18 more

@ruchamahabal ruchamahabal added needs-tests This PR needs automated unit-tests. and removed needs-tests This PR needs automated unit-tests. labels Jan 12, 2022
@ruchamahabal ruchamahabal merged commit 6aac8de into frappe:develop Jan 17, 2022
@ruchamahabal ruchamahabal deleted the attendance-marking-ux branch January 17, 2022 10:58
@ruchamahabal
Copy link
Member Author

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Jan 17, 2022

backport version-13-hotfix

✅ Backports have been created

ruchamahabal added a commit that referenced this pull request Jan 17, 2022
… (backport #29185) (#29321)

(cherry picked from commit 6aac8de)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
KrithiRamani pushed a commit to KrithiRamani/erpnext that referenced this pull request Mar 14, 2022
… (backport frappe#29185) (frappe#29321)

(cherry picked from commit 6aac8de)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant