[IMP] account_receipt_sale: Prepare invoice instead of forcing receipt

account_receipt_sale/models/__init__.py

@@ -1,4 +1,3 @@
 from . import account_fiscal_position
 from . import partner
 from . import sale
-from . import account_move

account_receipt_sale/models/sale.py

@@ -111,19 +111,12 @@ def _onchange_fiscal_position_id_receipts(self):
         if self.fiscal_position_id:
             self.receipts = self.fiscal_position_id.receipts
 
-    def _create_invoices(self, grouped=False, final=False, date=None):
-        sale_receipts = self.filtered(lambda o: o.receipts)
-        sale_no_receipts = self.filtered(lambda o: not o.receipts)
-        moves = self.env["account.move"]
-        if sale_receipts:
-            moves |= super(
-                SaleOrder, sale_receipts.with_context(force_move_type="out_receipt")
-            )._create_invoices(grouped, final, date)
-        if sale_no_receipts:
-            moves |= super(SaleOrder, sale_no_receipts)._create_invoices(
-                grouped, final, date
-            )
-        return moves
+    def _prepare_invoice(self):
+        invoice_values = super()._prepare_invoice()
+        if self.receipts:
+            invoice_values["move_type"] = "out_receipt"
+            self.env["account.move"]._update_receipts_journal([invoice_values])
+        return invoice_values
 
 
 class OrderLine(models.Model):