fix and add new

odex25_hr/employee_requests/i18n/ar_001.po

@@ -2706,7 +2706,7 @@ msgstr "آسف الموظف %s بالفعل في هذه الفترة%s"
 #: code:addons/employee_requests/models/hr_personal_permission.py:0
 #, python-format
 msgid "Sorry The Employee %s Actually On Mission/Training For this Period"
-msgstr "عذرًا ، الموظف%s بالفعل في مهمة %s تدريب لهذه الفترة"
+msgstr "آسف, الموظف %s فعليا في مهمة عمل/تدريب خلال هذه الفترة"
 
 #. module: employee_requests
 #: code:addons/employee_requests/models/hr_personal_permission.py:0

odex25_hr/exp_payroll_custom/models/hr_advance_payslip.py

@@ -35,7 +35,7 @@ class SalaryRuleInput(models.Model):
     total_loans = fields.Float(string='Total Loans', compute='compute_totals')
     total_sum = fields.Float(string='Total Net', compute='compute_totals')
     state = fields.Selection(selection_add=[('computed', 'Computed'), ('confirmed', 'Confirmed'),
-                                            ('transfered', 'Transfer'), ('close', 'Close')])
+                                            ('transfered', 'Transfer'), ('close', 'Close')], tracking=True)
     level_id = fields.Many2one('hr.payroll.structure', string='Level', readonly=1)
     group_id = fields.Many2one('hr.payroll.structure', string='Group', readonly=1)
     degree_id = fields.Many2one('hr.payroll.structure', string='Degree', readonly=1)
@@ -2241,7 +2241,7 @@ class HrPayslipRun(models.Model):
     required_condition = fields.Boolean(string='Required Condition', compute='compute_type')
     state = fields.Selection(selection_add=[('computed', 'Computed'),
                                             ('confirmed', 'Confirmed'),
-                                            ('transfered', 'Transfer'), ('close', 'Close')])
+                                            ('transfered', 'Transfer'), ('close', 'Close')], tracking=True)
 
     # Relational fields
     salary_scale = fields.Many2one('hr.payroll.structure', string='Salary Scale')

odex25_hr/hr_base/i18n/ar_001.po

@@ -2043,7 +2043,7 @@ msgstr "ممتاز"
 #: model:res.groups,name:hr_base.group_executive_manager
 #: model:res.groups,comment:hr_base.group_executive_manager
 msgid "Executive Manager"
-msgstr "الرئيس التفيذي"
+msgstr "الرئيس التنفيذي"
 
 
 #. module: hr_base
@@ -4671,3 +4671,28 @@ msgstr "مدير الموارد البشرية"
 #: model_terms:ir.ui.view,arch_db:hr_base.hr_extension_form_view
 msgid "Branch Name"
 msgstr "اسم الفرع"
+
+#. module: hr_base
+#: model:res.groups,name:hr_base.group_services_manager
+msgid "Shared Services"
+msgstr "الخدمات المشتركة"
+
+#. module: hr_base
+#: model:res.groups,name:hr_base.group_administrative_affairs
+msgid "Administrative Affairs"
+msgstr "الشئون الادارية"
+
+#. module: hr_base
+#: model:ir.model.fields,field_description:hr_base.field_res_company__services_manager_id
+msgid "Services Manager"
+msgstr "مدير الخدمات المشتركة"
+
+#. module: hr_base
+#: model:ir.model.fields,field_description:hr_base.field_res_company__it_manager_id
+msgid "IT Manager"
+msgstr "مدير التقنية"
+
+#. module: hr_base
+#: model:ir.model.fields,field_description:hr_base.field_res_company__admin_manager_id
+msgid "Admin Affairs Manager"
+msgstr "مدير الشئون الادارية"

odex25_hr/hr_base/models/res_company_ext.py

@@ -32,6 +32,10 @@ class ResCompanyExt(models.Model):
     max_amount_saudi_gosi = fields.Float(string='Max Amount Saudi Gosi',default=4387.5)
     max_amount_company_gosi = fields.Float(string='Max Amount Company Gosi',default=5287.5)
 
+    services_manager_id = fields.Many2one('hr.employee', string='Services Manager')
+    it_manager_id = fields.Many2one('hr.employee', string='IT Manager')
+    admin_manager_id = fields.Many2one('hr.employee', string='Admin Affairs Manager')
+
     @api.constrains('saudi_percentage')
     def saudi_percentage_less_100(self):
         for item in self:

odex25_hr/hr_base/security/hr_base_security.xml

@@ -50,6 +50,20 @@
         <field name="comment">This user is the IT Manager.</field>
     </record>
 
+    <record id="group_services_manager" model="res.groups">
+        <field name="name">Shared Services</field>
+        <field name="category_id" ref="base.module_category_human_resources_employees" />
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]" />
+        <field name="comment">This user is the Shared services Manager.</field>
+    </record>
+
+    <record id="group_administrative_affairs" model="res.groups">
+        <field name="name">Administrative Affairs</field>
+        <field name="category_id" ref="base.module_category_human_resources_employees" />
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]" />
+        <field name="comment">This user is Administrative Affairs Manager.</field>
+    </record>
+
     <!-- Rules-->
     <record id="hr_employee_employee_rule" model="ir.rule">
         <field name="name">Employee: views its profile only</field>

odex25_hr/hr_base/views/res_company_ext_view.xml

@@ -85,6 +85,9 @@
                 <xpath expr="//field[@name='email']" position="after">
                     <field name="hr_manager_id"/>
                     <field name="hr_email"/>
+                    <field name="services_manager_id"/>
+                    <field name="it_manager_id"/>
+                    <field name="admin_manager_id"/>
                 </xpath>
 
                 <xpath expr="//field[@name='country_id']" position="attributes">

odex25_hr/hr_holidays_community/models/hr_holidays.py

@@ -154,7 +154,7 @@ class Holidays(models.Model):
     _name = "hr.holidays"
     _description = "Leave"
     _order = "type desc, date_from desc"
-    _inherit = ['mail.thread']
+    _inherit = ['mail.thread', 'mail.activity.mixin']
 
     def _default_employee(self):
         return self.env.context.get('default_employee_id') or self.env['hr.employee'].search(

odex25_hr/hr_holidays_community/views/hr_holidays_views.xml

@@ -124,6 +124,7 @@
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="activity_ids" widget="mail_activity"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>

odex25_hr/hr_holidays_public/views/mail_template.xml

@@ -7,8 +7,9 @@
             <field name="name">Employee Leave Replacement</field>
             <field name="subject">بديل اجازة الموظف  ${object.employee_id.name} </field>
             <field name="model_id" ref="model_hr_holidays"/>
-            <field name="email_to">${object.employee_id.user_id.partner_id.email}</field>
-            <field name="email_cc">${object.employee_id.parent_id.user_id.partner_id.email}</field>
+            <field name="email_to">${object.replace_by.user_id.partner_id.email}</field>
+            <field name="email_cc">${object.employee_id.parent_id.user_id.partner_id.email},
+                                   ${object.employee_id.user_id.partner_id.email}</field>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <div  style="font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">