From fad9d12f44e4d18f6fd92949905f6e9f733ee66b Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Mon, 28 Apr 2025 00:39:52 +0100
Subject: [PATCH 01/10] [FIX] hr_holidays_public

---
 odex25_hr/hr_holidays_public/models/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_hr/hr_holidays_public/models/hr_holidays.py b/odex25_hr/hr_holidays_public/models/hr_holidays.py
index 37d41404a..4b83ac749 100644
--- a/odex25_hr/hr_holidays_public/models/hr_holidays.py
+++ b/odex25_hr/hr_holidays_public/models/hr_holidays.py
@@ -2006,7 +2006,7 @@ class holidaysAttach(models.Model):
             records.check_access_rule(mode)
 
         if require_employee:
-            if not (self.env.user._is_admin() or self.env.user.has_group('base.group_user')):
+            if not (self.env.user._is_admin() or self.env.user.has_group('base.group_user') or self._context.get('bypass_check_public_holidays', False)):
                 raise AccessError(_("Sorry, you are not allowed to access this document."))
     
     # @api.model

From e7a08530448863088d108f4fedb94112a5686d27 Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Tue, 29 Apr 2025 10:51:57 +0200
Subject: [PATCH 02/10] fixing prod error

---
 odex25_hr/attendances/models/hr_attendance_report.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/odex25_hr/attendances/models/hr_attendance_report.py b/odex25_hr/attendances/models/hr_attendance_report.py
index 7a7419914..2f1bd1b2e 100644
--- a/odex25_hr/attendances/models/hr_attendance_report.py
+++ b/odex25_hr/attendances/models/hr_attendance_report.py
@@ -127,8 +127,7 @@ class HrAttendanceReport(models.Model):
                 no_of_days = len(set(flexible_trans.mapped('date')))
                 flexible_days = emp_calendar.number_of_flexi_days
                 if no_of_days >= flexible_days:
-                    ord_trans_dates = sorted(set(flexible_trans.mapped('date')),
-                                             key=lambda x: datetime.strptime(x, DATE_FORMAT))
+                    ord_trans_dates = sorted(set(flexible_trans.mapped('date')))
                     index = len(ord_trans_dates) > flexible_days and flexible_days - 1 or len(ord_trans_dates) - 1
                     df = fields.Date.from_string(self.date_from)
                     while no_of_days >= flexible_days:

From 4818f7e553860bc3c369efa9c9cd1c665fde0bcb Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Tue, 29 Apr 2025 14:20:14 +0200
Subject: [PATCH 03/10] fix attendence

---
 odex25_hr/attendances/models/hr_attendance_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_hr/attendances/models/hr_attendance_report.py b/odex25_hr/attendances/models/hr_attendance_report.py
index 2f1bd1b2e..78bebd89f 100644
--- a/odex25_hr/attendances/models/hr_attendance_report.py
+++ b/odex25_hr/attendances/models/hr_attendance_report.py
@@ -132,7 +132,7 @@ class HrAttendanceReport(models.Model):
                     df = fields.Date.from_string(self.date_from)
                     while no_of_days >= flexible_days:
                         dt = ord_trans_dates[index]
-                        current_trans = attendance_transaction.filtered(lambda t: str(df) <= t.date <= str(dt))
+                        current_trans = attendance_transaction.filtered(lambda t: df <= t.date <= dt)
                         hours_dict = self.calcualte_flexible_transaction(current_trans)
                         total_mission += hours_dict['mission_by_days']
                         missed_hours += hours_dict['missed_hours']

From 0b0de1f3d961e78a7eb917053a5e9565510eaec0 Mon Sep 17 00:00:00 2001
From: Mostafa <m.dev.odoo@gmail.com>
Date: Tue, 29 Apr 2025 19:10:09 -0700
Subject: [PATCH 04/10] new report for employee attendance

---
 odex25_hr/attendances/i18n/ar_001.po          | 980 +++++++++++-------
 .../employee_attendances_report_template.xml  |  80 +-
 .../wizard/attendances_report_view.xml        |   4 +-
 .../wizard/attendances_report_wiz.py          | 286 +++--
 odex25_hr/to_attendance_system/.DS_Store      | Bin 0 -> 6148 bytes
 5 files changed, 890 insertions(+), 460 deletions(-)
 create mode 100644 odex25_hr/to_attendance_system/.DS_Store

diff --git a/odex25_hr/attendances/i18n/ar_001.po b/odex25_hr/attendances/i18n/ar_001.po
index 7dabbd6f1..27b66c850 100644
--- a/odex25_hr/attendances/i18n/ar_001.po
+++ b/odex25_hr/attendances/i18n/ar_001.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-22 11:08+0000\n"
-"PO-Revision-Date: 2022-11-22 11:08+0000\n"
+"POT-Creation-Date: 2025-04-30 02:08+0000\n"
+"PO-Revision-Date: 2025-04-30 02:08+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,85 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: attendances
+#: model:mail.template,body_html:attendances.attendance_notification_email_template
+msgid ""
+"\n"
+"                \n"
+"        <p>Dear ${object.employee_id.name},</p>\n"
+"        <p>We would like to inform you of the following attendance details:</p>\n"
+"        <table border=\"1\" style=\"width:100%; border-collapse: collapse;\">\n"
+"            <tr>\n"
+"                <th>Date</th>\n"
+"                <th>Day</th>\n"
+"                <th>Lateness</th>\n"
+"                <th>Early Exit</th>\n"
+"                <th>Note</th>\n"
+"            </tr>\n"
+"            <tr>\n"
+"                <td>${object.date.strftime('%Y-%m-%d')}</td>\n"
+"                <td>${object.date.strftime('%A')}</td>\n"
+"                <td>${ '%02d:%02d' % (((object.lateness or 0.0)), (((object.lateness or 0.0) * 60) % 60))}</td>\n"
+"                <td>${ '%02d:%02d' % ((object.early_exit or 0.0), (((object.early_exit or 0.0) * 60) % 60))}</td>>\n"
+"\n"
+"\n"
+"                <td>${'Missed Punch' if (object.sign_out == 0 and object.sign_in != 0)or(object.sign_out != 0 and object.sign_in == 0)} ${ 'Absent' if object.is_absent else 'Present'}\n"
+"                </td>\n"
+"            </tr>\n"
+"        </table>\n"
+"        <p>Please adhere to work timings. Thank you for your understanding.</p>\n"
+"        \n"
+"            "
+msgstr ""
+"                \n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\">Dear ${object.employee_id.name},</p>\n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\">We would like to inform you of the following attendance details:</p>\n"
+"        &gt;\n"
+"\n"
+"\n"
+"                <table border=\"1\" style=\"border-collapse:collapse;font-family:bukra, serif;width:100%; border-collapse: collapse;\">\n"
+"            <tbody style=\"font-family:bukra, serif;\"><tr style=\"font-family:bukra, serif;\">\n"
+"                <th style=\"font-family:bukra, serif;text-align:right;\">Date</th>\n"
+"                <th style=\"font-family:bukra, serif;text-align:right;\">Day</th>\n"
+"                <th style=\"font-family:bukra, serif;text-align:right;\">Lateness</th>\n"
+"                <th style=\"font-family:bukra, serif;text-align:right;\">Early Exit</th>\n"
+"                <th style=\"font-family:bukra, serif;text-align:right;\">Note</th>\n"
+"            </tr>\n"
+"            <tr style=\"font-family:bukra, serif;\">\n"
+"                <td style=\"font-family:bukra, serif;\">${object.date.strftime('%Y-%m-%d')}</td>\n"
+"                <td style=\"font-family:bukra, serif;\">${object.date.strftime('%A')}</td>\n"
+"                <td style=\"font-family:bukra, serif;\">${ '%02d:%02d' % (((object.lateness or 0.0)), (((object.lateness or 0.0) * 60) % 60))}</td>\n"
+"                <td style=\"font-family:bukra, serif;\">${ '%02d:%02d' % ((object.early_exit or 0.0), (((object.early_exit or 0.0) * 60) % 60))}</td><td style=\"font-family:bukra, serif;\">${'Missed Punch' if (object.sign_out == 0 and object.sign_in != 0)or(object.sign_out != 0 and object.sign_in == 0)} ${ 'Absent' if object.is_absent else 'Present'}\n"
+"                </td>\n"
+"            </tr>\n"
+"        </tbody></table>\n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\">Please adhere to work timings. Thank you for your understanding.</p>\n"
+"        \n"
+"            "
+
+#. module: attendances
+#: model:mail.template,body_html:attendances.attendance_notification_today_sign_in
+msgid ""
+"\n"
+"        <p>Dear ${object.employee_id.name},</p>\n"
+"        </p>\n"
+"        <p>We will Notify You Today You Do Not Have a Sign In On Time</p>\n"
+"        </p>\n"
+"        <p>Regards,</p>\n"
+"\n"
+"            "
+msgstr ""
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\"> ${object.employee_id.name},</p>\n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\"></p>\n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\">افتقدنا وجودك بالمكتب هذا الصباح، ودعواتنا أن تكون بخير وبأفضل حال. في حال كان لديك أي ظرف حال دون حضورك،</p>\n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\"></p>\n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\">ونرجو منك التكرم بتقديم ذلك من خلال النظام</p>\n"
+"\n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\">وتقبلوا أجمل تحياتنا،</p>\n"
+"        <p style=\"margin:0px;font-size:13px;font-family:bukra, serif;\">الموارد البشرية</p>\n"
+"\n"
+"            "
+
 #. module: attendances
 #: model:ir.ui.menu,name:attendances.hr_attendance_register_menu_item
 msgid " Attendance Registration"
@@ -27,34 +106,9 @@ msgid " Sign In"
 msgstr "تسجيل دخول"
 
 #. module: attendances
-#: code:addons/attendances/wizard/attendances_report_wiz.py:0
-#, python-format
-msgid "Office Hours"
-msgstr "ساعات العمل"
-
-#. module: attendances
-#: code:addons/attendances/wizard/attendances_report_wiz.py:0
-#, python-format
-msgid "Extra hours"
-msgstr "الاضافى"
-
-#. module: attendances
-#: code:addons/attendances/wizard/attendances_report_wiz.py:0
-#, python-format
-msgid "Total Extra"
-msgstr "اجمالى الاضافى"
-
-#. module: attendances
-#: code:addons/attendances/wizard/attendances_report_wiz.py:0
-#, python-format
-msgid "Total Leave"
-msgstr "اجمالى الاجازات"
-
-#. module: attendances
-#: code:addons/attendances/wizard/attendances_report_wiz.py:0
-#, python-format
-msgid "job "
-msgstr "المسمى الوظيفى"
+#: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_register__action_type__sign_out
+msgid " الإنصراف"
+msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.view_employee_attendance_form_inherit
@@ -64,11 +118,17 @@ msgstr "<span class=\"o_stat_text\">الحضور</span>"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__is_absent
 #: model:ir.model.fields.selection,name:attendances.selection__employee_attendance_report__type__absent
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_icon_display__presence_absent
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_icon_display__presence_absent
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_icon_display__presence_absent
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
+#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
 msgid "Absent"
 msgstr "غياب"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__absent
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
 msgid "Absent Hours"
 msgstr "ساعات الغياب"
 
@@ -83,6 +143,11 @@ msgstr "إستثناء ساعات الغياب"
 msgid "Absent Report"
 msgstr ""
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
+msgid "Account Overtime"
+msgstr "حساب الصرف"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_attendance_attendance__action
 #: model:ir.model.fields.selection,name:attendances.selection__attendance_attendance__action__action
@@ -97,6 +162,7 @@ msgstr "تاريخ الاجراء"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_needaction
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_needaction
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_needaction
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_needaction
 msgid "Action Needed"
 msgstr ""
@@ -121,6 +187,7 @@ msgstr "نشط"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_ids
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_ids
 msgid "Activities"
 msgstr ""
@@ -128,6 +195,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_exception_decoration
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_exception_decoration
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_exception_decoration
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_exception_decoration
 msgid "Activity Exception Decoration"
 msgstr ""
@@ -135,6 +203,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_state
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_state
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_state
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_state
 msgid "Activity State"
 msgstr ""
@@ -142,6 +211,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_type_icon
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_type_icon
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_type_icon
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_type_icon
 msgid "Activity Type Icon"
 msgstr ""
@@ -149,6 +219,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__additional_hours
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__additional_hours
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
 msgid "Additional Hours"
 msgstr "ساعات إضافية"
 
@@ -158,11 +229,25 @@ msgstr "ساعات إضافية"
 msgid "All Employee - Details"
 msgstr ""
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__all_employees
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
+msgid "All Employees"
+msgstr "لكل الموظفين"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__amount_per_hour
 msgid "Amount Per Hour"
 msgstr "مبلغ الساعة"
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__from_hr_depart
+#: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__from_hr_depart
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
+msgid "Another Employee"
+msgstr "من موظف آخر"
+
 #. module: attendances
 #: model:ir.actions.act_window,name:attendances.hr_lateness_absence_overtime_action
 msgid "Approval Of Attendance"
@@ -200,6 +285,7 @@ msgstr "هل أنت متأكد من إرجاع السجل لحالة المسو
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_attachment_count
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_attachment_count
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_attachment_count
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_attachment_count
 msgid "Attachment Count"
 msgstr ""
@@ -215,11 +301,31 @@ msgstr "اعداد جدول الحضور"
 msgid "Attendance Date"
 msgstr "تاريخ الحضور"
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
+msgid "Attendance Date From"
+msgstr "تاريخ الحضور من"
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
+msgid "Attendance Date To"
+msgstr "تاريخ الحضور إلى"
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.view_employee_attendance_form_inherit
 msgid "Attendance Green"
 msgstr ""
 
+#. module: attendances
+#: model:mail.template,subject:attendances.attendance_notification_today_sign_in
+msgid "Attendance No Sign In On time"
+msgstr ""
+
+#. module: attendances
+#: model:mail.template,subject:attendances.attendance_notification_email_template
+msgid "Attendance Notification Report"
+msgstr "تقرير الحضور"
+
 #. module: attendances
 #: model:ir.actions.act_window,name:attendances.attendance_action_reason_action
 #: model:ir.ui.menu,name:attendances.attendance_action_reason_menu_item
@@ -234,17 +340,25 @@ msgstr ""
 
 #. module: attendances
 #: model:ir.actions.act_window,name:attendances.hr_attendance_register_action
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_tree_view
 msgid "Attendance Register"
 msgstr "طلبات الحضور والانصراف"
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_resource_calendar__register_before
+msgid "Attendance Register Before"
+msgstr "تسجيل الحضور قبل"
+
 #. module: attendances
 #: model:ir.actions.report,name:attendances.general_attendance_action_report
 msgid "Attendance Report"
 msgstr "تقرير الحضور"
 
 #. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #: model:ir.ui.menu,name:attendances.attendance_report_emp_menu
 #: model:ir.ui.menu,name:attendances.parent_attendance_report_employee
+#, python-format
 msgid "Attendance Reports"
 msgstr " تقرير الحضور و الانصراف للموظفين"
 
@@ -253,6 +367,19 @@ msgstr " تقرير الحضور و الانصراف للموظفين"
 msgid "Attendance Search"
 msgstr "بحث الحضور"
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_employee__hr_presence_state
+#: model:ir.model.fields,field_description:attendances.field_hr_employee_base__hr_presence_state
+#: model:ir.model.fields,field_description:attendances.field_hr_employee_public__hr_presence_state
+msgid "Attendance State"
+msgstr "حالة الحضور"
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
+#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
+msgid "Attendance Today"
+msgstr "حضور اليوم"
+
 #. module: attendances
 #: model:ir.actions.server,name:attendances.hr_attendance_transaction_create_ir_actions_server
 #: model:ir.cron,cron_name:attendances.hr_attendance_transaction_create
@@ -287,6 +414,32 @@ msgstr "ساعات الحضور"
 msgid "Attending Type"
 msgstr "نوع الحضور"
 
+#. module: attendances
+#: model:ir.model,name:attendances.model_hr_employee_base
+msgid "Basic Employee"
+msgstr "الموظف الأساسي"
+
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__days_off__shift__both
+msgid "Both"
+msgstr "الشفتين معا"
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_filter
+#: model_terms:ir.ui.view,arch_db:attendances.hr_reasons_lateness_filter
+#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
+msgid "Branch"
+msgstr "الفروع"
+
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_attendance_attendance__is_branch
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__is_branch
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__is_branch
+#: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__is_branch
+msgid "Branch Name"
+msgstr ""
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__break_duration
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__break_duration
@@ -316,6 +469,15 @@ msgstr "إلغاء"
 msgid "Carried Hours"
 msgstr "ساعات مرحلة"
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_attendance_attendance__company_id
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__company_id
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__company_id
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__company_id
+#: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__company_id
+msgid "Company"
+msgstr "الشركة"
+
 #. module: attendances
 #: model:ir.ui.menu,name:attendances.menu_hr_attendance_configurations
 msgid "Configuration"
@@ -421,6 +583,16 @@ msgstr "تاريخ الخصم من"
 msgid "Deduct Date To"
 msgstr "تاريخ الخصم إلى"
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
+msgid "Deduction Date From"
+msgstr "تاريخ الخصم من"
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
+msgid "Deduction Date To"
+msgstr "تاريخ الخصم إلى"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__advantage_id
 msgid "Deduction Employee"
@@ -433,26 +605,41 @@ msgstr "قاعدة الخصم"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__delay
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
 msgid "Delay"
 msgstr "التاخيرات"
 
 #. module: attendances
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #: model:ir.model.fields,field_description:attendances.field_attendance_attendance__department_id
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__department_id
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__department_id
-#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_filter
-#: model_terms:ir.ui.view,arch_db:attendances.hr_reasons_lateness_filter
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_custom_form
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_custom_tree
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_filter
 #: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
 #, python-format
 msgid "Department"
 msgstr "الهيكل الإداري"
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__department_id
+#: model_terms:ir.ui.view,arch_db:attendances.attendance_transaction_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_transactions_form_view
+msgid "Department Name"
+msgstr "إسم القسم"
+
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__department_ids
+msgid "Departments"
+msgstr "الأقسام"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__name
 msgid "Description"
@@ -478,11 +665,9 @@ msgstr "المدير المباشر"
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__display_name
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__display_name
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_wizard__display_name
-#: model:ir.model.fields,field_description:attendances.field_hr_employee__display_name
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__display_name
 #: model:ir.model.fields,field_description:attendances.field_report_attendances_general_attendance_xls__display_name
 #: model:ir.model.fields,field_description:attendances.field_report_attendances_general_attendances_report_temp__display_name
-#: model:ir.model.fields,field_description:attendances.field_resource_calendar__display_name
 msgid "Display Name"
 msgstr "الاسم المعروض"
 
@@ -493,17 +678,23 @@ msgstr "الاسم المعروض"
 #: code:addons/attendances/models/hr_reasons_lateness.py:0
 #, python-format
 msgid "Draft"
-msgstr "مسوده"
+msgstr ""
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__dummy_field
 msgid "Dummy Field"
 msgstr ""
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
+msgid "Early Exist"
+msgstr ""
+
 #. module: attendances
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__early_exit
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_transaction_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_transactions_form_view
 #, python-format
 msgid "Early Exit"
 msgstr "خروج مبكر"
@@ -523,11 +714,12 @@ msgstr ""
 #: model:ir.model.fields.selection,name:attendances.selection__employee_attendance_report__type__employee
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
 #: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
-#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
 #: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_filter
-#: model_terms:ir.ui.view,arch_db:attendances.hr_reasons_lateness_filter
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
 #: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_reasons_lateness_filter
+#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
 msgid "Employee"
 msgstr "الموظف"
 
@@ -556,10 +748,26 @@ msgstr ""
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__employee_name
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__employee_id
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_transaction_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
 #, python-format
 msgid "Employee Name"
 msgstr "إسم الموظف"
 
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#: model:ir.model.fields,field_description:attendances.field_attendance_attendance__employee_number
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__employee_no
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__employee_number
+#: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__employee_no
+#: model_terms:ir.ui.view,arch_db:attendances.attendance_transaction_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
+#, python-format
+msgid "Employee Number"
+msgstr "رقم الموظف"
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_custom_form
 msgid "Employee attendances"
@@ -572,8 +780,10 @@ msgstr "سجل دوام الموظف"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_employee_attendance_report__employee_ids
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__employee_ids
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__employee_ids
 #: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_report_wizard_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
 #: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
 msgid "Employees"
 msgstr "الموظفون"
@@ -601,9 +811,16 @@ msgstr "خروج مبكر"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__extra_break_duration
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
 msgid "Extra Break Duration"
 msgstr "مدة الاستراحة الإضافية"
 
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#, python-format
+msgid "Extra hours"
+msgstr "الاضافى"
+
 #. module: attendances
 #: model:ir.model.fields.selection,name:attendances.selection__attendance_attendance__action_type__finger_print
 #: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_wizard__get_attendance_from__finger_print
@@ -621,11 +838,6 @@ msgstr "رقم  البصمة"
 msgid "First Shift"
 msgstr "الشفت الاول"
 
-#. module: attendances
-#: model:ir.model.fields.selection,name:attendances.selection__days_off__shift__both
-msgid "Both"
-msgstr "الشفتين معا"
-
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__number_of_flexi_days
 msgid "Flexible Days"
@@ -634,6 +846,7 @@ msgstr "أيام مرنة"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_follower_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_follower_ids
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_follower_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_follower_ids
 msgid "Followers"
 msgstr ""
@@ -641,6 +854,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_channel_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_channel_ids
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_channel_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_channel_ids
 msgid "Followers (Channels)"
 msgstr ""
@@ -648,6 +862,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_partner_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_partner_ids
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_partner_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_partner_ids
 msgid "Followers (Partners)"
 msgstr ""
@@ -655,6 +870,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__activity_type_icon
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__activity_type_icon
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__activity_type_icon
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__activity_type_icon
 msgid "Font awesome icon e.g. fa-tasks"
 msgstr ""
@@ -682,31 +898,13 @@ msgstr "صباح الجمعة"
 msgid "From Date"
 msgstr "من تاريخ"
 
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__from_hr_depart
-#: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__from_hr_depart
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
-msgid "Another Employee"
-msgstr "من موظف آخر"
-
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__all_employees
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
-msgid "All Employees"
-msgstr "لكل الموظفين"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
-msgid "Employees"
-msgstr "الموظفين"
-
 #. module: attendances
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #, python-format
 msgid "From date"
-msgstr "من تاريخ"
+msgstr ""
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__full_day_off
@@ -742,7 +940,9 @@ msgstr "معالجة الحضور والانصراف"
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_filter
 #: model_terms:ir.ui.view,arch_db:attendances.hr_reasons_lateness_filter
+#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
 msgid "Group By"
 msgstr "تجميع حسب"
 
@@ -762,20 +962,28 @@ msgstr "مدير الموارد البشرية"
 msgid "HR Manager Approval"
 msgstr "تصديق الموارد البشرية"
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__has_sign_in
+msgid "Has Sign In"
+msgstr ""
+
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__has_sign_out
+msgid "Has Sign Out"
+msgstr ""
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__leave
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
 msgid "Holiday Hours"
 msgstr "عدد ساعات الإجازة"
 
 #. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Hours Per Day"
-msgstr "عدد ساعات اليوم"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Hours Per Month"
-msgstr "عدد ساعات الشهر"
+#: model:ir.model.fields,field_description:attendances.field_hr_employee__hr_icon_display
+#: model:ir.model.fields,field_description:attendances.field_hr_employee_base__hr_icon_display
+#: model:ir.model.fields,field_description:attendances.field_hr_employee_public__hr_icon_display
+msgid "Hr Icon Display"
+msgstr "عرض أيقونة الموارد البشرية "
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_attendance_action_reason__id
@@ -788,17 +996,16 @@ msgstr "عدد ساعات الشهر"
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__id
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__id
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_wizard__id
-#: model:ir.model.fields,field_description:attendances.field_hr_employee__id
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__id
 #: model:ir.model.fields,field_description:attendances.field_report_attendances_general_attendance_xls__id
 #: model:ir.model.fields,field_description:attendances.field_report_attendances_general_attendances_report_temp__id
-#: model:ir.model.fields,field_description:attendances.field_resource_calendar__id
 msgid "ID"
 msgstr "المُعرف"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_exception_icon
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_exception_icon
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_exception_icon
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_exception_icon
 msgid "Icon"
 msgstr ""
@@ -806,6 +1013,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__activity_exception_icon
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__activity_exception_icon
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__activity_exception_icon
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__activity_exception_icon
 msgid "Icon to indicate an exception activity."
 msgstr ""
@@ -815,6 +1023,8 @@ msgstr ""
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__message_unread
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__message_needaction
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__message_unread
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__message_needaction
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__message_unread
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__message_needaction
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__message_unread
 msgid "If checked, new messages require your attention."
@@ -825,6 +1035,8 @@ msgstr ""
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__message_has_sms_error
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__message_has_error
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__message_has_sms_error
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__message_has_error
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__message_has_sms_error
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__message_has_error
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
@@ -851,6 +1063,7 @@ msgstr "مرن؟"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_is_follower
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_is_follower
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_is_follower
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_is_follower
 msgid "Is Follower"
 msgstr ""
@@ -861,9 +1074,15 @@ msgid "Is Full Day ?"
 msgstr "دوام كامل؟"
 
 #. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_tree_view
+#: model:ir.model.fields,field_description:attendances.field_attendance_attendance__is_today
+msgid "Is Today"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
 #: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
 msgid "Job"
 msgstr "المسمى الوظيفي"
 
@@ -873,6 +1092,11 @@ msgstr "المسمى الوظيفي"
 msgid "Job Position"
 msgstr "المسمى الوظيفي"
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
+msgid "Journal Overtime"
+msgstr "دفتر اليومية"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_attendance_action_reason____last_update
 #: model:ir.model.fields,field_description:attendances.field_attendance_attendance____last_update
