Merge pull request #4739 from expsa/kch_dev_odex25_hr
Leave Balance Report Notes
This commit is contained in:
commit
5994b5ca9e
|
|
@ -128,7 +128,7 @@ class EmployeeLeaveBalanceReport(models.AbstractModel):
|
|||
holidays = self.env['hr.holidays'].sudo().search(value)
|
||||
holidays = holidays.sorted(key=lambda r: r.holiday_status_id.id)
|
||||
labels = [
|
||||
(_('#')), (_('Employee NO')), (_('Employee Name')), (_('Join Date')), (_('Type Of Leave')),
|
||||
(_('#')), (_('Employee NO')), (_('Employee Name')), (_('Type Of Leave')),
|
||||
(_('Department')),
|
||||
(_('Deducted Leave Balance')), (_('Leave Balance')), (_('Overall Leave Balance'))]
|
||||
return [labels, holidays]
|
||||
|
|
@ -154,17 +154,17 @@ class EmployeeLeaveBalanceReportXlsx(models.AbstractModel):
|
|||
if self.env.user.lang != 'en_US':
|
||||
sheet.right_to_left()
|
||||
format0 = workbook.add_format(
|
||||
{'bottom': True, 'bg_color': '#263f79', 'right': True, 'left': True, 'top': True, 'align': 'center'})
|
||||
{'bottom': True, 'bg_color': '#b9d7d4', 'right': True, 'left': True, 'top': True, 'align': 'center'})
|
||||
format1 = workbook.add_format({'bottom': True, 'right': True, 'left': True, 'top': True, 'align': 'center'})
|
||||
format2 = workbook.add_format(
|
||||
{'font_size': 14, 'bottom': True, 'right': True, 'left': True, 'top': True, 'align': 'center',
|
||||
{'font_size': 14, 'align': 'center',
|
||||
'bold': True, 'bg_color': '#ffffff', 'font_color': 'black'})
|
||||
format2.set_align('center')
|
||||
sheet.merge_range('A9:L9', (_("Leave Balance Report")) + " ", format2)
|
||||
sheet.merge_range('G9:I9', (_("Leave Balance Report")) + " ", format2)
|
||||
sheet.set_column('B:D', 15)
|
||||
sheet.set_column('E:I', 10)
|
||||
row = 9
|
||||
clm = 0
|
||||
clm = 3
|
||||
for res in docs[0]:
|
||||
sheet.write(row, clm, res, format0)
|
||||
clm += 1
|
||||
|
|
@ -173,14 +173,13 @@ class EmployeeLeaveBalanceReportXlsx(models.AbstractModel):
|
|||
for doc in docs[1]:
|
||||
for rec in doc:
|
||||
seq += 1
|
||||
clm = 0
|
||||
clm = 3
|
||||
sheet.write(row, clm, seq, format1)
|
||||
sheet.write(row, clm + 1, rec.employee_id.emp_no, format1)
|
||||
sheet.write(row, clm + 2, rec.employee_id.name, format1)
|
||||
sheet.write(row, clm + 3, rec.employee_id.joining_date, format1)
|
||||
sheet.write(row, clm + 4, rec.holiday_status_id.name, format1)
|
||||
sheet.write(row, clm + 5, rec.employee_id.department_id.name, format1)
|
||||
sheet.write(row, clm + 6, round(rec.leaves_taken, 2), format1)
|
||||
sheet.write(row, clm + 7, round(rec.remaining_leaves, 2), format1)
|
||||
sheet.write(row, clm + 8, round(rec.remaining_leaves + rec.leaves_taken, 2), format1)
|
||||
sheet.write(row, clm + 3, rec.holiday_status_id.name, format1)
|
||||
sheet.write(row, clm + 4, rec.employee_id.department_id.name, format1)
|
||||
sheet.write(row, clm + 5, round(rec.leaves_taken, 2), format1)
|
||||
sheet.write(row, clm + 6, round(rec.remaining_leaves, 2), format1)
|
||||
sheet.write(row, clm + 7, round(rec.remaining_leaves + rec.leaves_taken, 2), format1)
|
||||
row += 1
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@
|
|||
<!-- Leave Balance-->
|
||||
<template id="public_leave_balance_report">
|
||||
<t t-call="web.html_container">
|
||||
<t t-call="hr_base.hr_layout">
|
||||
<t t-call="web.external_layout">
|
||||
<style>
|
||||
@font-face {font-family: "Sakkal Majalla"; src:
|
||||
url("/employee_requests/static/fonts/ce7b5754581057e6f7444e2192850cc8.eot"); src:
|
||||
|
|
@ -108,15 +108,16 @@
|
|||
}
|
||||
</style>
|
||||
<div class="page" style="font-family:'Sakkal Majalla'!important;direction:rtl;font-size:15pt">
|
||||
<table class="table table-condensed table-bordered">
|
||||
<thead class="text-center">
|
||||
<tr style="width:100%;">
|
||||
<th colspan="9" class="text-center" style="font-size:20px">Employee Leave Balance Report
|
||||
</th>
|
||||
</tr>
|
||||
<tr style="background-color: #263f79;width:100%;">
|
||||
<center>
|
||||
<h2 style="font-weight:bold">
|
||||
Employee Leave Balance Report
|
||||
</h2>
|
||||
</center>
|
||||
<table class="table table-condensed table-bordered" style="width:100%;">
|
||||
<thead style="width:100%;">
|
||||
<tr style="width:100%;text-align:center; background-color: #b9d7d4;">
|
||||
<t t-foreach="docs[0]" t-as="doc">
|
||||
<th style="text-align:center;color:#FFFFFF">
|
||||
<th style="text-align:center;">
|
||||
<t t-esc="doc"/>
|
||||
</th>
|
||||
</t>
|
||||
|
|
@ -136,9 +137,6 @@
|
|||
<td>
|
||||
<t t-esc="o.employee_id.name"/>
|
||||
</td>
|
||||
<td>
|
||||
<t t-esc="o.employee_id.first_hiring_date"/>
|
||||
</td>
|
||||
<td>
|
||||
<t t-esc="o.holiday_status_id.name"/>
|
||||
</td>
|
||||
|
|
|
|||
Loading…
Reference in New Issue