diff --git a/account_payment_order/migrations/9.0.1.0.0/pre-migration.py b/account_payment_order/migrations/9.0.1.0.0/pre-migration.py
index c6f38f802..e93c18f40 100644
--- a/account_payment_order/migrations/9.0.1.0.0/pre-migration.py
+++ b/account_payment_order/migrations/9.0.1.0.0/pre-migration.py
@@ -157,17 +157,19 @@ def populate_computed_fields(env):
     faster.
     """
     cr = env.cr
+    openupgrade.logged_query(
+        cr, "ALTER TABLE bank_payment_line ADD partner_id int4",
+    )
+    openupgrade.logged_query(
+        cr, "ALTER TABLE bank_payment_line ADD state varchar",
+    )
     openupgrade.add_fields(env, [
         ('company_currency_id', 'account.payment.order',
          'account_payment_order', 'many2one', False, 'account_payment_order'),
         ('payment_type', 'account.payment.line', 'account_payment_line',
          'selection', False, 'account_payment_order'),
-        ('partner_id', 'bank.payment.line', 'bank_payment_line',
-         'many2one', False, 'account_payment_order'),
         ('payment_type', 'bank.payment.line', 'bank_payment_line',
          'selection', False, 'account_payment_order'),
-        ('state', 'bank.payment.line', 'bank_payment_line',
-         'selection', False, 'account_payment_order'),
         ('amount_company_currency', 'bank.payment.line', 'bank_payment_line',
          'monetary', False, 'account_payment_order'),
     ])