diff --git a/sale_supply_supply_on_sale.diff b/sale_supply_supply_on_sale.diff new file mode 100644 index 0000000..5c27fb3 --- /dev/null +++ b/sale_supply_supply_on_sale.diff @@ -0,0 +1,20 @@ +diff --git a/product.py b/product.py +index 08537ed..34ccc24 100644 +--- a/tryton/modules/sale_supply/product.py ++++ b/tryton/modules/sale_supply/product.py +@@ -45,6 +56,7 @@ class Template(metaclass=PoolMeta): + + super().__register__(module) + ++ ''' + # Migration from 6.6: convert supply_on_sale from boolean to selection + if migrate_supply_on_sale: + cursor.execute(*table.update( +@@ -58,6 +70,7 @@ class Template(metaclass=PoolMeta): + ['always'], + where=h_table._temp_supply_on_sale == Literal(True))) + h_table_h.drop_column('_temp_supply_on_sale') ++ ''' + + @fields.depends(methods=['_notify_order_point']) + def on_change_notify(self): diff --git a/series b/series index 85557b2..a5a8279 100644 --- a/series +++ b/series @@ -64,6 +64,6 @@ sao_document_field.diff # [sao] fix issue with loading of 'document' fields in s product_cost_price_migration.diff # [product] Add missing column in product_cost_price -table_rename.diff # [trytond] Add missing sequence rename in table_rename function - sequence_exist.diff # [trytond] Search sequences using pg_sequences instead of information_schema.sequences + +sale_supply_supply_on_sale.diff # [sale_supply] Dont try to supply_on_sale field selection. diff --git a/table_rename.diff b/table_rename.diff deleted file mode 100644 index 7ffe3b9..0000000 --- a/table_rename.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tryton/trytond/trytond/backend/postgresql/table.py b/tryton/trytond/trytond/backend/postgresql/table.py -index e874ee61c0..769f07ccd5 100644 ---- a/tryton/trytond/trytond/backend/postgresql/table.py -+++ b/tryton/trytond/trytond/backend/postgresql/table.py -@@ -132,6 +132,11 @@ class TableHandler(TableHandlerInterface): - and not cls.table_exist(new_name)): - cursor.execute(SQL('ALTER TABLE {} RENAME TO {}').format( - Identifier(old_name), Identifier(new_name))) -+ # Migrate from 6.6: rename old sequence -+ old_sequence = old_name + '_id_seq' -+ new_sequence = new_name + '_id_seq' -+ transaction.database.sequence_rename( -+ transaction.connection, old_sequence, new_sequence) - # Rename history table - old_history = old_name + "__history" - new_history = new_name + "__history"