Delete users 5.6 and import transaction after pool

after/convert_domain_rules.py

@@ -6,8 +6,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 from trytond.pyson import PYSONEncoder, Eval
 

after/create_account_invoice_payment_method.py

@@ -7,8 +7,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

after/create_company_user.py

@@ -7,8 +7,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

after/delete_not_found_modules.py

@@ -7,8 +7,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import trytond.tools as tools
 import logging
 

after/migration_project_product.py

@@ -7,8 +7,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

after/migration_properties.py

@@ -6,8 +6,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 from datetime import timedelta
 import logging
 

after/migration_shipment_work.py

@@ -6,8 +6,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

after/purchase_work.py

@@ -7,8 +7,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

after/sync_model_data.py

@@ -6,8 +6,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

after/update_taxes.py

@@ -7,8 +7,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()
@@ -36,7 +36,7 @@ def get_tax(xml_id, company):
     data, = data
     template = AccountTaxTemplate(data.db_id)
 
-    with Transaction().set_user(0): 
+    with Transaction().set_user(0):
         tax = AccountTax.search([
             ('template', '=', template.id),
             ('company', '=', company)], limit=1)

after/upgrade_account_chart.py

@@ -12,9 +12,8 @@ if domain:
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

after/upgrade_account_code_digits.py

@@ -6,8 +6,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

after/upgrade_account_invoice_discount_global.py

@@ -7,8 +7,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 from decimal import Decimal
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 
 Pool.start()
 pool = Pool(dbname)

after/upload_sii.py

@@ -9,8 +9,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

before/migration_account_category.py

@@ -6,8 +6,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import logging
 
 Pool.start()

before/migration_electronic_mail.py

@@ -7,8 +7,8 @@ config_file = sys.argv[2]
 from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import trytond.tools as tools
 import logging
 

before/upgrade_account_chart.py

@@ -8,8 +8,8 @@ from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
 from trytond import __version__
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import trytond.tools as tools
 import logging
 

before/upgrade_account_codes_from_template.py

@@ -8,8 +8,8 @@ from trytond.config import config as CONFIG
 CONFIG.update_etc(config_file)
 
 from trytond import __version__
-from trytond.transaction import Transaction
 from trytond.pool import Pool
+from trytond.transaction import Transaction
 import trytond.tools as tools
 import logging
 

config.yml

@@ -54,10 +54,10 @@ to_install:
   - account_product_accounting
   - account_move_draft
   - account_invoice_line_description
-  - party_identifier
   - account_invoice_company_currency
   - electronic_mail
   - html_report
+  - party_identifier
 
 before:
   # - tables: ir_model_data
@@ -463,6 +463,17 @@ before:
     query: DELETE from ir_cron where function in ('generate_requests', 'generate_internal_shipment');
         DELETE from ir_model_data where module = 'stock_supply' and model = 'ir.cron';
 
+  - comment: # Delete unused crons
+    version: 5.6
+    query: DELETE from ir_cron where function in ('cron_post_clearing_moves');
+        DELETE from ir_model_data where fs_id = 'cron_post_clearing_moves' and model = 'ir.cron';
+        DELETE FROM res_user WHERE login IN ('user_cron_post_clearing_moves');
+        DELETE FROM ir_model_data WHERE model='res.user' AND fs_id IN ('user_post_clearing_moves');
+        DELETE from ir_cron where function in ('trigger_time');
+        DELETE from ir_model_data where fs_id = 'cron_trigger_time' and model = 'ir.cron';
+        DELETE FROM res_user WHERE login IN ('user_cron_trigger');
+        DELETE FROM ir_model_data WHERE model='res.user' AND fs_id IN ('user_trigger');
+
   - comment: # Remove error translations
     version: 5.1
     query: DELETE FROM "ir_translation" WHERE "type" = 'error';
@@ -676,8 +687,8 @@ after:
     query: UPDATE project_work SET status = db_id FROM ir_model_data WHERE module = 'project' AND fs_id = 'work_open_status' AND state = 'opened';
         UPDATE project_work SET status = db_id FROM ir_model_data WHERE module = 'project' and fs_id = 'work_done_status' AND state = 'done';
 
-  - script: ./upgrades/after/sync_model_data.py
-    version: 4.8
+  - comment: all versions sync model data
+    script: ./upgrades/after/sync_model_data.py
 
   - script: ./upgrades/after/upgrade_account_chart.py
     version: 4.8