diff --git a/invoice.py b/invoice.py index 0d3000a88f..e5c8c82362 100644 --- a/invoice.py +++ b/invoice.py @@ -117,14 +117,14 @@ class InvoiceLine: @classmethod def __register__(cls, module_name): TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() sql_table = cls.__table__() super(InvoiceLine, cls).__register__(module_name) # Migration from 2.6: remove purchase_lines rel_table_name = 'purchase_line_invoice_lines_rel' - if TableHandler.table_exist(cursor, rel_table_name): + if TableHandler.table_exist(rel_table_name): rel_table = Table(rel_table_name) cursor.execute(*rel_table.select( rel_table.purchase_line, rel_table.invoice_line)) @@ -133,7 +133,7 @@ class InvoiceLine: columns=[sql_table.origin], values=['purchase.line,%s' % purchase_line], where=sql_table.id == invoice_line)) - TableHandler.drop_table(cursor, + TableHandler.drop_table( 'purchase.line-account.invoice.line', rel_table_name) @property diff --git a/product.py b/product.py index bab116ed5b..690bfc0e5d 100644 --- a/product.py +++ b/product.py @@ -186,8 +186,9 @@ class ProductSupplier(ModelSQL, ModelView, MatchMixin): @classmethod def __register__(cls, module_name): TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor - table = TableHandler(cursor, cls, module_name) + transaction = Transaction() + cursor = transaction.connection.cursor() + table = TableHandler(cls, module_name) sql_table = cls.__table__() # Migration from 2.2 new field currency @@ -199,7 +200,7 @@ class ProductSupplier(ModelSQL, ModelView, MatchMixin): if not created_currency: Company = Pool().get('company.company') company = Company.__table__() - limit = cursor.IN_MAX + limit = transaction.database.IN_MAX cursor.execute(*sql_table.select(Count(sql_table.id))) product_supplier_count, = cursor.fetchone() for offset in range(0, product_supplier_count, limit): @@ -252,7 +253,7 @@ class ProductSupplier(ModelSQL, ModelView, MatchMixin): @fields.depends('party') def on_change_party(self): - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() self.currency = self.default_currency() if self.party: table = self.__table__() @@ -330,8 +331,8 @@ class ProductSupplierPrice(ModelSQL, ModelView, MatchMixin): @classmethod def __register__(cls, module_name): TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor - table = TableHandler(cursor, cls, module_name) + cursor = Transaction().connection.cursor() + table = TableHandler(cls, module_name) sql_table = cls.__table__() fill_sequence = not table.column_exist('sequence') diff --git a/purchase.py b/purchase.py index 317cb8b485..7c82178c61 100644 --- a/purchase.py +++ b/purchase.py @@ -227,7 +227,7 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): Move = pool.get('stock.move') InvoiceLine = pool.get('account.invoice.line') TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() model_data = Table('ir_model_data') model_field = Table('ir_model_field') sql_table = cls.__table__() @@ -254,7 +254,7 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): len('packing'))], where=model_field.name.like('%packing%') & (model_field.module == module_name))) - table = TableHandler(cursor, cls, module_name) + table = TableHandler(cls, module_name) table.column_rename('packing_state', 'shipment_state') super(Purchase, cls).__register__(module_name) @@ -266,7 +266,7 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): values=['shipment'], where=sql_table.invoice_method == 'packing')) - table = TableHandler(cursor, cls, module_name) + table = TableHandler(cls, module_name) # Migration from 2.2: warehouse is no more required table.not_null_action('warehouse', 'remove') @@ -275,9 +275,9 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): # Migration from 3.2 # state confirmed splitted into confirmed and processing - if (TableHandler.table_exist(cursor, PurchaseLine._table) - and TableHandler.table_exist(cursor, Move._table) - and TableHandler.table_exist(cursor, InvoiceLine._table)): + if (TableHandler.table_exist(PurchaseLine._table) + and TableHandler.table_exist(Move._table) + and TableHandler.table_exist(InvoiceLine._table)): purchase_line = PurchaseLine.__table__() move = Move.__table__() invoice_line = InvoiceLine.__table__() @@ -302,7 +302,7 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): where=sql_table.id.in_(sub_query.select(sub_query.id)))) # Add index on create_date - table = TableHandler(cursor, cls, module_name) + table = TableHandler(cls, module_name) table.index_action('create_date', action='add') @classmethod @@ -362,7 +362,7 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin): def on_change_party(self): pool = Pool() Currency = pool.get('currency.currency') - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() table = self.__table__() self.invoice_address = None self.payment_term = self.default_payment_term() @@ -969,10 +969,10 @@ class PurchaseLine(ModelSQL, ModelView): @classmethod def __register__(cls, module_name): TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() sql_table = cls.__table__() super(PurchaseLine, cls).__register__(module_name) - table = TableHandler(cursor, cls, module_name) + table = TableHandler(cls, module_name) # Migration from 1.0 comment change into note if table.column_exist('comment'): @@ -1437,7 +1437,7 @@ class OpenSupplier(Wizard): ModelData = pool.get('ir.model.data') Wizard = pool.get('ir.action.wizard') Purchase = pool.get('purchase.purchase') - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() purchase = Purchase.__table__() cursor.execute(*purchase.select(purchase.party, @@ -1463,7 +1463,7 @@ class HandleShipmentExceptionAsk(ModelView): @classmethod def __register__(cls, module_name): - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() model = Table('ir_model') # Migration from 1.2: packing renamed into shipment cursor.execute(*model.update( diff --git a/stock.py b/stock.py index 6c95b38965..c6940c6f8e 100644 --- a/stock.py +++ b/stock.py @@ -182,12 +182,12 @@ class Move: @classmethod def __register__(cls, module_name): TableHandler = backend.get('TableHandler') - cursor = Transaction().cursor + cursor = Transaction().connection.cursor() sql_table = cls.__table__() super(Move, cls).__register__(module_name) - table = TableHandler(cursor, cls, module_name) + table = TableHandler(cls, module_name) # Migration from 2.6: remove purchase_line if table.column_exist('purchase_line'):