..Merge branch 'develop'

addons_extensions/hr_emp_dashboard/static/src/js/profile_component.js

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

addons_extensions/hr_emp_dashboard/static/src/xml/employee_profile_template.xml

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