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: monthly attendance sheet #30748

Merged
merged 1 commit into from
Apr 20, 2022
Merged

fix: monthly attendance sheet #30748

merged 1 commit into from
Apr 20, 2022

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Apr 19, 2022 •
edited
Loading

Problem

In the report "Monthly Attendance Sheet" we have the option to show a "Summarized View". This includes the sum of leaves taken by Leave Type. Currently this shows zeros everywhere, regardless of the actual data.

before

Cause

This is because we tried to match column definitions ("LEAVE TYPE::Float:120", stored in leave_list) with Leave Types ("LEAVE TYPE", stored in leaves). They are never equal, so we output 0.

erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py

Lines 225 to 229 in 4389100

for d in leave_list:
if d in leaves:
row.append(leaves[d])
else:
row.append("0.0")

Solution

Use leave types instead of column definitions for the comparison.

after

This PR targets version-13-hotfix directly because the report has been refactored in develop and the problem most likely doesn't exist there.

@ruchamahabal
Copy link
Member

Unrelated testcase failure

@ruchamahabal ruchamahabal merged commit 0b4e3f1 into frappe:version-13-hotfix Apr 20, 2022
@barredterra barredterra deleted the fix-monthly-attendance-sheet branch April 20, 2022 10:10
frappe-pr-bot pushed a commit that referenced this pull request Apr 26, 2022
@frappe-bot
chore(release): Bumped to Version 13.27.1
b77b378 
## [13.27.1](v13.27.0...v13.27.1) (2022-04-26)

### Bug Fixes

