diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index 8f317e197..3295ed9c4 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -32,7 +32,7 @@
         "data/pms_sequence.xml",
         "report/pms_folio.xml",
         "report/pms_folio_templates.xml",
-        "templates/pms_email_template.xml",
+        #"templates/pms_email_template.xml",
         "views/general.xml",
         "data/menus.xml",
         "views/pms_amenity_views.xml",
diff --git a/pms/models/payment_return.py b/pms/models/payment_return.py
index 3fdc2a2ba..6c8235138 100644
--- a/pms/models/payment_return.py
+++ b/pms/models/payment_return.py
@@ -26,10 +26,10 @@ class PaymentReturn(models.Model):
                 folios_line = self.env["pms.folio"].browse(
                     payments.mapped("folio_id.id")
                 )
-                for folio in folios_line:
-                    if self.id not in folio.return_ids.ids:
-                        folio.update({"return_ids": [(4, self.id)]})
-                    msg = _("Return of %s registered") % (line.amount)
-                    folio.message_post(subject=_("Payment Return"), body=msg)
+                # for folio in folios_line:
+                #     if self.id not in folio.return_ids.ids:
+                #         folio.update({"return_ids": [(4, self.id)]})
+                #     msg = _("Return of %s registered") % (line.amount)
+                #     folio.message_post(subject=_("Payment Return"), body=msg)
                 folios += folios_line
             folios.compute_amount()
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 775cd7c69..85da442aa 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -413,8 +413,9 @@ class PmsFolio(models.Model):
                 }
             )
 
+    #TODO: Add return_ids to depends
     @api.depends(
-        "amount_total", "payment_ids", "return_ids", "reservation_type", "state"
+        "amount_total", "payment_ids", "reservation_type", "state"
     )
     def compute_amount(self):
         acc_pay_obj = self.env["account.payment"]