[FIX] sale: Recompute global discount on order line updates #855
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
rvar-odoo
force-pushed
the
18.0-global_discount_sale-rvar
branch
3 times, most recently
from
db41525 to
f3138a5
Compare
ramh-odoo
reviewed
Jul 23, 2025
There was a problem hiding this comment.
The current commit message doesn't clearly explain the purpose of the changes properly. Please update the commit message. It should ideally include:
The motivation behind this PR
The behavior before this PR
The desired behavior after this PR
This helps reviewers quickly understand the context and impact of the changes.
Comment on lines
35
to
48
| for line in lines: | ||
| if ( | ||
| line.product_id | ||
| and line.order_id | ||
| and line.order_id.company_id.sale_discount_product_id | ||
| ): | ||
| if ( | ||
| line.product_id.id | ||
| != line.order_id.company_id.sale_discount_product_id.id | ||
| ): | ||
| if ( | ||
| line.order_id.has_global_discount | ||
| and line.order_id.global_discount_percentage | ||
| ): |
There was a problem hiding this comment.
Shouldn't we combine all these conditions into a single if statement?
There was a problem hiding this comment.
Yes sir, actually i have done this to be easier to add print/logging at each level. will update it .
Comment on lines
18
to
19
| else: | ||
| return super(SaleOrderDiscount, company_self).action_apply_discount() |
There was a problem hiding this comment.
Can't we return early and remove the unnecessary else block for better readability?
rvar-odoo
force-pushed
the
18.0-global_discount_sale-rvar
branch
from
f3138a5 to
50f01a4
Compare
maad-odoo
suggested changes
Jul 26, 2025
sale_global_discount/__manifest__.py
Outdated
| "summary": "Manage global discounts in sale orders efficiently.", | ||
| "category": "Tutorials/Sale Discount Management", | ||
| "depends": ["sale_management"], | ||
| "data": [], |
Comment on lines
8
to
10
| has_global_discount = fields.Boolean( | ||
| string="Has Global Discount", compute="_compute_has_global_discount", store=True | ||
| ) |
There was a problem hiding this comment.
Suggested change
| has_global_discount = fields.Boolean( | |
| string="Has Global Discount", compute="_compute_has_global_discount", store=True | |
| ) | |
| has_global_discount = fields.Boolean(string="Has Global Discount", compute="_compute_has_global_discount", store=True) |
Comment on lines
13
to
15
| @api.depends( | ||
| "order_line", "order_line.product_id", "company_id.sale_discount_product_id" | ||
| ) |
There was a problem hiding this comment.
Suggested change
| @api.depends( | |
| "order_line", "order_line.product_id", "company_id.sale_discount_product_id" | |
| ) | |
| @api.depends( "order_line", "order_line.product_id", "company_id.sale_discount_product_id") |
|
|
||
| def write(self, vals): | ||
| result = super().write(vals) | ||
| # If order lines were modified, update discount |
Comment on lines
72
to
79
|
|
||
| regular_lines = self._get_regular_lines() | ||
| discount_lines = self._get_discount_lines() | ||
|
|
||
| if not regular_lines: | ||
| if discount_lines: | ||
| discount_lines.unlink() | ||
| self.global_discount_percentage = 0 | ||
| return | ||
|
|
||
| if discount_lines: | ||
| discount_lines.unlink() | ||
|
|
||
| self._create_global_discount_lines(self.global_discount_percentage / 100) |
There was a problem hiding this comment.
Why there are unnecessary lines left in between ??
| return False | ||
|
|
||
| lines = self.env["sale.order.line"].create(vals_list) | ||
| return lines |
There was a problem hiding this comment.
comments are unnecessary and there are unnecessary lines left inbetween
| @api.model_create_multi | ||
| def create(self, vals_list): | ||
| lines = super().create(vals_list) | ||
| # Avoid triggering for discount product lines to prevent infinite loop |
| def unlink(self): | ||
| orders = self.mapped("order_id") | ||
| result = super().unlink() | ||
| # After unlinking, update discount on affected orders |
Comment on lines
45
to
46
|
|
||
| # Update discounts for affected orders |
Motivation : Global discounts in sale orders were not behaving as expected in multi-company and multi-tax setups. Reviewers reported that discount lines were not updated or removed when order lines changed, leading to incorrect totals and tax inconsistencies. Behavior Before: - Adding/removing/updating sale order lines did not update the global discount. - Global discount lines remained even when no regular order lines existed. - Discount lines were not grouped by tax combinations, causing tax mismatches. - Discount lines could appear in the middle of the order lines. Behavior After: - Global discount lines now update automatically when sale order lines are created, modified, or deleted. - Global discount is removed when no regular order lines remain. - Discount amounts are grouped by tax combinations for correct tax application. - Discount lines are positioned at the end of the order lines. - Sale order line hooks (`create`, `write`, `unlink`) trigger global discount recalculation. This improves accuracy of global discount behavior, ensures tax compliance, and aligns with expected user workflows.
rvar-odoo
force-pushed
the
18.0-global_discount_sale-rvar
branch
from
50f01a4 to
acae4b4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
added, updated, or removed from a sale order.
sequence=999.This ensures accurate global discount behavior and maintains tax compliance.