diff --git a/account_payment_purchase_stock/__manifest__.py b/account_payment_purchase_stock/__manifest__.py
index 2990c5893..f558e422d 100644
--- a/account_payment_purchase_stock/__manifest__.py
+++ b/account_payment_purchase_stock/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     "name": "Account Payment Purchase Stock",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Banking addons",
     "license": "AGPL-3",
     "summary": "Integrate Account Payment Purchase with Stock",
diff --git a/account_payment_purchase_stock/models/stock_rule.py b/account_payment_purchase_stock/models/stock_rule.py
index 390e44375..d03a3fc8a 100644
--- a/account_payment_purchase_stock/models/stock_rule.py
+++ b/account_payment_purchase_stock/models/stock_rule.py
@@ -11,7 +11,7 @@ class StockRule(models.Model):
         """Propagate payment mode on MTO/drop shipping."""
         res = super()._prepare_purchase_order(company_id, origins, values)
         values = values[0]
-        partner = values["supplier"].name
+        partner = values["supplier"].partner_id
         if partner:
             res["payment_mode_id"] = partner.with_company(
                 self.company_id.id
diff --git a/account_payment_purchase_stock/tests/test_account_payment_purchase_stock.py b/account_payment_purchase_stock/tests/test_account_payment_purchase_stock.py
index b62cc8052..179f820a8 100644
--- a/account_payment_purchase_stock/tests/test_account_payment_purchase_stock.py
+++ b/account_payment_purchase_stock/tests/test_account_payment_purchase_stock.py
@@ -3,7 +3,6 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 from odoo import fields
-from odoo.tests import Form
 
 from odoo.addons.account_payment_purchase.tests.test_account_payment_purchase import (
     TestAccountPaymentPurchase,
@@ -16,14 +15,14 @@ class TestAccountPaymentPurchaseStock(TestAccountPaymentPurchase):
         self.purchase.button_confirm()
         picking = self.purchase.picking_ids[0]
         picking.action_confirm()
-        picking.move_lines.write({"quantity_done": 1.0})
+        picking.move_ids.write({"quantity_done": 1.0})
         picking.button_validate()
 
         invoice = self.env["account.move"].create(
             {"partner_id": self.partner.id, "move_type": "in_invoice"}
         )
-        with Form(invoice) as inv:
-            inv.purchase_id = self.purchase
+        invoice.purchase_id = self.purchase
+        invoice._onchange_purchase_auto_complete()
         self.assertEqual(
             self.purchase.invoice_ids[0].payment_mode_id, self.payment_mode
         )
@@ -37,7 +36,7 @@ class TestAccountPaymentPurchaseStock(TestAccountPaymentPurchase):
         self.purchase.button_confirm()
         picking = self.purchase.picking_ids[0]
         picking.action_confirm()
-        picking.move_lines.write({"quantity_done": 1.0})
+        picking.move_ids.write({"quantity_done": 1.0})
         picking.button_validate()
 
         invoice = self.env["account.move"].create(
@@ -52,7 +51,7 @@ class TestAccountPaymentPurchaseStock(TestAccountPaymentPurchase):
         purchase2.button_confirm()
         picking = purchase2.picking_ids[0]
         picking.action_confirm()
-        picking.move_lines.write({"quantity_done": 1.0})
+        picking.move_ids.write({"quantity_done": 1.0})
         picking.button_validate()
         invoice.purchase_id = purchase2
         result = invoice._onchange_purchase_auto_complete()
@@ -70,7 +69,7 @@ class TestAccountPaymentPurchaseStock(TestAccountPaymentPurchase):
         self.purchase.button_confirm()
         picking = self.purchase.picking_ids[0]
         picking.action_confirm()
-        picking.move_lines.write({"quantity_done": 1.0})
+        picking.move_ids.write({"quantity_done": 1.0})
         picking.button_validate()
 
         invoice = self.env["account.move"].create(
@@ -84,7 +83,7 @@ class TestAccountPaymentPurchaseStock(TestAccountPaymentPurchase):
         purchase2.button_confirm()
         picking = purchase2.picking_ids[0]
         picking.action_confirm()
-        picking.move_lines.write({"quantity_done": 1.0})
+        picking.move_ids.write({"quantity_done": 1.0})
         picking.button_validate()
         invoice.purchase_id = purchase2
         result = invoice._onchange_purchase_auto_complete()