odoo-addon-openupgrade-scripts 15.0.1.0.0.487__py3-none-any.whl → 15.0.1.0.0.490__py3-none-any.whl

odoo/addons/openupgrade_scripts/apriori.py

@@ -79,6 +79,8 @@ merged_modules = {
     "pos_order_return": "point_of_sale",
     # OCA/product-attribute
     "stock_account_product_cost_security": "product_cost_security",
+    # OCA/server-tools
+    "base_jsonify": "jsonifier",
     # OCA/stock-logistics-reporting
     "stock_inventory_valuation_pivot": "stock_account",
     # OCA/stock-logistics-warehouse

odoo/addons/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py

@@ -23,28 +23,27 @@ def _fill_payment_state(env):
     # v14 these ones were not computed being of type `entry`, which changes now
     # on v15 if the method `_payment_state_matters` returns True, which is the
     # case for the expense moves
-    # Disable the reconciliation check to be able to update reconciled moves
-    _check_reconciliation = env["account.move.line"].__class__._check_reconciliation
-    _check_fiscalyear_lock_date = env[
-        "account.move"
-    ].__class__._check_fiscalyear_lock_date
-    env["account.move.line"].__class__._check_reconciliation = lambda self: None
-    env["account.move"].__class__._check_fiscalyear_lock_date = lambda self: None
-    env["hr.expense.sheet"].search([]).account_move_id._compute_amount()
-    env["account.move.line"].__class__._check_reconciliation = _check_reconciliation
-    env[
-        "account.move"
-    ].__class__._check_fiscalyear_lock_date = _check_fiscalyear_lock_date
-    # Now perform the SQL to transfer the payment_state
-    openupgrade.logged_query(
-        env.cr,
-        """
-        UPDATE hr_expense_sheet hes
-        SET payment_state = am.payment_state
-        FROM account_move am
-        WHERE am.id = hes.account_move_id
-        """,
-    )
+    for move in env["hr.expense.sheet"].search([]).account_move_id:
+        # Extracted and adapted from _compute_amount() in account.move
+        new_pmt_state = "not_paid" if move.move_type != "entry" else False
+        total_to_pay = total_residual = 0.0
+        for line in move.line_ids:
+            if line.account_id.user_type_id.type in ("receivable", "payable"):
+                total_to_pay += line.balance
+                total_residual += line.amount_residual
+        currencies = move._get_lines_onchange_currency().currency_id
+        currency = currencies if len(currencies) == 1 else move.company_id.currency_id
+        if currency.is_zero(move.amount_residual):
+            reconciled_payments = move._get_reconciled_payments()
+            if not reconciled_payments or all(
+                payment.is_matched for payment in reconciled_payments
+            ):
+                new_pmt_state = "paid"
+            else:
+                new_pmt_state = move._get_invoice_in_payment_state()
+        elif currency.compare_amounts(total_to_pay, total_residual) != 0:
+            new_pmt_state = "partial"
+        move.payment_state = new_pmt_state
 
 
 @openupgrade.migrate()

{odoo_addon_openupgrade_scripts-15.0.1.0.0.487.dist-info → odoo_addon_openupgrade_scripts-15.0.1.0.0.490.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-openupgrade-scripts
-Version: 15.0.1.0.0.487
+Version: 15.0.1.0.0.490
 Summary: Module that contains all the migrations analysis and scripts for migrate Odoo SA modules.
 Home-page: https://github.com/OCA/OpenUpgrade
 Author: Odoo Community Association (OCA)

{odoo_addon_openupgrade_scripts-15.0.1.0.0.487.dist-info → odoo_addon_openupgrade_scripts-15.0.1.0.0.490.dist-info}/RECORD

@@ -1,7 +1,7 @@
 odoo/addons/openupgrade_scripts/README.rst,sha256=TFoeSTQ1dga9OiOaWPPw6VjE4FXLq6kAMfvg3HDTW3I,3185
 odoo/addons/openupgrade_scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 odoo/addons/openupgrade_scripts/__manifest__.py,sha256=Bg1odtEI40Tp3WWqRv_MMkuERgls81FORzrUAzezsxg,553
-odoo/addons/openupgrade_scripts/apriori.py,sha256=OQ5r7JNEigh7C5etuEA0GV6wMWFstWE7lmmVVvtPbG0,4430
+odoo/addons/openupgrade_scripts/apriori.py,sha256=7G4VLpfouZ1T3yNG3-VyHOpEC69DzD7G-Es5tMlHff4,4486
 odoo/addons/openupgrade_scripts/readme/CONFIGURE.rst,sha256=cy1swpDkuqi9-6q8L1M1QD058QyfBvAE2PN_mmdxvwI,255
 odoo/addons/openupgrade_scripts/readme/DESCRIPTION.rst,sha256=elLk0eys-xy60z5KMgqlCKySJWT_k2gTUoOiArMJkWc,86
 odoo/addons/openupgrade_scripts/readme/INSTALL.rst,sha256=tXbOmw3QIhO1KLIziMpXzuuY0tOhI8IGT2ktCArwfGM,115
@@ -172,7 +172,7 @@ odoo/addons/openupgrade_scripts/scripts/hr_contract/15.0.1.0/pre-migration.py,sh
 odoo/addons/openupgrade_scripts/scripts/hr_contract/15.0.1.0/upgrade_analysis.txt,sha256=9kL-dXhj7ZJUf3ZUiZY2RxSLYLBQVpVDaEhkmN-Kl1o,1677
 odoo/addons/openupgrade_scripts/scripts/hr_contract/15.0.1.0/upgrade_analysis_work.txt,sha256=sUl4hhfNWmbvyskqR26Meg_g1CxZwoSsn7PVoewjQ7A,1967
 odoo/addons/openupgrade_scripts/scripts/hr_expense/15.0.2.0/noupdate_changes.xml,sha256=dMUUfRJ75PVxQYe7pGpE-6hllgKO5DtrEr6_1ki9oW8,1307
-odoo/addons/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py,sha256=I5qp5e7iMyhuMa3pVCq7fMPTWUytTLbR4AA_osYRczg,2049
+odoo/addons/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py,sha256=sQsuTApuVjzMn1998Ej4CIFoDqe_e93_658ExfhWY9U,2227
 odoo/addons/openupgrade_scripts/scripts/hr_expense/15.0.2.0/pre-migration.py,sha256=0jJvJ2FNOm2CLFZQJSi6OEI3Tv-5AXV1Sb1bXO5bd7U,553
 odoo/addons/openupgrade_scripts/scripts/hr_expense/15.0.2.0/upgrade_analysis.txt,sha256=Kg3-cC-kvp3E3YTvK4IX5_NCMr32Tq2CNRLebCgUxyk,1664
 odoo/addons/openupgrade_scripts/scripts/hr_expense/15.0.2.0/upgrade_analysis_work.txt,sha256=6LDJ5RaB8fPhUsebYCJuVHj61Vq4L-cHhI4QjyY_BnI,2042
@@ -798,7 +798,7 @@ odoo/addons/openupgrade_scripts/scripts/website_twitter/15.0.1.0/upgrade_analysi
 odoo/addons/openupgrade_scripts/static/description/banner.png,sha256=KTIBu4gfxeZVw9zjs_fivTgFEOeaAorlBxajmCA1p6k,26859
 odoo/addons/openupgrade_scripts/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
 odoo/addons/openupgrade_scripts/static/description/index.html,sha256=Q6Orf6ynZuFFVbDWUruBEsSY4uaFaTiVYvLYU1tcCnc,12678
-odoo_addon_openupgrade_scripts-15.0.1.0.0.487.dist-info/METADATA,sha256=uUW0IYhGyg_dyqCfkoDU4ZTqIjeWxKE1S2Q_WWXCtfQ,3779
-odoo_addon_openupgrade_scripts-15.0.1.0.0.487.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-odoo_addon_openupgrade_scripts-15.0.1.0.0.487.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_openupgrade_scripts-15.0.1.0.0.487.dist-info/RECORD,,
+odoo_addon_openupgrade_scripts-15.0.1.0.0.490.dist-info/METADATA,sha256=rfos1n4lpVVtEFuoYpVyJ1jv74ruasOwb9Xy2VsFsLs,3779
+odoo_addon_openupgrade_scripts-15.0.1.0.0.490.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+odoo_addon_openupgrade_scripts-15.0.1.0.0.490.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_openupgrade_scripts-15.0.1.0.0.490.dist-info/RECORD,,