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

[UPDT] PAYROLL: Updated currency positon in allowance

Browse Source
This commit is contained in:
Horilla
2025-10-06 20:28:39 +05:30
parent 8f661b4de0
commit 069e3bffb0
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
payroll/templates/cbv/allowance_deduction/allowance/custom_amount.html
View File

@@ -1,20 +1,20 @@
{% load i18n %}
{% load i18n horillafilters %}
{% if instance.is_fixed %}
<span class="oh-timeoff-modal__stat-count">{{instance.amount}}</span>
<span class="oh-timeoff-modal__stat-count">{{instance.amount|currency_symbol_position}}</span>
{% else %}
{% if instance.based_on == "basic_pay" %}
<span class="oh-timeoff-modal__stat-count">{{instance.rate}}% of {{instance.get_based_on_display}}</span>
{% endif %}
{% if instance.based_on == "attendance" %}
<span class="oh-timeoff-modal__stat-count">{{instance.per_attendance_fixed_amount}} {{currency}} {% trans "Amount Per Attendance" %}</span>
<span class="oh-timeoff-modal__stat-count">{{instance.per_attendance_fixed_amount|currency_symbol_position}} {% trans "Amount Per Attendance" %}</span>
{% endif %}
{% if instance.based_on == "shift_id" %}
<span class="oh-timeoff-modal__stat-count">{{instance.shift_per_attendance_amount}} {{currency}} {% trans "Amount Per" %} {{instance.shift_id}}</span>
<span class="oh-timeoff-modal__stat-count">{{instance.shift_per_attendance_amount|currency_symbol_position}} {% trans "Amount Per" %} {{instance.shift_id}}</span>
{% endif %}
{% if instance.based_on == "work_type_id" %}
<span class="oh-timeoff-modal__stat-count">{{instance.work_type_per_attendance_amount}} {{currency}} {% trans "Amount Per" %} {{instance.work_type_id}}</span>
<span class="oh-timeoff-modal__stat-count">{{instance.work_type_per_attendance_amount|currency_symbol_position}} {% trans "Amount Per" %} {{instance.work_type_id}}</span>
{% endif %}
{% if instance.based_on == "overtime" %}
<span class="oh-timeoff-modal__stat-count">{{instance.amount_per_one_hr}} {{currency}} {% trans "Amount Per One Hour" %}</span>
<span class="oh-timeoff-modal__stat-count">{{instance.amount_per_one_hr|currency_symbol_position}} {% trans "Amount Per One Hour" %}</span>
{% endif %}
{% endif %}

12
payroll/templates/cbv/allowance_deduction/allowance/max_limit_col.html
View File

@@ -1,6 +1,12 @@
{% load i18n %}
{% load i18n horillafilters %}
{% if instance.has_max_limit %}
<span class="oh-timeoff-modal__stat-count">{{instance.maximum_amount}} {{currency}} {% if instance.based_on == "basic_pay" %}{% trans "For working days on a month" %}{% endif %}</span>
<span class="oh-timeoff-modal__stat-count"
>{{instance.maximum_amount|currency_symbol_position}}
{% if instance.based_on == "basic_pay" %}
{% trans "For working days on a month"%}
{% endif %}
</span>
{% else %}
<span class="oh-timeoff-modal__stat-count">{% trans "No" %}</span>
<span class="oh-timeoff-modal__stat-count">{% trans "No" %}</span>
{% endif %}