@@ -884,11 +1108,9 @@ msgstr "المسمى الوظيفي"
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line____last_update
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction____last_update
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_wizard____last_update
-#: model:ir.model.fields,field_description:attendances.field_hr_employee____last_update
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness____last_update
 #: model:ir.model.fields,field_description:attendances.field_report_attendances_general_attendance_xls____last_update
 #: model:ir.model.fields,field_description:attendances.field_report_attendances_general_attendances_report_temp____last_update
-#: model:ir.model.fields,field_description:attendances.field_resource_calendar____last_update
 msgid "Last Modified on"
 msgstr "آخر تعديل في"
 
@@ -922,12 +1144,6 @@ msgstr ""
 msgid "Last Updated on"
 msgstr ""
 
-#. module: attendances
-#: code:addons/attendances/wizard/attendances_report_wiz.py:0
-#, python-format
-msgid "Late and Early Exit Report"
-msgstr ""
-
 #. module: attendances
 #: model:ir.model.fields.selection,name:attendances.selection__employee_attendance_report__type__late
 msgid "Late and Early exit"
@@ -936,13 +1152,13 @@ msgstr "التأخيرات والخروج المبكر"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__lateness
 #: model_terms:ir.ui.view,arch_db:attendances.attendance_transaction_tree_view
+#: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_transactions_form_view
 msgid "Lateness"
 msgstr "التأخيرات"
 
 #. module: attendances
-#: model:ir.actions.act_window,name:attendances.hr_lateness_reasons_action
 #: model:ir.ui.menu,name:attendances.employee_lateness_reasons_menu_item
-msgid "Lateness/Exit Reasons"
+msgid "Lateness Reasons"
 msgstr "تبرير التأخير والخروج"
 
 #. module: attendances
@@ -950,11 +1166,21 @@ msgstr "تبرير التأخير والخروج"
 msgid "Lateness,Absence &Overtime"
 msgstr "تصديق الحضور والانصراف"
 
+#. module: attendances
+#: model:ir.actions.act_window,name:attendances.hr_lateness_reasons_action
+msgid "Lateness/Exit Reasons"
+msgstr "تبرير التأخير والخروج"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__latest_date
 msgid "Latest Date"
 msgstr "تاريخ التأخير"
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
+msgid "Leave"
+msgstr ""
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__line_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__line_id
@@ -964,6 +1190,7 @@ msgstr "بند"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_main_attachment_id
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_main_attachment_id
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_main_attachment_id
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_main_attachment_id
 msgid "Main Attachment"
 msgstr ""
@@ -1033,6 +1260,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_has_error
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_has_error
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_has_error
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_has_error
 msgid "Message Delivery error"
 msgstr ""
@@ -1040,6 +1268,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_ids
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_ids
 msgid "Messages"
 msgstr ""
@@ -1060,9 +1289,15 @@ msgstr "اقل وقت خروج"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__mission_by_days
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
 msgid "Mission Hours"
 msgstr "عدد ساعات المهمة"
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
+msgid "Missions By Days"
+msgstr ""
+
 #. module: attendances
 #: model:ir.model.fields.selection,name:attendances.selection__attendance_special_days__name__monday
 #: model:ir.model.fields.selection,name:attendances.selection__days_off__name__monday
@@ -1084,10 +1319,17 @@ msgstr "صباح الاثنين"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__my_activity_date_deadline
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__my_activity_date_deadline
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__my_activity_date_deadline
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__my_activity_date_deadline
 msgid "My Activity Deadline"
 msgstr ""
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
+#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
+msgid "My Attendance"
+msgstr "حضوري"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__noke
 msgid "NOC"
@@ -1097,11 +1339,12 @@ msgstr "الشفتات"
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #, python-format
 msgid "Name"
-msgstr "الاسم"
+msgstr ""
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_date_deadline
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_date_deadline
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_date_deadline
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_date_deadline
 msgid "Next Activity Deadline"
 msgstr ""
@@ -1109,6 +1352,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_summary
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_summary
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_summary
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_summary
 msgid "Next Activity Summary"
 msgstr ""
@@ -1116,6 +1360,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_type_id
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_type_id
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_type_id
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_type_id
 msgid "Next Activity Type"
 msgstr ""
@@ -1125,6 +1370,16 @@ msgstr ""
 msgid "No attendance records to display."
 msgstr "لاتوجد تسجيلات لاظهارها."
 
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_icon_display__presence_to_define
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_presence_state__to_define
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_icon_display__presence_to_define
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_presence_state__to_define
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_icon_display__presence_to_define
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_presence_state__to_define
+msgid "Not Present"
+msgstr "غير متواجـد"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__note_text
 msgid "Note Text"
@@ -1141,6 +1396,7 @@ msgstr "ملاحظات"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_needaction_counter
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_needaction_counter
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_needaction_counter
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_needaction_counter
 msgid "Number of Actions"
 msgstr ""
@@ -1148,6 +1404,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_has_error_counter
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_has_error_counter
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_has_error_counter
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_has_error_counter
 msgid "Number of errors"
 msgstr ""
@@ -1155,6 +1412,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__message_needaction_counter
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__message_needaction_counter
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__message_needaction_counter
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__message_needaction_counter
 msgid "Number of messages which requires an action"
 msgstr ""
@@ -1162,6 +1420,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__message_has_error_counter
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__message_has_error_counter
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__message_has_error_counter
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__message_has_error_counter
 msgid "Number of messages with delivery error"
 msgstr ""
@@ -1169,10 +1428,17 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__message_unread_counter
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__message_unread_counter
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__message_unread_counter
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__message_unread_counter
 msgid "Number of unread messages"
 msgstr ""
 
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#, python-format
+msgid "Office Hours"
+msgstr "ساعات العمل"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__official_hours
 msgid "Official Hours"
@@ -1180,8 +1446,8 @@ msgstr "الساعات المعتمدة"
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Overtime And Permission"
-msgstr ""
+msgid "Overtime Accounts Settings"
+msgstr "إعداد الحسابات"
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
@@ -1193,26 +1459,34 @@ msgstr "إعداد العمل الإضافي"
 msgid "Parent Calender"
 msgstr "جدول الدوام الاصل"
 
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Permission Hours"
-msgstr "ساعات الإذن"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Permission Number"
-msgstr ""
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Permission Settings"
-msgstr "إعداد الإستئذانات"
-
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__plan_hours
 msgid "Planned Hours"
 msgstr "الساعات المخططة"
 
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#, python-format
+msgid "Please select Employees Name"
+msgstr "الرجاء إختيار أسماء الموظفين"
+
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_icon_display__presence_present
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_presence_state__present
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_icon_display__presence_present
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_presence_state__present
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_icon_display__presence_present
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_presence_state__present
+msgid "Present"
+msgstr "متواجـد"
+
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_icon_display__presence_absent_active
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_icon_display__presence_absent_active
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_icon_display__presence_absent_active
+msgid "Present but not active"
+msgstr "موجود ولكن غير نشط "
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_report_wizard_view
 msgid "Print Excel Report"
@@ -1233,8 +1507,17 @@ msgstr "طباعة Excel"
 msgid "Reason"
 msgstr "السبب"
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__reason
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__reason
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__reason
+#: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__reason
+msgid "Reason/Justification"
+msgstr ""
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__reasons
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
 #: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
 msgid "Reasons"
 msgstr "الأسباب"
@@ -1262,6 +1545,7 @@ msgstr "معلومات الحضور والانصرف"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__request_date
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
 #: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
 msgid "Request Date"
 msgstr "تاريخ الطلب"
@@ -1274,6 +1558,7 @@ msgstr "فترة عمل المورد"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__activity_user_id
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__activity_user_id
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__activity_user_id
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__activity_user_id
 msgid "Responsible User"
 msgstr ""
@@ -1281,6 +1566,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_has_sms_error
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_has_sms_error
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_has_sms_error
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_has_sms_error
 msgid "SMS Delivery error"
 msgstr ""
@@ -1309,7 +1595,6 @@ msgstr "صباح السبت"
 msgid "Second Shift"
 msgstr "الشفت الثاني"
 
-
 #. module: attendances
 #: code:addons/attendances/models/hr_attendance_register.py:0
 #: code:addons/attendances/models/hr_reasons_lateness.py:0
@@ -1319,6 +1604,13 @@ msgstr "الشفت الثاني"
 msgid "Send"
 msgstr "إرسال"
 
+#. module: attendances
+#: model:ir.actions.server,name:attendances.ir_cron_send_lateness_notifications_ir_actions_server
+#: model:ir.cron,cron_name:attendances.ir_cron_send_lateness_notifications
+#: model:ir.cron,name:attendances.ir_cron_send_lateness_notifications
+msgid "Send Attendance Notifications"
+msgstr ""
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__sequence
 msgid "Sequence"
@@ -1332,7 +1624,10 @@ msgid "Set To Draft"
 msgstr "إرجاع الى المبدئي"
 
 #. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #: model:ir.model.fields,field_description:attendances.field_attendance_special_days__shift
+#: model:ir.model.fields,field_description:attendances.field_days_off__shift
+#, python-format
 msgid "Shift"
 msgstr "الشفت"
 
@@ -1405,13 +1700,37 @@ msgstr "ساعات الخروج"
 msgid "Sign in"
 msgstr "تسجيل الدخول"
 
-
 #. module: attendances
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #, python-format
 msgid "Sign out"
 msgstr "تسجيل خروج"
 
+#. module: attendances
+#: code:addons/attendances/models/hr_attendance_register.py:0
+#, python-format
+msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
+msgstr ""
+
+#. module: attendances
+#: code:addons/attendances/models/hr_attendance_register.py:0
+#, python-format
+msgid "Sorry, The Refuse For The Direct Manager '%s' Only OR HR Manager!"
+msgstr ""
+
+#. module: attendances
+#: code:addons/attendances/models/hr_attendance_register.py:0
+#, python-format
+msgid "Sorry, You can not Register Attendance Before %s Days."
+msgstr "للأسف, لايمكن إنشاء تسجيل حضور وإنصراف قبل %s يوم."
+
+#. module: attendances
+#: code:addons/attendances/models/hr_attendance_register.py:0
+#: code:addons/attendances/models/hr_attendance_register.py:0
+#, python-format
+msgid "Sorry,You must enter the Names Of Employees!"
+msgstr "للأسف، يجب ادخال اسماء الموظفين!"
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__special_days
 #: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
@@ -1449,8 +1768,8 @@ msgstr "اقل وقت خروج"
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__state
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__state
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__state
-#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
 #: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_filter
+#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
 #: model_terms:ir.ui.view,arch_db:attendances.hr_reasons_lateness_filter
 msgid "State"
 msgstr "الحالة"
@@ -1458,6 +1777,7 @@ msgstr "الحالة"
 #. module: attendances
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__activity_state
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__activity_state
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__activity_state
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__activity_state
 msgid ""
 "Status based on activities\n"
@@ -1500,14 +1820,9 @@ msgid "Temporary Lateness Hours"
 msgstr ""
 
 #. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "The Maximum Permission Hours per Month"
-msgstr "الحد الأعلى لعدد ساعات الإستيذانات خلال الشهر الواحد"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "The Minimum Permission Hours Per Day"
-msgstr "الحد الادني لعدد ساعات الإستيذانات خلال اليوم الواحد"
+#: model:ir.model.fields,help:attendances.field_resource_calendar__register_before
+msgid "The Maximum Number of Days to Request Missing Attendance"
+msgstr "الحد الأقصى لعدد الأيام لطلب تسجيل بصمة مفقوده"
 
 #. module: attendances
 #: model:ir.model.fields.selection,name:attendances.selection__attendance_special_days__name__thursday
@@ -1543,7 +1858,7 @@ msgstr "تاريخ النهاية"
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #, python-format
 msgid "To date"
-msgstr "الى تاريخ"
+msgstr ""
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__total_hours
@@ -1569,8 +1884,8 @@ msgstr "اجمالي الخصم"
 #. module: attendances
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #, python-format
-msgid "Total Early Exit"
-msgstr "عدد ساعات التأخير"
+msgid "Total Extra"
+msgstr "اجمالى الاضافى"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_resource_calendar__total_flexible_hours
@@ -1580,14 +1895,8 @@ msgstr "مجموع ساعات لأيام مرن"
 #. module: attendances
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #, python-format
-msgid "Total Not Sign In"
-msgstr ""
-
-#. module: attendances
-#: code:addons/attendances/wizard/attendances_report_wiz.py:0
-#, python-format
-msgid "Total Not Sign Out"
-msgstr ""
+msgid "Total Leave"
+msgstr "اجمالى الاجازات"
 
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report_line__total_amount
@@ -1612,6 +1921,11 @@ msgstr ""
 msgid "Total of Lateness "
 msgstr "إجمالي عدد التأخيرات"
 
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_employee_attendance_report__print_totals_only
+msgid "Totals only (one line per employee)"
+msgstr "اجمالي بدون تفاصيل"
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.view_attendance_calendar
 msgid "Transaction"
@@ -1643,13 +1957,22 @@ msgstr "النوع"
 #. module: attendances
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__activity_exception_decoration
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__activity_exception_decoration
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__activity_exception_decoration
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__activity_exception_decoration
 msgid "Type of the exception activity on record."
 msgstr ""
 
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_icon_display__presence_undetermined
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_icon_display__presence_undetermined
+#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_icon_display__presence_undetermined
+msgid "Undetermined"
+msgstr "غير محدد "
+
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_unread
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_unread
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_unread
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_unread
 msgid "Unread Messages"
 msgstr ""
