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(Payroll): no need to set abbr specially in Salary Slip #25877

Merged
merged 1 commit into from
Jun 1, 2021

Conversation

sagarvora
Copy link
Collaborator

This PR reverts #25117 and fixes the main issue: namely missing comma.
Refer https://github.com/frappe/erpnext/pull/25117/files#r641717041 for more info.

@ruchamahabal
Copy link
Member

I have to check one case before merging this.

@ruchamahabal
Copy link
Member

ruchamahabal commented Jun 1, 2021

Was aware of the missing comma while raising the earlier fix but the deduction component was still not getting computed in some cases. I checked all occurrences of abbr. The salary_component_abbr field from Salary Component gets fetched with the alias abbr everywhere. So the deductions are coming through just fine now. Merging.

@ruchamahabal ruchamahabal merged commit eff8f6f into frappe:develop Jun 1, 2021
@sagarvora
Copy link
Collaborator Author

Thanks, @ruchamahabal!

asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants