diff --git a/payroll/models/models.py b/payroll/models/models.py index 5bfaec7b4..accfe39b1 100644 --- a/payroll/models/models.py +++ b/payroll/models/models.py @@ -1747,7 +1747,8 @@ class Reimbursement(HorillaModel): if self.allowance_id: self.allowance_id.delete() return super().delete(*args, **kwargs) - + def __str__(self): + return f"{self.title}" # changing status canceled to reject for existing reimbursement try: diff --git a/payroll/templates/payroll/reimbursement/reimbursement_list.html b/payroll/templates/payroll/reimbursement/reimbursement_list.html index 3e0d9ecdc..dfc3041fe 100644 --- a/payroll/templates/payroll/reimbursement/reimbursement_list.html +++ b/payroll/templates/payroll/reimbursement/reimbursement_list.html @@ -117,7 +117,7 @@
{% for req in reimbursements %} -
{% endif %} {% if perms.payroll.delete_reimbursement %} - - + + {% endif %} @@ -198,39 +199,52 @@
- - -
+
+
- {% if req.status != "approved" and req.status != 'rejected'%} + {% if req.status != "approved" and req.status != 'rejected'%} + + + + + + {% else %} + + {% endif %} - {% else %} - - {% endif %} - -
+
+ - + /> {% endcomment %}
@@ -414,16 +428,12 @@
{% for req in leave_encashments %} -
- {% comment %}
{% endcomment %} + {% comment %}
{{req.title|truncatechars:20 }}
-
+
{% for req in bonus_encashments %} -
{{req.title|truncatechars:20 }}
-
+
-
+
-
+
+
-
+
{% if req.status != "approved" and req.status != "rejected" %} +
- + +
- {% comment %} {% endcomment %}
{% endfor %}
diff --git a/payroll/templates/payroll/reimbursement/view_reimbursement.html b/payroll/templates/payroll/reimbursement/view_reimbursement.html index 8b4ac380b..dca221756 100644 --- a/payroll/templates/payroll/reimbursement/view_reimbursement.html +++ b/payroll/templates/payroll/reimbursement/view_reimbursement.html @@ -64,6 +64,7 @@