@@ -1657,6 +1980,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__message_unread_counter
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__message_unread_counter
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__message_unread_counter
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__message_unread_counter
 msgid "Unread Messages Counter"
 msgstr ""
@@ -1675,6 +1999,7 @@ msgstr "معتمد"
 #. module: attendances
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__website_message_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__website_message_ids
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__website_message_ids
 #: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__website_message_ids
 msgid "Website Messages"
 msgstr ""
@@ -1682,6 +2007,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model.fields,help:attendances.field_hr_attendance_register__website_message_ids
 #: model:ir.model.fields,help:attendances.field_hr_attendance_report__website_message_ids
+#: model:ir.model.fields,help:attendances.field_hr_attendance_transaction__website_message_ids
 #: model:ir.model.fields,help:attendances.field_hr_reasons_lateness__website_message_ids
 msgid "Website communication history"
 msgstr ""
@@ -1763,25 +2089,13 @@ msgstr "للأسف. لايمكن إنشاء تسجيل حضور وإنصراف 
 msgid "You can not Register Attendance Before The Time"
 msgstr "للأسف. لايمكن إنشاء تسجيل حضور وإنصراف قبل زمنه"
 
-#. module: attendances
-#: code:addons/attendances/models/hr_attendance_register.py:0
-#, python-format
-msgid "Sorry, You can not Register Attendance Before %s Days."
-msgstr "للأسف, لايمكن إنشاء تسجيل حضور وإنصراف قبل %s يوم."
-
-#. module: attendances
-#: code:addons/attendances/models/hr_attendance_register.py:0
-#, python-format
-msgid "You can not Register Attendance More Than once in The Same day"
-msgstr "للأسف. لايمكن إنشاء تسجيل حضور وإنصراف أكثر من مره في نفس اليوم"
-
 #. module: attendances
 #: code:addons/attendances/models/hr_attendance_register.py:0
 #: code:addons/attendances/models/hr_attendance_report.py:0
 #: code:addons/attendances/models/hr_reasons_lateness.py:0
 #, python-format
 msgid "You can not delete record in state not in draft"
-msgstr "لا يمكن حذف سجل في حالة غير مبدئي"
+msgstr ""
 
 #. module: attendances
 #: model:ir.model,name:attendances.model_attendance_action_reason
@@ -1791,7 +2105,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model,name:attendances.model_attendance_attendance
 msgid "attendance.attendance"
-msgstr ""
+msgstr "الحضور. الحضور"
 
 #. module: attendances
 #: model:ir.model,name:attendances.model_attendance_special_days
@@ -1805,6 +2119,12 @@ msgstr ""
 msgid "date"
 msgstr "التاريخ"
 
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#, python-format
+msgid "day"
+msgstr ""
+
 #. module: attendances
 #: model:ir.model,name:attendances.model_days_off
 msgid "days.off"
@@ -1836,7 +2156,7 @@ msgstr ""
 #. module: attendances
 #: model:ir.model,name:attendances.model_hr_attendance_transaction
 msgid "hr.attendance.transaction"
-msgstr ""
+msgstr "سجلات الحضور والانصراف"
 
 #. module: attendances
 #: model:ir.model,name:attendances.model_hr_attendance_wizard
@@ -1848,6 +2168,12 @@ msgstr ""
 msgid "hr.reasons.lateness"
 msgstr "تبرير التأخير والخروج"
 
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#, python-format
+msgid "job "
+msgstr "المسمى الوظيفى"
+
 #. module: attendances
 #: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #, python-format
@@ -1855,6 +2181,7 @@ msgid "lateness"
 msgstr "التأخيرات"
 
 #. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
 #: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
 msgid "lateness Date"
 msgstr "تاريخ التأخير"
@@ -1908,26 +2235,77 @@ msgstr ""
 msgid "إلى"
 msgstr ""
 
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#, python-format
+msgid "إلى تاريخ"
+msgstr ""
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
-msgid "إنصراف  مبكر"
+msgid "اجمالى الاجازات والانتدابات"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
+msgid "اجمالى الاضافى"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
+msgid "اجمالى ايام الغياب"
 msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.absent_attendance_report_template
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
 msgid "اسم الموظف"
 msgstr ""
 
 #. module: attendances
-#: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_report__state__approved
-msgid "الإعتماد النهائي"
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "الاجازات"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "الاجازات الرسمية"
+msgstr ""
+
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#, python-format
+msgid "الاجمالي"
 msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.absent_attendance_report_template
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
 msgid "الادارة"
 msgstr ""
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "الاستئذان"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
+msgid "الاضافى"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
+msgid "التأخير"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "التأخيرات"
+msgstr ""
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.absent_attendance_report_template
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
@@ -1936,7 +2314,27 @@ msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
-msgid "الغيابات"
+msgid "التفصير"
+msgstr ""
+
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_register__action_type__sign_in
+msgid "الحضور"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "الخروج المبكر"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "الرقم الوظيفي"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "الغياب"
 msgstr ""
 
 #. module: attendances
@@ -1951,16 +2349,31 @@ msgid "المدير المباشر"
 msgstr ""
 
 #. module: attendances
-#: model:ir.model.fields.selection,name:attendances.selection__resource_calendar__state__confirm
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
+msgid "المسمى الوظيفى"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "المسمي الوظيفي"
+msgstr ""
+
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_register__state__hr_manager
+#: model:ir.model.fields.selection,name:attendances.selection__hr_reasons_lateness__state__hr_manager
 msgid "الموارد البشرية"
 msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_report_template
-#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
 msgid "الموظف"
 msgstr ""
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
+msgid "الوردية"
+msgstr ""
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
 msgid "الى:"
@@ -1968,6 +2381,7 @@ msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.absent_attendance_report_template
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
 msgid "اليوم"
 msgstr ""
 
@@ -1977,19 +2391,14 @@ msgid "انشــاء"
 msgstr ""
 
 #. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
-msgid "تأخير"
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "ايام الحضور"
 msgstr ""
 
 #. module: attendances
-#: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_register__action_type__sign_out
-msgid "Sign Out"
-msgstr "تسجيل الخروج"
-
-#. module: attendances
-#: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_register__action_type__sign_in
-msgid "Sign In"
-msgstr "تسجيل الدخول"
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "اﻹدارة"
+msgstr ""
 
 #. module: attendances
 #: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_report__state__confirmed
@@ -2001,27 +2410,59 @@ msgstr ""
 msgid "تقرير الحضور و الانصراف للعام"
 msgstr ""
 
+#. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+#, python-format
+msgid "تقرير الحضور والانصراف للموظفين"
+msgstr ""
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.absent_attendance_report_template
 msgid ""
 "تقرير الغياب\n"
-"                    <br/>\n"
-"                    جميع الموظفين- تفصيلي"
+"                        <br/>\n"
+"                        جميع الموظفين- تفصيلي"
 msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
-msgid "تقرير تاخير و خروج مبكر"
+msgid "تقرير بالحضور والانصراف تفصيلى"
+msgstr ""
+
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_report__state__approved
+msgid "تم التصديق"
 msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
-msgid "عدم تسجيل خروج"
+msgid "رقم الموظف"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "رقم الهوية"
 msgstr ""
 
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
-msgid "عدم تسجيل دخول"
+msgid "ساعات العمل"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "ساعات العمل الاضافية"
+msgstr ""
+
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "ساعات العمل الفعلية"
+msgstr ""
+
+#. module: attendances
+#: model:ir.model.fields.selection,name:attendances.selection__resource_calendar__state__confirm
+msgid "مؤكد"
 msgstr ""
 
 #. module: attendances
@@ -2029,23 +2470,16 @@ msgstr ""
 msgid "مجموع الانصراف المبكر"
 msgstr ""
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
+msgid "مجموع التأخير والتقصير"
+msgstr ""
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_report_template
-#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
 msgid "مجموع التأخيرات"
 msgstr ""
 
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
-msgid "مجموع الخروج المبكر"
-msgstr ""
-
-#. module: attendances
-#: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_register__state__hr_manager
-#: model:ir.model.fields.selection,name:attendances.selection__hr_reasons_lateness__state__hr_manager
-msgid "مدير الموارد البشرية"
-msgstr ""
-
 #. module: attendances
 #: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_register__state__refused
 #: model:ir.model.fields.selection,name:attendances.selection__hr_attendance_report__state__refused
@@ -2077,7 +2511,9 @@ msgid "ملاحظة"
 msgstr ""
 
 #. module: attendances
+#: code:addons/attendances/wizard/attendances_report_wiz.py:0
 #: model_terms:ir.ui.view,arch_db:attendances.absent_attendance_report_template
+#, python-format
 msgid "من تاريخ"
 msgstr ""
 
@@ -2086,6 +2522,11 @@ msgstr ""
 msgid "من تاريخ:"
 msgstr ""
 
+#. module: attendances
+#: model_terms:ir.ui.view,arch_db:attendances.totals_only_attendance_report_template
+msgid "مهام عمل/انتداب/تدريب"
+msgstr ""
+
 #. module: attendances
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
 msgid "وفت الخروج"
@@ -2095,194 +2536,3 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:attendances.late_attendance_report_template
 msgid "وقت الدخول"
 msgstr ""
-
-
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__company_id
-#: model:ir.model.fields,field_description:attendances.field_attendance_attendance__company_id
-#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__company_id
-msgid "Company"
-msgstr "الشركة"
-
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__employee_number
-#: model:ir.model.fields,field_description:attendances.field_attendance_attendance__employee_number
-#: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_transactions_form_view
-#: model_terms:ir.ui.view,arch_db:attendances.attendance_transaction_tree_view
-msgid "Employee Number"
-msgstr "رقم الموظف"
-
-#. module: attendences
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Overtime Accounts Settings"
-msgstr "إعداد الحسابات"
-
-#. module: attendences
-#: model:ir.model.fields,field_description:hr_base.field_resource_calendar__journal_overtime_id
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Journal Overtime"
-msgstr "دفتر اليومية"
-
-#. module: attendences
-#: model:ir.model.fields,field_description:hr_base.field_resource_calendar__account_overtime_id
-#: model_terms:ir.ui.view,arch_db:attendances.resource_calendar_inherited_form
-msgid "Account Overtime"
-msgstr "حساب الصرف"
-
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_hr_attendance_transaction__department_id
-#: model_terms:ir.ui.view,arch_db:attendances.employee_attendance_transactions_form_view
-#: model_terms:ir.ui.view,arch_db:attendances.attendance_transaction_tree_view
-msgid "Department Name"
-msgstr "إسم القسم"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
-msgid "Employee"
-msgstr "الموظف"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
-msgid "Department"
-msgstr "القسم"
-
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
-msgid "Absent"
-msgstr "الغياب"
-
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
-#: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
-msgid "My Attendance"
-msgstr "حضوري"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
-#: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
-msgid "Attendance Today"
-msgstr "حضور اليوم"
-
-#. module: hr_base
-#: model:ir.model.fields,field_description:hr_base.field_resource_calendar__approval_by
-msgid "Approval By"
-msgstr "التصديق بواسطة"
-
-#. module: hr_base
-#: model:ir.model.fields.selection,name:hr_base.selection__resource_calendar__approval_by__direct_manager
-msgid "Direct Manager"
-msgstr "المدير المباشر"
-
-#. module: hr_base
-#: model:ir.model.fields.selection,name:hr_base.selection__resource_calendar__approval_by__hr_manager
-msgid "HR Manager"
-msgstr "مدير الموارد البشرية"
-
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_resource_calendar__register_before
-msgid "Attendance Register Before"
-msgstr "تسجيل الحضور قبل"
-
-#. module: attendances
-#: model:ir.model.fields,help:attendances.field_resource_calendar__register_before
-msgid "The Maximum Number of Days to Request Missing Attendance"
-msgstr "الحد الأقصى لعدد الأيام لطلب تسجيل بصمة مفقوده"
-
-#. module: attendances
-#: code:addons/attendances/wizard/attendances_report_wiz.py:0
-#, python-format
-msgid "Please select Employees Name"
-msgstr "الرجاء إختيار أسماء الموظفين"
-
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_hr_attendance_register__employee_no
-#: model:ir.model.fields,field_description:attendances.field_hr_reasons_lateness__employee_no
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_tree_view
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_form_view
-#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_reasons_form_view
-#: model_terms:ir.ui.view,arch_db:attendances.hr_lateness_tree_view
-msgid "Employee Number"
-msgstr "رقم الموظف"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.hr_attendance_register_filter
-#: model_terms:ir.ui.view,arch_db:attendances.view_attendance_transaction_filter
-#: model_terms:ir.ui.view,arch_db:attendances.hr_reasons_lateness_filter
-#: model_terms:ir.ui.view,arch_db:attendances.attendance_view_filter
-#, python-format
-msgid "Branch"
-msgstr "الفروع"
-
-#. module: attendances
-#: code:addons/attendances/models/hr_attendance_register.py:0
-#, python-format
-msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
-msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"
-
-#. module: attendances
-#: code:addons/attendances/models/hr_attendance_register.py:0
-#, python-format
-msgid "Sorry, The Refuse For The Direct Manager '%s' Only OR HR Manager!"
-msgstr "للأسف، لرفض المدير المباشر '%s' فقط او مدير الموارد البشرية !"
-
-#. module: attendances
-#: code:addons/attendances/models/hr_attendance_register.py:0
-#, python-format
-msgid "Sorry,You must enter the Names Of Employees!"
-msgstr "للأسف، يجب ادخال اسماء الموظفين!"
-
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_hr_employee__hr_presence_state
-#: model:ir.model.fields,field_description:attendances.field_hr_employee_base__hr_presence_state
-#: model:ir.model.fields,field_description:attendances.field_hr_employee_public__hr_presence_state
-msgid "Attendance State"
-msgstr "حالة الحضور"
-
-#. module: attendances
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_icon_display__presence_present
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_presence_state__present
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_icon_display__presence_present
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_presence_state__present
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_icon_display__presence_present
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_presence_state__present
-msgid "Present"
-msgstr "متواجـد"
-
-#. module: attendances
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_icon_display__presence_to_define
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee__hr_presence_state__to_define
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_icon_display__presence_to_define
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_base__hr_presence_state__to_define
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_icon_display__presence_to_define
-#: model:ir.model.fields.selection,name:attendances.selection__hr_employee_public__hr_presence_state__to_define
-msgid "Not Present"
-msgstr "غير متواجـد"
-
-#. module: attendances
-#: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__department_ids
-msgid "Departments"
-msgstr "الأقسام"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
-msgid "Attendance Date From"
-msgstr "تاريخ الحضور من"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
-msgid "Attendance Date To"
-msgstr "تاريخ الحضور إلى"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
-msgid "Deduction Date From"
-msgstr "تاريخ الخصم من"
-
-#. module: attendances
-#: model_terms:ir.ui.view,arch_db:attendances.employee_lateness_absense_overtime_form_view
-msgid "Deduction Date To"
-msgstr "تاريخ الخصم إلى"
-
-
diff --git a/odex25_hr/attendances/report/employee_attendances_report_template.xml b/odex25_hr/attendances/report/employee_attendances_report_template.xml
index ff327919b..ec49be26a 100644
--- a/odex25_hr/attendances/report/employee_attendances_report_template.xml
+++ b/odex25_hr/attendances/report/employee_attendances_report_template.xml
@@ -323,6 +323,67 @@
 
 
         </template>
