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 'fix/13.0/hr_payroll_payment__use_slip_date' into '13.0'

Browse Source 
fix/13.0/hr_payroll_payment__use_slip_date into 13.0

See merge request hibou-io/hibou-odoo/suite!496
This commit is contained in:
Jared Kipe
2020-10-07 22:25:11 +00:00
parent b17c5074ec ae35d5de59
commit 57d08b814e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hr_payroll_payment/__manifest__.py
View File

@@ -38,6 +38,7 @@ Passes original Payroll Accounting tests and additional ones for gouping behavio
'depends': [
'hr_payroll_account',
'account_batch_payment',
'hibou_professional',
],
'data': [
#'wizard/hr_payroll_register_payment_views.xml',

5
hr_payroll_payment/models/hr_payslip.py
View File

@@ -139,12 +139,13 @@ class HrPayslip(models.Model):
# in
# payslips_to_post}
# Hibou Customization: group with journal itself so that journal behavior can be derived.
# Hibou Customization: prefer slip's `date` over end of month
slip_mapped_data = {
slip.struct_id.journal_id: {fields.Date().end_of(slip.date_to, 'month'): self.env['hr.payslip']} for slip
slip.struct_id.journal_id: {slip.date or fields.Date().end_of(slip.date_to, 'month'): self.env['hr.payslip']} for slip
in
payslips_to_post}
for slip in payslips_to_post:
slip_mapped_data[slip.struct_id.journal_id][fields.Date().end_of(slip.date_to, 'month')] |= slip
slip_mapped_data[slip.struct_id.journal_id][slip.date or fields.Date().end_of(slip.date_to, 'month')] |= slip
for journal in slip_mapped_data: # For each journal_id.
"""