Fix missing target field in operand of domain
This commit is contained in:
@@ -98,7 +98,7 @@ class Production(ShipmentAssignMixin, Workflow, ModelSQL, ModelView):
|
||||
unit = fields.Many2One(
|
||||
'product.uom', "Unit",
|
||||
domain=[
|
||||
('category', '=', Eval('uom_category')),
|
||||
('category', '=', Eval('uom_category', -1)),
|
||||
],
|
||||
states={
|
||||
'readonly': ~Eval('state').in_(['request', 'draft']),
|
||||
|
||||
@@ -36,7 +36,7 @@ class Template(metaclass=PoolMeta):
|
||||
'invisible': ~Eval('purchasable'),
|
||||
'required': Eval('purchasable', False),
|
||||
},
|
||||
domain=[('category', '=', Eval('default_uom_category'))],
|
||||
domain=[('category', '=', Eval('default_uom_category', -1))],
|
||||
help="The default Unit of Measure for purchases.")
|
||||
|
||||
@fields.depends('default_uom', 'purchase_uom', 'purchasable')
|
||||
@@ -118,7 +118,7 @@ class Product(metaclass=PoolMeta):
|
||||
product_suppliers = fields.One2Many(
|
||||
'purchase.product_supplier', 'product', "Suppliers",
|
||||
domain=[
|
||||
('template', '=', Eval('template')),
|
||||
('template', '=', Eval('template', -1)),
|
||||
],
|
||||
states={
|
||||
'invisible': (~Eval('purchasable', False)
|
||||
|
||||
@@ -138,7 +138,7 @@ class Purchase(
|
||||
invoice_address = fields.Many2One('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',
|
||||
|
||||
@@ -48,7 +48,7 @@ class Template(metaclass=PoolMeta):
|
||||
'required': Eval('salable', False),
|
||||
},
|
||||
domain=[
|
||||
('category', '=', Eval('default_uom_category')),
|
||||
('category', '=', Eval('default_uom_category', -1)),
|
||||
],
|
||||
help="The default Unit of Measure for sales.")
|
||||
lead_time = fields.MultiValue(fields.TimeDelta(
|
||||
|
||||
@@ -139,7 +139,7 @@ class Sale(
|
||||
invoice_address = fields.Many2One('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',
|
||||
|
||||
@@ -32,8 +32,8 @@ class Sale(metaclass=PoolMeta):
|
||||
('kind', '=', 'payable'),
|
||||
),
|
||||
('party', '=', If(Bool(Eval('invoice_party')),
|
||||
Eval('invoice_party'), Eval('party'))),
|
||||
('currency', '=', Eval('currency')),
|
||||
Eval('invoice_party', -1), Eval('party', -1))),
|
||||
('currency', '=', Eval('currency', -1)),
|
||||
],
|
||||
states={
|
||||
'readonly': Eval('state') != 'quotation',
|
||||
|
||||
@@ -198,7 +198,7 @@ class Move(Workflow, ModelSQL, ModelView):
|
||||
},
|
||||
domain=[
|
||||
If(~Eval('state').in_(['done', 'cancelled']),
|
||||
('category', '=', Eval('product_uom_category')),
|
||||
('category', '=', Eval('product_uom_category', -1)),
|
||||
()),
|
||||
],
|
||||
help="The unit in which the quantity is specified.")
|
||||
|
||||
@@ -409,13 +409,13 @@ class ShipmentIn(
|
||||
inventory_moves = fields.Function(fields.One2Many('stock.move', 'shipment',
|
||||
'Inventory Moves',
|
||||
domain=[
|
||||
('from_location', '=', Eval('warehouse_input')),
|
||||
('from_location', '=', Eval('warehouse_input', -1)),
|
||||
If(~Eval('state').in_(['done', 'cancelled']),
|
||||
['OR',
|
||||
('to_location', 'child_of',
|
||||
[Eval('warehouse_storage', -1)], 'parent'),
|
||||
('to_location.waste_warehouses', '=',
|
||||
Eval('warehouse')),
|
||||
Eval('warehouse', -1)),
|
||||
],
|
||||
[],),
|
||||
('company', '=', Eval('company', -1)),
|
||||
@@ -1210,9 +1210,9 @@ class ShipmentOut(
|
||||
If(Eval('warehouse_output') == Eval('warehouse_storage'),
|
||||
('from_location', 'child_of',
|
||||
[Eval('warehouse_output', -1)], 'parent'),
|
||||
('from_location', '=', Eval('warehouse_output'))),
|
||||
('from_location', '=', Eval('warehouse_output', -1))),
|
||||
If(~Eval('state').in_(['done', 'cancelled']),
|
||||
('to_location', '=', Eval('customer_location')),
|
||||
('to_location', '=', Eval('customer_location', -1)),
|
||||
()),
|
||||
('company', '=', Eval('company', -1)),
|
||||
],
|
||||
@@ -1238,7 +1238,7 @@ class ShipmentOut(
|
||||
('from_location', 'child_of',
|
||||
[Eval('warehouse_storage', -1)], 'parent'),
|
||||
()),
|
||||
('to_location', '=', Eval('warehouse_output')),
|
||||
('to_location', '=', Eval('warehouse_output', -1)),
|
||||
('company', '=', Eval('company', -1)),
|
||||
],
|
||||
order=[
|
||||
@@ -1947,13 +1947,13 @@ class ShipmentOutReturn(
|
||||
inventory_moves = fields.Function(fields.One2Many('stock.move', 'shipment',
|
||||
'Inventory Moves',
|
||||
domain=[
|
||||
('from_location', '=', Eval('warehouse_input')),
|
||||
('from_location', '=', Eval('warehouse_input', -1)),
|
||||
If(Eval('state').in_(['received']),
|
||||
['OR',
|
||||
('to_location', 'child_of',
|
||||
[Eval('warehouse_storage', -1)], 'parent'),
|
||||
('to_location.waste_warehouses', '=',
|
||||
Eval('warehouse')),
|
||||
Eval('warehouse', -1)),
|
||||
],
|
||||
[]),
|
||||
('company', '=', Eval('company', -1)),
|
||||
|
||||
@@ -82,7 +82,7 @@ class SplitMoveStart(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,
|
||||
|
||||
@@ -151,10 +151,11 @@ class StockSupplyTestCase(CompanyTestMixin, ModuleTestCase):
|
||||
}])
|
||||
|
||||
for clause, result in [
|
||||
(('location', '=', warehouse.name), [order_point]),
|
||||
(('location', '=', 'storage'), []),
|
||||
(('location', '!=', warehouse.name), []),
|
||||
(('location', '!=', 'storage'), [order_point]),
|
||||
(('location.rec_name', '=', warehouse.name),
|
||||
[order_point]),
|
||||
(('location.type', '=', 'storage'), []),
|
||||
(('location.rec_name', '!=', warehouse.name), []),
|
||||
(('location.type', '!=', 'storage'), [order_point]),
|
||||
]:
|
||||
self.assertListEqual(
|
||||
OrderPoint.search(clause), result, msg=clause)
|
||||
|
||||
Reference in New Issue
Block a user