From e0293c255e0e31d44a2e18f0e8f723071a281551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= <dario@commitsun.com>
Date: Mon, 14 Nov 2022 14:01:58 +0100
Subject: [PATCH] [IMP]pms_api_rest: set journal id by partner in reverse moves

---
 pms_api_rest/services/pms_folio_service.py       | 8 ++++++--
 pms_api_rest/services/pms_invoice_service.py     | 5 +++++
 pms_api_rest/services/pms_transaction_service.py | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pms_api_rest/services/pms_folio_service.py b/pms_api_rest/services/pms_folio_service.py
index 186c7f8f7..fd5e06656 100644
--- a/pms_api_rest/services/pms_folio_service.py
+++ b/pms_api_rest/services/pms_folio_service.py
@@ -232,7 +232,9 @@ class PmsFolioService(Component):
             if pms_account_payment_info.reservationIds
             else False
         )
-        self.env["pms.folio"].do_payment(
+        # TODO: no_cash_register context to maintain compatibility
+        # with older versions, delete it in the future
+        self.env["pms.folio"].with_context(no_cash_register=True).do_payment(
             journal_id,
             journal_id.suspense_account_id,
             self.env.user,
@@ -262,7 +264,9 @@ class PmsFolioService(Component):
         journal_id = self.env["account.journal"].browse(
             pms_account_payment_info.journalId
         )
-        self.env["pms.folio"].do_refund(
+        # TODO: no_cash_register context to maintain compatibility
+        # with older versions, delete it in the future
+        self.env["pms.folio"].with_context(no_cash_register=True).do_refund(
             journal_id,
             journal_id.suspense_account_id,
             self.env.user,
diff --git a/pms_api_rest/services/pms_invoice_service.py b/pms_api_rest/services/pms_invoice_service.py
index cf2b72031..06ce46c64 100644
--- a/pms_api_rest/services/pms_invoice_service.py
+++ b/pms_api_rest/services/pms_invoice_service.py
@@ -76,6 +76,11 @@ class PmsInvoiceService(Component):
                 )
                 move_reversal.reverse_moves()
                 reverse_invoice = move_reversal.new_move_ids
+                invoice = reverse_invoice
+                invoice.journal_id = invoice.pms_property_id._get_folio_default_journal(
+                    partner_invoice_id=new_vals.get("partner_id", invoice.partner_id.id)
+                )
+                invoice.sudo().action_post()
                 # If change invoice by reversal, and new_vals has invoice_line_ids
                 # we need to mapp the new invoice lines with the new invoice
                 reverse_lines = []
diff --git a/pms_api_rest/services/pms_transaction_service.py b/pms_api_rest/services/pms_transaction_service.py
index a186bdd87..0c19f2bfd 100644
--- a/pms_api_rest/services/pms_transaction_service.py
+++ b/pms_api_rest/services/pms_transaction_service.py
@@ -387,6 +387,7 @@ class PmsTransactionService(Component):
                 vals["counterpart_payment_id"] = counterpart_transaction.id
                 counterpart_vals["counterpart_payment_id"] = transaction.id
         if vals:
+            transaction.sudo().action_draft()
             transaction.sudo().write(vals)
             transaction.sudo().action_post()
         if counterpart_transaction: