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 %} - - - 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 @@ - +
{% trans "Date" %}
{% trans "Is Taxable" %}
{% trans "Is Condition Based" %}
{% trans "Is Fixed" %}
+
{% trans "Rate" %}
{% trans "Amount" %}
{% trans "Based On" %}
{% if perms.payroll.change_allowance or perms.payroll.delete_allowance %} @@ -74,6 +75,9 @@ hx-target="#objectDetailsModalTarget">
{{allowance.title}}
+
+ {% if allowance.one_time_date %}{% trans "On" %} {{allowance.one_time_date}} + {% else %}{% trans "All time allowance." %}{% endif %}
{{allowance.is_taxable|yes_no}}
@@ -84,12 +88,15 @@ {{allowance.is_fixed|yes_no}}
- {% if allowance.amount %}{{allowance.amount}}{% endif %} + {% if allowance.rate %}{{allowance.rate}}{% else %}-{% endif %} +
+
+ {% if allowance.amount %}{{allowance.amount}}{% else %}-{% endif %}
{% if allowance.get_based_on_display%} {{allowance.get_based_on_display}} - {% endif %} + {% else %}-{% endif %}
{% if perms.payroll.change_allowance or perms.payroll.delete_allowance %}