diff --git a/l10n_us_mn_hr_payroll/__manifest__.py b/l10n_us_mn_hr_payroll/__manifest__.py
index 0f6fc07b..62583b61 100755
--- a/l10n_us_mn_hr_payroll/__manifest__.py
+++ b/l10n_us_mn_hr_payroll/__manifest__.py
@@ -4,15 +4,14 @@
'license': 'AGPL-3',
'category': 'Localization',
'depends': ['l10n_us_hr_payroll'],
- 'version': '11.0.2019.0.0',
+ 'version': '12.0.2019.0.0',
'description': """
USA - Minnesota Payroll Rules
=============================
* Contribution register and partner for Minnesota Department of Revenue (MDOR) - Income Tax Withholding
* Contribution register and partner for Minnesota Unemployment Insurance (MUI) - Unemployment Taxes
-* Contract level Minnesota Exemptions
-* Company level Minnesota Unemployment Rate
+* Contract level Minnesota Allowances, Additional Withholding, Filing Status
""",
'auto_install': False,
diff --git a/l10n_us_mn_hr_payroll/data/rules.xml b/l10n_us_mn_hr_payroll/data/rules.xml
index af769d2d..d3dd3243 100755
--- a/l10n_us_mn_hr_payroll/data/rules.xml
+++ b/l10n_us_mn_hr_payroll/data/rules.xml
@@ -12,7 +12,7 @@
code
rate = payslip.dict.get_rate('US_MN_UNEMP')
-year = int(payslip.dict.date_to[:4])
+year = payslip.dict.date_to.year
ytd = payslip.sum('WAGE_US_MN_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01')
ytd += contract.external_wages
remaining = rate.wage_limit_year - ytd
@@ -53,7 +53,7 @@ if result_rate == 0.0:
EE: US-MN Income Tax Withholding
EE_US_MN_INC_WITHHOLD
python
- result = not contract.mn_w4mn_tax_exempt
+ result = contract.mn_w4mn_filing_status != 'exempt'
code
# Step 1 - Determine Employee's Total Wages for one payroll period.
diff --git a/l10n_us_mn_hr_payroll/models/hr_payroll.py b/l10n_us_mn_hr_payroll/models/hr_payroll.py
index a85e19e2..0b6a0e75 100755
--- a/l10n_us_mn_hr_payroll/models/hr_payroll.py
+++ b/l10n_us_mn_hr_payroll/models/hr_payroll.py
@@ -6,9 +6,8 @@ class USMNHrContract(models.Model):
mn_w4mn_allowances = fields.Integer(string="MN Allowances")
mn_w4mn_additional_wh = fields.Float(string="MN Additional Withholding")
- mn_w4mn_tax_exempt = fields.Boolean(string="MN Tax Exempt")
mn_w4mn_filing_status = fields.Selection([
- # ('exempt', 'Exempt'),
+ ('exempt', 'Exempt'),
('single', 'Single'),
('married', 'Married'),
- ], string='MN Filing Status', default='single')
+ ], string='MN Filing Status')
diff --git a/l10n_us_mn_hr_payroll/tests/test_us_mn_payslip.py b/l10n_us_mn_hr_payroll/tests/test_us_mn_payslip.py
index cf55afab..7fb8b5a9 100755
--- a/l10n_us_mn_hr_payroll/tests/test_us_mn_payslip.py
+++ b/l10n_us_mn_hr_payroll/tests/test_us_mn_payslip.py
@@ -1,5 +1,4 @@
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 TestUsMNPayslip(TestUsPayslip):
@@ -133,7 +132,7 @@ class TestUsMNPayslip(TestUsPayslip):
salary, struct_id=self.ref('l10n_us_mn_hr_payroll.hr_payroll_salary_structure_us_mn_employee'),
schedule_pay=schedule_pay)
contract.mn_w4mn_allowances = allowances
- contract.mn_w4mn_tax_exempt = True
+ contract.mn_w4mn_filing_status = 'exempt'
self.assertEqual(contract.schedule_pay, 'weekly')
diff --git a/l10n_us_mn_hr_payroll/views/hr_payroll_views.xml b/l10n_us_mn_hr_payroll/views/hr_payroll_views.xml
index c6485892..44315763 100755
--- a/l10n_us_mn_hr_payroll/views/hr_payroll_views.xml
+++ b/l10n_us_mn_hr_payroll/views/hr_payroll_views.xml
@@ -11,7 +11,6 @@
-