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

Merge pull request #2890 from expsa/Esraa-Ensan-hr-tasks 

hr edits
This commit is contained in:
Esraa-Exp 2025-04-24 18:10:38 +02:00 committed by GitHub
parent a87df024e5 fc9dcc4cdf
commit 394a3a1ed3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_hr/attendances/models/hr_attendance_report.py
View File

@ -107,7 +107,7 @@ class HrAttendanceReport(models.Model):
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)]
domain += [('department_id', 'in', self.department_ids.ids), ('state', '=', 'open')]
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)]

2
odex25_hr/attendances/views/hr_attendance_report.xml
View File

@ -108,7 +108,7 @@
<tree decoration-success="state=='approved'" decoration-danger="state == 'refused'" decoration-info="state == 'draft'" >
<field name="date_from"/>
<field name="date_to"/>
<field name="department_ids"/>
<field name="department_ids" widget="many2many_tags"/>
<field name="state"/>
</tree>
</field>

37
odex25_hr/exp_payroll_custom/models/hr_advance_payslip.py
View File

@ -68,6 +68,8 @@ class SalaryRuleInput(models.Model):
company_insurnce = fields.Float(string='Company Insurnce', compute='compute_allowances_',store=True)
employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True)
holiday_start_date = fields.Date(string="Holiday Start Date")
holiday_end_date = fields.Date(string="Holiday End Date")
def compute_allowances_(self):
for item in self:
@ -395,12 +397,9 @@ class SalaryRuleInput(models.Model):
holiday_date_to = datetime.strptime(str(holiday.date_to), '%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d')
payslip_date_from = str(payslip.date_from)
payslip_date_to = str(payslip.date_to)
payslip_date_from = str(payslip.payslip_run_id.holiday_start_date)
payslip_date_to = str(payslip.payslip_run_id.holiday_end_date)
if payslip.payslip_run_id.holiday_start_date and payslip.payslip_run_id.holiday_end_date:
payslip_date_from = str(payslip.payslip_run_id.holiday_start_date)
payslip_date_to = str(payslip.payslip_run_id.holiday_end_date)
if payslip.holiday_start_date and payslip.holiday_end_date:
payslip_date_from = str(payslip.holiday_start_date)
payslip_date_to = str(payslip.holiday_end_date)
if holiday.holiday_status_id.payslip_type == 'unpaid':
if payslip_date_to >= holiday_date_to and holiday_date_from >= payslip_date_from:
@ -551,8 +550,8 @@ class SalaryRuleInput(models.Model):
'contract_id': payslip.contract_id.id})]
elif holiday.holiday_status_id.payslip_type == 'addition':
if payslip_date_from >= holiday_date_from and payslip_date_to >= holiday_date_to:
start_date = payslip_date_from
end_date = payslip_date_to
start_date = datetime.strptime(holiday_date_from, "%Y-%m-%d").date()
end_date = datetime.strptime(holiday_date_to, "%Y-%m-%d").date()
number_of_days = relativedelta(end_date, start_date).days
if number_of_days >= 0: # number_of_days <= 0
@ -2375,6 +2374,8 @@ class HrPayslipRun(models.Model):
[data] = self.read()
from_date = str(self.date_start)
to_date = str(self.date_end)
holiday_start_date = str(self.holiday_start_date)
holiday_end_date = str(self.holiday_end_date)
start_time = time.time()
#worked_days, emps, dictionary = [], [], []
@ -2472,6 +2473,8 @@ class HrPayslipRun(models.Model):
'worked_days_line_ids': worked_days,
'date_from': str(employee.first_hiring_date) or from_date,
'date_to': employee.leaving_date or to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': employee.company_id.id,
'percentage': self.percentage}
@ -2535,6 +2538,8 @@ class HrPayslipRun(models.Model):
# 'worked_days_line_ids': worked_days ,
'date_from': str(employee.first_hiring_date) or from_date,
'date_to': to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': employee.company_id.id,
'percentage': self.percentage}
@ -2587,6 +2592,8 @@ class HrPayslipRun(models.Model):
'worked_days_line_ids': worked_days,
'date_from': from_date,
'date_to': employee.leaving_date or to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': employee.company_id.id,
'percentage': self.percentage}
@ -2633,6 +2640,8 @@ class HrPayslipRun(models.Model):
slip_data['value'].get('worked_days_line_ids')],
'date_from': from_date,
'date_to': to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': employee.company_id.id,
'percentage': self.percentage}
@ -2649,6 +2658,8 @@ class HrPayslipRun(models.Model):
slip_data['value'].get('worked_days_line_ids')],
'date_from': from_date,
'date_to': to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': employee.company_id.id,
'percentage': self.percentage}
@ -2693,6 +2704,8 @@ class HrPayslipRun(models.Model):
# 'worked_days_line_ids': worked_days,
'date_from': emp.first_hiring_date or from_date,
'date_to': emp.leaving_date or to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': emp.company_id.id,
'percentage': self.percentage}
@ -2749,6 +2762,8 @@ class HrPayslipRun(models.Model):
# 'worked_days_line_ids': worked_days,
'date_from': emp.first_hiring_date or from_date,
'date_to': to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': emp.company_id.id,
'percentage': self.percentage}
@ -2794,6 +2809,8 @@ class HrPayslipRun(models.Model):
'worked_days_line_ids': worked_days,
'date_from': from_date,
'date_to': emp.leaving_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': emp.company_id.id,
'percentage': self.percentage}
@ -2839,6 +2856,8 @@ class HrPayslipRun(models.Model):
slip_data['value'].get('worked_days_line_ids')],
'date_from': from_date,
'date_to': to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': emp.company_id.id,
'percentage': self.percentage}
@ -2859,6 +2878,8 @@ class HrPayslipRun(models.Model):
slip_data['value'].get('worked_days_line_ids')],
'date_from': from_date,
'date_to': to_date,
'holiday_start_date': holiday_start_date,
'holiday_end_date': holiday_end_date,
'credit_note': self.credit_note,
'company_id': emp.company_id.id,
'percentage': self.percentage}

