From 37d0f037fea5690a7a0ce07b1bb0707df0632147 Mon Sep 17 00:00:00 2001
From: Horilla <support@horilla.com>
Date: Tue, 14 Jan 2025 16:09:03 +0530
Subject: [PATCH] [UPDT] EMPLOYEE: Updated the allowance view table in
 individual view with more details

---
 .../employee/update_form/bank_info_as_p.html        |  3 ---
 .../templates/tabs/allowance_deduction-tab.html     | 13 ++++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/employee/templates/employee/update_form/bank_info_as_p.html b/employee/templates/employee/update_form/bank_info_as_p.html
index abbc07548..a82cb4e9c 100644
--- a/employee/templates/employee/update_form/bank_info_as_p.html
+++ b/employee/templates/employee/update_form/bank_info_as_p.html
@@ -60,6 +60,3 @@
       {% endif %}
     {% endfor %}
   </div>
-
-
-
diff --git a/employee/templates/tabs/allowance_deduction-tab.html b/employee/templates/tabs/allowance_deduction-tab.html
index e2a080fe4..1df40a366 100644
--- a/employee/templates/tabs/allowance_deduction-tab.html
+++ b/employee/templates/tabs/allowance_deduction-tab.html
@@ -56,10 +56,11 @@
                                             </div>
                                         </div>
                                     </div>
-
+                                    <div class="oh-sticky-table__th">{% trans "Date" %}</div>
                                     <div class="oh-sticky-table__th">{% trans "Is Taxable" %}</div>
                                     <div class="oh-sticky-table__th">{% trans "Is Condition Based" %}</div>
                                     <div class="oh-sticky-table__th">{% trans "Is Fixed" %}</div>
+                                    <div class="oh-sticky-table__th">{% trans "Rate" %}</div>
                                     <div class="oh-sticky-table__th">{% trans "Amount" %}</div>
                                     <div class="oh-sticky-table__th">{% trans "Based On" %}</div>
                                     {% if perms.payroll.change_allowance or perms.payroll.delete_allowance %}
@@ -74,6 +75,9 @@
                                     hx-target="#objectDetailsModalTarget">
                                     <div class="oh-sticky-table__tr ui-sortable-handle">
                                         <div class="oh-sticky-table__td">{{allowance.title}}</div>
+                                        <div class="oh-sticky-table__td">
+                                            {% if allowance.one_time_date %}{% trans "On" %} <span class="dateformat_changer">{{allowance.one_time_date}}</span>
+                                            {% else %}{% trans "All time allowance." %}{% endif %}</div>
                                         <div class="oh-sticky-table__td">
                                             {{allowance.is_taxable|yes_no}}
                                         </div>
@@ -84,12 +88,15 @@
                                             {{allowance.is_fixed|yes_no}}
                                         </div>
                                         <div class="oh-sticky-table__td">
-                                            {% if allowance.amount %}{{allowance.amount}}{% endif %}
+                                            {% if allowance.rate %}{{allowance.rate}}{% else %}-{% endif %}
+                                        </div>
+                                        <div class="oh-sticky-table__td">
+                                            {% if allowance.amount %}{{allowance.amount}}{% else %}-{% endif %}
                                         </div>
                                         <div class="oh-sticky-table__td">
                                             {% if allowance.get_based_on_display%}
                                                 {{allowance.get_based_on_display}}
-                                            {% endif %}
+                                            {% else %}-{% endif %}
                                         </div>
                                         {% if perms.payroll.change_allowance or perms.payroll.delete_allowance %}
                                             <div class="oh-sticky-table__td oh-sticky-table__right">