Fix usage of context company
Default value of company should be -1 to get the right cast and an impossible value. Replace False by None as other value in "in" clause. issue3394 review1119002
This commit is contained in:
+4
-4
@@ -11,8 +11,8 @@ class Configuration(ModelSingleton, ModelSQL, ModelView):
|
||||
__name__ = 'sale.configuration'
|
||||
sale_sequence = fields.Property(fields.Many2One('ir.sequence',
|
||||
'Sale Reference Sequence', domain=[
|
||||
('company', 'in', [Eval('context', {}).get('company', 0),
|
||||
False]),
|
||||
('company', 'in',
|
||||
[Eval('context', {}).get('company', -1), None]),
|
||||
('code', '=', 'sale.sale'),
|
||||
], required=True))
|
||||
sale_invoice_method = fields.Property(fields.Selection([
|
||||
@@ -20,12 +20,12 @@ class Configuration(ModelSingleton, ModelSQL, ModelView):
|
||||
('order', 'On Order Processed'),
|
||||
('shipment', 'On Shipment Sent')
|
||||
], 'Sale Invoice Method', states={
|
||||
'required': Bool(Eval('context', {}).get('company', 0)),
|
||||
'required': Bool(Eval('context', {}).get('company')),
|
||||
}))
|
||||
sale_shipment_method = fields.Property(fields.Selection([
|
||||
('manual', 'Manual'),
|
||||
('order', 'On Order Processed'),
|
||||
('invoice', 'On Invoice Paid'),
|
||||
], 'Sale Shipment Method', states={
|
||||
'required': Bool(Eval('context', {}).get('company', 0)),
|
||||
'required': Bool(Eval('context', {}).get('company')),
|
||||
}))
|
||||
|
||||
@@ -37,7 +37,7 @@ class Sale(Workflow, ModelSQL, ModelView):
|
||||
},
|
||||
domain=[
|
||||
('id', If(Eval('context', {}).contains('company'), '=', '!='),
|
||||
Eval('context', {}).get('company', 0)),
|
||||
Eval('context', {}).get('company', -1)),
|
||||
],
|
||||
depends=['state'], select=True)
|
||||
reference = fields.Char('Reference', readonly=True, select=True)
|
||||
|
||||
Reference in New Issue
Block a user