fix payroll
This commit is contained in:
parent
c4306943a3
commit
e79e68fc99
|
|
@ -161,6 +161,7 @@ class employee_overtime_request(models.Model):
|
|||
def submit(self):
|
||||
if not self.line_ids_over_time:
|
||||
raise exceptions.Warning(_('Sorry, Can Not Request without The Employees'))
|
||||
self.line_ids_over_time.get_max_remain_hours()
|
||||
self.chick_not_mission()
|
||||
self.state = "submit"
|
||||
|
||||
|
|
@ -346,7 +347,8 @@ class HrEmployeeOverTime(models.Model):
|
|||
|
||||
max_hours = fields.Float(compute='get_max_remain_hours', string="Max Hours", store=True)
|
||||
remaining_hours = fields.Float(compute='get_max_remain_hours', string="Remaining Hours", store=True)
|
||||
exception = fields.Boolean(string="Exception", default=False)
|
||||
#exception = fields.Boolean(string="Exception", default=False)
|
||||
exception = fields.Boolean(related='employee_over_time_id.exception', string="Exception Hours", store=True)
|
||||
overtime_plase = fields.Selection(related='employee_over_time_id.overtime_plase', store=True,
|
||||
string="Overtime Plase")
|
||||
state = fields.Selection(related='employee_over_time_id.state', store=True, string="State")
|
||||
|
|
|
|||
|
|
@ -2939,8 +2939,8 @@ class HrPayslipRun(models.Model):
|
|||
res.append({
|
||||
'name': v[0],
|
||||
'account_id': v[1],
|
||||
'debit': sum(dicc['debit'] for dicc in new_items),
|
||||
'credit': sum(dicc2['credit'] for dicc2 in new_items)
|
||||
'debit': round(sum(dicc['debit'] for dicc in new_items),2),
|
||||
'credit': round(sum(dicc2['credit'] for dicc2 in new_items),2)
|
||||
})
|
||||
return res
|
||||
|
||||
|
|
@ -3022,7 +3022,7 @@ class HrPayslipRun(models.Model):
|
|||
'name': "Total",
|
||||
'journal_id': journal.id,
|
||||
'account_id': journal.default_account_id.id,
|
||||
'credit': total_allow - total_ded - total_loan,
|
||||
'credit': round(total_allow,2) - round(total_ded,2) - round(total_loan,2),
|
||||
'debit': 0,
|
||||
})
|
||||
if not move_vals:
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@
|
|||
<!-- Customize menus security -->
|
||||
<odoo>
|
||||
<record model="ir.ui.menu" id="exp_hr_payroll.menu_hr_payroll_root">
|
||||
<field name="groups_id" eval="[(6,0,[ref('exp_hr_payroll.group_hr_payroll_user')])]"/>
|
||||
<field name="groups_id" eval="[(4,ref('exp_hr_payroll.group_hr_payroll_user')),
|
||||
(4,ref('hr_base.group_general_manager'))]"/>
|
||||
</record>
|
||||
</odoo>
|
||||
</odoo>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@
|
|||
|
||||
<record model="ir.ui.menu" id="exp_hr_payroll.menu_department_tree">
|
||||
<field name="groups_id"
|
||||
eval="[(6,0,[ref('exp_payroll_custom.group_hr_payroll_contributor')]),(6,0,[ref('exp_hr_payroll.group_hr_payroll_user')])]"/>
|
||||
eval="[(4,ref('exp_hr_payroll.group_hr_payroll_user')),
|
||||
(4,ref('hr_base.group_general_manager'))]"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.menu" id="exp_hr_payroll.menu_hr_payroll_configuration">
|
||||
|
|
|
|||
Loading…
Reference in New Issue