From a1fb59998e240e7067f0f3c75ccd63c731908970 Mon Sep 17 00:00:00 2001
From: Horilla <support@horilla.com>
Date: Thu, 25 Sep 2025 16:21:53 +0530
Subject: [PATCH] Merge master

---
 .../cbv/shift_request/shift_detail_actions.html          | 4 ++--
 payroll/forms/component_forms.py                         | 2 +-
 payroll/models/models.py                                 | 4 +++-
 recruitment/models.py                                    | 9 ++++-----
 .../templates/cbv/recruitment_survey/option_col.html     | 6 ++++++
 5 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 recruitment/templates/cbv/recruitment_survey/option_col.html

diff --git a/base/templates/cbv/shift_request/shift_detail_actions.html b/base/templates/cbv/shift_request/shift_detail_actions.html
index ade2ec6d0..266fd9459 100644
--- a/base/templates/cbv/shift_request/shift_detail_actions.html
+++ b/base/templates/cbv/shift_request/shift_detail_actions.html
@@ -16,7 +16,7 @@
         <ion-icon name="create-outline"></ion-icon>
         {% trans "Edit" %}
     </a>
-{% endif %} 
+{% endif %}
 
 {% if instance.approved or instance.canceled %}
     <button class="oh-btn oh-btn--secondary w-50" disabled>
@@ -34,7 +34,7 @@
         <ion-icon name="create-outline"></ion-icon>
         {% trans "Delete" %}
     </a>
-{% endif %} 
+{% endif %}
 
 {% if request.GET.deleted %}
     <script>
diff --git a/payroll/forms/component_forms.py b/payroll/forms/component_forms.py
index 358c4b452..fa1c5a7ae 100644
--- a/payroll/forms/component_forms.py
+++ b/payroll/forms/component_forms.py
@@ -803,7 +803,7 @@ class ReimbursementForm(ModelForm):
     class Meta:
         model = Reimbursement
         fields = "__all__"
-        exclude = ["is_active"]
+        exclude = ["is_active", "status"]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/payroll/models/models.py b/payroll/models/models.py
index 4b57fcde7..df5dce03b 100644
--- a/payroll/models/models.py
+++ b/payroll/models/models.py
@@ -2194,7 +2194,9 @@ class Reimbursement(HorillaModel):
     )
     amount = models.FloatField(default=0)
     status = models.CharField(
-        max_length=10, choices=status_types, default="requested", editable=False
+        max_length=10,
+        choices=status_types,
+        default="requested",
     )
     approved_by = models.ForeignKey(
         Employee,
diff --git a/recruitment/models.py b/recruitment/models.py
index 64cba36fa..1ce747b2c 100644
--- a/recruitment/models.py
+++ b/recruitment/models.py
@@ -1401,11 +1401,10 @@ class RecruitmentSurvey(HorillaModel):
         return str(self.question)
 
     def options_col(self):
-        if self.type == "options" or self.type == "multiple":
-            return (
-                f"<div class='oh-timeoff-modal__stat-title'>Options</div><div>{self.options}</div>"
-                if self.options
-                else ""
+        if self.type in ["options", "multiple"]:
+            return render_template(
+                "cbv/recruitment_survey/option_col.html",
+                {"instance": self},
             )
         return ""
 
diff --git a/recruitment/templates/cbv/recruitment_survey/option_col.html b/recruitment/templates/cbv/recruitment_survey/option_col.html
new file mode 100644
index 000000000..bf0ca1fa2
--- /dev/null
+++ b/recruitment/templates/cbv/recruitment_survey/option_col.html
@@ -0,0 +1,6 @@
+{% load static %}
+{% load i18n %}
+{% if instance.options %}
+    <div class='oh-timeoff-modal__stat-title'>{% trans "Options" %}</div>
+    <div>{{instance.options}}</div>
+{% endif %}
\ No newline at end of file