diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 2cd9d4f7c..47c44123b 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -3,11 +3,12 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import datetime
-from dateutil import relativedelta
 import logging
 from datetime import timedelta
 from itertools import groupby
 
+from dateutil import relativedelta
+
 from odoo import _, api, fields, models
 from odoo.exceptions import AccessError, UserError, ValidationError
 from odoo.tools import float_compare, float_is_zero
@@ -1788,16 +1789,16 @@ class PmsFolio(models.Model):
         self.ensure_one()
         pms_property = self.pms_property_id
         partner = self.env["res.partner"].browse(partner_invoice_id)
-        if partner.document_number_to_invoice:
-            return pms_property.journal_normal_invoice_id
-        return pms_property.journal_simplified_invoice_id
+        if not partner.document_number_to_invoice and self._context.get("autoinvoice"):
+            return pms_property.journal_simplified_invoice_id
+        return pms_property.journal_normal_invoice_id
 
     def _get_default_move_type(self, partner_invoice_id):
         self.ensure_one()
         partner = self.env["res.partner"].browse(partner_invoice_id)
-        if partner.document_number_to_invoice:
-            return "out_invoice"
-        return "out_receipt"
+        if not partner.document_number_to_invoice and self._context.get("autoinvoice"):
+            return "out_receipt"
+        return "out_invoice"
 
     def do_payment(
         self,