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: Discount and taxes in return document should follow the reference document (backport #41911) #42573

Merged
merged 2 commits into from
Sep 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 1, 2024

If a credit note is created against a sales invoice, the credit note should follow the same discount (based on the pricing rule) and tax template as in the original sales invoice.

Previously, if we changed the discount on the pricing rule after creating the original sales invoice, the system overwrites the discount on the credit note based on the updated pricing rule.

Similarly, the item tax template and tax table is overwritten based on the updated item tax template in the Item master.


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

…e document (#41911)

* fix: Discount and taxes in return document should follow the reference document

* fix: Ignore Pricing rule on debit/credit note if created against PI/SI with test cases

* fix: linter issue

(cherry picked from commit 2811984)

# Conflicts:
#	erpnext/controllers/sales_and_purchase_return.py
Copy link
Contributor Author

mergify bot commented Aug 1, 2024

Cherry-pick of 2811984 has failed:

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

You are currently cherry-picking commit 281198456d.
  (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:   erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
	modified:   erpnext/controllers/accounts_controller.py
	modified:   erpnext/controllers/taxes_and_totals.py
	modified:   erpnext/public/js/controllers/transaction.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/controllers/sales_and_purchase_return.py

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

Copy link

stale bot commented Sep 1, 2024

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Sep 1, 2024
@nabinhait nabinhait merged commit c55f8e3 into version-14-hotfix Sep 2, 2024
9 of 10 checks passed
@nabinhait nabinhait deleted the mergify/bp/version-14-hotfix/pr-41911 branch September 2, 2024 05:42
frappe-pr-bot pushed a commit that referenced this pull request Sep 4, 2024
## [14.73.1](v14.73.0...v14.73.1) (2024-09-04)

### Bug Fixes

* adjust price insertion logic for internal suppliers/customers ([#42988](#42988)) ([3912c68](3912c68))
* default fiscal year in report v14 ([#42960](#42960)) ([9db7f7b](9db7f7b))
* Discount and taxes in return document should follow the reference document (backport [#41911](#41911)) ([#42573](#42573)) ([c55f8e3](c55f8e3))
* indentation ([e8cfb4d](e8cfb4d))
* removed extra filter condition ([db319f9](db319f9))
* resolve gl entries duplication in asset purchase workflow ([#41845](#41845)) ([b3c9697](b3c9697))
* retain date filter when redirecting in Profit and Loss report ([c87f2d2](c87f2d2))
* set up filters for dimensions ([450b3f3](450b3f3))
* typeerror on Payment Entry ([dda4002](dda4002))
* typerror on default_currency ([22b283d](22b283d))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.73.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants