Merge branch 'develop'

addons/web/controllers/webmanifest.py

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

third_party_addons/hr_biometric_attendance/models/biometric_device_details.py

@@ -271,18 +271,17 @@ class BiometricDeviceDetails(models.Model):
                                     ('check_out', '>=', lower_bound),
                                     ('check_out', '<=', upper_bound)
                                 ])
-
-                                if next_in or next_out:
-                                    continue
                                 if get_user_id:
                                     if self.display_name == 'IN' and not check_in_today:
+                                        if next_in:
+                                            continue
                                         hr_attendance.create({
                                             'employee_id':get_user_id.id,
                                             'check_in': atten_time,
                                         })
                                         get_user_id.attendance_state = 'checked_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
                                         check_in_today.write({
                                             'check_out': atten_time,