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: Validity dates in Tax Withholding Rates (backport #27258) #46124

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2025

Replaced fiscal year in tax withholding rates with from and to date and patched existing records by Fiscal Year Start and End Dates

The reason for replacing this will from and to date is some categories come into effect from the mid of the fiscal year and hence only the invoices made during that period should be considered for checking threshold and not the entire fiscal year

Screenshot 2021-08-31 at 6 26 02 PM

no-docs


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

(cherry picked from commit 5e10e10)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
#	erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
#	erpnext/accounts/doctype/tax_withholding_rate/tax_withholding_rate.json
#	erpnext/patches.txt
#	erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
(cherry picked from commit d06221a)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
(cherry picked from commit b6d0b17)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
#	erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
(cherry picked from commit d5a736d)
(cherry picked from commit 092d41e)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
(cherry picked from commit 51d9572)

# Conflicts:
#	erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
(cherry picked from commit c33bbd4)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
(cherry picked from commit e7e2ce1)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
#	erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
Copy link
Contributor Author

mergify bot commented Feb 25, 2025

Cherry-pick of 5e10e10 has failed:

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

You are currently cherry-picking commit 5e10e10329.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
	both modified:   erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
	both modified:   erpnext/accounts/doctype/tax_withholding_rate/tax_withholding_rate.json
	both modified:   erpnext/patches.txt
	both added:      erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d06221a has failed:

On branch mergify/bp/version-13-hotfix/pr-27258
Your branch is ahead of 'origin/version-13-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d06221ad7a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of b6d0b17 has failed:

On branch mergify/bp/version-13-hotfix/pr-27258
Your branch is ahead of 'origin/version-13-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit b6d0b17ed6.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
	both modified:   erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 092d41e has failed:

On branch mergify/bp/version-13-hotfix/pr-27258
Your branch is ahead of 'origin/version-13-hotfix' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 092d41ecda.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 51d9572 has failed:

On branch mergify/bp/version-13-hotfix/pr-27258
Your branch is ahead of 'origin/version-13-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 51d9572fe7.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py
	both modified:   erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of c33bbd4 has failed:

On branch mergify/bp/version-13-hotfix/pr-27258
Your branch is ahead of 'origin/version-13-hotfix' by 6 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c33bbd4f39.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e7e2ce1 has failed:

On branch mergify/bp/version-13-hotfix/pr-27258
Your branch is ahead of 'origin/version-13-hotfix' by 7 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e7e2ce1271.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
	both modified:   erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py

no changes added to commit (use "git add" and/or "git commit -a")

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

@ankush ankush closed this Feb 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants