Skip to content

[18.0][REF] product_contract: simplify contract line upsell/downsell code #1383

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

Open
anthonissen-a wants to merge 2 commits into
base: 18.0
Choose a base branch
from
+7 −21
Open

[18.0][REF] product_contract: simplify contract line upsell/downsell code #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d18da0e
[18.0][REF] product_contract: simplify contract line upsell/downsell …
anthonissen-a Jan 26, 2026
a69c87f
[REF] product_contract - add func _check_set_successor
anthonissen-a Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions product_contract/models/contract_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@ def _compute_recurring_invoicing_type(self):
)
def _compute_recurring_interval(self):
return super()._compute_recurring_interval()

def _check_set_successor(self):
return self.state == "closed"
25 changes: 4 additions & 21 deletions product_contract/models/sale_order_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,30 +86,13 @@ def _prepare_contract_line_values(
def create_contract_line(self, contract):
contract_line_model = self.env["contract.line"]
contract_line = self.env["contract.line"]
predecessor_contract_line = False
for rec in self:
if rec.contract_line_id:
# If the upsell/downsell line start at the same date or before
# the contract line to replace supposed to start, we cancel
# the one to be replaced. Otherwise we stop it.
if rec.date_start <= rec.contract_line_id.date_start:
# The contract will handel the contract line integrity
# An exception will be raised if we try to cancel an
# invoiced contract line
rec.contract_line_id.cancel()
elif (
not rec.contract_line_id.date_end
or rec.date_start <= rec.contract_line_id.date_end
):
rec.contract_line_id.stop(rec.date_start - relativedelta(days=1))
predecessor_contract_line = rec.contract_line_id
if predecessor_contract_line:
rec.contract_line_id.stop(rec.date_start - relativedelta(days=1))
if rec.contract_line_id._check_set_successor():
new_contract_line = contract_line_model.create(
rec._prepare_contract_line_values(
contract, predecessor_contract_line.id
)
rec._prepare_contract_line_values(contract, rec.contract_line_id.id)
)
predecessor_contract_line.successor_contract_line_id = new_contract_line
rec.contract_line_id.successor_contract_line_id = new_contract_line
else:
new_contract_line = contract_line_model.create(
rec._prepare_contract_line_values(contract)
Expand Down