diff --git a/l10n_us_tx_hr_payroll/__init__.py b/l10n_us_tx_hr_payroll/__init__.py index 1bbfd266..8b137891 100755 --- a/l10n_us_tx_hr_payroll/__init__.py +++ b/l10n_us_tx_hr_payroll/__init__.py @@ -1 +1 @@ -from . import us_tx_hr_payroll + diff --git a/l10n_us_tx_hr_payroll/__manifest__.py b/l10n_us_tx_hr_payroll/__manifest__.py index 875e7d87..f905ab8b 100755 --- a/l10n_us_tx_hr_payroll/__manifest__.py +++ b/l10n_us_tx_hr_payroll/__manifest__.py @@ -5,7 +5,7 @@ 'license': 'AGPL-3', 'category': 'Localization', 'depends': ['l10n_us_hr_payroll'], - 'version': '11.0.2018.0.0', + 'version': '11.0.2019.0.0', 'description': """ USA::Texas Payroll Rules. ========================= @@ -20,9 +20,10 @@ USA::Texas Payroll Rules. 'auto_install': False, 'website': 'https://hibou.io/', 'data':[ - 'us_tx_hr_payroll_view.xml', + 'views/us_tx_hr_payroll_views.xml', 'data/base.xml', - 'data/rules_2018.xml', + 'data/rates.xml', + 'data/rules.xml', 'data/final.xml', ], 'installable': True diff --git a/l10n_us_tx_hr_payroll/data/base.xml b/l10n_us_tx_hr_payroll/data/base.xml index 58aca4aa..4037c2a7 100755 --- a/l10n_us_tx_hr_payroll/data/base.xml +++ b/l10n_us_tx_hr_payroll/data/base.xml @@ -27,25 +27,25 @@ - Texas Unemployment - Wages - TX_UNEMP_WAGES + Wage: US-TX Unemployment + WAGE_US_TX_UNEMP - Texas Unemployment - TX_UNEMP + ER: US-TX Unemployment + ER_US_TX_UNEMP - Texas Obligation Assessment - TX_OA + ER: US-TX Obligation Assessment + ER_US_TX_OA - Texas Employment and Training Investment Assessment - TX_ETIA + ER: US-TX Employment & Training Investment Assessment + ER_US_TX_ETIA diff --git a/l10n_us_tx_hr_payroll/data/rates.xml b/l10n_us_tx_hr_payroll/data/rates.xml new file mode 100755 index 00000000..087a6694 --- /dev/null +++ b/l10n_us_tx_hr_payroll/data/rates.xml @@ -0,0 +1,44 @@ + + + + + US Texas Unemployment + US_TX_UNEMP + 2.7 + 2018-01-01 + + + + US Texas Obligation Assessment + US_TX_OA + 0.0 + 2018-01-01 + + + US Texas Employment & Training Investment Assessment + US_TX_ETIA + 0.1 + 2018-01-01 + + + + US Texas Unemployment + US_TX_UNEMP + 2.7 + 2019-01-01 + + + + US Texas Obligation Assessment + US_TX_OA + 0.0 + 2019-01-01 + + + US Texas Employment & Training Investment Assessment + US_TX_ETIA + 0.1 + 2019-01-01 + + + \ No newline at end of file diff --git a/l10n_us_tx_hr_payroll/data/rules_2018.xml b/l10n_us_tx_hr_payroll/data/rules.xml similarity index 62% rename from l10n_us_tx_hr_payroll/data/rules_2018.xml rename to l10n_us_tx_hr_payroll/data/rules.xml index 6ca7845a..9ea5b529 100755 --- a/l10n_us_tx_hr_payroll/data/rules_2018.xml +++ b/l10n_us_tx_hr_payroll/data/rules.xml @@ -6,16 +6,18 @@ - Texas Unemployment - Wages (2018) - TX_UNEMP_WAGES_2018 + Wage: US-TX Unemployment + WAGE_US_TX_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code ### -ytd = payslip.sum('TX_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') +rate = payslip.dict.get_rate('US_TX_UNEMP') +year = int(payslip.dict.date_from[:4]) +ytd = payslip.sum('WAGE_US_TX_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages -remaining = 9000.0 - ytd +remaining = rate.wage_limit_year - ytd if remaining <= 0.0: result = 0 elif remaining < categories.BASIC: @@ -28,14 +30,15 @@ else: - Texas Unemployment (2018) - TX_UNEMP_2018 + ER: US-TX Unemployment + ER_US_TX_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code -result_rate = -contract.tx_unemp_rate(2018) -result = categories.TX_UNEMP_WAGES +rate = payslip.dict.get_rate('US_TX_UNEMP') +result_rate = -rate.rate +result = categories.WAGE_US_TX_UNEMP # result_rate of 0 implies 100% due to bug if result_rate == 0.0: @@ -47,14 +50,15 @@ if result_rate == 0.0: - Texas Obligation Assessment (2018) - TX_OA_2018 + ER: US-TX Obligation Assessment + ER_US_TX_OA python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code -result_rate = -contract.tx_oa_rate(2018) -result = categories.TX_UNEMP_WAGES +rate = payslip.dict.get_rate('US_TX_OA') +result_rate = -rate.rate +result = categories.WAGE_US_TX_UNEMP # result_rate of 0 implies 100% due to bug if result_rate == 0.0: @@ -66,14 +70,15 @@ if result_rate == 0.0: - Texas Employment and Training Investment Assessment (2018) - TX_ETIA_2018 + ER: US-TX Employment & Training Investment Assessment + ER_US_TX_ETIA python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code -result_rate = -contract.tx_etia_rate(2018) -result = categories.TX_UNEMP_WAGES +rate = payslip.dict.get_rate('US_TX_ETIA') +result_rate = -rate.rate +result = categories.WAGE_US_TX_UNEMP # result_rate of 0 implies 100% due to bug if result_rate == 0.0: diff --git a/l10n_us_tx_hr_payroll/tests/__init__.py b/l10n_us_tx_hr_payroll/tests/__init__.py index a174888c..cf2d1f27 100755 --- a/l10n_us_tx_hr_payroll/tests/__init__.py +++ b/l10n_us_tx_hr_payroll/tests/__init__.py @@ -1 +1,2 @@ from . import test_us_tx_payslip_2018 +from . import test_us_tx_payslip_2019 diff --git a/l10n_us_tx_hr_payroll/tests/test_us_tx_payslip_2018.py b/l10n_us_tx_hr_payroll/tests/test_us_tx_payslip_2018.py index 5f794581..50986edf 100755 --- a/l10n_us_tx_hr_payroll/tests/test_us_tx_payslip_2018.py +++ b/l10n_us_tx_hr_payroll/tests/test_us_tx_payslip_2018.py @@ -7,22 +7,16 @@ class TestUsTXPayslip(TestUsPayslip): # 2018 Taxes and Rates ### TX_UNEMP_MAX_WAGE = 9000.0 + TX_UNEMP = -2.7 / 100.0 + TX_OA = 0.0 + TX_ETIA = -0.1 / 100.0 def test_2018_taxes(self): salary = 5000.0 employee = self._createEmployee() - employee.company_id.tx_unemp_rate_2018 = 2.7 - employee.company_id.tx_oa_rate_2018 = 0.0 - employee.company_id.tx_etia_rate_2018 = 0.1 - contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_tx_hr_payroll.hr_payroll_salary_structure_us_tx_employee')) - # tax rates - tx_unemp = contract.tx_unemp_rate(2018) / -100.0 - tx_oa = contract.tx_oa_rate(2018) / -100.00 - tx_etia = contract.tx_etia_rate(2018) / -100.00 - self._log('2018 Texas tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -30,10 +24,10 @@ class TestUsTXPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['TX_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['TX_UNEMP'], cats['TX_UNEMP_WAGES'] * tx_unemp) - self.assertPayrollEqual(cats['TX_OA'], cats['TX_UNEMP_WAGES'] * tx_oa) - self.assertPayrollEqual(cats['TX_ETIA'], cats['TX_UNEMP_WAGES'] * tx_etia) + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], cats['WAGE_US_TX_UNEMP'] * self.TX_UNEMP) + self.assertPayrollEqual(cats['ER_US_TX_OA'], cats['WAGE_US_TX_UNEMP'] * self.TX_OA) + self.assertPayrollEqual(cats['ER_US_TX_ETIA'], cats['WAGE_US_TX_UNEMP'] * self.TX_ETIA) process_payslip(payslip) @@ -49,26 +43,18 @@ class TestUsTXPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['TX_UNEMP_WAGES'], remaining_tx_unemp_wages) - self.assertPayrollEqual(cats['TX_UNEMP'], remaining_tx_unemp_wages * tx_unemp) + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], remaining_tx_unemp_wages) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], remaining_tx_unemp_wages * self.TX_UNEMP) def test_2018_taxes_with_external(self): salary = 5000.0 external_wages = 6000.0 employee = self._createEmployee() - employee.company_id.tx_unemp_rate_2018 = 2.7 - employee.company_id.tx_oa_rate_2018 = 0.0 - employee.company_id.tx_etia_rate_2018 = 0.1 contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref('l10n_us_tx_hr_payroll.hr_payroll_salary_structure_us_tx_employee')) - # tax rates - tx_unemp = contract.tx_unemp_rate(2018) / -100.0 - tx_oa = contract.tx_oa_rate(2018) / -100.00 - tx_etia = contract.tx_etia_rate(2018) / -100.00 - self._log('2018 Texas_external tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -76,30 +62,20 @@ class TestUsTXPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['TX_UNEMP_WAGES'], self.TX_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['TX_UNEMP'], cats['TX_UNEMP_WAGES'] * tx_unemp) - self.assertPayrollEqual(cats['TX_OA'], cats['TX_UNEMP_WAGES'] * tx_oa) - self.assertPayrollEqual(cats['TX_ETIA'], cats['TX_UNEMP_WAGES'] * tx_etia) + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], self.TX_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], cats['WAGE_US_TX_UNEMP'] * self.TX_UNEMP) + self.assertPayrollEqual(cats['ER_US_TX_OA'], cats['WAGE_US_TX_UNEMP'] * self.TX_OA) + self.assertPayrollEqual(cats['ER_US_TX_ETIA'], cats['WAGE_US_TX_UNEMP'] * self.TX_ETIA) def test_2018_taxes_with_state_exempt(self): salary = 5000.0 external_wages = 6000.0 employee = self._createEmployee() - employee.company_id.tx_unemp_rate_2018 = 2.7 - employee.company_id.tx_oa_rate_2018 = 0.0 - employee.company_id.tx_etia_rate_2018 = 0.1 contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( 'l10n_us_tx_hr_payroll.hr_payroll_salary_structure_us_tx_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) - # tax rates - tx_unemp = contract.tx_unemp_rate(2018) / -100.0 - tx_oa = contract.tx_oa_rate(2018) / -100.00 - tx_etia = contract.tx_etia_rate(2018) / -100.00 - - self.assertPayrollEqual(tx_unemp, 0.0) - self._log('2018 Texas_external tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -107,29 +83,20 @@ class TestUsTXPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['TX_UNEMP_WAGES'], self.TX_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['TX_UNEMP'], cats['TX_UNEMP_WAGES'] * tx_unemp) - self.assertPayrollEqual(cats['TX_OA'], cats['TX_UNEMP_WAGES'] * tx_oa) - self.assertPayrollEqual(cats['TX_ETIA'], cats['TX_UNEMP_WAGES'] * tx_etia) + self.assertPayrollEqual(cats.get('WAGE_US_TX_UNEMP', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_TX_UNEMP', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_TX_OA', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_TX_ETIA', 0.0), 0.0) def test_payslip_example(self): salary = 2916.67 employee = self._createEmployee() - employee.company_id.tx_unemp_rate_2018 = 2.7 - employee.company_id.tx_oa_rate_2018 = 0.0 - employee.company_id.tx_etia_rate_2018 = 0.1 - contract = self._createContract(employee, salary, struct_id=self.ref( 'l10n_us_tx_hr_payroll.hr_payroll_salary_structure_us_tx_employee')) contract.w4_allowances = 2 contract.w4_filing_status = 'single' - # tax rates - tx_unemp = contract.tx_unemp_rate(2018) / -100.0 - tx_oa = contract.tx_oa_rate(2018) / -100.00 - tx_etia = contract.tx_etia_rate(2018) / -100.00 - self._log('2018 Texas tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -137,10 +104,10 @@ class TestUsTXPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['TX_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['TX_UNEMP'], cats['TX_UNEMP_WAGES'] * tx_unemp) - self.assertPayrollEqual(cats['TX_OA'], cats['TX_UNEMP_WAGES'] * tx_oa) - self.assertPayrollEqual(cats['TX_ETIA'], cats['TX_UNEMP_WAGES'] * tx_etia) + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], cats['WAGE_US_TX_UNEMP'] * self.TX_UNEMP) + self.assertPayrollEqual(cats['ER_US_TX_OA'], cats['WAGE_US_TX_UNEMP'] * self.TX_OA) + self.assertPayrollEqual(cats['ER_US_TX_ETIA'], cats['WAGE_US_TX_UNEMP'] * self.TX_ETIA) process_payslip(payslip) @@ -156,6 +123,6 @@ class TestUsTXPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['TX_UNEMP_WAGES'], remaining_tx_unemp_wages) - self.assertPayrollEqual(cats['TX_UNEMP'], remaining_tx_unemp_wages * tx_unemp) + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], remaining_tx_unemp_wages) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], remaining_tx_unemp_wages * self.TX_UNEMP) diff --git a/l10n_us_tx_hr_payroll/tests/test_us_tx_payslip_2019.py b/l10n_us_tx_hr_payroll/tests/test_us_tx_payslip_2019.py new file mode 100755 index 00000000..4bd97ae8 --- /dev/null +++ b/l10n_us_tx_hr_payroll/tests/test_us_tx_payslip_2019.py @@ -0,0 +1,128 @@ +from odoo.addons.l10n_us_hr_payroll.tests.test_us_payslip import TestUsPayslip, process_payslip +from odoo.addons.l10n_us_hr_payroll.models.l10n_us_hr_payroll import USHrContract + + +class TestUsTXPayslip(TestUsPayslip): + ### + # 2019 Taxes and Rates + ### + TX_UNEMP_MAX_WAGE = 9000.0 + TX_UNEMP = -2.7 / 100.0 + TX_OA = 0.0 + TX_ETIA = -0.1 / 100.0 + + def test_2019_taxes(self): + salary = 5000.0 + + employee = self._createEmployee() + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_tx_hr_payroll.hr_payroll_salary_structure_us_tx_employee')) + + self._log('2019 Texas tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], cats['WAGE_US_TX_UNEMP'] * self.TX_UNEMP) + self.assertPayrollEqual(cats['ER_US_TX_OA'], cats['WAGE_US_TX_UNEMP'] * self.TX_OA) + self.assertPayrollEqual(cats['ER_US_TX_ETIA'], cats['WAGE_US_TX_UNEMP'] * self.TX_ETIA) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_tx_unemp_wages = self.TX_UNEMP_MAX_WAGE - salary if (self.TX_UNEMP_MAX_WAGE - 2*salary < salary) \ + else salary + + self._log('2019 Texas tax second payslip:') + payslip = self._createPayslip(employee, '2019-02-01', '2019-02-28') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], remaining_tx_unemp_wages) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], remaining_tx_unemp_wages * self.TX_UNEMP) + + def test_2019_taxes_with_external(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + + contract = self._createContract(employee, salary, external_wages=external_wages, + struct_id=self.ref('l10n_us_tx_hr_payroll.hr_payroll_salary_structure_us_tx_employee')) + + self._log('2019 Texas_external tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], self.TX_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], cats['WAGE_US_TX_UNEMP'] * self.TX_UNEMP) + self.assertPayrollEqual(cats['ER_US_TX_OA'], cats['WAGE_US_TX_UNEMP'] * self.TX_OA) + self.assertPayrollEqual(cats['ER_US_TX_ETIA'], cats['WAGE_US_TX_UNEMP'] * self.TX_ETIA) + + def test_2019_taxes_with_state_exempt(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( + 'l10n_us_tx_hr_payroll.hr_payroll_salary_structure_us_tx_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) + + self._log('2019 Texas_external tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats.get('WAGE_US_TX_UNEMP', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_TX_UNEMP', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_TX_OA', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_TX_ETIA', 0.0), 0.0) + + def test_payslip_example(self): + salary = 2916.67 + + employee = self._createEmployee() + contract = self._createContract(employee, salary, struct_id=self.ref( + 'l10n_us_tx_hr_payroll.hr_payroll_salary_structure_us_tx_employee')) + contract.w4_allowances = 2 + contract.w4_filing_status = 'single' + + self._log('2019 Texas tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], cats['WAGE_US_TX_UNEMP'] * self.TX_UNEMP) + self.assertPayrollEqual(cats['ER_US_TX_OA'], cats['WAGE_US_TX_UNEMP'] * self.TX_OA) + self.assertPayrollEqual(cats['ER_US_TX_ETIA'], cats['WAGE_US_TX_UNEMP'] * self.TX_ETIA) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_tx_unemp_wages = self.TX_UNEMP_MAX_WAGE - salary if (self.TX_UNEMP_MAX_WAGE - 2 * salary < salary) \ + else salary + + self._log('2019 Texas tax second payslip:') + payslip = self._createPayslip(employee, '2019-02-01', '2019-02-28') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_TX_UNEMP'], remaining_tx_unemp_wages) + self.assertPayrollEqual(cats['ER_US_TX_UNEMP'], remaining_tx_unemp_wages * self.TX_UNEMP) + diff --git a/l10n_us_tx_hr_payroll/us_tx_hr_payroll.py b/l10n_us_tx_hr_payroll/us_tx_hr_payroll.py deleted file mode 100755 index e27219c0..00000000 --- a/l10n_us_tx_hr_payroll/us_tx_hr_payroll.py +++ /dev/null @@ -1,44 +0,0 @@ -from odoo import models, fields, api - - -class USTXHrContract(models.Model): - _inherit = 'hr.contract' - - @api.multi - def tx_unemp_rate(self, year): - self.ensure_one() - if self.futa_type == self.FUTA_TYPE_BASIC: - return 0.0 - - if hasattr(self.employee_id.company_id, 'tx_unemp_rate_' + str(year)): - return self.employee_id.company_id['tx_unemp_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Texas.') - - def tx_oa_rate(self, year): - self.ensure_one() - if self.futa_type == self.FUTA_TYPE_BASIC: - return 0.0 - - if hasattr(self.employee_id.company_id, 'tx_oa_rate_' + str(year)): - return self.employee_id.company_id['tx_oa_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Texas.') - - def tx_etia_rate(self, year): - self.ensure_one() - if self.futa_type == self.FUTA_TYPE_BASIC: - return 0.0 - - if hasattr(self.employee_id.company_id, 'tx_etia_rate_' + str(year)): - return self.employee_id.company_id['tx_etia_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Texas.') - - -class TXCompany(models.Model): - _inherit = 'res.company' - - tx_unemp_rate_2018 = fields.Float(string="Texas Unemployment Rate 2018", default=2.7) - tx_oa_rate_2018 = fields.Float(strimg="Texas Obligation Assessment Rate 2018", default=0.0) - tx_etia_rate_2018 = fields.Float(string="Texas Employment & Training Investment Assessment Rate", default=0.1) diff --git a/l10n_us_tx_hr_payroll/us_tx_hr_payroll_view.xml b/l10n_us_tx_hr_payroll/views/us_tx_hr_payroll_views.xml similarity index 52% rename from l10n_us_tx_hr_payroll/us_tx_hr_payroll_view.xml rename to l10n_us_tx_hr_payroll/views/us_tx_hr_payroll_views.xml index 6481f458..8460562b 100755 --- a/l10n_us_tx_hr_payroll/us_tx_hr_payroll_view.xml +++ b/l10n_us_tx_hr_payroll/views/us_tx_hr_payroll_views.xml @@ -1,21 +1,6 @@ - - res.company.form - res.company - 20 - - - - - - - - - - - hr.contract.form.inherit hr.contract