+        <template id="totals_only_attendance_report_template">
+            <div class="page"  style="font-size:12pt" dir="rtl">
+                <center>
+                    <h2 style="font-weight:bold">تقرير الحضور والانصراف للموظفين</h2>
+                </center>
+                <br/>
+                <div class="row">
+                    <div class="col-md-6">
+                        <h4 style="font-weight:bold">من تاريخ</h4>
+                        <t t-esc="date_start"/>
+                </div>
+                    <div class="col-md-6">
+                        <h4 style="font-weight:bold">إلى</h4>
+                        <t t-esc="date_end"/>
+                    </div>
+                </div>
+                <table  class="table table-condensed" style="width:100%">
+                    <thead  style="width:100%;">
+                        <tr style="width:100%;text-align:center;">
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">الرقم الوظيفي</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:10%;text-align:center;">اسم الموظف</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:10%;text-align:center;">رقم الهوية</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:10%;text-align:center;">اﻹدارة</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:10%;text-align:center;">المسمي الوظيفي</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">ايام الحضور</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">الاجازات</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">الاجازات الرسمية</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">الغياب</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">ساعات العمل الفعلية</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">ساعات العمل الاضافية</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">الاستئذان</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">مهام عمل/انتداب/تدريب</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">التأخيرات</th>
+                            <th tyle="border: 1px solid gray; padding: 1px; font-size:0.8em;background-color: #b9d7d4;color: black;width:6%;text-align:center;">الخروج المبكر</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <t t-foreach="summary" t-as="row">
+                            <tr style="text-align:center;font-weight:bold;background-color: #b9d7d4">
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['employee_number']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:10%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['name']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:10%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['iqama']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:10%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['department']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:10%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['job']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['days_present']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['leave_days']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['holiday_days']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['absent_days']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['office_hours']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['extra_hours']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['permission_hours']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['mission_hours']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['lateness_approved']"/>
+                                <td style="border: 1px solid gray;padding: 1px; width:6%;font-size:0.8em;background-color: white;color: black; text-align:center" t-esc="row['early_exit_approved']"/>
+                            </tr>
+                        </t>
+                    </tbody>
+                </table>
+            </div>
+        </template>
+
         <template id="general_attendances_report_temp">
             <t t-call="web.html_container">
                 <t t-call="web.external_layout">
@@ -336,14 +397,19 @@
                         font-family: ae_AlMohanad;
                         }
                     </style>
-                    <t t-if="type == 'late'">
-                        <t t-call="attendances.late_attendance_report_template"/>
+                    <t t-if="totals_only">
+                        <t t-call="attendances.totals_only_attendance_report_template"/>
                     </t>
-                    <t t-if="type == 'absent'">
-                        <t t-call="attendances.absent_attendance_report_template"/>
-                    </t>
-                    <t t-if="type == 'employee'">
-                        <t t-call="attendances.employee_attendance_report_template"/>
+                    <t t-else="">
+                        <t t-if="type == 'late'">
+                            <t t-call="attendances.late_attendance_report_template"/>
+                        </t>
+                        <t t-if="type == 'absent'">
+                            <t t-call="attendances.absent_attendance_report_template"/>
+                        </t>
+                        <t t-if="type == 'employee'">
+                            <t t-call="attendances.employee_attendance_report_template"/>
+                        </t>
                     </t>
                 </t>
             </t>
diff --git a/odex25_hr/attendances/wizard/attendances_report_view.xml b/odex25_hr/attendances/wizard/attendances_report_view.xml
index d7ec1e72f..1c0122922 100644
--- a/odex25_hr/attendances/wizard/attendances_report_view.xml
+++ b/odex25_hr/attendances/wizard/attendances_report_view.xml
@@ -15,9 +15,11 @@
                             </group>
                             <group>
                                 <field name="to_date"/>
-<!--                                <field name="employee_ids"  widget="many2many_tags"/>-->
                             </group>
                         </group>
+                        <group>
+                             <field name="print_totals_only"/>
+                        </group>
                         <notebook>
                             <page string="Employees" >
                                 <field name="employee_ids" nolabel="1" required="1">
diff --git a/odex25_hr/attendances/wizard/attendances_report_wiz.py b/odex25_hr/attendances/wizard/attendances_report_wiz.py
index dfe447317..25c6f1c77 100644
--- a/odex25_hr/attendances/wizard/attendances_report_wiz.py
+++ b/odex25_hr/attendances/wizard/attendances_report_wiz.py
@@ -1,62 +1,71 @@
 # -*- coding: utf-8 -*-
-
-import collections
-import datetime
-from odoo import api, fields, models, _
-from odoo.exceptions import ValidationError
 import pytz
 from pytz import timezone
+import collections
+import datetime
+from odoo import fields, models, _,api
+from odoo.exceptions import ValidationError
+
+WEEK_DAYS_AR = {
+    0: "الاثنين",
+    1: "الثلاثاء",
+    2: "الاربعاء",
+    3: "الخميس",
+    4: "الجمعة",
+    5: "السبت",
+    6: "الاحد",
+}
+
+def hhmm(val):
+    if not val:
+        return "00:00"
+    mins = float(val) * 60
+    return "{0:02.0f}:{1:02.0f}".format(*divmod(mins, 60))
 
-week_dayS_arabic={0:"الاثنين",  1: 'الثلاثاء',  4:'الجمعة' , 2:'الاربعاء',3: 'الخميس', 6:'الاحد',5: 'السبت'}
 class AttendancesReport(models.TransientModel):
     _name = "employee.attendance.report"
     _description = "Employee Attendance Report"
 
-    from_date = fields.Date(string='From Date', required=True)
-    to_date = fields.Date(string='To Date', required=True)
-    employee_ids = fields.Many2many(comodel_name='hr.employee', string='Employees' ,required=True)
-    resource_calender_id = fields.Many2one(comodel_name='resource.calendar', string='Employee work record')
-    type = fields.Selection(selection=[('late', 'Late and Early exit'), ('absent', 'Absent'), ('employee', 'Employee')],
-                            required=True,
-                            default='late', string='Type')
+    from_date = fields.Date(required=True)
+    to_date = fields.Date(required=True)
+    employee_ids = fields.Many2many("hr.employee", string="Employees", required=True)
+    resource_calender_id = fields.Many2one("resource.calendar", string="Employee work record")
+    type = fields.Selection([
+        ("late", "Late and Early exit"),
+        ("absent", "Absent"),
+        ("employee", "Employee"),
+    ], default="late", required=True)
+    print_totals_only = fields.Boolean(string="Totals only (one line per employee)", default=False)
+
+    def _payload(self):
+        return {
+            "ids": self.ids,
+            "model": self._name,
+            "form": {
+                "resource_calender_id": self.resource_calender_id.id,
+                "from_date": self.from_date,
+                "to_date": self.to_date,
+                "employee_ids": self.employee_ids.ids,
+                "type": self.type,
+                "print_totals_only": self.print_totals_only,
+            },
+        }
 
     def print_report(self):
         if not self.employee_ids:
             raise ValidationError(_("Please select Employees Name"))
-        data = {
-            'ids': self.ids,
-            'model': self._name,
-            'form': {
-                'resource_calender_id': self.resource_calender_id.id,
-                'from_date': self.from_date,
-                'to_date': self.to_date,
-                'employee_ids': self.employee_ids.ids,
-                'type': self.type,
-            },
-        }
-        return self.env.ref('attendances.general_attendance_action_report').report_action(self, data=data)
+        return self.env.ref("attendances.general_attendance_action_report").report_action(self, data=self._payload())
 
     def print_excel_report(self):
-        data = {
-            'ids': self.ids,
-            'model': self._name,
-            'form': {
-                'resource_calender_id': self.resource_calender_id.id,
-                'from_date': self.from_date,
-                'to_date': self.to_date,
-                'employee_ids': self.employee_ids.ids,
-                'type': self.type,
-            },
-        }
-        return self.env.ref('attendances.general_attendance_action_xls').report_action(self, data=data, config=False)
-
+        return self.env.ref("attendances.general_attendance_action_xls").report_action(self, data=self._payload(), config=False)
 
 class ReportAttendancePublic(models.AbstractModel):
-    _name = 'report.attendances.general_attendances_report_temp'
+    _name = "report.attendances.general_attendances_report_temp"
     _description = "General Attendances Report"
 
     def get_value(self, data):
         type = data['form']['type']
+        totals_only = data["form"].get("print_totals_only", False)
         employee_ids = data['form']['employee_ids']
         resource_calender_id = data['form']['resource_calender_id']
         from_date = data['form']['from_date']
@@ -68,7 +77,7 @@ class ReportAttendancePublic(models.AbstractModel):
         total_dic = {}
         mykey = []
         resource = self.env['resource.calendar'].browse(resource_calender_id)
-        if resource  and not employee_ids:
+        if resource and not employee_ids:
             if resource.employee_ids:
                 for emp in resource.employee_ids:
                     employee_ids.append(emp.id)
@@ -83,23 +92,23 @@ class ReportAttendancePublic(models.AbstractModel):
         attendance_transaction_ids = self.env['hr.attendance.transaction'].search(domain)
         employees = attendance_transaction_ids.mapped('employee_id.name')
         employee_ids = attendance_transaction_ids.mapped('employee_id')
-        emp_data=[]
+        emp_data = []
         for emp in employee_ids:
             emp_data.append({'job': emp.sudo().job_id.name, 'department': emp.department_id.name,
-                                  'emp_no': emp.emp_no,'emp_namw':emp.name})
+                             'emp_no': emp.emp_no, 'emp_namw': emp.name})
         grouped_data = collections.defaultdict(list)
-        emp_data_dict={}
+        emp_data_dict = {}
         for item in emp_data:
             grouped_data[item['emp_namw']].append(item)
-        for key,value in grouped_data.items():
-            emp_data_dict[key]=list(value)
+        for key, value in grouped_data.items():
+            emp_data_dict[key] = list(value)
         if type == 'late':
             for resource in attendance_transaction_ids:
-                note=''
+                note = ''
                 if resource.is_absent:
-                    note='غياب'
+                    note = 'غياب'
                 elif resource.public_holiday:
-                    note="عطلة رسمية"
+                    note = "عطلة رسمية"
                 elif resource.official_id:
                     note = resource.official_id.mission_type.name
                 elif resource.normal_leave:
@@ -109,27 +118,27 @@ class ReportAttendancePublic(models.AbstractModel):
 
                 data.append({
                     'date': resource.date,
-                    'day': week_dayS_arabic[resource.date.weekday()],
+                    'day': WEEK_DAYS_AR[resource.date.weekday()],
                     'sig_in': resource.sign_in,
                     'sig_out': resource.sign_out,
                     'lateness': resource.lateness,
                     'early_exit': resource.early_exit,
                     'extra_hours': resource.additional_hours,
-                    'office_hours':resource.office_hours,
-                    'note':note,
-                    'department':resource.employee_id.department_id.name,
-                    'employee_number':resource.employee_number,
-                    'calendar_id':resource.calendar_id.name,
+                    'office_hours': resource.office_hours,
+                    'note': note,
+                    'department': resource.employee_id.department_id.name,
+                    'employee_number': resource.employee_number,
+                    'calendar_id': resource.calendar_id.name,
                     'employee_id': resource.employee_id,
                     'employee_name': resource.employee_id.name,
                 })
 
-            data=sorted(data, key=lambda d: d['date'])
+            data = sorted(data, key=lambda d: d['date'])
             for emp in employees:
                 list_cat = attendance_transaction_ids.filtered(lambda r: r.employee_id.name == emp)
                 total_lateness = sum(list_cat.mapped('lateness'))
                 total_early_exit = sum(list_cat.mapped('early_exit'))
-                total_late_early = str(datetime.timedelta(minutes=total_early_exit+total_lateness))
+                total_late_early = str(datetime.timedelta(minutes=total_early_exit + total_lateness))
                 total_extra_hours = sum(list_cat.mapped('additional_hours'))
                 total_extra_hours = str(datetime.timedelta(minutes=total_extra_hours))
                 list_absent = attendance_transaction_ids.filtered(
@@ -141,11 +150,13 @@ class ReportAttendancePublic(models.AbstractModel):
                 list_not_log_out = attendance_transaction_ids.filtered(
                     lambda r: r.employee_id.name == emp and r.sign_out == 0.0)
                 list_leave = attendance_transaction_ids.filtered(
-                    lambda r: r.employee_id.name == emp and (r.normal_leave or r.approve_personal_permission ))
+                    lambda r: r.employee_id.name == emp and (r.normal_leave or r.approve_personal_permission))
                 total_not_sig_out = len(list_not_log_out)
                 total_leave = len(list_leave)
                 total_dic[emp] = {'total_lateness': total_lateness, 'total_early_exit': total_early_exit,
-                                  "total_extra_hours":total_extra_hours, "total_late_early":total_late_early,"total_leave":total_leave,'total_absent': total_absent, 'total_not_sig_in': total_not_sig_in,
+                                  "total_extra_hours": total_extra_hours, "total_late_early": total_late_early,
+                                  "total_leave": total_leave, 'total_absent': total_absent,
+                                  'total_not_sig_in': total_not_sig_in,
                                   'total_not_sig_out': total_not_sig_out}
             grouped = collections.defaultdict(list)
             for item in data:
@@ -154,7 +165,7 @@ class ReportAttendancePublic(models.AbstractModel):
                 final_dic[key] = list(value)
                 key_list.append(key)
             mykey = list(dict.fromkeys(key_list))
-            return final_dic, mykey,total_dic,emp_data_dict
+            return final_dic, mykey, total_dic, emp_data_dict
 
         elif type == 'absent':
             for resource in attendance_transaction_ids.filtered(lambda r: r.is_absent == True):
@@ -171,7 +182,7 @@ class ReportAttendancePublic(models.AbstractModel):
                     final_dic[key] = list(value)
                     key_list.append(key)
                 mykey = list(dict.fromkeys(key_list))
-            return final_dic, mykey, '',emp_data_dict
+            return final_dic, mykey, '', emp_data_dict
         elif type == 'employee':
             for emp in employees:
                 list_cat = attendance_transaction_ids.filtered(lambda r: r.employee_id.name == emp)
@@ -182,20 +193,55 @@ class ReportAttendancePublic(models.AbstractModel):
                 total_dic[emp] = {'total_lateness': total_lateness, 'total_early_exit': total_early_exit}
                 key_list.append(emp)
             mykey = list(dict.fromkeys(key_list))
-            print("mk",mykey,total_dic)
-            return '', mykey, total_dic,emp_data_dict
+            print("mk", mykey, total_dic)
+            return '', mykey, total_dic, emp_data_dict
 
     @api.model
     def _get_report_values(self, docids, data=None):
-        final_dic, mykey, total,emp_data = self.get_value(data)
+        final_dic, mykey, total, emp_data = self.get_value(data)
         start_date = data['form']['from_date']
         end_date = data['form']['to_date']
         type = data['form']['type']
-        print("dataa",mykey,final_dic)
+        print("dataa", mykey, final_dic)
         local_tz = pytz.timezone(
             self.env.user.tz or 'GMT')
-        print_date=datetime.datetime.now(timezone('UTC'))
-        print_date=print_date.astimezone(local_tz)
+        print_date = datetime.datetime.now(timezone('UTC'))
+        print_date = print_date.astimezone(local_tz)
+        totals_only = data['form'].get('print_totals_only', False)
+
+        summary_rows = []
+        if totals_only:
+            domain = [('date', '>=', start_date), ('date', '<=', end_date)]
+            emp_ids = data['form']['employee_ids']
+            cal_id = data['form']['resource_calender_id']
+            if emp_ids:
+                domain.append(('employee_id', 'in', list(set(emp_ids))))
+            elif cal_id:
+                rc = self.env['resource.calendar'].browse(cal_id)
+                domain.append(('employee_id', 'in', rc.employee_ids.ids))
+            att = self.env['hr.attendance.transaction'].search(domain)
+            for emp in att.mapped('employee_id'):
+                lines = att.filtered(lambda l, e=emp: l.employee_id == e)
+                iq =  getattr(emp, 'iqama_number', False) or getattr(emp, 'saudi_number', '')
+                summary_rows.append({
+                    'employee_number': emp.emp_no or '',
+                    'name': emp.name,
+                    'iqama':iq.display_name or '',
+                    'department': emp.department_id.name,
+                    'job': emp.sudo().job_id.name,
+                    'days_present': len({l.date for l in lines if not l.is_absent}),
+                    'leave_days': len(lines.filtered(lambda l: l.normal_leave)),
+                    'holiday_days': len(lines.filtered(lambda l: l.public_holiday)),
+                    'absent_days': len(lines.filtered(lambda l: l.is_absent)),
+                    'office_hours': hhmm(sum(lines.mapped('office_hours'))),
+                    'extra_hours': hhmm(sum(lines.mapped('additional_hours'))),
+                    'permission_hours': hhmm(sum(lines.mapped('total_permission_hours'))),
+                    'mission_hours': hhmm(sum(lines.mapped('total_mission_hours'))),
+                    'lateness_approved': hhmm(sum(lines.filtered(lambda l: l.approve_lateness).mapped('lateness'))),
+                    'early_exit_approved': hhmm(sum(lines.filtered(lambda l: l.approve_exit_out).mapped('early_exit'))),
+                })
+
+
         return {
             'doc_ids': data['ids'],
             'doc_model': data['model'],
@@ -204,14 +250,15 @@ class ReportAttendancePublic(models.AbstractModel):
             'type': type,
             'data': final_dic,
             'mykey': mykey,
-            'emp_data':emp_data,
+            'emp_data': emp_data,
             'total': total,
-            'print_date':print_date.strftime("%H:%m %m/%d/%Y" ),
-            'print_user':self.env.user.name
+            'summary': summary_rows,
+            'totals_only': totals_only,
+            'print_date': print_date.strftime("%H:%m %m/%d/%Y"),
+            'print_user': self.env.user.name
 
         }
 
-
 class AttendancesReportXls(models.AbstractModel):
     _name = 'report.attendances.general_attendance_xls'
     _inherit = 'report.report_xlsx.abstract'
@@ -219,19 +266,85 @@ class AttendancesReportXls(models.AbstractModel):
     def generate_xlsx_report(self, workbook, data, datas):
         self = self.with_context(lang=self.env.user.lang)
         x = self.env['report.attendances.general_attendances_report_temp']
-        final_dic, mykey, total,emp_data = ReportAttendancePublic.get_value(x, data)
+        final_dic, mykey, total, emp_data = ReportAttendancePublic.get_value(x, data)
         start_date = data['form']['from_date']
         end_date = data['form']['to_date']
         type = data['form']['type']
+        totals_only = data['form'].get('print_totals_only', False)
         sheet = workbook.add_worksheet(U'Holiday Report')
+        calendar_id = data['form']['resource_calender_id']
         sheet.right_to_left()
         sheet.set_column(1, 10, 15)
-        # sheet.set_column(6, 100, 25)
+        employee_ids = data['form']['employee_ids']
         format2 = workbook.add_format(
             {'font_size': 10, 'bottom': True, 'right': True, 'left': True, 'top': True, 'align': 'center',
              'bold': True})
         format2.set_align('center')
         format2.set_align('vcenter')
+        fmt = workbook.add_format({'font_size': 10, 'border': 1, 'align': 'center', 'valign': 'vcenter', 'bold': True})
+
+        if totals_only:
+            sheet.merge_range('F2:P2', _('تقرير الحضور والانصراف للموظفين'), fmt)
+            sheet.write('G3', _('من تاريخ'), fmt)
+            sheet.write('J3', _('إلى تاريخ'), fmt)
+            sheet.write(2, 7, str(start_date)[0:10], fmt)
+            sheet.write(2, 10, str(end_date)[0:10], fmt)
+
+            headers = [
+                'الرقم الوظيفي', 'اسم الموظف', 'رقم الهوية', 'اﻹدارة', 'المسمي الوظيفي',
+                'ايام الحضور', 'الاجازات', 'الاجازات الرسمية', 'الغياب', 'ساعات العمل الفعلية',
+                'ساعات العمل الاضافية', 'الاستئذان', 'مهام عمل/انتداب/تدريب', 'التأخيرات', 'الخروج المبكر',
+            ]
+            header_row = 5
+            for col, title in enumerate(headers, start=1):
+                sheet.write(header_row, col, title, fmt)
+
+            domain = [('date', '>=', start_date), ('date', '<=', end_date)]
+            if employee_ids:
+                domain.append(('employee_id', 'in', list(set(employee_ids))))
+            elif calendar_id:
+                rc = self.env['resource.calendar'].browse(calendar_id)
+                domain.append(('employee_id', 'in', rc.employee_ids.ids))
+            att = self.env['hr.attendance.transaction'].search(domain)
+
+            row = header_row + 1
+            for emp in att.mapped('employee_id'):
+                lines = att.filtered(lambda l, e=emp: l.employee_id == e)
+                sheet.write(row, 1, emp.emp_no or '', fmt)
+                sheet.write(row, 2, emp.name, fmt)
+                iq = getattr(emp, 'iqama_number', False) or getattr(emp, 'saudi_number', '')
+                sheet.write(row, 3, iq.display_name, fmt)
+                sheet.write(row, 4, emp.department_id.name, fmt)
+                sheet.write(row, 5, emp.sudo().job_id.name, fmt)
+                sheet.write(row, 6, len({l.date for l in lines if not l.is_absent}), fmt)
+                sheet.write(row, 7, len(lines.filtered(lambda l: l.normal_leave)), fmt)
+                sheet.write(row, 8, len(lines.filtered(lambda l: l.public_holiday)), fmt)
+                sheet.write(row, 9, len(lines.filtered(lambda l: l.is_absent)), fmt)
+                sheet.write(row, 10, hhmm(sum(lines.mapped('office_hours'))), fmt)
+                sheet.write(row, 11, hhmm(sum(lines.mapped('additional_hours'))), fmt)
+                sheet.write(row, 12, hhmm(sum(lines.mapped('total_permission_hours'))), fmt)
+                sheet.write(row, 13, hhmm(sum(lines.mapped('total_mission_hours'))), fmt)
+                sheet.write(row, 14, hhmm(sum(lines.filtered(lambda l: l.approve_lateness).mapped('lateness'))), fmt)
+                sheet.write(row, 15, hhmm(sum(lines.filtered(lambda l: l.approve_exit_out).mapped('early_exit'))), fmt)
+                row += 1
+            sheet.write(row, 1, _('الاجمالي'), fmt)
+            sheet.write(row, 2, '', fmt)
+            sheet.write(row, 3, '', fmt)
+            sheet.write(row, 4, '', fmt)
+            sheet.write(row, 5, '', fmt)
+            sheet.write(row, 6, len({l.date for l in att if not l.is_absent}), fmt)
+            sheet.write(row, 7, len(att.filtered(lambda l: l.normal_leave)), fmt)
+            sheet.write(row, 8, len(att.filtered(lambda l: l.public_holiday)), fmt)
+            sheet.write(row, 9, len(att.filtered(lambda l: l.is_absent)), fmt)
+            sheet.write(row, 10, hhmm(sum(att.mapped('office_hours'))), fmt)
+            sheet.write(row, 11, hhmm(sum(att.mapped('additional_hours'))), fmt)
+            sheet.write(row, 12, hhmm(sum(att.mapped('total_permission_hours'))), fmt)
+            sheet.write(row, 13, hhmm(sum(att.mapped('total_mission_hours'))), fmt)
+            sheet.write(row, 14, hhmm(sum(att.filtered(lambda l: l.approve_lateness).mapped('lateness'))), fmt)
+            sheet.write(row, 15, hhmm(sum(att.filtered(lambda l: l.approve_exit_out).mapped('early_exit'))), fmt)
+            return
+
+
         if type == 'late':
             sheet.merge_range('D3:I3', _("Attendance Reports"), format2)
             sheet.write('E4:E4', _("From date"), format2)
