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: Salary deductions report fixes #22397

Merged
merged 3 commits into from
Jun 28, 2020
Merged

fix: Salary deductions report fixes #22397

merged 3 commits into from
Jun 28, 2020

Conversation

Anurag810
Copy link
Contributor

Traceback:
image

some enhancements:
image

@rohitwaghchaure rohitwaghchaure added the CI-failing Unit tests or patch tests are failing. label Jun 23, 2020
@Anurag810 Anurag810 force-pushed the salary_deductions_report_fixes branch from 5337f03 to ece9508 Compare June 23, 2020 08:56
@Anurag810 Anurag810 removed the CI-failing Unit tests or patch tests are failing. label Jun 24, 2020
@Anurag810 Anurag810 requested a review from nabinhait June 24, 2020 08:12
@rohitwaghchaure rohitwaghchaure merged commit 7e3f10e into frappe:develop Jun 28, 2020
@nabinhait
Copy link
Member

@Mergifyio backport version-13-beta-pre-release

@mergify mergify bot mentioned this pull request Jun 30, 2020
Merged
@mergify
Copy link
Contributor

mergify bot commented Jun 30, 2020

Command backport version-13-beta-pre-release: success

Backports have been created

nabinhait pushed a commit that referenced this pull request Jun 30, 2020
@mergify @Anurag810
fix: Salary deductions report fixes (bp #22397) (#22520)
dca65de 
* feat: added year filters

(cherry picked from commit d0d9b53)

* Fix: if there is no component

(cherry picked from commit f9ca29c)

* fix: test_tax_for_payroll_period

(cherry picked from commit ece9508)

Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
@nabinhait nabinhait mentioned this pull request Apr 1, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohitwaghchaure rohitwaghchaure rohitwaghchaure approved these changes

@nabinhait nabinhait Awaiting requested review from nabinhait

Assignees

@rohitwaghchaure rohitwaghchaure

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Anurag810 @nabinhait @rohitwaghchaure