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

[UPDT] PAYROLL: Allowance and deduction single view permission

Browse Source
This commit is contained in:
Horilla
2024-01-03 16:19:31 +05:30
parent 1ff9771477
commit 6d4d920dfb
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
payroll/templates/payroll/allowance/view_single_allowance.html
View File

@@ -86,6 +86,7 @@
<span class="oh-timeoff-modal__stat-count">If {{allowance.get_if_choice_display}} {{allowance.get_if_condition_display}} {{allowance.if_amount}}</span>
</div>
</div>
{% if perms.payroll.change_allowance or perms.payroll.delete_allowance %}
<div class="oh-modal__button-container text-center">
<div class="oh-btn-group">
<a href="{% url 'update-allowance' allowance.id %}" class="oh-btn oh-btn--info" style="width: 50%;">
@@ -106,6 +107,7 @@
</a>
</div>
</div>
{% endif %}
</div>

4
payroll/templates/payroll/deduction/view_single_deduction.html
View File

@@ -88,6 +88,7 @@
<span class="oh-timeoff-modal__stat-count">If {{deduction.get_if_choice_display}} {{deduction.get_if_condition_display}} {{deduction.if_amount}}</span>
</div>
</div>
{% if perms.payroll.change_deduction or perms.payroll.delete_deduction %}
<div class="oh-modal__button-container text-center">
<div class="oh-btn-group">
@@ -108,7 +109,8 @@
></ion-icon>{% trans "Delete" %}
</a>
</div>
</div>
</div>
{% endif %}
</div>

35
payroll/views/component_views.py
View File

@@ -239,7 +239,6 @@ def view_allowance(request):
@login_required
@permission_required("payroll.view_allowance")
def view_single_allowance(request, allowance_id):
"""
This method is used render template to view the selected allowance instances
@@ -371,7 +370,6 @@ def view_deduction(request):
@login_required
@permission_required("payroll.view_allowance")
def view_single_deduction(request, deduction_id):
"""
This method is used render template to view all the deduction instances
@@ -750,9 +748,9 @@ def payslip_export(request):
data = str(value) if value is not None else ""
if column_name == "Status":
data = choices_mapping.get(value, "")
if type(value) == date:
user= request.user
user = request.user
employee = user.employee_get
# Taking the company_name of the user
@@ -766,24 +764,24 @@ def payslip_export(request):
# Access the date_format attribute directly
date_format = emp_company.date_format
else:
date_format = 'MMM. D, YYYY'
date_format = "MMM. D, YYYY"
# Define date formats
date_formats = {
'DD-MM-YYYY': '%d-%m-%Y',
'DD.MM.YYYY': '%d.%m.%Y',
'DD/MM/YYYY': '%d/%m/%Y',
'MM/DD/YYYY': '%m/%d/%Y',
'YYYY-MM-DD': '%Y-%m-%d',
'YYYY/MM/DD': '%Y/%m/%d',
'MMMM D, YYYY': '%B %d, %Y',
'DD MMMM, YYYY': '%d %B, %Y',
'MMM. D, YYYY': '%b. %d, %Y',
'D MMM. YYYY': '%d %b. %Y',
'dddd, MMMM D, YYYY': '%A, %B %d, %Y',
"DD-MM-YYYY": "%d-%m-%Y",
"DD.MM.YYYY": "%d.%m.%Y",
"DD/MM/YYYY": "%d/%m/%Y",
"MM/DD/YYYY": "%m/%d/%Y",
"YYYY-MM-DD": "%Y-%m-%d",
"YYYY/MM/DD": "%Y/%m/%d",
"MMMM D, YYYY": "%B %d, %Y",
"DD MMMM, YYYY": "%d %B, %Y",
"MMM. D, YYYY": "%b. %d, %Y",
"D MMM. YYYY": "%d %b. %Y",
"dddd, MMMM D, YYYY": "%A, %B %d, %Y",
}
# Convert the string to a datetime.date object
start_date = datetime.strptime(str(value), '%Y-%m-%d').date()
start_date = datetime.strptime(str(value), "%Y-%m-%d").date()
# Print the formatted date for each format
for format_name, format_string in date_formats.items():
@@ -818,9 +816,6 @@ def hx_create_allowance(request):
return render(request, "payroll/htmx/form.html", {"form": form})
@login_required
@permission_required("payroll.add_payslip")
def send_slip(request):