mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
# Conflicts: # l10n_us_hr_payroll/data/state/ak_alaska.xml # l10n_us_hr_payroll/data/state/al_alabama.xml # l10n_us_hr_payroll/data/state/ar_arkansas.xml # l10n_us_hr_payroll/data/state/az_arizona.xml # l10n_us_hr_payroll/data/state/ca_california.xml # l10n_us_hr_payroll/data/state/co_colorado.xml # l10n_us_hr_payroll/data/state/ct_connecticut.xml # l10n_us_hr_payroll/data/state/de_delaware.xml # l10n_us_hr_payroll/data/state/hi_hawaii.xml # l10n_us_hr_payroll/data/state/ia_iowa.xml # l10n_us_hr_payroll/data/state/id_idaho.xml # l10n_us_hr_payroll/data/state/il_illinois.xml # l10n_us_hr_payroll/data/state/ks_kansas.xml # l10n_us_hr_payroll/data/state/ky_kentucky.xml # l10n_us_hr_payroll/data/state/me_maine.xml # l10n_us_hr_payroll/data/state/mi_michigan.xml # l10n_us_hr_payroll/data/state/mn_minnesota.xml # l10n_us_hr_payroll/data/state/mo_missouri.xml # l10n_us_hr_payroll/data/state/nc_northcarolina.xml # l10n_us_hr_payroll/data/state/nd_north_dakota.xml # l10n_us_hr_payroll/data/state/ne_nebraska.xml # l10n_us_hr_payroll/data/state/nj_newjersey.xml # l10n_us_hr_payroll/data/state/nm_new_mexico.xml # l10n_us_hr_payroll/data/state/nv_nevada.xml # l10n_us_hr_payroll/data/state/ok_oklahoma.xml # l10n_us_hr_payroll/data/state/ri_rhode_island.xml # l10n_us_hr_payroll/data/state/sc_south_carolina.xml # l10n_us_hr_payroll/data/state/ut_utah.xml # l10n_us_hr_payroll/data/state/vt_vermont.xml # l10n_us_hr_payroll/data/state/wv_west_virginia.xml # l10n_us_hr_payroll/models/__init__.py # l10n_us_hr_payroll/models/federal/fed_941.py # l10n_us_hr_payroll/models/hr_payslip.py # l10n_us_hr_payroll/tests/test_special.py