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-02-21 15:20:47 +05:30
parent 506d9e82aa 8cd88a5d43
commit 0bc54d0d13
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/controllers/webmanifest.py
View File

@ -47,13 +47,13 @@ class WebManifest(http.Controller):
'scope': '/odoo', 'scope': '/odoo',
'start_url': '/odoo', 'start_url': '/odoo',
'display': 'standalone', 'display': 'standalone',
'background_color': '#714B67', 'background_color': '#017e84',
'theme_color': '#714B67', 'theme_color': '#017e84',
'prefer_related_applications': False, 'prefer_related_applications': False,
} }
icon_sizes = ['192x192', '512x512'] icon_sizes = ['192x192', '512x512']
manifest['icons'] = [{ manifest['icons'] = [{
'src': '/web/static/img/odoo-icon-%s.png' % size, 'src': '/web/static/img/ftp.png',
'sizes': size, 'sizes': size,
'type': 'image/png', 'type': 'image/png',
} for size in icon_sizes] } for size in icon_sizes]

BIN
addons/web/static/img/ftp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 355 KiB

7
third_party_addons/hr_biometric_attendance/models/biometric_device_details.py
View File

@ -271,18 +271,17 @@ class BiometricDeviceDetails(models.Model):
('check_out', '>=', lower_bound), ('check_out', '>=', lower_bound),
('check_out', '<=', upper_bound) ('check_out', '<=', upper_bound)
]) ])
if next_in or next_out:
continue
if get_user_id: if get_user_id:
if self.display_name == 'IN' and not check_in_today: if self.display_name == 'IN' and not check_in_today:
if next_in:
continue
hr_attendance.create({ hr_attendance.create({
'employee_id':get_user_id.id, 'employee_id':get_user_id.id,
'check_in': atten_time, 'check_in': atten_time,
}) })
get_user_id.attendance_state = 'checked_in' get_user_id.attendance_state = 'checked_in'
elif check_in_today and self.display_name != 'IN': elif check_in_today and self.display_name != 'IN':
if fields.Datetime.to_string(check_in_today.check_in) > atten_time: if fields.Datetime.to_string(check_in_today.check_in) > atten_time or next_out:
continue continue
check_in_today.write({ check_in_today.write({
'check_out': atten_time, 'check_out': atten_time,