From d0b9d3801db075cb5ec7589232f4c1b2add81b9c Mon Sep 17 00:00:00 2001 From: AlexPForgeFlow Date: Tue, 20 Aug 2024 10:46:04 +0200 Subject: [PATCH] [16.0][IMP] rma_account & rma_sale: fix delivery and invoice addresses --- rma_account/models/rma_order_line.py | 4 +++- rma_account/wizards/rma_add_account_move.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rma_account/models/rma_order_line.py b/rma_account/models/rma_order_line.py index 14bcf759..b659cae5 100644 --- a/rma_account/models/rma_order_line.py +++ b/rma_account/models/rma_order_line.py @@ -207,7 +207,9 @@ class RmaOrderLine(models.Model): line.date, round=False, ), - "delivery_address_id": line.move_id.partner_id.id, + "delivery_address_id": line.move_id.partner_shipping_id.id + if line.move_id.partner_shipping_id + else line.move_id.partner_id.id, "invoice_address_id": line.move_id.partner_id.id, "receipt_policy": operation.receipt_policy, "refund_policy": operation.refund_policy, diff --git a/rma_account/wizards/rma_add_account_move.py b/rma_account/wizards/rma_add_account_move.py index 1147a180..8ab574a4 100644 --- a/rma_account/wizards/rma_add_account_move.py +++ b/rma_account/wizards/rma_add_account_move.py @@ -89,7 +89,9 @@ class RmaAddAccountMove(models.TransientModel): line.date, round=False, ), - "delivery_address_id": line.move_id.partner_id.id, + "delivery_address_id": line.move_id.partner_shipping_id.id + if line.move_id.partner_shipping_id + else line.move_id.partner_id.id, "invoice_address_id": line.move_id.partner_id.id, "rma_id": self.rma_id.id, "receipt_policy": operation.receipt_policy,