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

Merge branch 'develop'

This commit is contained in:
administrator 2025-01-30 10:06:02 +05:30
parent 0f071e6dda aa9f2aa12d
commit cd075e628e
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,10 +146,10 @@ export class NetflixProfileContainer extends Component {
attendanceLines.forEach(line => { attendanceLines.forEach(line => {
let createDate = new Date(line.create_date); let createDate = new Date(line.create_date);
line.create_date = createDate.toISOString().split('T')[0]; // Format as 'YYYY-MM-DD' line.create_date = createDate.toISOString().split('T')[0]; // Format as 'YYYY-MM-DD'
let checkIn = new Date(line.check_in); let checkIn = new Date(line.check_in + 'Z');
line.check_in = checkIn.toTimeString().slice(0, 5); // Format as 'HH:MM' line.check_in = checkIn.toLocaleTimeString([], {hour: '2-digit', minute: '2-digit', timeZone:'Asia/Kolkata'}); // Format as 'HH:MM'
let checkOut = new Date(line.check_out); let checkOut = new Date(line.check_out + 'Z');
line.check_out = checkOut.toTimeString().slice(0, 5); // Format as 'HH:MM' line.check_out = checkOut.toLocaleTimeString([], {hour: '2-digit', minute: '2-digit', timeZone:'Asia/Kolkata'}); // Format as 'HH:MM'
line.worked_hours = line.worked_hours.toFixed(2); line.worked_hours = line.worked_hours.toFixed(2);
}); });
this.state.attendance_lines = attendanceLines, this.state.attendance_lines = attendanceLines,

16
addons_extensions/hr_timeoff_extended/views/hr_timeoff.xml
View File

@ -241,22 +241,26 @@
</xpath> </xpath>
<xpath expr="//group[@name='milestone']" position="replace"> <xpath expr="//group[@name='milestone']" position="replace">
<group name="milestone"> <group name="milestone">
<div class="o_td_label">
<label for="experience_required" string="Experience Required"/>
</div>
<div> <div>
<field name="experience_required"/> <field name="experience_required"/>
</div> </div>
<div class="o_td_label" invisible="!experience_required">
<div class="o_td_label" invisible="not experience_required">
<label for="start_count" string="Employee total Experience"/> <label for="start_count" string="Employee total Experience"/>
</div> </div>
<div invisible="!experience_required">Min <div invisible="not experience_required">Min
<field name="start_count" style="width: 2rem" invisible="!experience_required" <field name="start_count" style="width: 2rem" invisible="not experience_required"
required="experience_required and (max_start_count > 0 or max_start_type != False)"/> required="experience_required and (max_start_count > 0 or max_start_type != False)"/>
<field name="start_type" style="width: 4.75rem" invisible="!experience_required" <field name="start_type" style="width: 4.75rem" invisible="not experience_required"
required="experience_required and (max_start_count > 0 or max_start_type != False)"/> required="experience_required and (max_start_count > 0 or max_start_type != False)"/>
&amp; &amp;
Max of Max of
<field name="max_start_count" style="width: 2rem" invisible="!experience_required" <field name="max_start_count" style="width: 2rem" invisible="not experience_required"
required="experience_required and (start_count > 0 or start_type != False)"/> required="experience_required and (start_count > 0 or start_type != False)"/>
<field name="max_start_type" style="width: 4.75rem" invisible="!experience_required" <field name="max_start_type" style="width: 4.75rem" invisible="not experience_required"
required="experience_required and (start_count > 0 or start_type != False)"/> required="experience_required and (start_count > 0 or start_type != False)"/>
Experience is required Experience is required