diff --git a/odex25_hr/attendances/report/employee_attendances_report_template.xml b/odex25_hr/attendances/report/employee_attendances_report_template.xml
index 2ce9a78a0..32c761a3b 100644
--- a/odex25_hr/attendances/report/employee_attendances_report_template.xml
+++ b/odex25_hr/attendances/report/employee_attendances_report_template.xml
@@ -7,12 +7,20 @@
             <field name="default" eval="False"/>
             <field name="format">A4</field>
             <field name="orientation">Landscape</field>
-            <field name="margin_top">10</field>
+<!--            <field name="margin_top">10</field>-->
+<!--            <field name="margin_bottom">10</field>-->
+<!--            <field name="margin_left">7</field>-->
+<!--            <field name="margin_right">7</field>-->
+<!--            <field name="header_line" eval="False"/>-->
+<!--            <field name="header_spacing">10</field>-->
+<!--            <field name="dpi">90</field>-->
+
+            <field name="margin_top">30</field>
+            <field name="margin_right">5</field>
             <field name="margin_bottom">10</field>
-            <field name="margin_left">7</field>
-            <field name="margin_right">7</field>
+            <field name="margin_left">5</field>
             <field name="header_line" eval="False"/>
-            <field name="header_spacing">10</field>
+            <field name="header_spacing">35</field>
             <field name="dpi">90</field>
         </record>
 
@@ -357,24 +365,7 @@
 
         </template>
         <template id="totals_only_attendance_report_template">
-            <!--            <div class="page"  style="font-size:12pt" dir="rtl">-->
-            <!--            print-orientation="landscape"-->
-            <!--            &lt;!&ndash;            print-orientation="landscape" &ndash;&gt;-->
-                        <style>
-                            @page {
-                            size: A4 landscape;
-
-                            margin: 0.5cm;
-                            }
-                        </style>
-
-            <div class="page" style="font-size:12pt;"
-                 dir="rtl"
-
-            >
-<!--                 print-orientation="landscape"-->
-<!--                 t-att-data-report-orientation="'landscape'"-->
-
+            <div class="page" style="font-size:12pt;" dir="rtl">
                 <center>
                     <h2 style="font-weight:bold">تقرير الحضور والانصراف للموظفين</h2>
                 </center>
@@ -501,9 +492,9 @@
                         font-family: ae_AlMohanad;
                         }
                     </style>
-                    <!--                    <t t-if="totals_only">-->
+
                     <t t-call="attendances.totals_only_attendance_report_template"/>
-                    <!--                    </t>-->
+
 
                 </t>
             </t>
diff --git a/odex25_hr/employee_requests/views/hr_personal_permission.xml b/odex25_hr/employee_requests/views/hr_personal_permission.xml
index 272f7f5e2..9f47bf772 100644
--- a/odex25_hr/employee_requests/views/hr_personal_permission.xml
+++ b/odex25_hr/employee_requests/views/hr_personal_permission.xml
@@ -128,6 +128,7 @@
                     <!--field name="date" string="Date Request"/-->
                     <field name="employee_no" string="Employee Number"/>
                     <field name="employee_id" string="Employee"/>
+                    <field name="department_id" />
                     <field name="permission_type_id" />
                     <field name="date_from" string="Date From"/>
                     <field name="date_to" string="Date To"/>
diff --git a/odex25_hr/exp_official_mission/views/especially_hours.xml b/odex25_hr/exp_official_mission/views/especially_hours.xml
index 48bc28f7c..2ae45a23a 100644
--- a/odex25_hr/exp_official_mission/views/especially_hours.xml
+++ b/odex25_hr/exp_official_mission/views/especially_hours.xml
@@ -143,6 +143,7 @@
                       string="Employee Especially Hours">
                     <field name="employee_no" string="Employee Number"/>
                     <field name="employee_id" string="Responsible"/>
+                    <field name="department_id" />
                     <field name="mission_type" string="Mission Type"/>
                     <field name="date" string="Date Request"/>
                     <field name="date_from" string="Date From"/>
diff --git a/odex25_hr/hr_disciplinary_tracking/views/penalty_register.xml b/odex25_hr/hr_disciplinary_tracking/views/penalty_register.xml
index 8246a5e4d..dbf044f22 100644
--- a/odex25_hr/hr_disciplinary_tracking/views/penalty_register.xml
+++ b/odex25_hr/hr_disciplinary_tracking/views/penalty_register.xml
@@ -131,6 +131,7 @@
                 <tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'"   string="Penalty Register">
                     <field name="employee_no" string="Employee Number"/>
                     <field name="employee_id" string="Employee Name"/>
