details: https://code.tryton.org/tryton/commit/2331d431f069
branch: 6.0
user: Cédric Krier <[email protected]>
date: Thu Oct 30 01:00:12 2025 +0100
description:
Use line's get_move_product_types to require incoterm
Closes #14332
(grafted from 5a841eff1afcd0476bbb6c762d3000b890324fa4)
diffstat:
modules/incoterm/purchase.py | 4 +++-
modules/incoterm/sale.py | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diffs (27 lines):
diff -r f90b353dc7cd -r 2331d431f069 modules/incoterm/purchase.py
--- a/modules/incoterm/purchase.py Tue Oct 28 17:19:38 2025 +0100
+++ b/modules/incoterm/purchase.py Thu Oct 30 01:00:12 2025 +0100
@@ -32,7 +32,9 @@
super().check_for_quotation()
if not self.incoterm and self._incoterm_required:
for line in self.lines:
- if line.product and line.product.type in {'goods', 'assets'}:
+ if (line.product
+ and line.product.type in line.get_move_product_types()
+ ):
raise PurchaseQuotationError(
gettext('incoterm'
'.msg_purchase_incoterm_required_for_quotation',
diff -r f90b353dc7cd -r 2331d431f069 modules/incoterm/sale.py
--- a/modules/incoterm/sale.py Tue Oct 28 17:19:38 2025 +0100
+++ b/modules/incoterm/sale.py Thu Oct 30 01:00:12 2025 +0100
@@ -52,7 +52,8 @@
super().check_for_quotation()
if not self.incoterm and self._incoterm_required:
for line in self.lines:
- if line.product and line.product.type in {'goods', 'assets'}:
+ if (line.product
+ and line.product.type in ('goods', 'assets')):
raise SaleQuotationError(
gettext('incoterm'
'.msg_sale_incoterm_required_for_quotation',