nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT] EMPLOYEE: Updated the allowance view table in individual view with more details

Browse Source
This commit is contained in:
Horilla
2025-01-14 16:09:03 +05:30
parent 3131204b62
commit 37d0f037fe
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
employee/templates/employee/update_form/bank_info_as_p.html
View File

@@ -60,6 +60,3 @@
{% endif %}
{% endfor %}
</div>

13
employee/templates/tabs/allowance_deduction-tab.html
View File

@@ -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">