From 512c3110e42f704b19eea1ac34a6dd961d5bbcbb Mon Sep 17 00:00:00 2001 From: hugues de keyzer Date: Wed, 2 Oct 2024 17:43:42 +0200 Subject: [PATCH 1/2] [OU-FIX] fix hr.expense account.move and lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix the value of several fields on account.move and account.move.line records linked to hr.expense records. Co-authored-by: Miquel Raïch --- .../hr_expense/15.0.2.0/post-migration.py | 54 +++++++------------ 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py b/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py index c9b5b354fe41..8f232ddf831a 100644 --- a/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py +++ b/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py @@ -14,44 +14,26 @@ def _fill_payment_state(env): openupgrade.logged_query( env.cr, """ - UPDATE account_move_line - SET exclude_from_invoice_tab=(coalesce(quantity, 0) = 0) - WHERE expense_id IS NOT NULL + UPDATE account_move_line AS aml + SET exclude_from_invoice_tab = true + FROM account_account AS aa + INNER JOIN account_account_type AS aat ON + aa.user_type_id = aat.id + WHERE + aml.account_id = aa.id AND + aml.expense_id IS NOT NULL AND + aat.type = 'payable' """, ) - # Recompute payment_state for the moves associated to the expenses, as on - # 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 - 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" - openupgrade.logged_query( - env.cr, - """ - UPDATE account_move - SET payment_state = %s - WHERE id = %s - """, - (new_pmt_state, move.id), - ) + # Recompute several fields (always_tax_exigible, amount_residual, + # amount_residual_signed, amount_untaxed, amount_untaxed_signed, + # payment_state) for the moves associated to the expenses, as on 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 + env["account.move"].with_context(active_test=False, tracking_disable=True).search( + [("line_ids.expense_id", "!=", False)] + )._compute_amount() @openupgrade.migrate() From 934b1b19bf4618c741f3546a0fd44ce199242164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Wed, 9 Oct 2024 14:44:10 +0200 Subject: [PATCH 2/2] [OU-FIX] disable fiscalyear_lock_date check fiscalyear_lock_date check prevent modifying old move, but some field should be recomputed to be correct in 15.0. --- .../scripts/hr_expense/15.0.2.0/post-migration.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py b/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py index 8f232ddf831a..35f1c12ace23 100644 --- a/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py +++ b/openupgrade_scripts/scripts/hr_expense/15.0.2.0/post-migration.py @@ -25,6 +25,11 @@ def _fill_payment_state(env): aat.type = 'payable' """, ) + # Disable fiscalyear_lock_date check + _check_fiscalyear_lock_date = env[ + "account.move" + ].__class__._check_fiscalyear_lock_date + env["account.move"].__class__._check_fiscalyear_lock_date = lambda self: None # Recompute several fields (always_tax_exigible, amount_residual, # amount_residual_signed, amount_untaxed, amount_untaxed_signed, # payment_state) for the moves associated to the expenses, as on v14 these @@ -34,6 +39,10 @@ def _fill_payment_state(env): env["account.move"].with_context(active_test=False, tracking_disable=True).search( [("line_ids.expense_id", "!=", False)] )._compute_amount() + # Enable fiscalyear_lock_date check + env["account.move"].__class__._check_fiscalyear_lock_date = ( + _check_fiscalyear_lock_date + ) @openupgrade.migrate()