audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '15.0' into 15.0-test

Browse Source
This commit is contained in:
Jared Kipe
2022-09-22 16:30:21 +00:00
parent 05e84bf7b6 d957c043bb
commit 1defe35b45
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hr_payroll_attendance/models/hr_attendance.py
View File

@@ -14,7 +14,7 @@ class HrAttendance(models.Model):
if isinstance(vals_list, dict):
vals_list = [vals_list]
payslip_ids = [i for i in set([d.get('payslip_id', 0) for d in vals_list]) if i != 0]
payslip_ids = [i for i in set([d.get('payslip_id') or 0 for d in vals_list]) if i != 0]
if payslip_ids:
payslips = self.env['hr.payslip'].sudo().browse(payslip_ids)
if payslips.filtered(lambda p: p.state not in ('draft', 'verify')):

10
hr_payroll_timesheet/models/account.py
View File

@@ -14,9 +14,11 @@ class AnalyticLine(models.Model):
if isinstance(vals_list, dict):
vals_list = [vals_list]
payslips = self.env['hr.payslip'].sudo().browse([d.get('payslip_id', 0) for d in vals_list])
if any(p.state not in ('draft', 'verify') for p in payslips.exists()):
raise ValidationError(_('Cannot create attendance linked to payslip that is not draft.'))
payslip_ids = [i for i in set([d.get('payslip_id') or 0 for d in vals_list]) if i != 0]
if payslip_ids:
payslips = self.env['hr.payslip'].sudo().browse(payslip_ids)
if any(p.state not in ('draft', 'verify') for p in payslips):
raise ValidationError(_('Cannot create timesheet linked to payslip that is not draft.'))
return super().create(vals_list)
def write(self, values):
@@ -24,7 +26,7 @@ class AnalyticLine(models.Model):
if payslip_id:
payslip = self.env['hr.payslip'].sudo().browse(payslip_id)
if payslip.exists().state not in ('draft', 'verify'):
raise ValidationError(_('Cannot modify attendance linked to payslip that is not draft.'))
raise ValidationError(_('Cannot modify timesheet linked to payslip that is not draft.'))
return super().write(values)
def unlink(self):