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

Added new accrue_max field to hr_holidays_accrual and hr_holidays_accrual_payroll.

Browse Source
This commit is contained in:
Kristen Marie Kulha
2018-08-09 11:24:13 -07:00
committed by Jared Kipe
parent 15ca4c0e3e
commit a24b2fcb3a
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hr_holidays_accrual_payroll/__manifest__.py
View File

@@ -1,7 +1,7 @@
{ {
'name': 'HR Holidays Accrual - Payroll', 'name': 'HR Holidays Accrual - Payroll',
'author': 'Hibou Corp. <hello@hibou.io>', 'author': 'Hibou Corp. <hello@hibou.io>',
'version': '11.0.0.0.0', 'version': '11.0.1.0.0',
'category': 'Human Resources', 'category': 'Human Resources',
'sequence': 95, 'sequence': 95,
'summary': 'Grant leave allocations per payperiod', 'summary': 'Grant leave allocations per payperiod',

17
hr_holidays_accrual_payroll/models/hr_payslip.py
View File

@@ -13,7 +13,20 @@ class HRPayslip(models.Model):
('accrue_by_pay_period', '=', True)]) ('accrue_by_pay_period', '=', True)])
for leave_to_update in leaves_to_update: for leave_to_update in leaves_to_update:
new_allocation = leave_to_update.number_of_days_temp + leave_to_update.allocation_per_period new_allocation = leave_to_update.number_of_days_temp + leave_to_update.allocation_per_period
leave_to_update.write({'number_of_days_temp': new_allocation}) q = """SELECT SUM(number_of_days)
FROM hr_holidays
WHERE employee_id = %d AND holiday_status_id = %d;""" % (leave_to_update.employee_id.id, leave_to_update.holiday_status_id.id)
self.env.cr.execute(q)
total_days = self.env.cr.fetchall()
total_days = total_days[0][0]
new_total_days = total_days + leave_to_update.allocation_per_period
if leave_to_update.accrue_max and total_days > leave_to_update.accrue_max:
new_allocation = leave_to_update.number_of_days_temp
elif leave_to_update.accrue_max and new_total_days > leave_to_update.accrue_max:
difference = leave_to_update.accrue_max - total_days
new_allocation = leave_to_update.number_of_days_temp + difference
if leave_to_update.number_of_days_temp != new_allocation:
leave_to_update.write({'number_of_days_temp': new_allocation})
return res return res
@@ -23,10 +36,12 @@ class HRHolidays(models.Model):
accrue_by_pay_period = fields.Boolean(string="Accrue by Pay Period") accrue_by_pay_period = fields.Boolean(string="Accrue by Pay Period")
allocation_per_period = fields.Float(string="Allocation Per Pay Period", digits=(12, 4)) allocation_per_period = fields.Float(string="Allocation Per Pay Period", digits=(12, 4))
accrue_max = fields.Float(string="Maximum Accrual")
def _accrue_for_employee_values(self, employee): def _accrue_for_employee_values(self, employee):
values = super(HRHolidays, self)._accrue_for_employee_values(employee) values = super(HRHolidays, self)._accrue_for_employee_values(employee)
if values: if values:
values['accrue_by_pay_period'] = self.accrue_by_pay_period values['accrue_by_pay_period'] = self.accrue_by_pay_period
values['allocation_per_period'] = self.allocation_per_period values['allocation_per_period'] = self.allocation_per_period
values['accrue_max'] = self.accrue_max
return values return values

3
hr_holidays_accrual_payroll/views/hr_holidays_views.xml
View File

@@ -5,9 +5,10 @@
<field name="model">hr.holidays</field> <field name="model">hr.holidays</field>
<field name="inherit_id" ref="hr_holidays.edit_holiday_new"/> <field name="inherit_id" ref="hr_holidays.edit_holiday_new"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='category_id']" position="after"> <xpath expr="//group[@name='accrue']" position="inside">
<field name="accrue_by_pay_period"/> <field name="accrue_by_pay_period"/>
<field name="allocation_per_period"/> <field name="allocation_per_period"/>
<field name="accrue_max"/>
</xpath> </xpath>
</field> </field>
</record> </record>