12
odex25_hr/exp_payroll_custom/views/payslip_view.xml
View File

@ -161,13 +161,21 @@
<attribute name="invisible">1</attribute>
</xpath>
<xpath expr="//field[@name='credit_note']" position="before">
<label for="holiday_start_date" string="Holiday Period"/>
<div>
<field name="holiday_start_date" class="oe_inline"/>
-
<field name="holiday_end_date" class="oe_inline"/>
</div>
<field name="salary_scale" domain="[('type', '=', 'scale')]"
attrs="{'readonly': [('state','!=','draft')]}" required="1"/>
<field name="holiday_start_date"/>
<field name="holiday_end_date"/>
<field name="journal_id"
attrs="{'readonly': [('state','!=','draft')], 'required': [('required_condition','=',True)]}"/>
<field name="move_id" readonly="1" attrs="{'invisible': [('required_condition','=',False)]}"/>
<field name="company_id" groups="base.group_multi_company" readonly="1" options="{'no_create': True}"/>
<!--field name="percentage" string="Percentage" attrs="{'readonly': [('state','!=','draft')]}"/-->

1
odex25_hr/hr_base/models/hr_base.py
View File

@ -243,7 +243,6 @@ class HrEmployee(models.Model):
], 'Certificate Level', default='other', groups="base.group_user", tracking=True)
children = fields.Integer(string='Number of Children', groups="base.group_user", tracking=True)
branch_name = fields.Many2one(related='department_id.branch_name', store=True, string="Branch Name")
attendance_zone_id = fields.Many2many('attendance.zone', string='Attendance Zone')
'''employee_cars_count = fields.Integer(compute="_compute_employee_cars_count", string="Cars",

1
odex25_hr/hr_base/views/hr_base_view.xml
View File

@ -293,7 +293,6 @@
attrs="{'readonly':[('state','!=','draft')]}"/>
<!-- <field name="barcode" string="Attendance ID" attrs="{'readonly':[('state','!=','draft')]}"/> -->
<field name="resource_calendar_id" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="attendance_zone_id" widget="many2many_tags"/>
<field name="active" string="Active" attrs="{'readonly':[('state','!=','draft')]}"/>
</group>
</xpath>

2
odex25_hr/hr_holidays_public/models/hr_holidays_status.py
View File

@ -74,7 +74,7 @@ class HrHolidaysStatus(models.Model):
('exclusion', _('Exclusion'))], string='Payslip Type',tracking=True)
percentage = fields.Float(string='Percentage')
salary_rules_ids = fields.Many2many('hr.salary.rule', string='Rules',
domain="[('special','!=',True))]")
domain="[('special','!=',True)]")
leave_annual_type = fields.Selection(
selection=[('open_balance', _('Opening Balance')), ('save_annual_year', _('Save Annual'))],
string='Annual Type', default='open_balance',tracking=True)