From a4990af234ec04d749e530a60e0fdf92eb078ab3 Mon Sep 17 00:00:00 2001 From: ?ngel ?lvarez Date: Wed, 3 Apr 2019 14:39:02 +0200 Subject: [PATCH] comment patches and add needed to upgrade --- party_identifier_migration.diff | 17 ++++++++++++++++ series | 35 ++++++++++++++++----------------- trytond_test_database.diff | 12 +++++++++++ 3 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 party_identifier_migration.diff create mode 100644 trytond_test_database.diff diff --git a/party_identifier_migration.diff b/party_identifier_migration.diff new file mode 100644 index 0000000..90721f0 --- /dev/null +++ b/party_identifier_migration.diff @@ -0,0 +1,17 @@ +diff -r d04990e66e97 party.py +--- a/trytond/trytond/modules/party/party.py Wed Mar 27 23:25:26 2019 +0100 ++++ b/trytond/trytond/modules/party/party.py Mon Apr 01 14:49:19 2019 +0200 +@@ -454,8 +454,11 @@ + continue + for type in Party.tax_identifier_types(): + module = get_cc_module(*type.split('_', 1)) +- if module.is_valid(code): +- break ++ try: ++ if module and module.is_valid(code): ++ break ++ except: ++ pass + else: + type = None + identifiers.append( diff --git a/series b/series index 4357f46..5220249 100644 --- a/series +++ b/series @@ -1,28 +1,27 @@ babi_multiprocess.diff # [trytond] babi multiprocess -logging_jsonrpc_exeption.diff # [trytond] logging JSONRPC Exception -match.diff # [trytond] Control when tje filed is a Char o Text and the value is not none but it's an empty string -issue3932.diff # [account] rule account move and account move line by company -issue6253.diff # [account_invoice] add invoice type criteria -issue4506.diff # [account_invoice] Add credit invoices keyword from account.invoice -issue4030.diff # [analytic_account] Not selected root accounts in analytic account lines +trytond_test_database.diff # [trytond] avoid errors on upgrades from version 3.4 +party_identifier_migration.diff # [Party] avoid errors on upgrades -issue4482.diff # [stock] stock inventory misses company access rule -search_warehouse.diff #[stock] search function for warehouse. +#logging_jsonrpc_exeption.diff # [trytond] logging JSONRPC Exception +#match.diff # [trytond] Control when tje filed is a Char o Text and the value is not none but it's an empty string +#issue3932.diff # [account] rule account move and account move line by company +#issue6253.diff # [account_invoice] add invoice type criteria +#issue4506.diff # [account_invoice] Add credit invoices keyword from account.invoice +#issue4030.diff # [analytic_account] Not selected root accounts in analytic account lines +# +#issue4482.diff # [stock] stock inventory misses company access rule +#search_warehouse.diff #[stock] search function for warehouse. # TODO: improve_performance_on_try_assign.diff # [stock] change browse of product to get default_uom to pysql # issue240_631.diff # [stock_lot] stock_by_locations get all locations with that lot. -issue10467.diff # stock_lot: add lot to grouping if lot it's required on product +#issue10467.diff # stock_lot: add lot to grouping if lot it's required on product # issue53451002_1_10001.diff # [stock] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages -# sale_number_of_packages.diff # [sale_number_of_packages] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages -# stock_lot_deactivatable.diff # [stock_lot_deactivatable] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages -stock_lot_sled.diff # [stock_lot_sled] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages +# stock_lot_sled.diff # [stock_lot_sled] Allow configuring which quantity is grouped in compute_quantities_query() needed by stock_number_of_packages -issue7826.diff # [stock_package] Total packages moves are all -lock_stock_move.diff # [stock] Function to overwrite if lock table or not -issue7856.diff # [stock] Can't move qty from a parent location to child location +#issue7826.diff # [stock_package] Total packages moves are all +#lock_stock_move.diff # [stock] Function to overwrite if lock table or not +#issue7856.diff # [stock] Can't move qty from a parent location to child location -issue8058.diff # [stock_supply_production] Can't create productions from request because exceeds digits limit - -sale_list_price.diff # [sale] Can't convert to currency with list price is null (multicompany) +#sale_list_price.diff # [sale] Can't convert to currency with list price is null (multicompany) diff --git a/trytond_test_database.diff b/trytond_test_database.diff new file mode 100644 index 0000000..59be1c6 --- /dev/null +++ b/trytond_test_database.diff @@ -0,0 +1,12 @@ +diff -r bbae9fd78f9e trytond/backend/postgresql/database.py +--- a/trytond/trytond/backend/postgresql/database.py Thu Mar 28 19:22:49 2019 +0100 ++++ b/trytond/trytond/backend/postgresql/database.py Mon Apr 01 14:39:22 2019 +0200 +@@ -291,7 +291,7 @@ + def _test(cls, connection, hostname=None): + cursor = connection.cursor() + tables = ('ir_model', 'ir_model_field', 'ir_ui_view', 'ir_ui_menu', +- 'res_user', 'res_group', 'ir_module', 'ir_module_dependency', ++ 'res_user', 'res_group', + 'ir_translation', 'ir_lang', 'ir_configuration') + cursor.execute('SELECT table_name FROM information_schema.tables ' + 'WHERE table_name IN %s', (tables,))