Skip to content

[FW][FIX] sale: take line discount in global discount calculation #193291

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
Closed
wants to merge 1 commit into from
Closed

[FW][FIX] sale: take line discount in global discount calculation #193291

wants to merge 1 commit into from

Conversation

@fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jan 10, 2025

If discount was appplied to sale order line and user applied global discount, it would have been calculated based on unsdicounted amount resulting in too high global discount as global discount should be calculated based on price after line discount.

opw-4349320

Description of the issue/feature this PR addresses:

Current behavior before PR:

Desired behavior after PR is merged:

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #191211

@robodoo
Copy link
Contributor

robodoo commented Jan 10, 2025

Pull request status dashboard

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Jan 10, 2025
@fw-bot fw-bot mentioned this pull request Jan 10, 2025
Closed
@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 10, 2025

@anko-odoo cherrypicking of pull request #191211 failed.

stdout:

Auto-merging addons/sale/tests/test_sale_order_discount.py
Auto-merging addons/sale/wizard/sale_order_discount.py
CONFLICT (content): Merge conflict in addons/sale/wizard/sale_order_discount.py

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Jan 10, 2025
@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 13, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

7 similar comments
@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 14, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 15, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 16, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 17, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 18, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 19, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 21, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

@anko-odoo
[FIX] sale: take line discount in global discount calculation
f860c77 
If discount was appplied to sale order line and user applied global
discount, it would have been calculated based on unsdicounted amount
resulting in too high global discount as global discount should be
calculated based on price after line discount.

opw-4349320

X-original-commit: 0062ba1
@anko-odoo anko-odoo force-pushed the saas-18.1-17.0-global-discount-calculation-fix-anko-zcvx-fw branch from e788eda to f860c77 Compare January 22, 2025 14:49
@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 29, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

1 similar comment
@fw-bot
Copy link
Contributor Author

fw-bot commented Feb 20, 2025

@anko-odoo this forward port of #191211 is awaiting action (not merged or closed).

@anko-odoo anko-odoo closed this Feb 20, 2025
@xmo-odoo xmo-odoo deleted the saas-18.1-17.0-global-discount-calculation-fix-anko-zcvx-fw branch March 7, 2025 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@fw-bot @robodoo @C3POdoo @anko-odoo