From a62a3c5eb328018a8b0bbf07bf40bf8842ae0425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Fri, 6 Dec 2019 17:33:46 +0100 Subject: [PATCH] Use direct access to backend classes issue8836 review258421002 --- invoice.py | 6 +++--- party.py | 3 +-- payment_term.py | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/invoice.py b/invoice.py index 37142bd860..7eb7430a8c 100644 --- a/invoice.py +++ b/invoice.py @@ -735,7 +735,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin): invoice_query = Rule.query_get('account.invoice') Operator = fields.SQL_OPERATORS[operator] # SQLite uses float for sum - if backend.name() == 'sqlite': + if backend.name == 'sqlite': value = float(value) union = (line.join(invoice, condition=(invoice.id == line.invoice) @@ -771,7 +771,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin): invoice_query = Rule.query_get('account.invoice') Operator = fields.SQL_OPERATORS[operator] # SQLite uses float for sum - if backend.name() == 'sqlite': + if backend.name == 'sqlite': value = float(value) query = line.join(invoice, @@ -800,7 +800,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin): invoice_query = Rule.query_get('account.invoice') Operator = fields.SQL_OPERATORS[operator] # SQLite uses float for sum - if backend.name() == 'sqlite': + if backend.name == 'sqlite': value = float(value) query = tax.select(tax.invoice, diff --git a/party.py b/party.py index 2f59dbe341..413dc4979d 100644 --- a/party.py +++ b/party.py @@ -58,8 +58,7 @@ class PartyPaymentTerm(ModelSQL, ValueMixin): @classmethod def __register__(cls, module_name): - TableHandler = backend.get('TableHandler') - exist = TableHandler.table_exist(cls._table) + exist = backend.TableHandler.table_exist(cls._table) super(PartyPaymentTerm, cls).__register__(module_name) diff --git a/payment_term.py b/payment_term.py index c1fb04cb3c..7c7d14add3 100644 --- a/payment_term.py +++ b/payment_term.py @@ -251,7 +251,6 @@ class PaymentTermLineRelativeDelta(sequence_ordered(), ModelSQL, ModelView): @classmethod def __register__(cls, module_name): - TableHandler = backend.get('TableHandler') transaction = Transaction() cursor = transaction.connection.cursor() pool = Pool() @@ -267,12 +266,12 @@ class PaymentTermLineRelativeDelta(sequence_ordered(), ModelSQL, ModelView): old_model_name = 'account.invoice.payment_term.line.relativedelta' old_table = config.get( 'table', old_model_name, default=old_model_name.replace('.', '_')) - if TableHandler.table_exist(old_table): - TableHandler.table_rename(old_table, cls._table) + if backend.TableHandler.table_exist(old_table): + backend.TableHandler.table_rename(old_table, cls._table) # Migration from 5.0: use ir.calendar migrate_calendar = False - if TableHandler.table_exist(cls._table): + if backend.TableHandler.table_exist(cls._table): cursor.execute(*sql_table.select( sql_table.month, sql_table.weekday, where=(sql_table.month != Null)