From e5658ccf9266cf82a023a5056da138cb880c5ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 30 Oct 2024 11:24:15 +0100 Subject: [PATCH] Fix missing target field in operand of domain --- modules/account/tax.py | 2 +- modules/commission/commission.py | 2 +- modules/marketing_email/marketing.py | 2 +- modules/production/bom.py | 6 +++--- modules/production_outsourcing/production.py | 5 +++-- modules/production_split/production.py | 2 +- modules/purchase_amendment/purchase.py | 2 +- modules/purchase_request_quotation/purchase.py | 6 +++--- modules/purchase_secondary_unit/product.py | 2 +- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/account/tax.py b/modules/account/tax.py index 93ad8fa5bb..b94538c2c1 100644 --- a/modules/account/tax.py +++ b/modules/account/tax.py @@ -810,7 +810,7 @@ class Tax(sequence_ordered(), ModelSQL, ModelView, DeactivableMixin): company = fields.Many2One('company.company', "Company", required=True) invoice_account = fields.Many2One('account.account', 'Invoice Account', domain=[ - ('company', '=', Eval('company')), + ('company', '=', Eval('company', -1)), ('type.statement', '=', 'balance'), ('closed', '!=', True), ], diff --git a/modules/commission/commission.py b/modules/commission/commission.py index daee551297..45a73ed013 100644 --- a/modules/commission/commission.py +++ b/modules/commission/commission.py @@ -213,7 +213,7 @@ class AgentSelection(sequence_ordered(), MatchMixin, ModelSQL, ModelView): employee = fields.Many2One( 'company.employee', "Employee", domain=[ - ('company', '=', Eval('company')), + ('company', '=', Eval('company', -1)), ]) @classmethod diff --git a/modules/marketing_email/marketing.py b/modules/marketing_email/marketing.py index 2d23f603da..aae3aa04f4 100644 --- a/modules/marketing_email/marketing.py +++ b/modules/marketing_email/marketing.py @@ -567,5 +567,5 @@ class SendTestView(ModelView): email = fields.Many2One( 'marketing.email', "Email", required=True, domain=[ - ('list_', '=', Eval('list_')), + ('list_', '=', Eval('list_', -1)), ]) diff --git a/modules/production/bom.py b/modules/production/bom.py index eed892e182..a7427282b8 100644 --- a/modules/production/bom.py +++ b/modules/production/bom.py @@ -127,7 +127,7 @@ class BOMInput(ModelSQL, ModelView): unit = fields.Many2One( 'product.uom', "Unit", required=True, domain=[ - ('category', '=', Eval('uom_category')), + ('category', '=', Eval('uom_category', -1)), ]) quantity = fields.Float( "Quantity", digits='unit', required=True, @@ -277,13 +277,13 @@ class OpenBOMTreeStart(ModelView): unit = fields.Many2One( 'product.uom', "Unit", required=True, domain=[ - ('category', '=', Eval('category')), + ('category', '=', Eval('category', -1)), ]) category = fields.Many2One('product.uom.category', 'Category', readonly=True) bom = fields.Many2One('product.product-production.bom', 'BOM', required=True, domain=[ - ('product', '=', Eval('product')), + ('product', '=', Eval('product', -1)), ]) product = fields.Many2One('product.product', 'Product', readonly=True) diff --git a/modules/production_outsourcing/production.py b/modules/production_outsourcing/production.py index c6bddbfa24..78b785b239 100644 --- a/modules/production_outsourcing/production.py +++ b/modules/production_outsourcing/production.py @@ -41,10 +41,11 @@ class Routing(metaclass=PoolMeta): If(Bool('supplier_service'), ['OR', [ - ('template.products', '=', Eval('supplier_service')), + ('template.products', + '=', Eval('supplier_service', -1)), ('product', '=', None), ], - ('product', '=', Eval('supplier_service')), + ('product', '=', Eval('supplier_service', -1)), ], []), ('party', '=', Eval('supplier', -1)), diff --git a/modules/production_split/production.py b/modules/production_split/production.py index 2b2340231d..18fee34996 100644 --- a/modules/production_split/production.py +++ b/modules/production_split/production.py @@ -99,7 +99,7 @@ class SplitProductionStart(ModelView): unit = fields.Many2One( 'product.uom', "Unit", required=True, domain=[ - ('category', '=', Eval('uom_category')), + ('category', '=', Eval('uom_category', -1)), ]) uom_category = fields.Many2One( 'product.uom.category', "UoM Category", readonly=True, diff --git a/modules/purchase_amendment/purchase.py b/modules/purchase_amendment/purchase.py index a9ea0f2b3c..900f04e7ff 100644 --- a/modules/purchase_amendment/purchase.py +++ b/modules/purchase_amendment/purchase.py @@ -220,7 +220,7 @@ class AmendmentLine(ModelSQL, ModelView): 'party.address', "Invoice Address", domain=[ ('party', '=', If(Eval('invoice_party'), - Eval('invoice_party'), Eval('party'))), + Eval('invoice_party', -1), Eval('party', -1))), ], states={ 'readonly': Eval('state') != 'draft', diff --git a/modules/purchase_request_quotation/purchase.py b/modules/purchase_request_quotation/purchase.py index 1eacbcd23e..19ee2448df 100644 --- a/modules/purchase_request_quotation/purchase.py +++ b/modules/purchase_request_quotation/purchase.py @@ -327,8 +327,8 @@ class QuotationLine(ModelSQL, ModelView): quotation = fields.Many2One('purchase.request.quotation', 'Quotation', ondelete='CASCADE', required=True, domain=[ - ('supplier', '=', Eval('supplier')), - ]) + ('supplier', '=', Eval('supplier', -1)), + ]) quotation_state = fields.Function(fields.Selection( 'get_quotation_state', 'Quotation State'), 'on_change_with_quotation_state', searcher='search_quotation_state') @@ -590,7 +590,7 @@ class PurchaseRequest(metaclass=PoolMeta): 'purchase.request.quotation.line', 'Preferred Quotation Line', domain=[ ('quotation_state', '=', 'received'), - ('request', '=', Eval('id')) + ('request', '=', Eval('id', -1)) ], help="The quotation that will be chosen to create the purchase\n" "otherwise first ordered received quotation line will be selected.") diff --git a/modules/purchase_secondary_unit/product.py b/modules/purchase_secondary_unit/product.py index 3e98924b3a..5a22d0500c 100644 --- a/modules/purchase_secondary_unit/product.py +++ b/modules/purchase_secondary_unit/product.py @@ -14,7 +14,7 @@ class PurchaseSecondaryMixin: purchase_secondary_uom = fields.Many2One( 'product.uom', "Purchase Secondary UoM", domain=[ - ('category', '!=', Eval('default_uom_category')), + ('category', '!=', Eval('default_uom_category', -1)), ], help="The secondary Unit of Measure for purchases.") purchase_secondary_uom_factor = fields.Float(