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: add attachment for each type of proof in income tax proof submission instead of one single attachment (backport #1893) #1921

Merged
merged 2 commits into from
Jun 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 25, 2024

Created the Employee Tax Exmption proof submission attachment option inside the child tabe.So employee can submit seperate proof in each categories.
feat: add attachment for each type of proof in income tax declaration instead of one single attachment
issue:#1822

Video Link komododecks.com/recordings/GpvGAtOI98Z9dOT9DK2X?onlyRecording=1

no-docs


This is an automatic backport of pull request #1893 done by Mergify.

…ssion instead of one single attachment (#1893)

* proof_changes

* fix: fieldname, col widths in table + `toggle_display` code

---------

Co-authored-by: shiniln-cloud <[email protected]>
Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit 259e291)

# Conflicts:
#	hrms/payroll/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json
@mergify mergify bot added the conflicts label Jun 25, 2024
@mergify mergify bot requested a review from ruchamahabal as a code owner June 25, 2024 14:51
Copy link
Contributor Author

mergify bot commented Jun 25, 2024

Cherry-pick of 259e291 has failed:

On branch mergify/bp/version-15-hotfix/pr-1893
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 259e291ef.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/employee_tax_exemption_proof_submission/employee_tax_exemption_proof_submission.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/employee_tax_exemption_proof_submission_detail/employee_tax_exemption_proof_submission_detail.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal ruchamahabal merged commit 1a92a66 into version-15-hotfix Jun 25, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1893 branch June 25, 2024 15:21
frappe-pr-bot pushed a commit that referenced this pull request Jun 26, 2024
# [15.23.0](v15.22.3...v15.23.0) (2024-06-26)

### Bug Fixes

* ignore links while adding lending docperms to ess (backport [#1916](#1916)) ([#1919](#1919)) ([198061a](198061a))
* TypeError in Salary Slip Creation Due to Uninitialized Loans Field (backport [#1909](#1909)) ([#1922](#1922)) ([7869b4a](7869b4a))
* **UX:** validate missing Income Tax Slab in Salary Structure Assignment (backport [#1912](#1912)) ([#1915](#1915)) ([04ec743](04ec743))

### Features

* add attachment for each type of proof in income tax proof submission instead of one single attachment (backport [#1893](#1893)) ([#1921](#1921)) ([1a92a66](1a92a66))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.23.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants