diff --git a/modules/account/tax.py b/modules/account/tax.py index b94538c2c1..580cce414b 100644 --- a/modules/account/tax.py +++ b/modules/account/tax.py @@ -1575,7 +1575,7 @@ class TaxRuleLineTemplate(sequence_ordered(), ModelSQL, ModelView): origin_tax = fields.Many2One('account.tax.template', 'Original Tax', domain=[ ('parent', '=', None), - ('account', '=', Eval('_parent_rule', {}).get('account', 0)), + ('account', '=', Eval('_parent_rule', {}).get('account', -1)), ('group', '=', Eval('group', -1)), ['OR', ('group', '=', None), @@ -1698,7 +1698,7 @@ class TaxRuleLine(sequence_ordered(), ModelSQL, ModelView, MatchMixin): domain=[ ('parent', '=', None), ('company', '=', Eval('_parent_rule', {}).get('company', -1)), - ('group', '=', Eval('group')), + ('group', '=', Eval('group', -1)), ['OR', ('group', '=', None), If(Eval('_parent_rule', {}).get('kind', 'both') == 'sale', @@ -1719,7 +1719,7 @@ class TaxRuleLine(sequence_ordered(), ModelSQL, ModelView, MatchMixin): domain=[ ('parent', '=', None), ('company', '=', Eval('_parent_rule', {}).get('company', -1)), - ('group', '=', Eval('group')), + ('group', '=', Eval('group', -1)), ['OR', ('group', '=', None), If(Eval('_parent_rule', {}).get('kind', 'both') == 'sale', diff --git a/modules/account_asset/invoice.py b/modules/account_asset/invoice.py index ba9257a974..ede421bdea 100644 --- a/modules/account_asset/invoice.py +++ b/modules/account_asset/invoice.py @@ -10,7 +10,7 @@ class InvoiceLine(metaclass=PoolMeta): __name__ = 'account.invoice.line' asset = fields.Many2One('account.asset', 'Asset', domain=[ ('state', '=', 'running'), - ('product', '=', Eval('product')), + ('product', '=', Eval('product', -1)), ], states={ 'invisible': (~Eval('is_assets_depreciable', False) diff --git a/modules/account_invoice_correction/invoice.py b/modules/account_invoice_correction/invoice.py index 0db6b0beef..bffe03fad9 100644 --- a/modules/account_invoice_correction/invoice.py +++ b/modules/account_invoice_correction/invoice.py @@ -36,7 +36,7 @@ class InvoiceCorrectStart(ModelView): lines = fields.Many2Many('account.invoice.line', None, None, 'Invoice Lines', domain=[ - ('invoice', '=', Eval('invoice')), + ('invoice', '=', Eval('invoice', -1)), ('type', '=', 'line'), ]) diff --git a/modules/account_payment_braintree/account.py b/modules/account_payment_braintree/account.py index 657e28228e..7cfbfcea80 100644 --- a/modules/account_payment_braintree/account.py +++ b/modules/account_payment_braintree/account.py @@ -61,7 +61,7 @@ class PaymentJournal(metaclass=PoolMeta): braintree_account = fields.Many2One( 'account.payment.braintree.account', "Account", ondelete='RESTRICT', domain=[ - ('currency', '=', Eval('currency')), + ('currency', '=', Eval('currency', -1)), ], states={ 'required': Eval('process_method') == 'braintree', diff --git a/modules/account_payment_sepa/payment.py b/modules/account_payment_sepa/payment.py index 7664ddd508..dd59886ce9 100644 --- a/modules/account_payment_sepa/payment.py +++ b/modules/account_payment_sepa/payment.py @@ -76,7 +76,7 @@ class Journal(metaclass=PoolMeta): }, domain=[ ('type', '=', 'iban'), - ('account.owners', '=', Eval('company_party')), + ('account.owners', '=', Eval('company_party', -1)), ]) sepa_payable_flavor = fields.Selection([ (None, ''), @@ -495,7 +495,7 @@ class Mandate(Workflow, ModelSQL, ModelView): }, domain=[ ('type', '=', 'iban'), - ('account.owners', '=', Eval('party')), + ('account.owners', '=', Eval('party', -1)), ]) identification = fields.Char('Identification', size=35, states={ diff --git a/modules/analytic_account/account.py b/modules/analytic_account/account.py index 8972ce3959..7b54d5cb79 100644 --- a/modules/analytic_account/account.py +++ b/modules/analytic_account/account.py @@ -387,7 +387,7 @@ class AnalyticAccountEntry(ModelView, ModelSQL): account = fields.Many2One('analytic_account.account', 'Account', ondelete='RESTRICT', domain=[ - ('root', '=', Eval('root')), + ('root', '=', Eval('root', -1)), ('type', 'in', ['normal', 'distribution']), ]) company = fields.Function(fields.Many2One('company.company', 'Company'),