devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

This commit is contained in:
Bakry 2024-08-22 17:00:04 +03:00
parent d920ccbd89
commit 04e6f6248d
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
odex25_hr/attendances/views/hr_attendance_view.xml
View File

@ -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"/>

14
odex25_hr/exp_official_mission/models/hr_official_mission.py
View File

@ -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 = {

1
odex25_hr/hr_base/__manifest__.py
View File

@ -15,6 +15,7 @@
"account",
"hr_holidays_community",
"hr_contract",
"base_custom",
],
"data": [
"security/hr_base_security.xml",

4
odex25_hr/hr_docs_expiry/i18n/ar_001.po
View File

@ -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 "رقم الموظف"