@@ -241,16 +354,16 @@ class AttendancesReportXls(models.AbstractModel):
             row = 8
             for key in mykey:
                 n = 1
-                h_col=4
+                h_col = 4
                 size = len(final_dic[key])
                 tot_size = len(total[key])
                 sheet.write(row - 3, h_col, _('Employee Number'), format2)
-                sheet.write(row - 3, h_col+3, _('job '), format2)
+                sheet.write(row - 3, h_col + 3, _('job '), format2)
                 sheet.write(row - 2, h_col, _('Name'), format2)
-                sheet.write(row - 2, h_col+3, _('Department'), format2)
+                sheet.write(row - 2, h_col + 3, _('Department'), format2)
                 sheet.write(row, n, _('date'), format2)
-                sheet.write(row, n+1, _('day'), format2)
-                sheet.write(row, n +2 , _('Sign in'), format2)
+                sheet.write(row, n + 1, _('day'), format2)
+                sheet.write(row, n + 2, _('Sign in'), format2)
                 sheet.write(row, n + 3, _('Sign out'), format2)
                 sheet.write(row, n + 4, _('lateness'), format2)
                 sheet.write(row, n + 5, _('Early Exit'), format2)
@@ -262,13 +375,12 @@ class AttendancesReportXls(models.AbstractModel):
                 total_lateness = total_early_exit = total_extra_hours = total_office_hours = 0.0
 
                 for line in final_dic[key]:
-
-                    sheet.merge_range(row - 3, h_col + 1,row - 3,h_col + 2, emp_data[key][0]['emp_no'], format2)
+                    sheet.merge_range(row - 3, h_col + 1, row - 3, h_col + 2, emp_data[key][0]['emp_no'], format2)
                     sheet.write(row - 3, h_col + 4, emp_data[key][0]['job'], format2)
-                    sheet.merge_range(row - 2, h_col + 1,row - 2,h_col + 2, emp_data[key][0]['emp_namw'], format2)
+                    sheet.merge_range(row - 2, h_col + 1, row - 2, h_col + 2, emp_data[key][0]['emp_namw'], format2)
                     sheet.write(row - 2, h_col + 4, emp_data[key][0]['department'], format2)
                     sheet.write(data_row, n, str(line['date']), format2)
-                    sheet.write(data_row, n+1, str(line['day']), format2)
+                    sheet.write(data_row, n + 1, str(line['day']), format2)
 
                     sheet.write(data_row, n + 2, '{0:02.0f}:{1:02.0f}'.format(*divmod(float(line['sig_in']) * 60, 60)),
                                 format2)
@@ -283,7 +395,7 @@ class AttendancesReportXls(models.AbstractModel):
                     sheet.write(data_row, n + 7,
                                 '{0:02.0f}:{1:02.0f}'.format(*divmod(float(line['office_hours']) * 60, 60)), format2)
 
-                    sheet.write(data_row, n + 8,line['note'], format2)
+                    sheet.write(data_row, n + 8, line['note'], format2)
                     sheet.write(data_row, n + 9, line['calendar_id'], format2)
                     total_lateness += float(line['lateness'])
                     total_early_exit += float(line['early_exit'])
@@ -301,13 +413,13 @@ class AttendancesReportXls(models.AbstractModel):
                 sheet.write(data_row + 1, n + 7, '{0:02.0f}:{1:02.0f}'.format(*divmod(total_office_hours * 60, 60)),
                             format2)
 
-                sheet.write(data_row+3, n+4, _('Total lateness'), format2)
+                sheet.write(data_row + 3, n + 4, _('Total lateness'), format2)
                 # sheet.set_column(data_row,data_row, 15)
-                sheet.write(data_row+3, n + 5, str(total[key]['total_late_early'].split('.')[0]), format2)
-                sheet.write(data_row+3, n + 6, _('Total Absent'), format2)
-                sheet.write(data_row+3, n + 7, str(total[key]['total_absent']), format2)
+                sheet.write(data_row + 3, n + 5, str(total[key]['total_late_early'].split('.')[0]), format2)
+                sheet.write(data_row + 3, n + 6, _('Total Absent'), format2)
+                sheet.write(data_row + 3, n + 7, str(total[key]['total_absent']), format2)
                 size -= 2
-                sheet.write(data_row + 4, n+4, _('Total Extra'), format2)
+                sheet.write(data_row + 4, n + 4, _('Total Extra'), format2)
                 sheet.write(data_row + 4, n + 5, str(total[key]['total_extra_hours'].split('.')[0]), format2)
                 sheet.write(data_row + 4, n + 6, _('Total Leave'), format2)
                 sheet.write(data_row + 4, n + 7, total[key]['total_leave'], format2)
