diff --git a/odex25_hr/attendances/i18n/ar_001.po b/odex25_hr/attendances/i18n/ar_001.po
index ca93dfc9f..5f9a2650e 100644
--- a/odex25_hr/attendances/i18n/ar_001.po
+++ b/odex25_hr/attendances/i18n/ar_001.po
@@ -2260,3 +2260,8 @@ msgstr "متواجـد"
msgid "Not Present"
msgstr "غير متواجـد"
+#. module: attendances
+#: model:ir.model.fields,field_description:attendances.field_hr_attendance_report__department_ids
+msgid "Departments"
+msgstr "الأقسام"
+
diff --git a/odex25_hr/attendances/models/hr_attendance_report.py b/odex25_hr/attendances/models/hr_attendance_report.py
index af2e4f26f..e6bc88104 100644
--- a/odex25_hr/attendances/models/hr_attendance_report.py
+++ b/odex25_hr/attendances/models/hr_attendance_report.py
@@ -25,6 +25,8 @@ class HrAttendanceReport(models.Model):
deduct_date_from = fields.Date()
deduct_date_to = fields.Date()
company_id = fields.Many2one('res.company', string="Company", default=lambda self: self.env.user.company_id)
+ department_ids = fields.Many2many('hr.department', string='Departments')
+
def unlink(self):
for rec in self:
@@ -104,6 +106,8 @@ class HrAttendanceReport(models.Model):
transaction_pool = self.env['hr.attendance.transaction']
reason_pool = self.env['hr.reasons.lateness']
domain = self._context.get('emp_id', False) and [('id', '=', self._context.get('emp_id'))] or []
+ if self.department_ids:
+ domain += [('department_id', 'in', self.department_ids.ids)]
emps = self.env['hr.employee'].search(domain)
trans_domain = [('date', '>=', self.date_from), ('date', '<=', self.date_to), ('attending_type', '=', 'in_cal')]
if self.calendar_ids: trans_domain += [('calendar_id', 'in', self.calendar_ids.ids)]
diff --git a/odex25_hr/attendances/views/hr_attendance_report.xml b/odex25_hr/attendances/views/hr_attendance_report.xml
index b01ee0e68..e5fa1f263 100644
--- a/odex25_hr/attendances/views/hr_attendance_report.xml
+++ b/odex25_hr/attendances/views/hr_attendance_report.xml
@@ -47,6 +47,8 @@
+
+
@@ -106,6 +108,7 @@
+
diff --git a/odex25_hr/hr_base/views/res_config_settings.xml b/odex25_hr/hr_base/views/res_config_settings.xml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/odex25_hr/hr_holidays_public/views/hr_holidays_view.xml b/odex25_hr/hr_holidays_public/views/hr_holidays_view.xml
index 194ad2ff1..cf657625b 100644
--- a/odex25_hr/hr_holidays_public/views/hr_holidays_view.xml
+++ b/odex25_hr/hr_holidays_public/views/hr_holidays_view.xml
@@ -36,6 +36,7 @@
{'readonly':[('state','!=','draft')]}
+
@@ -61,6 +62,7 @@
attrs="{'invisible':['|',('check_unlimit','=',False),('type','!=','remove')],'readonly':[('state','!=','draft')]}"/>
+
@@ -226,6 +228,9 @@
1
+
+
+
1