From 04e6f6248d125e22d264aefaa7d809f48dc43172 Mon Sep 17 00:00:00 2001
From: Bakry <bakry@exp-sa.com>
Date: Thu, 22 Aug 2024 17:00:04 +0300
Subject: [PATCH] fix

---
 odex25_hr/attendances/views/hr_attendance_view.xml |  4 ++--
 .../models/hr_official_mission.py                  | 14 +++++++++++++-
 odex25_hr/hr_base/__manifest__.py                  |  1 +
 odex25_hr/hr_docs_expiry/i18n/ar_001.po            |  4 ++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/odex25_hr/attendances/views/hr_attendance_view.xml b/odex25_hr/attendances/views/hr_attendance_view.xml
index 9a61b2e18..3fb13148d 100644
--- a/odex25_hr/attendances/views/hr_attendance_view.xml
+++ b/odex25_hr/attendances/views/hr_attendance_view.xml
@@ -258,7 +258,7 @@
                             <page string="Working Hours" invisible="1">
                                 <field name="attendance_ids" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                             </page>
-                           <page string="Overtime Settings" name="over_time_full1">
+                           <page string="Overtime Settings" name="over_time_not_full1">
                                 <group>
                                     <field name="work_days" string="Work Days overtime"/>
                                     <field name="work_hour" string="Work Hours"/>
@@ -271,7 +271,7 @@
 		                    <field name="account_overtime_id" string="Account Overtime"/>
 		                </group> 
                             </page>
-                             <page string="Permission Settings" name="over_time_full">
+                             <page string="Permission Settings" name="over_time_not_full">
                                  <group>
 					<group>
 	                                    <field name="permission_hours" string="Hours Per Day" widget="float_time"  help="The Minimum Permission Hours Per Day"/>
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 3c16a41c2..94ecf09a7 100644
--- a/odex25_hr/exp_official_mission/models/hr_official_mission.py
+++ b/odex25_hr/exp_official_mission/models/hr_official_mission.py
@@ -46,6 +46,8 @@ class HrOfficialMission(models.Model):
     refused_by = fields.Many2one(comodel_name='res.users')
     mission_type = fields.Many2one('hr.official.mission.type', tracking=True)
     country_id = fields.Many2one('res.country', )
+    # add new field
+    miss_state = fields.Selection(related='mission_type.work_state')
     official_mission = fields.Many2one('hr.salary.rule', domain=[('rules_type', '=', 'mandate')])
 
     ticket_insurance = fields.Char()
@@ -86,6 +88,9 @@ class HrOfficialMission(models.Model):
 
     company_id = fields.Many2one('res.company',string="Company", default=lambda self: self.env.user.company_id)
 
+    ticket_request_id = fields.Many2one('hr.ticket.request', string="Ticket Request", readonly=True)
+
+
     '''@api.constrains('employee_ids')
     def chick_employee_ids(self):
         for item in self:
@@ -243,9 +248,14 @@ class HrOfficialMission(models.Model):
                                             total += item.compute_rule(rule, line.employee_id.contract_id)
                                         line.hour_price = total
                                         line.amount = total * line.hours
+            self.sudo().employee_ids.chick_not_overtime()
+            self.sudo().re_compute()
 
     def re_compute(self):
         self.employee_ids.compute_Training_cost_emp()
+        self.employee_ids.compute_day_price()
+        self.employee_ids.compute_number_of_days()
+        self.employee_ids.compute_number_of_hours()
         return True
 
     def draft_state(self):
@@ -420,7 +430,7 @@ class HrOfficialMission(models.Model):
             # create ticket request from all employee
             if item.issuing_ticket == 'yes':
                 for emp in item.employee_ids:
-                    self.env['hr.ticket.request'].create({
+                    ticket = self.env['hr.ticket.request'].create({
                         'employee_id': emp.employee_id.id,
                         'mission_request_id': item.id,
                         'mission_check': True,
@@ -429,6 +439,8 @@ class HrOfficialMission(models.Model):
                         'cost_of_tickets': item.get_ticket_cost(emp.employee_id),
                         'destination': item.destination.id,
                     })
+                    item.write({'ticket_request_id': ticket.id})
+
             # move invoice  training cost our trining center
             if item.Training_cost > 0:
                 invoice_line_vals = {
diff --git a/odex25_hr/hr_base/__manifest__.py b/odex25_hr/hr_base/__manifest__.py
index 2bb6cbec5..68c0d6eea 100644
--- a/odex25_hr/hr_base/__manifest__.py
+++ b/odex25_hr/hr_base/__manifest__.py
@@ -15,6 +15,7 @@
         "account",
         "hr_holidays_community",
         "hr_contract",
+        "base_custom",
     ],
     "data": [
         "security/hr_base_security.xml",
diff --git a/odex25_hr/hr_docs_expiry/i18n/ar_001.po b/odex25_hr/hr_docs_expiry/i18n/ar_001.po
index 27100766d..0bce34a91 100644
--- a/odex25_hr/hr_docs_expiry/i18n/ar_001.po
+++ b/odex25_hr/hr_docs_expiry/i18n/ar_001.po
@@ -502,7 +502,11 @@ msgstr "الشركة"
 
 #. module: hr_docs_expiry
 #: model:ir.model.fields,field_description:hr_docs_expiry.field_hr_employee_document__employee_number
+#: model_terms:ir.ui.view,arch_db:hr_docs_expiry.employee_document_form_view
+#: model_terms:ir.ui.view,arch_db:hr_docs_expiry.employee_document_inherit_view
+#: model_terms:ir.ui.view,arch_db:hr_docs_expiry.employee_document_tree_view
 msgid "Employee Number"
 msgstr "رقم الموظف"
 
 
+