+                    <field name="department_id" />
                     <field name="date" string="Date"/>
                     <field name="penalty_id" string="Penalty"/>
                     <field name="punishment_id" string="punishment" widget="many2many_tags"/>
diff --git a/odex25_hr/hr_holidays_community/views/hr_holidays_views.xml b/odex25_hr/hr_holidays_community/views/hr_holidays_views.xml
index 1145de5db..17af84723 100644
--- a/odex25_hr/hr_holidays_community/views/hr_holidays_views.xml
+++ b/odex25_hr/hr_holidays_community/views/hr_holidays_views.xml
@@ -140,6 +140,7 @@
                 <tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Allocation Requests"
                        decoration-bf="message_needaction == True">
                     <field name="employee_id"/>
+                    <field name="department_id" />
                     <field name="holiday_type"/>
                     <field name="category_id"/>
                     <field name="department_id" invisible="1"/>
@@ -278,6 +279,7 @@
                 <tree decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Leave Requests"
                        decoration-bf="message_needaction == True">
                     <field name="employee_id"/>
+                    <field name="department_id" />
                     <field name="holiday_type" string="Mode" groups="base.group_no_one"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>
diff --git a/odex25_hr/hr_holidays_public/models/hr_holidays.py b/odex25_hr/hr_holidays_public/models/hr_holidays.py
index 3b1a970c5..5fe8bc223 100644
--- a/odex25_hr/hr_holidays_public/models/hr_holidays.py
+++ b/odex25_hr/hr_holidays_public/models/hr_holidays.py
@@ -2059,3 +2059,11 @@ class holidaysAttach(models.Model):
     #         })
     #     return result
 
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    resource_calendar_id = fields.Many2one(
+        'resource.calendar', 'Company Working Hours',
+        related='company_id.resource_calendar_id', readonly=False)
+
diff --git a/odex25_hr/hr_holidays_public/views/leave_cancellation.xml b/odex25_hr/hr_holidays_public/views/leave_cancellation.xml
index dd1b517d0..93bf3434d 100644
--- a/odex25_hr/hr_holidays_public/views/leave_cancellation.xml
+++ b/odex25_hr/hr_holidays_public/views/leave_cancellation.xml
@@ -95,6 +95,7 @@
             <field name="arch" type="xml">
                 <tree decoration-success="state=='approve'" decoration-danger="state == 'refuse'" decoration-info="state == 'draft'" string="Leave Cancellation">
                     <field name="employee_id" string="Employee"/>
+                    <field name="department_id" />
                     <field name="leave_request_id"  />
                     <field name="from_date" widget="date"/>
                     <!--field name="leave_cancellation_date" widget="date"/-->
diff --git a/odex25_hr/hr_holidays_public/views/leaves_balance.xml b/odex25_hr/hr_holidays_public/views/leaves_balance.xml
index 0ce8f8fb1..af8126e95 100644
--- a/odex25_hr/hr_holidays_public/views/leaves_balance.xml
+++ b/odex25_hr/hr_holidays_public/views/leaves_balance.xml
@@ -10,6 +10,40 @@
             <field name="search_view_id" ref="hr_holidays_community.view_hr_holidays_filter"/>
         </record>
 
+    <record id="view_employee_form_leave_inheritt" model="ir.ui.view">
+        <field name="name">hr.employee.leave.form.inherit</field>
+        <field name="model">hr.employee</field>
+        <field name="inherit_id" ref="hr.view_employee_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='active_group']" position="after">
+                <group string="Leaves" groups="base.group_no_one">
+                    <label for="remaining_leaves"/>
+                    <div>
+                        <field name="remaining_leaves" class="oe_inline"/> days
+                    </div>
+                </group>
+            </xpath>
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <field name="show_leaves" invisible="1"/>
+                <button name="%(leaves_balance_action)d"
+                        type="action"
+                        class="oe_stat_button"
+                        icon="fa-calendar"
+                        attrs="{'invisible': [('show_leaves','=', False)]}"
+                        groups="base.group_user"
+                        help="Remaining leaves">
+                    <field string="Leaves Left" name="leaves_count" widget="statinfo"/>
+                </button>
+            </xpath>
+        </field>
+    </record>
+
+
+
+
+
+
+
 
 
         <record model="ir.ui.view" id="leaves_balance_form_view">
@@ -58,6 +92,8 @@
             <field name="arch" type="xml">
                 <tree create="false" edit="false" delete="false">
                     <field name="employee_id" string="Employee"/>
+                    <field name="department_id" />
+
                     <field name="holiday_status_id" string="Leave Type"/>
                     <field name="state" invisible="1"/>
                     <field name="leaves_taken" string="Leaves Taken"/>