* Add accounting dimensions for round off GL Entry ([dedb90e](dedb90e))
* batch_no filtering not working when batch no is also a number in scientific notation ([#30770](#30770)) ([#30771](#30771)) ([c339305](c339305))
* Check if accounting dimension exists ([1834671](1834671))
* dependent gle reposting (backport [#30726](#30726)) ([#30772](#30772)) ([a6d0938](a6d0938))
* Do not validate while creating accounting dimension ([153b41a](153b41a))
* e_commerce_settings.js ([3a5f5d5](3a5f5d5))
* e_commerce_settings.py ([86c5f4d](86c5f4d))
* First preference to parent cost center rather than round off cost center ([a2d95fc](a2d95fc))
* Handle Multiselect field mapping separately ([dc2f694](dc2f694))
* **india:** 401 & 403 client error while generating IRN ([198bdcf](198bdcf))
* **india:** cess value not considered while validating e-invoice totals ([#30800](#30800)) ([f70fca1](f70fca1))
* **india:** transporter name is null while generating e-way bill ([#30736](#30736)) ([6291b28](6291b28))
* linter ([6dddbb9](6dddbb9))
* Loan doctypes in bank reconciliation ([e69c715](e69c715))
* Mistyped variable name in patch ([e76220e](e76220e))
* monthly attendance sheet ([#30748](#30748)) ([0b4e3f1](0b4e3f1))
* Must not be able to start Job Card if it is related to Work Order that is not started yet ([#29072](#29072)) ([#30755](#30755)) ([b656ffa](b656ffa))
* Query filter fields from Website Item instead of Item master ([bed9e09](bed9e09))
* select doctype as payment_document ([44f0b69](44f0b69))
* **Selling,E-Commerce:** Shopping cart quotation without website item. ([#29085](#29085)) ([ea0fe5e](ea0fe5e))
* SO analysis rpt will fetch SO's without Delivery note as well ([f9d89c7](f9d89c7))
* translation ([#30781](#30781)) ([#30783](#30783)) ([8335ca6](8335ca6))
* Update token to allow updates on protected branch ([baab379](baab379))
* update translation ([#30725](#30725)) ([#30776](#30776)) ([b585262](b585262))
* Use parent cost center for Sales and Purchase Invoice ([fe9f329](fe9f329))
* Use right precision for asset value after full schedule ([#30745](#30745)) ([269e192](269e192))
* Validate field filter wrt to Website Item & re-use validation in Item Group ([34437a8](34437a8))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.27.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

deepeshgarg007 pushed a commit to deepeshgarg007/erpnext that referenced this pull request May 13, 2022
@frappe-bot @deepeshgarg007
chore(release): Bumped to Version 13.27.1
096dcf0 
## [13.27.1](frappe/erpnext@v13.27.0...v13.27.1) (2022-04-26)

### Bug Fixes

* Add accounting dimensions for round off GL Entry ([dedb90e](frappe@dedb90e))
* batch_no filtering not working when batch no is also a number in scientific notation ([frappe#30770](frappe#30770)) ([frappe#30771](frappe#30771)) ([c339305](frappe@c339305))
* Check if accounting dimension exists ([1834671](frappe@1834671))
* dependent gle reposting (backport [frappe#30726](frappe#30726)) ([frappe#30772](frappe#30772)) ([a6d0938](frappe@a6d0938))
* Do not validate while creating accounting dimension ([153b41a](frappe@153b41a))
* e_commerce_settings.js ([3a5f5d5](frappe@3a5f5d5))
* e_commerce_settings.py ([86c5f4d](frappe@86c5f4d))
* First preference to parent cost center rather than round off cost center ([a2d95fc](frappe@a2d95fc))
* Handle Multiselect field mapping separately ([dc2f694](frappe@dc2f694))
* **india:** 401 & 403 client error while generating IRN ([198bdcf](frappe@198bdcf))
* **india:** cess value not considered while validating e-invoice totals ([frappe#30800](frappe#30800)) ([f70fca1](frappe@f70fca1))
* **india:** transporter name is null while generating e-way bill ([frappe#30736](frappe#30736)) ([6291b28](frappe@6291b28))
* linter ([6dddbb9](frappe@6dddbb9))
* Loan doctypes in bank reconciliation ([e69c715](frappe@e69c715))
* Mistyped variable name in patch ([e76220e](frappe@e76220e))
* monthly attendance sheet ([frappe#30748](frappe#30748)) ([0b4e3f1](frappe@0b4e3f1))
* Must not be able to start Job Card if it is related to Work Order that is not started yet ([frappe#29072](frappe#29072)) ([frappe#30755](frappe#30755)) ([b656ffa](frappe@b656ffa))
* Query filter fields from Website Item instead of Item master ([bed9e09](frappe@bed9e09))
* select doctype as payment_document ([44f0b69](frappe@44f0b69))
* **Selling,E-Commerce:** Shopping cart quotation without website item. ([frappe#29085](frappe#29085)) ([ea0fe5e](frappe@ea0fe5e))
* SO analysis rpt will fetch SO's without Delivery note as well ([f9d89c7](frappe@f9d89c7))
* translation ([frappe#30781](frappe#30781)) ([frappe#30783](frappe#30783)) ([8335ca6](frappe@8335ca6))
* Update token to allow updates on protected branch ([baab379](frappe@baab379))
* update translation ([frappe#30725](frappe#30725)) ([frappe#30776](frappe#30776)) ([b585262](frappe@b585262))
* Use parent cost center for Sales and Purchase Invoice ([fe9f329](frappe@fe9f329))
* Use right precision for asset value after full schedule ([frappe#30745](frappe#30745)) ([269e192](frappe@269e192))
* Validate field filter wrt to Website Item & re-use validation in Item Group ([34437a8](frappe@34437a8))
@ruchamahabal ruchamahabal mentioned this pull request May 13, 2022
Closed
mergify bot pushed a commit that referenced this pull request May 15, 2022
@frappe-bot @mergify
chore(release): Bumped to Version 13.27.1
e66aab7 
## [13.27.1](v13.27.0...v13.27.1) (2022-04-26)

### Bug Fixes

* Add accounting dimensions for round off GL Entry ([dedb90e](dedb90e))
* batch_no filtering not working when batch no is also a number in scientific notation ([#30770](#30770)) ([#30771](#30771)) ([c339305](c339305))
* Check if accounting dimension exists ([1834671](1834671))
* dependent gle reposting (backport [#30726](#30726)) ([#30772](#30772)) ([a6d0938](a6d0938))
* Do not validate while creating accounting dimension ([153b41a](153b41a))
* e_commerce_settings.js ([3a5f5d5](3a5f5d5))
* e_commerce_settings.py ([86c5f4d](86c5f4d))
* First preference to parent cost center rather than round off cost center ([a2d95fc](a2d95fc))
* Handle Multiselect field mapping separately ([dc2f694](dc2f694))
* **india:** 401 & 403 client error while generating IRN ([198bdcf](198bdcf))
* **india:** cess value not considered while validating e-invoice totals ([#30800](#30800)) ([f70fca1](f70fca1))
* **india:** transporter name is null while generating e-way bill ([#30736](#30736)) ([6291b28](6291b28))
* linter ([6dddbb9](6dddbb9))
* Loan doctypes in bank reconciliation ([e69c715](e69c715))
* Mistyped variable name in patch ([e76220e](e76220e))
* monthly attendance sheet ([#30748](#30748)) ([0b4e3f1](0b4e3f1))
* Must not be able to start Job Card if it is related to Work Order that is not started yet ([#29072](#29072)) ([#30755](#30755)) ([b656ffa](b656ffa))
* Query filter fields from Website Item instead of Item master ([bed9e09](bed9e09))
* select doctype as payment_document ([44f0b69](44f0b69))
* **Selling,E-Commerce:** Shopping cart quotation without website item. ([#29085](#29085)) ([ea0fe5e](ea0fe5e))
* SO analysis rpt will fetch SO's without Delivery note as well ([f9d89c7](f9d89c7))
* translation ([#30781](#30781)) ([#30783](#30783)) ([8335ca6](8335ca6))
* Update token to allow updates on protected branch ([baab379](baab379))
* update translation ([#30725](#30725)) ([#30776](#30776)) ([b585262](b585262))
* Use parent cost center for Sales and Purchase Invoice ([fe9f329](fe9f329))
* Use right precision for asset value after full schedule ([#30745](#30745)) ([269e192](269e192))
* Validate field filter wrt to Website Item & re-use validation in Item Group ([34437a8](34437a8))

(cherry picked from commit 096dcf0)

# Conflicts:
#	erpnext/__init__.py
hrwX pushed a commit to hrwX/erpnext that referenced this pull request May 20, 2022
@frappe-bot @hrwX
chore(release): Bumped to Version 13.27.1
e563981 
## [13.27.1](frappe/erpnext@v13.27.0...v13.27.1) (2022-04-26)

### Bug Fixes

* Add accounting dimensions for round off GL Entry ([dedb90e](frappe@dedb90e))
* batch_no filtering not working when batch no is also a number in scientific notation ([frappe#30770](frappe#30770)) ([frappe#30771](frappe#30771)) ([c339305](frappe@c339305))
* Check if accounting dimension exists ([1834671](frappe@1834671))
* dependent gle reposting (backport [frappe#30726](frappe#30726)) ([frappe#30772](frappe#30772)) ([a6d0938](frappe@a6d0938))
* Do not validate while creating accounting dimension ([153b41a](frappe@153b41a))
* e_commerce_settings.js ([3a5f5d5](frappe@3a5f5d5))
* e_commerce_settings.py ([86c5f4d](frappe@86c5f4d))
* First preference to parent cost center rather than round off cost center ([a2d95fc](frappe@a2d95fc))
* Handle Multiselect field mapping separately ([dc2f694](frappe@dc2f694))
* **india:** 401 & 403 client error while generating IRN ([198bdcf](frappe@198bdcf))
* **india:** cess value not considered while validating e-invoice totals ([frappe#30800](frappe#30800)) ([f70fca1](frappe@f70fca1))
* **india:** transporter name is null while generating e-way bill ([frappe#30736](frappe#30736)) ([6291b28](frappe@6291b28))
* linter ([6dddbb9](frappe@6dddbb9))
* Loan doctypes in bank reconciliation ([e69c715](frappe@e69c715))
* Mistyped variable name in patch ([e76220e](frappe@e76220e))
* monthly attendance sheet ([frappe#30748](frappe#30748)) ([0b4e3f1](frappe@0b4e3f1))
* Must not be able to start Job Card if it is related to Work Order that is not started yet ([frappe#29072](frappe#29072)) ([frappe#30755](frappe#30755)) ([b656ffa](frappe@b656ffa))
* Query filter fields from Website Item instead of Item master ([bed9e09](frappe@bed9e09))
* select doctype as payment_document ([44f0b69](frappe@44f0b69))
* **Selling,E-Commerce:** Shopping cart quotation without website item. ([frappe#29085](frappe#29085)) ([ea0fe5e](frappe@ea0fe5e))
* SO analysis rpt will fetch SO's without Delivery note as well ([f9d89c7](frappe@f9d89c7))
* translation ([frappe#30781](frappe#30781)) ([frappe#30783](frappe#30783)) ([8335ca6](frappe@8335ca6))
* Update token to allow updates on protected branch ([baab379](frappe@baab379))
* update translation ([frappe#30725](frappe#30725)) ([frappe#30776](frappe#30776)) ([b585262](frappe@b585262))
* Use parent cost center for Sales and Purchase Invoice ([fe9f329](frappe@fe9f329))
* Use right precision for asset value after full schedule ([frappe#30745](frappe#30745)) ([269e192](frappe@269e192))
* Validate field filter wrt to Website Item & re-use validation in Item Group ([34437a8](frappe@34437a8))

(cherry picked from commit 096dcf0)

# Conflicts:
#	erpnext/__init__.py
@tajff
Copy link

tajff commented Oct 21, 2022

Is it possible to show the total number of hours of late entry, and number of hours of early exit?

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ruchamahabal ruchamahabal ruchamahabal approved these changes

@pateljannat pateljannat Awaiting requested review from pateljannat

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@barredterra @ruchamahabal @frappe-pr-bot @tajff