diff --git a/odex25_hr/to_attendance_system/.DS_Store b/odex25_hr/to_attendance_system/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..40ff9949ade0d566a65d985afef21d595bd0add2
GIT binary patch
literal 6148
zcmeHK%}T>S5Z-O8O({YS3Oz1(Ef`y|h?fxS3mDOZN=-<>V45vWN)Dxvv%Zi|;`2DO
zyDik_ETS_o`_0bJX7fRIGmJ6rEuvG#Y{r-cipbHZ5p>sv8YY<og2Eap%fm9Cg{cf{
z7W$1Y-1|P8GRYzqf7|~@I7^efaGX!xXtwtD+g97^T2KCqEd3%V7P%M9A8>XnWg4#S
zAiPWBa$+A|$*c&HES{@^B#I&B@jl5SS$cAjMY*c=b-?Oaor&FBE=Pl5Uz|CkRbMPG
z1`gQ6^VO<j9UY%s-b`N8X(rz^ksSAqa-d-|zHclthyh}N7$63Sfn5g7{b6-?L*yX_
zh=G630G<y56wx(UX;eoC45|eHY=K(|*w{;8jWFmMtTaLdgzHj3UCK?1!F4(Kg~@Xb
zRvL9V<EHuG=E>{kg{!B-`a-2M?rNlw7$63=8EERMjradGd@{97{&oq?hyh~Yk1@bo
zV}I<yOPRZM=k@Te6`;?cD418F0Rr~cPXJ8t9O<c`jtjIQ&ox+S#8uF*$^q#|KoLR%
JG4KNnd;zp8MoItx

literal 0
HcmV?d00001


From 815ba3235361b27dcfcf8206350dd21dd09f796c Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Tue, 6 May 2025 12:17:43 +0100
Subject: [PATCH 05/10] [FIX] attendances

---
 odex25_hr/attendances/models/hr_attendance_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_hr/attendances/models/hr_attendance_report.py b/odex25_hr/attendances/models/hr_attendance_report.py
index 78bebd89f..e86eee3a7 100644
--- a/odex25_hr/attendances/models/hr_attendance_report.py
+++ b/odex25_hr/attendances/models/hr_attendance_report.py
@@ -94,7 +94,7 @@ class HrAttendanceReport(models.Model):
         missed_hours = planed_hours - working_hours
         if missed_hours < 0:
             missed_hours = 0
-        return {'leaves': leave_hours, 'missed_hours': missed_hours, 'mission_by_days': mission_by_days_hours}
+        return {'leaves': leave_hours, 'missed_hours': missed_hours, 'mission_by_days': mission_by_days_hours, 'additional_hours': 0.0}
 
     def generate_report(self):
         transaction_values = {}

From ea8c0b9bd7337b64b28a2dd598ed0b2fa83f2064 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Tue, 6 May 2025 12:32:23 +0100
Subject: [PATCH 06/10] [FIX] attendances

---
 odex25_hr/attendances/models/hr_attendance_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_hr/attendances/models/hr_attendance_report.py b/odex25_hr/attendances/models/hr_attendance_report.py
index e86eee3a7..887aacecf 100644
--- a/odex25_hr/attendances/models/hr_attendance_report.py
+++ b/odex25_hr/attendances/models/hr_attendance_report.py
@@ -143,7 +143,7 @@ class HrAttendanceReport(models.Model):
                         no_of_days -= flexible_days
                     else:
                         if no_of_days and no_of_days < flexible_days:
-                            current_trans = attendance_transaction.filtered(lambda t: str(df) <= t.date <= self.date_to)
+                            current_trans = attendance_transaction.filtered(lambda t: df <= t.date <= self.date_to)
                             hours_dict = self.calcualte_flexible_transaction(current_trans)
                             total_mission += hours_dict['mission_by_days']
                             missed_hours += hours_dict['missed_hours']

From ef69eddccbd853a0a7b54b0f1db127c031a0815a Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Wed, 7 May 2025 12:10:05 +0100
Subject: [PATCH 07/10] [FIX] hr_base

---
 odex25_hr/hr_base/models/hr_base.py | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/odex25_hr/hr_base/models/hr_base.py b/odex25_hr/hr_base/models/hr_base.py
index 6cf449a78..797eb9ae9 100644
--- a/odex25_hr/hr_base/models/hr_base.py
+++ b/odex25_hr/hr_base/models/hr_base.py
@@ -28,7 +28,7 @@ class HrEmployee(models.Model):
     _order = 'id'
 
     # iqama fields in employee view
-    identity_number = fields.Char(compute='_compute_identity_number', string='Identity Number',store=True)
+    identity_number = fields.Char(compute_sudo=True, compute='_compute_identity_number', string='Identity Number',store=True)
     iqama_creat_date = fields.Date(related="iqama_number.issue_date", readonly=True)
     iqama_expiy_date = fields.Date(related="iqama_number.expiry_date", readonly=True)
     iqama_job = fields.Many2one(related="iqama_number.job_id", readonly=True)
@@ -78,7 +78,7 @@ class HrEmployee(models.Model):
     airport = fields.Char("Nearest Airport")
 
     first_hiring_date = fields.Date(string="First Hiring Date")
-    # duration_in_months = fields.Float(compute='_get_months_no')
+    # duration_in_months = fields.Float(compute_sudo=True, compute='_get_months_no')
     contact_no = fields.Char("Contact No")
     reason = fields.Char(string="Reason")
     r_name = fields.Char("Name")
@@ -170,10 +170,10 @@ class HrEmployee(models.Model):
                                 ("widower", "Widower"), ("divorced", "Divorced")],
                                string="Marital Status", groups="base.group_user", default="single", tracking=True)
 
-    base_salary = fields.Float(compute='compute_base_salary')
-    salary_in_words = fields.Char(compute='get_salary_amount')
-    payslip_lines = fields.One2many(comodel_name='hr.payslip.line', compute='compute_base_salary')
-    check_nationality = fields.Boolean(compute="_check_nationality_type")
+    base_salary = fields.Float(compute_sudo=True, compute='compute_base_salary')
+    salary_in_words = fields.Char(compute_sudo=True, compute='get_salary_amount')
+    payslip_lines = fields.One2many(comodel_name='hr.payslip.line', compute_sudo=True, compute='compute_base_salary')
+    check_nationality = fields.Boolean(compute_sudo=True, compute="_check_nationality_type")
     # National address
     address_city = fields.Many2one("address.city")
     address_region = fields.Many2one("address.region")
@@ -185,14 +185,14 @@ class HrEmployee(models.Model):
     drug_type = fields.Selection([('company_property', 'Company Property'), ('property', 'Employee Property'),
                                   ('rent', 'Rent')], default="rent")
     apartment_number = fields.Char()
-    service_year = fields.Integer(compute='_compute_service_duration')
-    service_month = fields.Integer(compute='_compute_service_duration')
-    service_day = fields.Integer(compute='_compute_service_duration')
-    experience_year = fields.Integer(compute='_compute_duration_experience')
-    experience_month = fields.Integer(compute='_compute_duration_experience')
-    experience_day = fields.Integer(compute='_compute_duration_experience')
+    service_year = fields.Integer(compute_sudo=True, compute='_compute_service_duration')
+    service_month = fields.Integer(compute_sudo=True, compute='_compute_service_duration')
+    service_day = fields.Integer(compute_sudo=True, compute='_compute_service_duration')
+    experience_year = fields.Integer(compute_sudo=True, compute='_compute_duration_experience')
+    experience_month = fields.Integer(compute_sudo=True, compute='_compute_duration_experience')
+    experience_day = fields.Integer(compute_sudo=True, compute='_compute_duration_experience')
     relationship = fields.Char(string="Relationship")
-    employee_age = fields.Integer(string="Age", compute='_compute_employee_age', store=True)
+    employee_age = fields.Integer(string="Age", compute_sudo=True, compute='_compute_employee_age', store=True)
 
     personal_email = fields.Char('Personal Email')
 
@@ -202,9 +202,9 @@ class HrEmployee(models.Model):
                                   domain="[('company_id', '=', company_id)]",
                                   help='Current contract of the employee')
     phone_ext = fields.Char(string="Extension Phone")
-    first_contract_date = fields.Date(compute='_compute_first_contract_date', groups="base.group_user")
+    first_contract_date = fields.Date(compute_sudo=True, compute='_compute_first_contract_date', groups="base.group_user")
 
-    contract_warning = fields.Boolean(string='Contract Warning', store=True, compute='_compute_contract_warning',
+    contract_warning = fields.Boolean(string='Contract Warning', store=True, compute_sudo=True, compute='_compute_contract_warning',
                                       groups="base.group_user")
 
     barcode = fields.Char(string="Badge ID", help="ID used for employee identification.", groups="base.group_user",
@@ -245,7 +245,7 @@ class HrEmployee(models.Model):
     branch_name = fields.Many2one(related='department_id.branch_name', store=True, string="Branch Name")
 
 
-    '''employee_cars_count = fields.Integer(compute="_compute_employee_cars_count", string="Cars",
+    '''employee_cars_count = fields.Integer(compute_sudo=True, compute="_compute_employee_cars_count", string="Cars",
                                          groups="base.group_user")
 
     def _compute_employee_cars_count(self):

From f3ec541ebe88d7e84f9fa07e4f713ca18e8af2cf Mon Sep 17 00:00:00 2001
From: ahmed-nouri051 <A.nouri@exp-sa.com>
Date: Sun, 11 May 2025 10:05:10 +0200
Subject: [PATCH 08/10] noupdate for hr

---
 .../hr_administrative_circular/data/mail_template_data.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odex25_hr/hr_administrative_circular/data/mail_template_data.xml b/odex25_hr/hr_administrative_circular/data/mail_template_data.xml
index 5741afba2..61398f93c 100644
--- a/odex25_hr/hr_administrative_circular/data/mail_template_data.xml
+++ b/odex25_hr/hr_administrative_circular/data/mail_template_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
+    <data noupdate="1">
         <record id="mail_circulars" model="mail.template">
             <field name="name">Administrative circulars and decisions publication e-mail.</field>
             <field name="subject">${(object.name)}</field>

From fcbb178b17aef44817c43d6224fa90b0d1266977 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Mon, 12 May 2025 12:41:22 +0100
Subject: [PATCH 09/10] [UPD] exp_official_mission

---
 odex25_hr/exp_official_mission/i18n/ar_001.po |  4 +--
 .../models/hr_official_mission.py             |  9 +++--
 .../views/especially_hours.xml                | 34 +++++++++++--------
 .../views/hr_official_mission_type_view.xml   |  1 +
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/odex25_hr/exp_official_mission/i18n/ar_001.po b/odex25_hr/exp_official_mission/i18n/ar_001.po
index 28bdb3790..72ae8ab10 100644
--- a/odex25_hr/exp_official_mission/i18n/ar_001.po
+++ b/odex25_hr/exp_official_mission/i18n/ar_001.po
@@ -1393,7 +1393,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission_employee__official_mission_id
 #: model:ir.ui.menu,name:exp_official_mission.employee_official_mission_menu_item
 msgid "Official Mission"
-msgstr "الانتدابات ومهام العمل"
+msgstr "الانتداب"
 
 #. module: exp_official_mission
 #: model:ir.actions.act_window,name:exp_official_mission.hr_official_mission_action_hr_employee
@@ -2349,7 +2349,7 @@ msgstr ""
 #: model:ir.ui.menu,name:exp_official_mission.employee_especially_hours_menu_item
 #: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_especially_hours_tree_view
 msgid "Employee Especially Hours"
-msgstr "ساعات الموظف الخاصة"
+msgstr "مهام العمل"
 
 #. module: exp_official_mission
 #: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_especially_hours_form_view
diff --git a/odex25_hr/exp_official_mission/models/hr_official_mission.py b/odex25_hr/exp_official_mission/models/hr_official_mission.py
index e9bbfb36d..e27bad2be 100644
--- a/odex25_hr/exp_official_mission/models/hr_official_mission.py
+++ b/odex25_hr/exp_official_mission/models/hr_official_mission.py
@@ -488,18 +488,20 @@ class HrOfficialMission(models.Model):
         self.employee_ids.chick_not_overtime()
         self.employee_ids.compute_Training_cost_emp()
         self.employee_ids.write({'status': 'approved'})
-        self.state = "direct_manager"
+        self.state = 'depart_manager'
         for rec in self:
             manager = rec.sudo().employee_id.parent_id
             hr_manager = rec.sudo().employee_id.company_id.hr_manager_id
             if manager:
                if manager.user_id.id == rec.env.uid or hr_manager.user_id.id == rec.env.uid:
-                  rec.write({'state': 'direct_manager'})
+                  rec.write({'state': 'depart_manager'})
                else:
                   raise exceptions.Warning(
                        _("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(manager.name))
             else:
-                rec.write({'state': 'direct_manager'})
+                rec.write({'state': 'depart_manager'})
+        if self.mission_type.approval_by == 'direct_manager':
+            self.approve()
 
     #Refuse For The Direct Manager Only
     def direct_manager_refused(self):
@@ -968,6 +970,7 @@ class HrOfficialMissionType(models.Model):
                                    ('training', _('Training')),
                                    ('others', _('others'))], 'Work Status')
     special_hours = fields.Boolean(string='Special Hours', default=False)
+    approve_by = fields.Selection([('direct_manager', 'Direct Manager'), ('depart_manager', 'HR Department')], default='direct_manager', required=True)
 
     @api.onchange('duration_type')
     def _change_duration_type(self):
diff --git a/odex25_hr/exp_official_mission/views/especially_hours.xml b/odex25_hr/exp_official_mission/views/especially_hours.xml
index f6214a923..6ec4a8e43 100644
--- a/odex25_hr/exp_official_mission/views/especially_hours.xml
+++ b/odex25_hr/exp_official_mission/views/especially_hours.xml
@@ -14,7 +14,7 @@
         <menuitem name="Employee Especially Hours" id="employee_especially_hours_menu_item"
                   parent="employee_requests.employee_request_menu_item"
                   action="employee_especially_hours_action"
-                  sequence="4"/>
+                  sequence="9"/>
 
         <record model="ir.ui.view" id="employee_especially_hours_form_view">
             <field name="name">Employee Especially Hours</field>
@@ -31,15 +31,15 @@
                                 states="send" groups="hr_base.group_division_manager"/>
 
                         <button name="approve" string="HR Approval" class="oe_highlight" type="object"
-                                states="direct_manager" groups="hr.group_hr_user"/>
+                                states="depart_manager" groups="hr.group_hr_user"/>
                         <button name="refused" string="Refused" class="oe_highlight" type="object"
-                                states="direct_manager" groups="hr.group_hr_user"/>
+                                states="depart_manager" groups="hr.group_hr_user"/>
 
                         <button name="draft_state" string="RE-Draft" class="oe_highlight" type="object"
                                 states="approve,refused" groups="hr.group_hr_user"
                                 confirm="Are you sure to Reset To Draft This Record?"/>
                         <field name="state" widget="statusbar"
-                               statusbar_visible="draft,send,direct_manager,approve,refused"/>
+                               statusbar_visible="draft,send,depart_manager,approve,refused"/>
                     </header>
                     <sheet>
                         <group>
@@ -59,16 +59,6 @@
 
                                 <field name="date_duration" string="Duration Days" readonly="1" force_save="1"
                                        attrs="{'required':[('duration_type','=','days')]}"/>
-                            </group>
-                            <group>
-                                 <field name="company_id" groups="base.group_multi_company" attrs="{'readonly': [('state','!=', 'draft')]}"/>
-                                <field name="date" string="Date Request" attrs="{'readonly':[('state','!=','draft')]}"
-                                       required="1"/>
-                                <field name="employee_id" string="Responsible" required="1"
-                                       attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="employee_no" string="Employee Number" readonly="1"/>
-                                <field name="department_id2" string="Department" readonly="1"/>
-                                <!--field name="note"  string='Comments' attrs="{'readonly':[('state','!=','draft')]}" /-->
                                 <field name="hour_from" string="Hour From" widget="float_time"
                                        attrs="{'required': [('state', '=', 'direct_manager')],
                                                'readonly':[('state','not in',('draft','direct_manager','send'))] }"/>
@@ -79,6 +69,22 @@
                                        widget="float_time"
                                        attrs="{'required':[('duration_type','=','hours')]}"/>
                             </group>
+                            <group>
+                                 <field name="company_id" groups="base.group_multi_company" attrs="{'readonly': [('state','!=', 'draft')]}"/>
+                                <field name="date" string="Date Request" attrs="{'readonly':[('state','!=','draft')]}"
+                                       required="1"/>
+                                <field name="employee_id" string="Responsible" required="1"
+                                       attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="employee_no" string="Employee Number" readonly="1"/>
+                                <field name="department_id2" string="Department" readonly="1"/>
+                                <field name="destination" string="Destination" widget="selection" 
+                                        domain="[('destination_type','in',('mission','all'))]" />
+                                <!--field name="note"  string='Comments' attrs="{'readonly':[('state','!=','draft')]}" /-->
+                            </group>
+                        </group>
+                        <group string="Mission Purpose">
+                            <field name="mission_purpose" nolabel="1"
+                                   attrs="{'readonly':[('state','!=','draft')], 'required':[('state','=','draft')]}"/>
                         </group>
 
                         <notebook>
diff --git a/odex25_hr/exp_official_mission/views/hr_official_mission_type_view.xml b/odex25_hr/exp_official_mission/views/hr_official_mission_type_view.xml
index 9f018e7fb..31b6c0c2f 100644
--- a/odex25_hr/exp_official_mission/views/hr_official_mission_type_view.xml
+++ b/odex25_hr/exp_official_mission/views/hr_official_mission_type_view.xml
@@ -70,6 +70,7 @@
 
                                 <field name="max_amount" string="Maximum Amount"
                                        attrs="{'invisible':[('related_with_financial','=',False)],'required':[('related_with_financial','=',True)]}"/>
+                                <field name="approve_by"/>
 
                                 <separator string="Accounting"
                                            attrs="{'invisible':[('related_with_financial','=',False)]}"/>

From d003b586a10f8f9380ac238e32b69ef8712baf77 Mon Sep 17 00:00:00 2001
From: Samir Ladoui <whitexhunter23@gmail.com>
Date: Mon, 12 May 2025 13:27:43 +0100
Subject: [PATCH 10/10] [FIX] exp_official_mission

---
 odex25_hr/exp_official_mission/i18n/ar_001.po     | 15 ++++++++++++++-
 .../models/hr_official_mission.py                 |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/odex25_hr/exp_official_mission/i18n/ar_001.po b/odex25_hr/exp_official_mission/i18n/ar_001.po
index 72ae8ab10..3ebaa6edc 100644
--- a/odex25_hr/exp_official_mission/i18n/ar_001.po
+++ b/odex25_hr/exp_official_mission/i18n/ar_001.po
@@ -619,6 +619,7 @@ msgstr "المنصب"
 #. module: exp_official_mission
 #: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission__destination
 #: model:ir.ui.menu,name:exp_official_mission.mission_destination_menu
+#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_especially_hours_form_view
 #: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_form_view
 #: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_tree_view
 #: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_training_form_view
@@ -1217,6 +1218,7 @@ msgstr "مكان المهمة"
 
 #. module: exp_official_mission
 #: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission__mission_purpose
+#: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_especially_hours_form_view
 #: model_terms:ir.ui.view,arch_db:exp_official_mission.employee_official_mission_form_view
 msgid "Mission Purpose"
 msgstr "الغرض من المهمة"
@@ -2685,6 +2687,17 @@ msgstr "للأسف الموظف %s, لايمكن تجاوز عدد ايام ال
 msgid "Sorry The Employee %s Cannot Exceed %s Days, This Maximum Days Per year."
 msgstr "للأسف الموظف %s, لايمكن تجاوز عدد %s يوم, وهي اقصى أيام للإنتدابات بالسنة."
 
+#. module: exp_official_mission
+#: model:ir.model.fields,field_description:exp_official_mission.field_hr_official_mission_type__approve_by
+msgid "Approve By"
+msgstr "تصديق بواسطة"
 
+#. module: exp_official_mission
+#: model:ir.model.fields.selection,name:exp_official_mission.selection__hr_official_mission_type__approve_by__direct_manager
+msgid "Direct Manager"
+msgstr "المدير المباشر"
 
-
+#. module: exp_official_mission
+#: model:ir.model.fields.selection,name:exp_official_mission.selection__hr_official_mission_type__approve_by__depart_manager
+msgid "HR Department"
+msgstr "الموارد البشرية"
diff --git a/odex25_hr/exp_official_mission/models/hr_official_mission.py b/odex25_hr/exp_official_mission/models/hr_official_mission.py
index e27bad2be..e03df0876 100644
--- a/odex25_hr/exp_official_mission/models/hr_official_mission.py
+++ b/odex25_hr/exp_official_mission/models/hr_official_mission.py
@@ -500,7 +500,7 @@ class HrOfficialMission(models.Model):
                        _("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(manager.name))
             else:
                 rec.write({'state': 'depart_manager'})
-        if self.mission_type.approval_by == 'direct_manager':
+        if self.mission_type.approve_by == 'direct_manager':
             self.approve()
 
     #Refuse For The Direct Manager Only