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/12.0/l10n_us_hr_payroll__ca_mig_2020' into '12.0'

Browse Source 
fix/12.0/l10n_us_hr_payroll__ca_mig_2020 into 12.0

See merge request hibou-io/hibou-odoo/suite!427
This commit is contained in:
Jared Kipe
2020-08-05 16:14:28 +00:00
parent afffb84c07 5e66eb4dc1
commit 2e050c4dc4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
l10n_us_hr_payroll/migrations/12.0.2020.1.0/post-migration.py
View File

@@ -60,6 +60,11 @@ def migrate(cr, installed_version):
temp_values = temp_field_values(cr, 'hr_contract', contract.id, fields_to_move) temp_values = temp_field_values(cr, 'hr_contract', contract.id, fields_to_move)
# Resolve mapping to the new field names. # Resolve mapping to the new field names.
values = {FIELDS_CONTRACT_TO_US_PAYROLL_FORMS_2020[k]: v for k, v in temp_values.items()} values = {FIELDS_CONTRACT_TO_US_PAYROLL_FORMS_2020[k]: v for k, v in temp_values.items()}
# Edge cases
if 'ca_de4_sit_filing_status' in values and values['ca_de4_sit_filing_status'] == 'exempt':
values['ca_de4_sit_filing_status'] = ''
values.update({ values.update({
'name': 'MIG: ' + str(contract.name), 'name': 'MIG: ' + str(contract.name),
'employee_id': contract.employee_id.id, 'employee_id': contract.employee_id.id,

2
l10n_us_hr_payroll/migrations/data.py
View File

@@ -22,7 +22,7 @@ FIELDS_CONTRACT_TO_US_PAYROLL_FORMS_2020 = {
'az_a4_additional_withholding': 'state_income_tax_additional_withholding', 'az_a4_additional_withholding': 'state_income_tax_additional_withholding',
'ca_de4_allowances': 'ca_de4_sit_allowances', 'ca_de4_allowances': 'ca_de4_sit_allowances',
'ca_additional_allowances': 'ca_sit_additional_allowances', 'ca_additional_allowances': 'ca_de4_sit_additional_allowances',
'ca_de4_filing_status': 'ca_de4_sit_filing_status', 'ca_de4_filing_status': 'ca_de4_sit_filing_status',
'ct_w4na_code': 'ct_w4na_sit_code', 'ct_w4na_code': 'ct_w4na_sit_code',