From 1fdda8bdb2c42fcbfb0109fdd1423fb4fd7c9667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 29 Oct 2024 19:56:58 +0100 Subject: [PATCH] Fix missing target field in operand of domain --- modules/account_invoice_secondary_unit/account.py | 2 +- modules/sale_amendment/sale.py | 2 +- modules/sale_product_customer/product.py | 2 +- modules/sale_product_customer/sale.py | 8 ++++---- modules/sale_secondary_unit/product.py | 2 +- modules/sale_subscription/subscription.py | 2 +- modules/sale_subscription_asset/sale.py | 2 +- modules/stock_lot/stock.py | 4 ++-- modules/stock_product_location/product.py | 2 +- modules/stock_secondary_unit/stock.py | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/account_invoice_secondary_unit/account.py b/modules/account_invoice_secondary_unit/account.py index a9dc9d49b3..894b5f1b13 100644 --- a/modules/account_invoice_secondary_unit/account.py +++ b/modules/account_invoice_secondary_unit/account.py @@ -21,7 +21,7 @@ class InvoiceLine(metaclass=PoolMeta): secondary_unit = fields.Many2One( 'product.uom', "Secondary Unit", ondelete='RESTRICT', domain=[ - ('category', '=', Eval('product_secondary_uom_category')), + ('category', '=', Eval('product_secondary_uom_category', -1)), ], states={ 'invisible': ((Eval('type') != 'line') diff --git a/modules/sale_amendment/sale.py b/modules/sale_amendment/sale.py index cf1be1660c..52e06ee119 100644 --- a/modules/sale_amendment/sale.py +++ b/modules/sale_amendment/sale.py @@ -236,7 +236,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/sale_product_customer/product.py b/modules/sale_product_customer/product.py index e71040b7ee..86ba5ef65c 100644 --- a/modules/sale_product_customer/product.py +++ b/modules/sale_product_customer/product.py @@ -130,7 +130,7 @@ class Product(metaclass=PoolMeta): product_customers = fields.One2Many( 'sale.product_customer', 'product', "Customers", domain=[ - ('template', '=', Eval('template')), + ('template', '=', Eval('template', -1)), ], states={ 'invisible': ~Eval('salable', False), diff --git a/modules/sale_product_customer/sale.py b/modules/sale_product_customer/sale.py index 97cb88cbd6..b7667aaff9 100644 --- a/modules/sale_product_customer/sale.py +++ b/modules/sale_product_customer/sale.py @@ -17,10 +17,10 @@ class Line(metaclass=PoolMeta): If(Bool(Eval('product')), ['OR', [ - ('template.products', '=', Eval('product')), + ('template.products', '=', Eval('product', -1)), ('product', '=', None), ], - ('product', '=', Eval('product')), + ('product', '=', Eval('product', -1)), ], []), ('party', '=', Eval('customer', -1)), @@ -79,10 +79,10 @@ class AmendmentLine(metaclass=PoolMeta): domain=[ ['OR', [ - ('template.products', '=', Eval('product')), + ('template.products', '=', Eval('product', -1)), ('product', '=', None), ], - ('product', '=', Eval('product')), + ('product', '=', Eval('product', -1)), ], ('party', '=', Eval('party', -1)), ], diff --git a/modules/sale_secondary_unit/product.py b/modules/sale_secondary_unit/product.py index 63c22005da..07105c3327 100644 --- a/modules/sale_secondary_unit/product.py +++ b/modules/sale_secondary_unit/product.py @@ -14,7 +14,7 @@ class SaleSecondaryMixin: sale_secondary_uom = fields.Many2One( 'product.uom', "Sale Secondary UoM", domain=[ - ('category', '!=', Eval('default_uom_category')), + ('category', '!=', Eval('default_uom_category', -1)), ], help="The secondary Unit of Measure for sales.") sale_secondary_uom_factor = fields.Float( diff --git a/modules/sale_subscription/subscription.py b/modules/sale_subscription/subscription.py index 2c7c1325fd..e4e6e21000 100644 --- a/modules/sale_subscription/subscription.py +++ b/modules/sale_subscription/subscription.py @@ -84,7 +84,7 @@ class Subscription(Workflow, ModelSQL, ModelView): 'party.address', "Invoice Address", domain=[ ('party', '=', If(Bool(Eval('invoice_party',)), - Eval('invoice_party'), Eval('party'))), + Eval('invoice_party', -1), Eval('party', -1))), ], states={ 'readonly': Eval('state') != 'draft', diff --git a/modules/sale_subscription_asset/sale.py b/modules/sale_subscription_asset/sale.py index 18d74356af..a385ddd7db 100644 --- a/modules/sale_subscription_asset/sale.py +++ b/modules/sale_subscription_asset/sale.py @@ -74,7 +74,7 @@ class SubscriptionLine(metaclass=PoolMeta): asset_lot = fields.Many2One('stock.lot', "Asset Lot", domain=[ - ('subscription_services', '=', Eval('service')), + ('subscription_services', '=', Eval('service', -1)), ], states={ 'required': ((Eval('subscription_state') == 'running') diff --git a/modules/stock_lot/stock.py b/modules/stock_lot/stock.py index 248c47a486..fcc4d9fed0 100644 --- a/modules/stock_lot/stock.py +++ b/modules/stock_lot/stock.py @@ -431,7 +431,7 @@ class Move(metaclass=PoolMeta): lot = fields.Many2One( 'stock.lot', "Lot", ondelete='RESTRICT', domain=[ - ('product', '=', Eval('product')), + ('product', '=', Eval('product', -1)), ], states={ 'readonly': Eval('state').in_(['cancelled', 'done']), @@ -855,7 +855,7 @@ class InventoryLine(metaclass=PoolMeta): __name__ = 'stock.inventory.line' lot = fields.Many2One('stock.lot', 'Lot', domain=[ - ('product', '=', Eval('product')), + ('product', '=', Eval('product', -1)), ], states={ 'readonly': Eval('inventory_state') != 'draft', diff --git a/modules/stock_product_location/product.py b/modules/stock_product_location/product.py index 28120a649d..8c87fcbab5 100644 --- a/modules/stock_product_location/product.py +++ b/modules/stock_product_location/product.py @@ -43,7 +43,7 @@ class Product(metaclass=PoolMeta): locations = fields.One2Many('stock.product.location', 'product', "Default Locations", domain=[ - ('template', '=', Eval('template')), + ('template', '=', Eval('template', -1)), ], states={ 'invisible': ~Eval('type').in_(['goods', 'assets']), diff --git a/modules/stock_secondary_unit/stock.py b/modules/stock_secondary_unit/stock.py index e2653d8a57..34df8d7a38 100644 --- a/modules/stock_secondary_unit/stock.py +++ b/modules/stock_secondary_unit/stock.py @@ -21,7 +21,7 @@ class Move(metaclass=PoolMeta): secondary_unit = fields.Many2One( 'product.uom', "Secondary Unit", ondelete='RESTRICT', domain=[ - ('category', '=', Eval('product_secondary_uom_category')), + ('category', '=', Eval('product_secondary_uom_category', -1)), ], states={ 'invisible': ~Eval('product_secondary_uom_category'),