administrator
/
odoo18
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: administrator:2587b41e247f3f415549685369e521204ae894ce
Branches Tags
administrator:feature/odoo18
administrator:samashti
administrator:feature/share_module
administrator:master
administrator:develop
administrator:ats_web
...
compare: administrator:9a92ee5181b3f0bbf368d7b2fba9a255b0a8c3f7
Branches Tags
administrator:samashti
administrator:feature/share_module
administrator:master
administrator:develop
administrator:feature/odoo18
administrator:ats_web

50 Commits
2587b41e24 ... 9a92ee5181

Author SHA1 Message Date
administrator 9a92ee5181 ..Merge branch 'develop' 2025-06-10 10:52:46 +05:30
administrator f75ffc63d3 Initial commit 2025-06-10 10:52:30 +05:30
administrator 58b946779f Initial commit 2025-06-10 10:52:30 +05:30
administrator 7f91058abd Initial commit 2025-06-10 10:52:30 +05:30
administrator 7167acc89a Initial commit 2025-06-10 10:52:30 +05:30
administrator 0ba4d18a9c Initial commit 2025-06-10 10:52:30 +05:30
administrator 6ed3352dff Initial commit 2025-06-10 10:52:30 +05:30
administrator 6901d03b71 Initial commit 2025-06-10 10:52:30 +05:30
administrator 18524b4f8c Initial commit 2025-06-10 10:52:30 +05:30
administrator 298eda122e Initial commit 2025-06-10 10:52:30 +05:30
administrator 325a85a52e Initial commit 2025-06-10 10:52:29 +05:30
administrator 562e525e9b Initial commit 2025-06-10 10:52:29 +05:30
administrator 2a5d4aeba7 Initial commit 2025-06-10 10:52:29 +05:30
administrator 9a8250c9a2 Initial commit 2025-06-10 10:52:29 +05:30
administrator 7291a7939c Initial commit 2025-06-10 10:52:29 +05:30
administrator 9467c1b548 Initial commit 2025-06-10 10:52:29 +05:30
administrator ffcfa741f9 Initial commit 2025-06-10 10:52:29 +05:30
administrator f5895b181f Initial commit 2025-06-10 10:52:29 +05:30
administrator 4b0bc7f015 Initial commit 2025-06-10 10:52:29 +05:30
administrator e63513ce6b Initial commit 2025-06-10 10:52:29 +05:30
administrator ff727011f1 Initial commit 2025-06-10 10:52:29 +05:30
administrator ff13f8a66e Initial commit 2025-06-10 10:52:29 +05:30
administrator b9b8ee4b7a pull commit 2025-06-10 10:52:29 +05:30
administrator 9b82c41cbd Initial commit 2025-06-10 10:52:29 +05:30
Pranay 27a58aec8e TimeOff Fix 2025-06-10 10:52:29 +05:30
Pranay 37e1860aa0 time-off FIX 2025-06-10 10:52:29 +05:30
Pranay db7c63ee24 Recruitment Changes 2025-06-10 10:52:29 +05:30
Pranay 4962d0fab3 fix whatsapp 2025-06-10 10:52:29 +05:30
Pranay f3ee87f237 update whatsapp code 2025-06-10 10:52:29 +05:30
administrator 294a373483 Initial commit 2025-06-10 10:52:29 +05:30
administrator c8a4608bfd Initial commit 2025-06-10 10:52:29 +05:30
administrator e925318cb6 Initial commit 2025-06-10 10:52:29 +05:30
administrator ce696fbad2 Initial commit 2025-06-10 10:52:28 +05:30
administrator f66e642583 Initial commit 2025-06-10 10:52:28 +05:30
administrator 3730455260 Initial commit 2025-06-10 10:52:28 +05:30
administrator 9baa0b3ede Initial commit 2025-06-10 10:52:28 +05:30
administrator bfeb6544a6 Initial commit 2025-06-10 10:52:28 +05:30
administrator a288460378 Initial commit 2025-06-10 10:52:28 +05:30
administrator 6b324292eb Initial commit 2025-06-10 10:52:28 +05:30
administrator bd32eb9007 Initial commit 2025-06-10 10:52:28 +05:30
administrator 1e60a546e6 Initial commit 2025-06-10 10:52:28 +05:30
administrator 6675e7fb66 Initial commit 2025-06-10 10:52:28 +05:30
administrator a3436d1554 Initial commit 2025-06-10 10:52:28 +05:30
administrator 30586d0f83 Initial commit 2025-06-10 10:52:28 +05:30
administrator cfa18b6ddc Initial commit 2025-06-10 10:52:28 +05:30
administrator 84b5cdaa34 Initial commit 2025-06-10 10:52:28 +05:30
administrator 49a7099e26 Initial commit 2025-06-10 10:52:28 +05:30
administrator 9ad02e7246 Initial commit 2025-06-10 10:52:28 +05:30
administrator c8f8a49f4c Initial commit 2025-06-10 10:52:28 +05:30
raman b81d17bcc0 changes 2025-06-10 10:50:22 +05:30
2 changed files with 1 additions and 4 deletions
Show Stats Expand all files Collapse all files

3
addons_extensions/hr_emp_dashboard/static/src/js/profile_component.js
View File

@ -309,7 +309,6 @@ attendanceLines.forEach(line => {
const dateStr = createDate.toLocaleDateString('en-IN', { timeZone: 'Asia/Kolkata' }); const dateStr = createDate.toLocaleDateString('en-IN', { timeZone: 'Asia/Kolkata' });
const workedHours = parseFloat(line.worked_hours); const workedHours = parseFloat(line.worked_hours);
const working_hours = ''
const checkIn = new Date(line.check_in + 'Z'); const checkIn = new Date(line.check_in + 'Z');
const checkOut = new Date(line.check_out + 'Z'); const checkOut = new Date(line.check_out + 'Z');
@ -320,7 +319,6 @@ attendanceLines.forEach(line => {
groupedLines[dateStr] = { groupedLines[dateStr] = {
create_date: dateStr, create_date: dateStr,
worked_hours: workedHours, worked_hours: workedHours,
working_hours: `${Math.floor(workedHours)}h ${Math.round((workedHours - Math.floor(workedHours)) * 60)}m`,
check_in: checkInStr, check_in: checkInStr,
check_out: checkOutStr, check_out: checkOutStr,
earliestCheckIn: checkIn, earliestCheckIn: checkIn,
@ -347,7 +345,6 @@ attendanceLines.forEach(line => {
const groupedAttendance = Object.values(groupedLines).map(line => ({ const groupedAttendance = Object.values(groupedLines).map(line => ({
create_date: line.create_date, create_date: line.create_date,
worked_hours: line.worked_hours.toFixed(2), worked_hours: line.worked_hours.toFixed(2),
working_hours :line.working_hours,
check_in: line.check_in, check_in: line.check_in,
check_out: line.check_out check_out: line.check_out
})); }));

2
addons_extensions/hr_emp_dashboard/static/src/xml/employee_profile_template.xml
View File

@ -219,7 +219,7 @@
</td> </td>
<td t-esc="line['check_out']"> <td t-esc="line['check_out']">
</td> </td>
<td t-esc="line['working_hours']"> <td t-esc="line['worked_hours']">
</td> </td>
</tr> </tr>
</tbody> </tbody>