From 190a833e2e127171272b2ed34ee4ac41779bd768 Mon Sep 17 00:00:00 2001
From: Mishael De La Cruz <mishael@hibou.io>
Date: Mon, 20 Dec 2021 13:10:10 -0600
Subject: [PATCH 1/7] [IMP] l10n_us_hr_payroll: WY

---
 l10n_us_hr_payroll/data/state/wy_wyoming.xml | 21 +++++---------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/l10n_us_hr_payroll/data/state/wy_wyoming.xml b/l10n_us_hr_payroll/data/state/wy_wyoming.xml
index 2f5485e1..f7383a7c 100644
--- a/l10n_us_hr_payroll/data/state/wy_wyoming.xml
+++ b/l10n_us_hr_payroll/data/state/wy_wyoming.xml
@@ -6,19 +6,11 @@
         <field name="code">us_wy_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_wy_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">26400.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wy_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- http://wyomingworkforce.org/businesses/ui/utwb/ -->
-        <record id="rule_parameter_us_wy_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">27300.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wy_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wy_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">26400.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wy_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_wy_suta_rate" model="hr.rule.parameter">
@@ -27,9 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Except as otherwise provided by law, the base rate of contributions assigned to any employer is eight and one-half percent (8.5%) -->
-        <!-- 27-3-503 (b) https://law.justia.com/codes/wyoming/2010/Title27/chapter3.html -->
-        <!-- 2020 Statuses > 20Titles > Title 27 > Chapter 3 > Article 5 > 27-3-503 > (b) -->
         <record id="rule_parameter_us_wy_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">8.5</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_wy_suta_rate"/>

From 7294fb1a32401dad80a5a97d7791ca8ceb0478f1 Mon Sep 17 00:00:00 2001
From: Mishael De La Cruz <mishael@hibou.io>
Date: Mon, 20 Dec 2021 13:44:30 -0600
Subject: [PATCH 2/7] [IMP] l10n_us_hr_payroll: WV

---
 .../data/state/wv_west_virginia.xml           | 280 +++++++++---------
 1 file changed, 135 insertions(+), 145 deletions(-)

diff --git a/l10n_us_hr_payroll/data/state/wv_west_virginia.xml b/l10n_us_hr_payroll/data/state/wv_west_virginia.xml
index 8ded67b7..57a31347 100644
--- a/l10n_us_hr_payroll/data/state/wv_west_virginia.xml
+++ b/l10n_us_hr_payroll/data/state/wv_west_virginia.xml
@@ -6,14 +6,11 @@
         <field name="code">us_wv_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged for 2021 https://workforcewv.org/images/files/employers/Employer_Handbook.pdf -->
-        <record id="rule_parameter_us_wv_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">12000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wv_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wv_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">12000.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wv_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_wv_suta_rate" model="hr.rule.parameter">
@@ -22,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Unchanged for 2021 https://workforcewv.org/images/files/employers/Employer_Handbook.pdf -->
         <record id="rule_parameter_us_wv_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">2.7</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_wv_suta_rate"/>
@@ -30,152 +26,146 @@
         </record>
     </data>
 
-    <!-- Table base on this https://tax.wv.gov/Documents/TaxForms/it100.1a.pdf page 16-->
     <record id="rule_parameter_us_wv_sit_exemption_rate" model="hr.rule.parameter">
         <field name="name">US WV West Virginia Exemption Rate</field>
         <field name="code">us_wv_sit_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged for 2021 https://tax.wv.gov/Documents/TaxForms/it100.1a.pdf -->
-        <record id="rule_parameter_us_wv_sit_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly' :        38.46,
-                'bi-weekly' :     76.92,
-                'semi-monthly':   83.33,
-                'monthly' :      166.67,
-                'annually':     2000.00,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wv_sit_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
-    <!-- Table base on this https://tax.wv.gov/Documents/TaxForms/it100.1a.pdf page 17-->
+    <record id="rule_parameter_us_wv_sit_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly' :        38.46,
+            'bi-weekly' :     76.92,
+            'semi-monthly':   83.33,
+            'monthly' :      166.67,
+            'annually':     2000.00,
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wv_sit_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
+
     <record id="rule_parameter_us_wv_sit_tax_rate" model="hr.rule.parameter">
         <field name="name">US WV West Virginia SIT Tax Rate</field>
         <field name="code">us_wv_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://tax.wv.gov/Documents/TaxForms/it100.1a.pdf -->
-        <record id="rule_parameter_us_wv_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly':(
-                        (  192,  0.00, 3.0),
-                        (  481,  5.76, 4.0),
-                        (  769, 17.32, 4.5),
-                        ( 1154, 30.28, 6.0),
-                        ('inf', 53.38, 6.5),
-                    ),
-                    'bi-weekly':(
-                        (  385,   0.00, 3.0),
-                        (  962,  11.55, 4.0),
-                        ( 1538,  34.63, 4.5),
-                        ( 2308,  60.55, 6.0),
-                        ('inf', 106.75, 6.5),
-                    ),
-                    'semi-monthly':(
-                        (  417,   0.00, 3.0),
-                        ( 1042 , 12.51, 4.0),
-                        ( 1667,  37.51, 4.5),
-                        ( 2500,  65.64, 6.0),
-                        ('inf', 115.62, 6.5),
-                    ),
-                    'monthly':(
-                        (  833,   0.00, 3.0),
-                        ( 2083,  24.99, 4.0),
-                        ( 3333,  74.99, 4.5),
-                        ( 5000, 131.24, 6.0),
-                        ('inf', 231.26, 6.5),
-                    ),
-                    'annually':(
-                        ( 10000,    0.00, 3.0),
-                        ( 25000,  300.00, 4.0),
-                        ( 40000,  900.00, 4.5),
-                        ( 60000, 1575.00, 6.0),
-                        ( 'inf', 2775.00, 6.5),
-                    ),
-                },
-                'married': {
-                    'weekly':(
-                        (  115,  0.00, 3.0),
-                        (  288,  3.45, 4.0),
-                        (  462, 10.37, 4.5),
-                        (  692, 18.20, 6.0),
-                        ('inf', 32.00, 6.5),
-                    ),
-                    'bi-weekly':(
-                        (  231,  0.00, 3.0),
-                        (  577,  6.93, 4.0),
-                        (  923, 20.77, 4.5),
-                        ( 1385, 36.34, 6.0),
-                        ('inf', 64.06, 6.5),
-                    ),
-                    'semi-monthly':(
-                        (  250,  0.00, 3.0),
-                        (  625,  7.50, 4.0),
-                        ( 1000, 22.50, 4.5),
-                        ( 1500, 39.38, 6.0),
-                        ('inf', 69.38, 6.5),
-                    ),
-                    'monthly':(
-                        (  500,   0.00, 3.0),
-                        ( 1250,  15.00, 4.0),
-                        ( 2000,  45.00, 4.5),
-                        ( 3000,  78.75, 6.0),
-                        ('inf', 138.75, 6.5),
-                    ),
-                    'annually':(
-                        ( 6000,    0.00, 3.0),
-                        (15000,  180.00, 4.0),
-                        (24000,  540.00, 4.5),
-                        (36000,  945.00, 6.0),
-                        ('inf', 1665.00, 6.5),
-                    ),
-                },
-                'head_household': {
-                    'weekly':(
-                        (  192,  0.00, 3.0),
-                        (  481,  5.76, 4.0),
-                        (  769, 17.32, 4.5),
-                        ( 1154, 30.28, 6.0),
-                        ('inf', 53.38, 6.5),
-                    ),
-                    'bi-weekly':(
-                        (  385,   0.00, 3.0),
-                        (  962,  11.55, 4.0),
-                        ( 1538,  34.63, 4.5),
-                        ( 2308,  60.55, 6.0),
-                        ('inf', 106.75, 6.5),
-                    ),
-                    'semi-monthly':(
-                        (  417,   0.00, 3.0),
-                        ( 1042,  12.51, 4.0),
-                        ( 1667,  37.51, 4.5),
-                        ( 2500,  65.64, 6.0),
-                        ('inf', 115.62, 6.5),
-                    ),
-                    'monthly':(
-                        (  833,   0.00, 3.0),
-                        ( 2083,  24.99, 4.0),
-                        ( 3333,  74.99, 4.5),
-                        ( 5000, 131.24, 6.0),
-                        ('inf', 231.26, 6.5),
-                    ),
-                    'annually':(
-                        ( 10000,    0.00, 3.0),
-                        ( 25000,  300.00, 4.0),
-                        ( 40000,  900.00, 4.5),
-                        ( 60000, 1575.00, 6.0),
-                        ( 'inf', 2775.00, 6.5),
-                    ),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wv_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+
+    <record id="rule_parameter_us_wv_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly':(
+                    (  192,  0.00, 3.0),
+                    (  481,  5.76, 4.0),
+                    (  769, 17.32, 4.5),
+                    ( 1154, 30.28, 6.0),
+                    ('inf', 53.38, 6.5),
+                ),
+                'bi-weekly':(
+                    (  385,   0.00, 3.0),
+                    (  962,  11.55, 4.0),
+                    ( 1538,  34.63, 4.5),
+                    ( 2308,  60.55, 6.0),
+                    ('inf', 106.75, 6.5),
+                ),
+                'semi-monthly':(
+                    (  417,   0.00, 3.0),
+                    ( 1042 , 12.51, 4.0),
+                    ( 1667,  37.51, 4.5),
+                    ( 2500,  65.64, 6.0),
+                    ('inf', 115.62, 6.5),
+                ),
+                'monthly':(
+                    (  833,   0.00, 3.0),
+                    ( 2083,  24.99, 4.0),
+                    ( 3333,  74.99, 4.5),
+                    ( 5000, 131.24, 6.0),
+                    ('inf', 231.26, 6.5),
+                ),
+                'annually':(
+                    ( 10000,    0.00, 3.0),
+                    ( 25000,  300.00, 4.0),
+                    ( 40000,  900.00, 4.5),
+                    ( 60000, 1575.00, 6.0),
+                    ( 'inf', 2775.00, 6.5),
+                ),
+            },
+            'married': {
+                'weekly':(
+                    (  115,  0.00, 3.0),
+                    (  288,  3.45, 4.0),
+                    (  462, 10.37, 4.5),
+                    (  692, 18.20, 6.0),
+                    ('inf', 32.00, 6.5),
+                ),
+                'bi-weekly':(
+                    (  231,  0.00, 3.0),
+                    (  577,  6.93, 4.0),
+                    (  923, 20.77, 4.5),
+                    ( 1385, 36.34, 6.0),
+                    ('inf', 64.06, 6.5),
+                ),
+                'semi-monthly':(
+                    (  250,  0.00, 3.0),
+                    (  625,  7.50, 4.0),
+                    ( 1000, 22.50, 4.5),
+                    ( 1500, 39.38, 6.0),
+                    ('inf', 69.38, 6.5),
+                ),
+                'monthly':(
+                    (  500,   0.00, 3.0),
+                    ( 1250,  15.00, 4.0),
+                    ( 2000,  45.00, 4.5),
+                    ( 3000,  78.75, 6.0),
+                    ('inf', 138.75, 6.5),
+                ),
+                'annually':(
+                    ( 6000,    0.00, 3.0),
+                    (15000,  180.00, 4.0),
+                    (24000,  540.00, 4.5),
+                    (36000,  945.00, 6.0),
+                    ('inf', 1665.00, 6.5),
+                ),
+            },
+            'head_household': {
+                'weekly':(
+                    (  192,  0.00, 3.0),
+                    (  481,  5.76, 4.0),
+                    (  769, 17.32, 4.5),
+                    ( 1154, 30.28, 6.0),
+                    ('inf', 53.38, 6.5),
+                ),
+                'bi-weekly':(
+                    (  385,   0.00, 3.0),
+                    (  962,  11.55, 4.0),
+                    ( 1538,  34.63, 4.5),
+                    ( 2308,  60.55, 6.0),
+                    ('inf', 106.75, 6.5),
+                ),
+                'semi-monthly':(
+                    (  417,   0.00, 3.0),
+                    ( 1042,  12.51, 4.0),
+                    ( 1667,  37.51, 4.5),
+                    ( 2500,  65.64, 6.0),
+                    ('inf', 115.62, 6.5),
+                ),
+                'monthly':(
+                    (  833,   0.00, 3.0),
+                    ( 2083,  24.99, 4.0),
+                    ( 3333,  74.99, 4.5),
+                    ( 5000, 131.24, 6.0),
+                    ('inf', 231.26, 6.5),
+                ),
+                'annually':(
+                    ( 10000,    0.00, 3.0),
+                    ( 25000,  300.00, 4.0),
+                    ( 40000,  900.00, 4.5),
+                    ( 60000, 1575.00, 6.0),
+                    ( 'inf', 2775.00, 6.5),
+                ),
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wv_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_wv_dor" model="res.partner">

From 8521b076c44fa915dbf1a97cf6c2086e0a64bd92 Mon Sep 17 00:00:00 2001
From: Mishael De La Cruz <mishael@hibou.io>
Date: Mon, 20 Dec 2021 13:57:14 -0600
Subject: [PATCH 3/7] [IMP] l10n_us_hr_payroll: WI

---
 .../data/state/wi_wisconsin.xml               | 79 ++++++++-----------
 1 file changed, 34 insertions(+), 45 deletions(-)

diff --git a/l10n_us_hr_payroll/data/state/wi_wisconsin.xml b/l10n_us_hr_payroll/data/state/wi_wisconsin.xml
index 491c7311..0fdb3c86 100644
--- a/l10n_us_hr_payroll/data/state/wi_wisconsin.xml
+++ b/l10n_us_hr_payroll/data/state/wi_wisconsin.xml
@@ -6,14 +6,11 @@
         <field name="code">us_wi_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://dwd.wisconsin.gov/ui/employers/taxrates.htm -->
-        <record id="rule_parameter_us_wi_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">14000.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wi_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wi_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">14000.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wi_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_wi_suta_rate" model="hr.rule.parameter">
@@ -22,8 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Rate based on this file https://dwd.wisconsin.gov/ui/employers/taxrates.htm -->
-        <!-- Unchanged in 2021 -->
         <record id="rule_parameter_us_wi_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">3.05</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_wi_suta_rate"/>
@@ -36,47 +31,41 @@
         <field name="code">us_wi_sit_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_wi_sit_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">22</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wi_sit_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wi_sit_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">22</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wi_sit_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_wi_sit_tax_rate" model="hr.rule.parameter">
         <field name="name">US WI Wisconsin SIT Tax Rate</field>
         <field name="code">us_wi_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Table based on https://www.revenue.wi.gov/DOR%20Publications/pb166.pdf page 25. -->
-        <!-- Unchanged in 2021 -->
-        <record id="rule_parameter_us_wi_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single':  (
-                    (  5730, 0.0000,     0.00),
-                    ( 15200, 4.0000,     0.00),
-                    ( 16486, 4.4800,   378.80),
-                    ( 26227, 6.5408,   436.41),
-                    ( 62950, 7.0224,  1073.55),
-                    (240190, 6.2700,  3652.39),
-                    ( 'inf', 7.6500, 14765.34),
-                ),
-                'married': (
-                    (  7870, 0.0000,     0.00),
-                    ( 18780, 4.0000,     0.00),
-                    ( 21400, 5.8400,   436.40),
-                    ( 28308, 7.0080,   589.41),
-                    ( 60750, 7.5240,  1073.52),
-                    (240190, 6.2700,  3514.46),
-                    ( 'inf', 7.6500, 14765.35),
-                ),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wi_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wi_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single':  (
+                (  5730, 0.0000,     0.00),
+                ( 15200, 4.0000,     0.00),
+                ( 16486, 4.4800,   378.80),
+                ( 26227, 6.5408,   436.41),
+                ( 62950, 7.0224,  1073.55),
+                (240190, 6.2700,  3652.39),
+                ( 'inf', 7.6500, 14765.34),
+            ),
+            'married': (
+                (  7870, 0.0000,     0.00),
+                ( 18780, 4.0000,     0.00),
+                ( 21400, 5.8400,   436.40),
+                ( 28308, 7.0080,   589.41),
+                ( 60750, 7.5240,  1073.52),
+                (240190, 6.2700,  3514.46),
+                ( 'inf', 7.6500, 14765.35),
+            ),
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wi_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_wi_dor" model="res.partner">

From 5d2d88594cabae78216d83dfb639bab12df47040 Mon Sep 17 00:00:00 2001
From: Mishael De La Cruz <mishael@hibou.io>
Date: Mon, 20 Dec 2021 14:41:11 -0600
Subject: [PATCH 4/7] [IMP] l10n_us_hr_payroll: WA

---
 .../data/state/wa_washington.xml              | 104 +++++-------------
 1 file changed, 25 insertions(+), 79 deletions(-)

diff --git a/l10n_us_hr_payroll/data/state/wa_washington.xml b/l10n_us_hr_payroll/data/state/wa_washington.xml
index 5da8acef..75e4d7f2 100644
--- a/l10n_us_hr_payroll/data/state/wa_washington.xml
+++ b/l10n_us_hr_payroll/data/state/wa_washington.xml
@@ -1,44 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- No Income Tax in Washington https://dor.wa.gov/taxes-rates/income-tax-->
     <!-- Wage Base -->
-    <!--    https://esd.wa.gov/employer-taxes/rates#:~:text=State%20Unemployment%20Taxes%20(SUTA),increasing%20from%20%2452%2C700%20in%202020.-->
     <record id="rule_parameter_us_wa_suta_wage_base" model="hr.rule.parameter">
         <field name="name">US WA Washington SUTA Wage Base</field>
         <field name="code">us_wa_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_wa_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">52700.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_wa_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">56500.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wa_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">52700.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wa_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_wa_fml_wage_base" model="hr.rule.parameter">
         <field name="name">US WA Washington FML Wage Base</field>
         <field name="code">us_wa_fml_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!--        https://paidleave.wa.gov/estimate-your-paid-leave-payments/-->
-        <record id="rule_parameter_us_wa_fml_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">137700.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_wa_fml_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">142800.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wa_fml_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">137700.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_wa_suta_rate" model="hr.rule.parameter">
@@ -46,23 +29,12 @@
         <field name="code">us_wa_suta_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <!--    todo: need to figure out how this was/is calculated-->
     <data noupdate="1">
         <record id="rule_parameter_us_wa_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">1.0</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_wa_suta_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <!--        https://esd.wa.gov/employer-taxes/determining-rates-->
-        <!--        At the above link and under the "New Employers" Header:-->
-        <!--        "For 2021, new employers will pay 115 percent of the average rate for all businesses in their respective industries."-->
-        <!--        Under "Average tax rates: "The 2021 average tax rate is 1.88%"-->
-        <!--        (1.88 * 1.15) = 2.16-->
-        <record id="rule_parameter_us_wa_suta_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">2.16</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_suta_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
 
     <record id="rule_parameter_us_wa_fml_rate" model="hr.rule.parameter">
@@ -70,59 +42,33 @@
         <field name="code">us_wa_fml_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!--        https://resources.paidleave.wa.gov/premium-calculator-->
-        <record id="rule_parameter_us_wa_fml_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.4</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_wa_fml_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.4</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wa_fml_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">0.4</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_wa_fml_rate_ee" model="hr.rule.parameter">
         <field name="name">US WA Washington FML Rate (Employee)</field>
         <field name="code">us_wa_fml_rate_ee</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_wa_fml_rate_ee_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">66.33</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate_ee"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!--        Bullet 4 in: https://resources.paidleave.wa.gov/premium-calculator-->
-        <!--        "Employers may withhold up to 63.33% of the total premium from an employee."-->
-        <record id="rule_parameter_us_wa_fml_rate_ee_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">63.33</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate_ee"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wa_fml_rate_ee_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">66.33</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate_ee"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_wa_fml_rate_er" model="hr.rule.parameter">
         <field name="name">US WA Washington FML Rate (Employer)</field>
         <field name="code">us_wa_fml_rate_er</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_wa_fml_rate_er_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">33.67</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate_er"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!--        Bullet 4 also says in: https://resources.paidleave.wa.gov/premium-calculator-->
-        <!--        "The employer is responsible for paying the other 36.67%"-->
-        <record id="rule_parameter_us_wa_fml_rate_er_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">36.67</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate_er"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_wa_fml_rate_er_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">33.67</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_wa_fml_rate_er"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_wa_dor" model="res.partner">

From 617cb50e7a34f673b00e72c4bca3c52bce537604 Mon Sep 17 00:00:00 2001
From: Mishael De La Cruz <mishael@hibou.io>
Date: Tue, 21 Dec 2021 10:30:22 -0600
Subject: [PATCH 5/7] [IMP] l10n_us_hr_payroll: UT, VA, VT

---
 l10n_us_hr_payroll/data/state/ut_utah.xml     | 183 ++++-----
 l10n_us_hr_payroll/data/state/va_virginia.xml |  83 ++---
 l10n_us_hr_payroll/data/state/vt_vermont.xml  | 346 ++++++------------
 3 files changed, 221 insertions(+), 391 deletions(-)

diff --git a/l10n_us_hr_payroll/data/state/ut_utah.xml b/l10n_us_hr_payroll/data/state/ut_utah.xml
index cb3b9710..53a3d4d1 100644
--- a/l10n_us_hr_payroll/data/state/ut_utah.xml
+++ b/l10n_us_hr_payroll/data/state/ut_utah.xml
@@ -6,19 +6,11 @@
         <field name="code">us_ut_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ut_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">36600.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ut_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-<!--        https://jobs.utah.gov/UI/Employer/Public/Questions/TaxRates.aspx#:~:text=For%202021%2C%20the%20minimum%20overall,to%20the%20overall%20tax%20rate.-->
-        <record id="rule_parameter_us_ut_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">38900.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ut_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ut_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">36600.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ut_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_ut_suta_rate" model="hr.rule.parameter">
@@ -32,13 +24,6 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_ut_suta_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-<!--        https://jobs.utah.gov/UI/Employer/Public/Questions/TaxRates.aspx#:~:text=For%202021%2C%20the%20minimum%20overall,to%20the%20overall%20tax%20rate.-->
-<!--        Benefit Ratio(unique to client) X Reserve Factor(1.05% for 2021) + Social Cost(.002)-->
-        <record id="rule_parameter_us_ut_suta_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.1052</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ut_suta_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
     
     <record id="rule_parameter_us_ut_tax_rate" model="hr.rule.parameter">
@@ -46,101 +31,89 @@
         <field name="code">us_ut_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-<!--        rates unchanged in 2021-->
-        <record id="rule_parameter_us_ut_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.0495</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ut_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
-    <!-- Table based on https://tax.utah.gov/forms/pubs/pub-14.pdf -->
+    <record id="rule_parameter_us_ut_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">0.0495</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ut_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
+
     <record id="rule_parameter_us_ut_sit_allowances_rate" model="hr.rule.parameter">
         <field name="name">US UT Utah Allowances Rate</field>
         <field name="code">us_ut_sit_allowances_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Table based on https://tax.utah.gov/forms/pubs/pub-14.pdf -->
-<!--        Note at top of page 12:-->
-<!--        "Note: Use the Single column for taxpayers who file as head-of-household on their federal return." -->
-        <record id="rule_parameter_us_ut_sit_allowances_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly' :        7,
-                    'bi-weekly' :     14,
-                    'semi-monthly':   15,
-                    'monthly' :       30,
-                    'quarterly' :     90,
-                    'semi-annual':   180,
-                    'annually':      360,
-                },
-                'married': {
-                    'weekly' :        14,
-                    'bi-weekly' :     28,
-                    'semi-monthly':   30,
-                    'monthly' :       60,
-                    'quarterly' :    180,
-                    'semi-annual':   360,
-                    'annually':      720,
-                },
-                'head_household': {
-                    'weekly' :        7,
-                    'bi-weekly' :     14,
-                    'semi-monthly':   15,
-                    'monthly' :       30,
-                    'quarterly' :     90,
-                    'semi-annual':   180,
-                    'annually':      360,
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ut_sit_allowances_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
-    <!-- Table based on https://tax.utah.gov/forms/pubs/pub-14.pdf -->
+    <record id="rule_parameter_us_ut_sit_allowances_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly' :        7,
+                'bi-weekly' :     14,
+                'semi-monthly':   15,
+                'monthly' :       30,
+                'quarterly' :     90,
+                'semi-annual':   180,
+                'annually':      360,
+            },
+            'married': {
+                'weekly' :        14,
+                'bi-weekly' :     28,
+                'semi-monthly':   30,
+                'monthly' :       60,
+                'quarterly' :    180,
+                'semi-annual':   360,
+                'annually':      720,
+            },
+            'head_household': {
+                'weekly' :        7,
+                'bi-weekly' :     14,
+                'semi-monthly':   15,
+                'monthly' :       30,
+                'quarterly' :     90,
+                'semi-annual':   180,
+                'annually':      360,
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ut_sit_allowances_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
+
     <record id="rule_parameter_us_ut_sit_tax_rate" model="hr.rule.parameter">
         <field name="name">US UT Utah SIT Tax Rate</field>
         <field name="code">us_ut_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-<!--        unchanged in 2021-->
-<!--        see page 9 line 4 and line 5 in schedules https://tax.utah.gov/forms/pubs/pub-14.pdf-->
-        <record id="rule_parameter_us_ut_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': ((137, 1.3)),
-                    'bi-weekly': ((274, 1.3)),
-                    'semi-monthly': ((297, 1.3)),
-                    'monthly': ((594, 1.3)),
-                    'quarterly': ((1782, 1.3)),
-                    'semi-annual': ((3564, 1.3)),
-                    'annually': ((7128, 1.3)),
-                },
-                'married': {
-                    'weekly': ((274, 1.3)),
-                    'bi-weekly': (548, 1.3),
-                    'semi-monthly': ((594, 1.3)),
-                    'monthly': ((1188, 1.3)),
-                    'quarterly': ((3564, 1.3)),
-                    'semi-annual': ((7128, 1.3)),
-                    'annually': ((14256, 1.3)),
-                },
-                'head_household': {
-                    'weekly': ((137, 1.3)),
-                    'bi-weekly': ((274, 1.3)),
-                    'semi-monthly': ((297, 1.3)),
-                    'monthly': ((594, 1.3)),
-                    'quarterly': ((1782, 1.3)),
-                    'semi-annual': ((3564, 1.3)),
-                    'annually': ((7128, 1.3)),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ut_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ut_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly': ((137, 1.3)),
+                'bi-weekly': ((274, 1.3)),
+                'semi-monthly': ((297, 1.3)),
+                'monthly': ((594, 1.3)),
+                'quarterly': ((1782, 1.3)),
+                'semi-annual': ((3564, 1.3)),
+                'annually': ((7128, 1.3)),
+            },
+            'married': {
+                'weekly': ((274, 1.3)),
+                'bi-weekly': (548, 1.3),
+                'semi-monthly': ((594, 1.3)),
+                'monthly': ((1188, 1.3)),
+                'quarterly': ((3564, 1.3)),
+                'semi-annual': ((7128, 1.3)),
+                'annually': ((14256, 1.3)),
+            },
+            'head_household': {
+                'weekly': ((137, 1.3)),
+                'bi-weekly': ((274, 1.3)),
+                'semi-monthly': ((297, 1.3)),
+                'monthly': ((594, 1.3)),
+                'quarterly': ((1782, 1.3)),
+                'semi-annual': ((3564, 1.3)),
+                'annually': ((7128, 1.3)),
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ut_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_ut_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/va_virginia.xml b/l10n_us_hr_payroll/data/state/va_virginia.xml
index d1c2db08..985cb4ba 100644
--- a/l10n_us_hr_payroll/data/state/va_virginia.xml
+++ b/l10n_us_hr_payroll/data/state/va_virginia.xml
@@ -6,14 +6,11 @@
         <field name="code">us_va_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.vec.virginia.gov/employers/faqs/Employer-UI-Tax-Questions -->
-        <record id="rule_parameter_us_va_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">8000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_va_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_va_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">8000.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_va_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_va_suta_rate" model="hr.rule.parameter">
@@ -27,76 +24,56 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_va_suta_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <!-- https://www.vec.virginia.gov/employers/faqs/Employer-UI-Tax-Questions -->
-        <record id="rule_parameter_us_va_suta_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">2.5</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_va_suta_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
 
-
-    <!-- Table page no 10 based https://www.tax.virginia.gov/sites/default/files/inline-files/Employer%20Withholding%20Instructions.pdf -->
     <record id="rule_parameter_us_va_sit_rate" model="hr.rule.parameter">
         <field name="name">US VA Virginia SIT Rate Table</field>
         <field name="code">us_va_sit_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.business.tax.virginia.gov/calculators/withholding-calculator.cfm -->
-        <record id="rule_parameter_us_va_sit_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">[
-                    (      0.00,       0.0,  2.00),
-                    (   3000.00,      60.0,  3.00),
-                    (   5000.00,     120.0,  5.00),
-                    (  17000.00,     720.0,  5.75),
-                ]</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_va_sit_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_va_sit_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">[
+                (      0.00,       0.0,  2.00),
+                (   3000.00,      60.0,  3.00),
+                (   5000.00,     120.0,  5.00),
+                (  17000.00,     720.0,  5.75),
+            ]</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_va_sit_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_va_sit_exemption_rate" model="hr.rule.parameter">
         <field name="name">US VA Virginia SIT Exemption Rate Table</field>
         <field name="code">us_va_sit_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.business.tax.virginia.gov/calculators/withholding-calculator.cfm -->
-        <record id="rule_parameter_us_va_sit_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">930.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_va_sit_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_va_sit_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">930.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_va_sit_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_va_sit_other_exemption_rate" model="hr.rule.parameter">
         <field name="name">US VA Virginia SIT Other Exemption Rate Table</field>
         <field name="code">us_va_sit_other_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.business.tax.virginia.gov/calculators/withholding-calculator.cfm -->
-        <record id="rule_parameter_us_va_sit_other_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">800.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_va_sit_other_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_va_sit_other_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">800.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_va_sit_other_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_va_sit_deduction" model="hr.rule.parameter">
         <field name="name">US VA Virginia SIT Deduction</field>
         <field name="code">us_va_sit_deduction</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.business.tax.virginia.gov/calculators/withholding-calculator.cfm -->
-        <record id="rule_parameter_us_va_sit_deduction_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">4500.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_va_sit_deduction"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_va_sit_deduction_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">4500.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_va_sit_deduction"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_va_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/vt_vermont.xml b/l10n_us_hr_payroll/data/state/vt_vermont.xml
index 9ee8c497..7626e998 100644
--- a/l10n_us_hr_payroll/data/state/vt_vermont.xml
+++ b/l10n_us_hr_payroll/data/state/vt_vermont.xml
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- Wage Base from  https://labor.vermont.gov/unemployment-insurance/ui-employers/quarterly-reporting-taxable-wage-information -->
+    <!-- Wage Base -->
     <record id="rule_parameter_us_vt_suta_wage_base" model="hr.rule.parameter">
         <field name="name">US VT Vermont SUTA Wage Base</field>
         <field name="code">us_vt_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_vt_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">16100.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_vt_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_vt_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">14100.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_vt_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_vt_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">16100.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_vt_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_vt_suta_rate" model="hr.rule.parameter">
@@ -26,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Unchanged in 2021 https://labor.vermont.gov/unemployment-insurance/ui-employers/unemployment-tax-rates -->
         <record id="rule_parameter_us_vt_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">1.0</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_vt_suta_rate"/>
@@ -39,230 +31,118 @@
         <field name="code">us_vt_sit_allowances_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_vt_sit_allowances_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly' :         83.65,
-                'bi-weekly' :     167.31,
-                'semi-monthly':   181.25,
-                'monthly' :       362.50,
-                'quarterly' :    1087.50,
-                'annually':      4350.00,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_vt_sit_allowances_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://tax.vermont.gov/sites/tax/files/documents/GB-1210-2021.pdf -->
-        <record id="rule_parameter_us_vt_sit_allowances_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly' :         84.62,
-                'bi-weekly' :     169.23,
-                'semi-monthly':   183.33,
-                'monthly' :       366.67,
-                'quarterly' :    1100.00,
-                'annually':      4400.00,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_vt_sit_allowances_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
-    <!-- Table based on https://tax.vermont.gov/sites/tax/files/documents/WithholdingInstructions.pdf-->
+    <record id="rule_parameter_us_vt_sit_allowances_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly' :         83.65,
+            'bi-weekly' :     167.31,
+            'semi-monthly':   181.25,
+            'monthly' :       362.50,
+            'quarterly' :    1087.50,
+            'annually':      4350.00,
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_vt_sit_allowances_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
+
     <record id="rule_parameter_us_vt_sit_tax_rate" model="hr.rule.parameter">
         <field name="name">US VT Vermont SIT Tax Rate</field>
         <field name="code">us_vt_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_vt_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': (
-                        (   60,   0.00, 0.00),
-                        (  836,   0.00, 3.35),
-                        ( 1941,  26.00, 6.60),
-                        ( 3983,  98.93, 7.60),
-                        ('inf', 254.12, 8.75),
-                    ),
-                    'bi-weekly': (
-                        (  120,   0.00, 0.00),
-                        ( 1672,   0.00, 3.35),
-                        ( 3882,  51.99, 6.60),
-                        ( 7966, 197.85, 7.60),
-                        ('inf', 508.24, 8.75),
-                    ),
-                    'semi-monthly': (
-                        (  130,   0.00, 0.00),
-                        ( 1811,   0.00, 3.35),
-                        ( 4205,  56.31, 6.60),
-                        ( 8630, 214.32, 7.60),
-                        ('inf', 550.62, 8.75),
-                    ),
-                    'monthly': (
-                        (  260,    0.00, 0.00),
-                        ( 3623,    0.00, 3.35),
-                        ( 8410,  112.66, 6.60),
-                        (17260,  428.60, 7.60),
-                        ('inf', 1101.20, 8.75),
-                    ),
-                    'quarterly': (
-                        (  781,    0.00, 0.00),
-                        (10869,    0.00, 3.35),
-                        (25231,  337.95, 6.60),
-                        (51781, 1285.84, 7.60),
-                        ('inf', 3303.64, 8.75),
-                    ),
-                    'annually': (
-                        (  3125,     0.00, 0.00),
-                        ( 43475,     0.00, 3.35),
-                        (100925,  1351.73, 6.60),
-                        (207125,  5143.43, 7.60),
-                        ( 'inf', 13214.63, 8.75),
-                    ),
-                },
-                'married': {
-                    'weekly': (
-                        (  180,   0.00, 0.00),
-                        ( 1477,   0.00, 3.35),
-                        ( 3315,  43.45, 6.60),
-                        ( 4956, 164.76, 7.60),
-                        ('inf', 289.47, 8.75),
-                    ),
-                    'bi-weekly': (
-                        (  361,   0.00, 0.00),
-                        ( 2955,   0.00, 3.35),
-                        ( 6630,  86.90, 6.60),
-                         (9913, 329.45, 7.60),
-                        ('inf', 578.96, 8.75),
-                    ),
-                    'semi-monthly': (
-                        (  391,   0.00, 0.00),
-                        ( 3201,   0.00, 3.35),
-                        ( 7182,  94.14, 6.60),
-                        (10739, 356.88, 7.60),
-                        ('inf', 627.21, 8.75),
-                    ),
-                    'monthly': (
-                        (  781,    0.00, 0.00),
-                        ( 6402,    0.00, 3.35),
-                        (14365,  188.30, 6.60),
-                        (21477,  713.86, 7.60),
-                        ('inf', 1254.37, 8.75),
-                    ),
-                    'quarterly': (
-                        ( 2344,    0.00, 0.00),
-                        (19206,    0.00, 3.35),
-                        (43094,  564.88, 6.60),
-                        (64431, 2141.49, 7.60),
-                        ('inf', 3763.10, 8.75),
-                    ),
-                    'annually': (
-                        (  9375,     0.00, 0.00),
-                        ( 76825,     0.00, 3.35),
-                        (172375,  2259.58, 6.60),
-                        (257725,  8565.88, 7.60),
-                        ( 'inf', 15052.48, 8.75),
-                    ),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_vt_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://tax.vermont.gov/sites/tax/files/documents/GB-1210-2021.pdf -->
-        <record id="rule_parameter_us_vt_sit_tax_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': (
-                        (   61,   0.00, 0.00),
-                        (  849,   0.00, 3.35),
-                        ( 1969,  26.40, 6.60),
-                        ( 4041, 100.32, 7.60),
-                        ('inf', 257.79, 8.75),
-                    ),
-                    'bi-weekly': (
-                        (  122,   0.00, 0.00),
-                        ( 1697,   0.00, 3.35),
-                        ( 3938,  52.76, 6.60),
-                        ( 8082, 200.67, 7.60),
-                        ('inf', 515.61, 8.75),
-                    ),
-                    'semi-monthly': (
-                        (  132,   0.00, 0.00),
-                        ( 1839,   0.00, 3.35),
-                        ( 4266,  57.18, 6.60),
-                        ( 8755, 217.37, 7.60),
-                        ('inf', 558.53, 8.75),
-                    ),
-                    'monthly': (
-                        (  265,    0.00, 0.00),
-                        ( 3677,    0.00, 3.35),
-                        ( 8531,  114.30, 6.60),
-                        (17510,  434.67, 7.60),
-                        ('inf', 1117.07, 8.75),
-                    ),
-                    'quarterly': (
-                        (  794,    0.00, 0.00),
-                        (11031,    0.00, 3.35),
-                        (25594,  342.94, 6.60),
-                        (52531, 1304.10, 7.60),
-                        ('inf', 3351.31, 8.75),
-                    ),
-                    'annually': (
-                        (  3175,     0.00, 0.00),
-                        ( 44125,     0.00, 3.35),
-                        (102375,  1371.83, 6.60),
-                        (210125,  5216.33, 7.60),
-                        ( 'inf', 13405.33, 8.75),
-                    ),
-                },
-                'married': {
-                    'weekly': (
-                        (  183,   0.00, 0.00),
-                        ( 1499,   0.00, 3.35),
-                        ( 3363,  44.09, 6.60),
-                        ( 5028, 167.11, 7.60),
-                        ('inf', 293.65, 8.75),
-                    ),
-                    'bi-weekly': (
-                        (  366,   0.00, 0.00),
-                        ( 2997,   0.00, 3.35),
-                        ( 6726,  88.14, 6.60),
-                        (10057, 334.25, 7.60),
-                        ('inf', 587.41, 8.75),
-                    ),
-                    'semi-monthly': (
-                        (  397,   0.00, 0.00),
-                        ( 3247,   0.00, 3.35),
-                        ( 7286,  95.48, 6.60),
-                        (10895, 362.05, 7.60),
-                        ('inf', 636.33, 8.75),
-                    ),
-                    'monthly': (
-                        (  794,    0.00, 0.00),
-                        ( 6494,    0.00, 3.35),
-                        (14573,  190.95, 6.60),
-                        (21790,  724.16, 7.60),
-                        ('inf', 1272.66, 8.75),
-                    ),
-                    'quarterly': (
-                        ( 2381,    0.00, 0.00),
-                        (19481,    0.00, 3.35),
-                        (43719,  572.85, 6.60),
-                        (65719, 2172.56, 7.60),
-                        ('inf', 3817.96, 8.75),
-                    ),
-                    'annually': (
-                        (  9525,     0.00, 0.00),
-                        ( 77925,     0.00, 3.35),
-                        (174875,  2291.40, 6.60),
-                        (261475,  8690.10, 7.60),
-                        ( 'inf', 15271.70, 8.75),
-                    ),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_vt_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_vt_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly': (
+                    (   60,   0.00, 0.00),
+                    (  836,   0.00, 3.35),
+                    ( 1941,  26.00, 6.60),
+                    ( 3983,  98.93, 7.60),
+                    ('inf', 254.12, 8.75),
+                ),
+                'bi-weekly': (
+                    (  120,   0.00, 0.00),
+                    ( 1672,   0.00, 3.35),
+                    ( 3882,  51.99, 6.60),
+                    ( 7966, 197.85, 7.60),
+                    ('inf', 508.24, 8.75),
+                ),
+                'semi-monthly': (
+                    (  130,   0.00, 0.00),
+                    ( 1811,   0.00, 3.35),
+                    ( 4205,  56.31, 6.60),
+                    ( 8630, 214.32, 7.60),
+                    ('inf', 550.62, 8.75),
+                ),
+                'monthly': (
+                    (  260,    0.00, 0.00),
+                    ( 3623,    0.00, 3.35),
+                    ( 8410,  112.66, 6.60),
+                    (17260,  428.60, 7.60),
+                    ('inf', 1101.20, 8.75),
+                ),
+                'quarterly': (
+                    (  781,    0.00, 0.00),
+                    (10869,    0.00, 3.35),
+                    (25231,  337.95, 6.60),
+                    (51781, 1285.84, 7.60),
+                    ('inf', 3303.64, 8.75),
+                ),
+                'annually': (
+                    (  3125,     0.00, 0.00),
+                    ( 43475,     0.00, 3.35),
+                    (100925,  1351.73, 6.60),
+                    (207125,  5143.43, 7.60),
+                    ( 'inf', 13214.63, 8.75),
+                ),
+            },
+            'married': {
+                'weekly': (
+                    (  180,   0.00, 0.00),
+                    ( 1477,   0.00, 3.35),
+                    ( 3315,  43.45, 6.60),
+                    ( 4956, 164.76, 7.60),
+                    ('inf', 289.47, 8.75),
+                ),
+                'bi-weekly': (
+                    (  361,   0.00, 0.00),
+                    ( 2955,   0.00, 3.35),
+                    ( 6630,  86.90, 6.60),
+                        (9913, 329.45, 7.60),
+                    ('inf', 578.96, 8.75),
+                ),
+                'semi-monthly': (
+                    (  391,   0.00, 0.00),
+                    ( 3201,   0.00, 3.35),
+                    ( 7182,  94.14, 6.60),
+                    (10739, 356.88, 7.60),
+                    ('inf', 627.21, 8.75),
+                ),
+                'monthly': (
+                    (  781,    0.00, 0.00),
+                    ( 6402,    0.00, 3.35),
+                    (14365,  188.30, 6.60),
+                    (21477,  713.86, 7.60),
+                    ('inf', 1254.37, 8.75),
+                ),
+                'quarterly': (
+                    ( 2344,    0.00, 0.00),
+                    (19206,    0.00, 3.35),
+                    (43094,  564.88, 6.60),
+                    (64431, 2141.49, 7.60),
+                    ('inf', 3763.10, 8.75),
+                ),
+                'annually': (
+                    (  9375,     0.00, 0.00),
+                    ( 76825,     0.00, 3.35),
+                    (172375,  2259.58, 6.60),
+                    (257725,  8565.88, 7.60),
+                    ( 'inf', 15052.48, 8.75),
+                ),
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_vt_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_vt_dor" model="res.partner">

From af960fafbd71ab64c8a8bc26d228df3e7c40a13b Mon Sep 17 00:00:00 2001
From: Mishael De La Cruz <mishael@hibou.io>
Date: Tue, 21 Dec 2021 15:13:10 -0600
Subject: [PATCH 6/7] [IMP] l10n_us_hr_payroll: OK, PA, RI, SC, SD, TN, TX

---
 l10n_us_hr_payroll/data/state/ok_oklahoma.xml | 460 +++++++++---------
 .../data/state/pa_pennsylvania.xml            |  28 +-
 .../data/state/ri_rhode_island.xml            | 184 +++----
 .../data/state/sc_south_carolina.xml          |  90 +---
 .../data/state/sd_south_dakota.xml            |  14 +-
 .../data/state/tn_tennessee.xml               |  12 +-
 l10n_us_hr_payroll/data/state/tx_texas.xml    |  40 +-
 7 files changed, 335 insertions(+), 493 deletions(-)

diff --git a/l10n_us_hr_payroll/data/state/ok_oklahoma.xml b/l10n_us_hr_payroll/data/state/ok_oklahoma.xml
index 8968ea39..27ebd5f6 100644
--- a/l10n_us_hr_payroll/data/state/ok_oklahoma.xml
+++ b/l10n_us_hr_payroll/data/state/ok_oklahoma.xml
@@ -6,19 +6,11 @@
         <field name="code">us_ok_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ok_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">18700.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ok_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://oklahoma.gov/content/dam/ok/en/omes/documents/car/newsletter/2021RatesAndMaximums.pdf -->
-        <record id="rule_parameter_us_ok_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">24000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ok_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ok_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">18700.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ok_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_ok_suta_rate" model="hr.rule.parameter">
@@ -32,247 +24,233 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_ok_suta_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <!-- https://oklahoma.gov/content/dam/ok/en/omes/documents/car/newsletter/2021RatesAndMaximums.pdf -->
-        <record id="rule_parameter_us_ok_suta_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">1.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ok_suta_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
 
-    <!-- table from https://www.ok.gov/tax/documents/2020WHTables.pdf -->
     <record id="rule_parameter_us_ok_sit_allowances_rate" model="hr.rule.parameter">
         <field name="name">US OK Oklahoma Allowances Rate</field>
         <field name="code">us_ok_sit_allowances_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.ok.gov/tax/documents/2021WHTables.pdf -->
-        <record id="rule_parameter_us_ok_sit_allowances_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly' :        19.23,
-                'bi-weekly' :     38.46,
-                'semi-monthly':   41.67,
-                'monthly' :       83.33,
-                'quarterly' :    250.00,
-                'semi-annual':   500.00,
-                'annually':     1000.00,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ok_sit_allowances_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ok_sit_allowances_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly' :        19.23,
+            'bi-weekly' :     38.46,
+            'semi-monthly':   41.67,
+            'monthly' :       83.33,
+            'quarterly' :    250.00,
+            'semi-annual':   500.00,
+            'annually':     1000.00,
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ok_sit_allowances_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_ok_sit_tax_rate" model="hr.rule.parameter">
         <field name="name">US OK Oklahoma SIT Tax Rate</field>
         <field name="code">us_ok_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- table from https://www.ok.gov/tax/documents/2020WHTables.pdf -->
-        <!-- Unchanged in 2021 https://www.ok.gov/tax/documents/2021WHTables.pdf -->
-        <record id="rule_parameter_us_ok_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': (
-                        (  122, 0.00, 0.00),
-                        (  141, 0.50, 0.00),
-                        (  170, 1.00, 0.10),
-                        (  194, 2.00, 0.38),
-                        (  216, 3.00, 0.87),
-                        (  261, 4.00, 1.53),
-                        ('inf', 5.00, 3.30),
-                    ),
-                    'bi-weekly': (
-                        (  244, 0.00, 0.00),
-                        (  283, 0.50, 0.00),
-                        (  340, 1.00, 0.19),
-                        (  388, 2.00, 0.77),
-                        (  433, 3.00, 1.73),
-                        (  521, 4.00, 3.06),
-                        ('inf', 5.00, 6.60),
-                    ),
-                    'semi-monthly': (
-                        (  265, 0.00, 0.00),
-                        (  306, 0.50, 0.00),
-                        (  369, 1.00, 0.21),
-                        (  421, 2.00, 0.83),
-                        (  469, 3.00, 1.88),
-                        (  565, 4.00, 3.31),
-                        ('inf', 5.00, 7.15),
-                    ),
-                    'monthly': (
-                        (  529, 0.00,  0.00),
-                        (  613, 0.50,  0.00),
-                        (  738, 1.00,  0.42),
-                        (  842, 2.00,  1.67),
-                        (  938, 3.00,  3.75),
-                         (1129, 4.00,  6.63),
-                        ('inf', 5.00, 14.29),
-                    ),
-                    'quarterly': (
-                        ( 1588, 0.00,  0.00),
-                        ( 1838, 0.50,  0.00),
-                        ( 2213, 1.00,  1.25),
-                        ( 2525, 2.00,  5.00),
-                        ( 2813, 3.00, 11.25),
-                        ( 3388, 4.00, 19.88),
-                        ('inf', 5.00, 42.88),
-                    ),
-                    'semi-annual': (
-                        ( 3175, 0.00,  0.00),
-                        ( 3675, 0.50,  0.00),
-                        ( 4425, 1.00,  2.50),
-                        ( 5050, 2.00, 10.00),
-                         (5625, 3.00, 22.50),
-                        ( 6775, 4.00, 39.75),
-                        ('inf', 5.00, 85.75),
-                    ),
-                    'annually': (
-                        ( 6350, 0.00,   0.00),
-                        ( 7350, 0.50,   0.00),
-                        ( 8850, 1.00,   5.00),
-                        (10100, 2.00,  20.00),
-                        (11250, 3.00,  45.00),
-                        (13550, 4.00,  79.50),
-                        ('inf', 5.00, 171.50),
-                    ),
-                },
-                'married': {
-                    'weekly': (
-                        (  244, 0.00, 0.00),
-                        (  283, 0.50, 0.00),
-                        (  340, 1.00, 0.19),
-                        (  388, 2.00, 0.77),
-                        (  433, 3.00, 1.73),
-                        (  479, 4.00, 3.06),
-                        ('inf', 5.00, 4.90),
-                    ),
-                    'bi-weekly': (
-                        (  488, 0.00, 0.00),
-                        (  565, 0.50, 0.00),
-                        (  681, 1.00, 0.38),
-                        (  777, 2.00, 1.54),
-                        (  865, 3.00, 3.46),
-                        (  958, 4.00, 6.12),
-                        ('inf', 5.00, 9.81),
-                    ),
-                    'semi-monthly': (
-                        (  529, 0.00,  0.00),
-                        (  613, 0.50,  0.00),
-                        (  738, 1.00,  0.42),
-                        (  842, 2.00,  1.67),
-                        (  938, 3.00,  3.75),
-                        ( 1038, 4.00,  6.63),
-                        ('inf', 5.00, 10.63),
-                    ),
-                    'monthly': (
-                        ( 1058, 0.00,  0.00),
-                        ( 1225, 0.50,  0.00),
-                        ( 1475, 1.00,  0.83),
-                        ( 1683, 2.00,  3.33),
-                        ( 1875, 3.00,  7.50),
-                        ( 2075, 4.00, 13.25),
-                        ('inf', 5.00, 21.25),
-                    ),
-                    'quarterly': (
-                        ( 3175, 0.00,  0.00),
-                        ( 3675, 0.50,  0.00),
-                        ( 4425, 1.00,  2.50),
-                        ( 5050, 2.00, 10.00),
-                        ( 5625, 3.00, 22.50),
-                        ( 6225, 4.00, 39.75),
-                        ('inf', 5.00, 63.75),
-                    ),
-                    'semi-annual': (
-                        (  6350, 0.00,   0.00),
-                        (  7350, 0.50,   0.00),
-                        (  8850, 1.00,   5.00),
-                        ( 10100, 2.00,  20.00),
-                        ( 11250, 3.00,  45.00),
-                        ( 12450, 4.00,  79.50),
-                        ( 'inf', 5.00, 127.50),
-                    ),
-                    'annually': (
-                        (  12700, 0.00,   0.00),
-                        (  14700, 0.50,   0.00),
-                        (  17700, 1.00,  10.00),
-                        (  20200, 2.00,  40.00),
-                        (  22500, 3.00,  90.00),
-                        (  24900, 4.00, 159.00),
-                        (  'inf', 5.00, 255.00),
-                    ),
-                },
-                'head_household': {
-                    'weekly': (
-                        (  122, 0.00, 0.00),
-                        (  141, 0.50, 0.00),
-                        (  170, 1.00, 0.10),
-                        (  194, 2.00, 0.38),
-                        (  216, 3.00, 0.87),
-                        (  261, 4.00, 1.53),
-                        ('inf', 5.00, 3.30),
-                    ),
-                    'bi-weekly': (
-                        (  244, 0.00, 0.00),
-                        (  283, 0.50, 0.00),
-                        (  340, 1.00, 0.19),
-                        (  388, 2.00, 0.77),
-                        (  433, 3.00, 1.73),
-                        (  521, 4.00, 3.06),
-                        ('inf', 5.00, 6.60),
-                    ),
-                    'semi-monthly': (
-                        (  265, 0.00, 0.00),
-                        (  306, 0.50, 0.00),
-                        (  369, 1.00, 0.21),
-                        (  421, 2.00, 0.83),
-                        (  469, 3.00, 1.88),
-                        (  565, 4.00, 3.31),
-                        ('inf', 5.00, 7.15),
-                    ),
-                    'monthly': (
-                        (  529, 0.00,  0.00),
-                        (  613, 0.50,  0.00),
-                        (  738, 1.00,  0.42),
-                        (  842, 2.00,  1.67),
-                        (  938, 3.00,  3.75),
-                        ( 1129, 4.00,  6.63),
-                        ('inf', 5.00, 14.29),
-                    ),
-                    'quarterly': (
-                        ( 1588, 0.00,  0.00),
-                        ( 1838, 0.50,  0.00),
-                        ( 2213, 1.00,  1.25),
-                        ( 2525, 2.00,  5.00),
-                        ( 2813, 3.00, 11.25),
-                        ( 3388, 4.00, 19.88),
-                        ('inf', 5.00, 42.88),
-                    ),
-                    'semi-annual': (
-                        ( 3175, 0.00,  0.00),
-                        ( 3675, 0.50,  0.00),
-                        ( 4425, 1.00,  2.50),
-                        ( 5050, 2.00, 10.00),
-                        ( 5625, 3.00, 22.50),
-                        ( 6775, 4.00, 39.75),
-                        ('inf', 5.00, 85.75),
-                    ),
-                    'annually': (
-                        ( 6350, 0.00,   0.00),
-                        ( 7350, 0.50,   0.00),
-                        ( 8850, 1.00,   5.00),
-                        (10100, 2.00,  20.00),
-                        (11250, 3.00,  45.00),
-                        (13550, 4.00,  79.50),
-                        ('inf', 5.00, 171.50),
-                    ),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ok_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ok_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly': (
+                    (  122, 0.00, 0.00),
+                    (  141, 0.50, 0.00),
+                    (  170, 1.00, 0.10),
+                    (  194, 2.00, 0.38),
+                    (  216, 3.00, 0.87),
+                    (  261, 4.00, 1.53),
+                    ('inf', 5.00, 3.30),
+                ),
+                'bi-weekly': (
+                    (  244, 0.00, 0.00),
+                    (  283, 0.50, 0.00),
+                    (  340, 1.00, 0.19),
+                    (  388, 2.00, 0.77),
+                    (  433, 3.00, 1.73),
+                    (  521, 4.00, 3.06),
+                    ('inf', 5.00, 6.60),
+                ),
+                'semi-monthly': (
+                    (  265, 0.00, 0.00),
+                    (  306, 0.50, 0.00),
+                    (  369, 1.00, 0.21),
+                    (  421, 2.00, 0.83),
+                    (  469, 3.00, 1.88),
+                    (  565, 4.00, 3.31),
+                    ('inf', 5.00, 7.15),
+                ),
+                'monthly': (
+                    (  529, 0.00,  0.00),
+                    (  613, 0.50,  0.00),
+                    (  738, 1.00,  0.42),
+                    (  842, 2.00,  1.67),
+                    (  938, 3.00,  3.75),
+                        (1129, 4.00,  6.63),
+                    ('inf', 5.00, 14.29),
+                ),
+                'quarterly': (
+                    ( 1588, 0.00,  0.00),
+                    ( 1838, 0.50,  0.00),
+                    ( 2213, 1.00,  1.25),
+                    ( 2525, 2.00,  5.00),
+                    ( 2813, 3.00, 11.25),
+                    ( 3388, 4.00, 19.88),
+                    ('inf', 5.00, 42.88),
+                ),
+                'semi-annual': (
+                    ( 3175, 0.00,  0.00),
+                    ( 3675, 0.50,  0.00),
+                    ( 4425, 1.00,  2.50),
+                    ( 5050, 2.00, 10.00),
+                        (5625, 3.00, 22.50),
+                    ( 6775, 4.00, 39.75),
+                    ('inf', 5.00, 85.75),
+                ),
+                'annually': (
+                    ( 6350, 0.00,   0.00),
+                    ( 7350, 0.50,   0.00),
+                    ( 8850, 1.00,   5.00),
+                    (10100, 2.00,  20.00),
+                    (11250, 3.00,  45.00),
+                    (13550, 4.00,  79.50),
+                    ('inf', 5.00, 171.50),
+                ),
+            },
+            'married': {
+                'weekly': (
+                    (  244, 0.00, 0.00),
+                    (  283, 0.50, 0.00),
+                    (  340, 1.00, 0.19),
+                    (  388, 2.00, 0.77),
+                    (  433, 3.00, 1.73),
+                    (  479, 4.00, 3.06),
+                    ('inf', 5.00, 4.90),
+                ),
+                'bi-weekly': (
+                    (  488, 0.00, 0.00),
+                    (  565, 0.50, 0.00),
+                    (  681, 1.00, 0.38),
+                    (  777, 2.00, 1.54),
+                    (  865, 3.00, 3.46),
+                    (  958, 4.00, 6.12),
+                    ('inf', 5.00, 9.81),
+                ),
+                'semi-monthly': (
+                    (  529, 0.00,  0.00),
+                    (  613, 0.50,  0.00),
+                    (  738, 1.00,  0.42),
+                    (  842, 2.00,  1.67),
+                    (  938, 3.00,  3.75),
+                    ( 1038, 4.00,  6.63),
+                    ('inf', 5.00, 10.63),
+                ),
+                'monthly': (
+                    ( 1058, 0.00,  0.00),
+                    ( 1225, 0.50,  0.00),
+                    ( 1475, 1.00,  0.83),
+                    ( 1683, 2.00,  3.33),
+                    ( 1875, 3.00,  7.50),
+                    ( 2075, 4.00, 13.25),
+                    ('inf', 5.00, 21.25),
+                ),
+                'quarterly': (
+                    ( 3175, 0.00,  0.00),
+                    ( 3675, 0.50,  0.00),
+                    ( 4425, 1.00,  2.50),
+                    ( 5050, 2.00, 10.00),
+                    ( 5625, 3.00, 22.50),
+                    ( 6225, 4.00, 39.75),
+                    ('inf', 5.00, 63.75),
+                ),
+                'semi-annual': (
+                    (  6350, 0.00,   0.00),
+                    (  7350, 0.50,   0.00),
+                    (  8850, 1.00,   5.00),
+                    ( 10100, 2.00,  20.00),
+                    ( 11250, 3.00,  45.00),
+                    ( 12450, 4.00,  79.50),
+                    ( 'inf', 5.00, 127.50),
+                ),
+                'annually': (
+                    (  12700, 0.00,   0.00),
+                    (  14700, 0.50,   0.00),
+                    (  17700, 1.00,  10.00),
+                    (  20200, 2.00,  40.00),
+                    (  22500, 3.00,  90.00),
+                    (  24900, 4.00, 159.00),
+                    (  'inf', 5.00, 255.00),
+                ),
+            },
+            'head_household': {
+                'weekly': (
+                    (  122, 0.00, 0.00),
+                    (  141, 0.50, 0.00),
+                    (  170, 1.00, 0.10),
+                    (  194, 2.00, 0.38),
+                    (  216, 3.00, 0.87),
+                    (  261, 4.00, 1.53),
+                    ('inf', 5.00, 3.30),
+                ),
+                'bi-weekly': (
+                    (  244, 0.00, 0.00),
+                    (  283, 0.50, 0.00),
+                    (  340, 1.00, 0.19),
+                    (  388, 2.00, 0.77),
+                    (  433, 3.00, 1.73),
+                    (  521, 4.00, 3.06),
+                    ('inf', 5.00, 6.60),
+                ),
+                'semi-monthly': (
+                    (  265, 0.00, 0.00),
+                    (  306, 0.50, 0.00),
+                    (  369, 1.00, 0.21),
+                    (  421, 2.00, 0.83),
+                    (  469, 3.00, 1.88),
+                    (  565, 4.00, 3.31),
+                    ('inf', 5.00, 7.15),
+                ),
+                'monthly': (
+                    (  529, 0.00,  0.00),
+                    (  613, 0.50,  0.00),
+                    (  738, 1.00,  0.42),
+                    (  842, 2.00,  1.67),
+                    (  938, 3.00,  3.75),
+                    ( 1129, 4.00,  6.63),
+                    ('inf', 5.00, 14.29),
+                ),
+                'quarterly': (
+                    ( 1588, 0.00,  0.00),
+                    ( 1838, 0.50,  0.00),
+                    ( 2213, 1.00,  1.25),
+                    ( 2525, 2.00,  5.00),
+                    ( 2813, 3.00, 11.25),
+                    ( 3388, 4.00, 19.88),
+                    ('inf', 5.00, 42.88),
+                ),
+                'semi-annual': (
+                    ( 3175, 0.00,  0.00),
+                    ( 3675, 0.50,  0.00),
+                    ( 4425, 1.00,  2.50),
+                    ( 5050, 2.00, 10.00),
+                    ( 5625, 3.00, 22.50),
+                    ( 6775, 4.00, 39.75),
+                    ('inf', 5.00, 85.75),
+                ),
+                'annually': (
+                    ( 6350, 0.00,   0.00),
+                    ( 7350, 0.50,   0.00),
+                    ( 8850, 1.00,   5.00),
+                    (10100, 2.00,  20.00),
+                    (11250, 3.00,  45.00),
+                    (13550, 4.00,  79.50),
+                    ('inf', 5.00, 171.50),
+                ),
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ok_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_ok_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/pa_pennsylvania.xml b/l10n_us_hr_payroll/data/state/pa_pennsylvania.xml
index c8002192..902aa80b 100644
--- a/l10n_us_hr_payroll/data/state/pa_pennsylvania.xml
+++ b/l10n_us_hr_payroll/data/state/pa_pennsylvania.xml
@@ -6,14 +6,11 @@
         <field name="code">us_pa_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged for 2021 https://www.uc.pa.gov/employers-uc-services-uc-tax/uc-tax-rates/Pages/Yearly-Tax-Highlights.aspx -->
-        <record id="rule_parameter_us_pa_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">10000.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_pa_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_pa_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">10000.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_pa_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_pa_suta_rate" model="hr.rule.parameter">
@@ -22,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Unchanged for 2021 https://www.uc.pa.gov/employers-uc-services-uc-tax/uc-tax-rates/Pages/Yearly-Tax-Highlights.aspx -->
         <record id="rule_parameter_us_pa_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">3.6890</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_pa_suta_rate"/>
@@ -36,7 +32,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- unchanged in 2021 https://www.uc.pa.gov/employers-uc-services-uc-tax/uc-tax-rates/Pages/Yearly-Tax-Highlights.aspx -->
         <record id="rule_parameter_us_pa_suta_ee_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">0.06</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_pa_suta_ee_rate"/>
@@ -49,14 +44,11 @@
         <field name="code">us_pa_sit_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- unchanged in 2021 https://www.revenue.pa.gov/GeneralTaxInformation/Tax%20Types%20and%20Information/EmployerWithholding/Pages/default.aspx -->
-        <record id="rule_parameter_us_pa_sit_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">3.07</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_pa_sit_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_pa_sit_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">3.07</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_pa_sit_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_pa_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/ri_rhode_island.xml b/l10n_us_hr_payroll/data/state/ri_rhode_island.xml
index 5c9e05c8..fddc42b1 100644
--- a/l10n_us_hr_payroll/data/state/ri_rhode_island.xml
+++ b/l10n_us_hr_payroll/data/state/ri_rhode_island.xml
@@ -6,14 +6,11 @@
         <field name="code">us_ri_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 http://www.uitax.ri.gov/ -->
-        <record id="rule_parameter_us_ri_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">24000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ri_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ri_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">24000.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ri_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_ri_suta_rate" model="hr.rule.parameter">
@@ -22,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Unchanged in 2021 http://www.uitax.ri.gov/ -->
         <record id="rule_parameter_us_ri_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">1.06</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_ri_suta_rate"/>
@@ -30,132 +26,72 @@
         </record>
     </data>
 
-    <!-- Withhooding tax exemption based on two table on page 7. from http://www.tax.ri.gov/forms/2020/Withholding/2020%20Withhholding%20Tax%20Booklet.pdf -->
     <record id="rule_parameter_us_ri_sit_exemption_rate" model="hr.rule.parameter">
         <field name="name">US RI Rhode Island Exemption Rate</field>
         <field name="code">us_ri_sit_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ri_sit_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly' :        (( 0.00,   19.23), (   4451.92,  0.00)),
-                'bi-weekly' :     (( 0.00,   38.46), (   8903.85,  0.00)),
-                'semi-monthly':   (( 0.00,   41.67), (   9645.83,  0.00)),
-                'monthly' :       (( 0.00,   83.33), (  19291.67,  0.00)),
-                'quarterly' :     (( 0.00,  250.00), (  57875.00,  0.00)),
-                'semi-annually':  (( 0.00,  500.00), ( 115750.00,  0.00)),
-                'annually':       (( 0.00,  1000.0), ( 231500.00,  0000)),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ri_sit_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- Page 7 http://www.tax.ri.gov/forms/2021/Withholding/2021%20Withholding%20Tax%20Booklet.pdf -->
-        <record id="rule_parameter_us_ri_sit_exemption_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly' :        (( 0.00,   19.23), (   4514.42,  0.00)),
-                'bi-weekly' :     (( 0.00,   38.46), (   9028.85,  0.00)),
-                'semi-monthly':   (( 0.00,   41.67), (   9781.25,  0.00)),
-                'monthly' :       (( 0.00,   83.33), (  19562.50,  0.00)),
-                'quarterly' :     (( 0.00,  250.00), (  58687.50,  0.00)),
-                'semi-annually':  (( 0.00,  500.00), ( 117375.00,  0.00)),
-                'annually':       (( 0.00,  1000.0), ( 234750.00,  0.00)),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ri_sit_exemption_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ri_sit_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly' :        (( 0.00,   19.23), (   4451.92,  0.00)),
+            'bi-weekly' :     (( 0.00,   38.46), (   8903.85,  0.00)),
+            'semi-monthly':   (( 0.00,   41.67), (   9645.83,  0.00)),
+            'monthly' :       (( 0.00,   83.33), (  19291.67,  0.00)),
+            'quarterly' :     (( 0.00,  250.00), (  57875.00,  0.00)),
+            'semi-annually':  (( 0.00,  500.00), ( 115750.00,  0.00)),
+            'annually':       (( 0.00,  1000.0), ( 231500.00,  0000)),
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ri_sit_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
+        
 
     <record id="rule_parameter_us_ri_sit_tax_rate" model="hr.rule.parameter">
         <field name="name">US RI Rhode Island SIT Tax Rate</field>
         <field name="code">us_ri_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ri_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly': (
-                    ( 1255,   0.00, 3.75),
-                    ( 2853,  47.06, 4.75),
-                    ('inf', 122.97, 5.99),
-                ),
-                'bi-weekly': (
-                    ( 2510,   0.00, 3.75),
-                    ( 5706,  94.13, 4.75),
-                    ('inf', 245.94, 5.99),
-                ),
-                'semi-monthly': (
-                    ( 2719,   0.00, 3.75),
-                    ( 6181, 101.96, 4.75),
-                    ('inf', 266.41, 5.99),
-                ),
-                'monthly': (
-                    ( 5438,   0.00, 3.75),
-                    (12363, 203.93, 4.75),
-                    ('inf', 532.87, 5.99),
-                ),
-                'quarterly': (
-                    (16313,    0.00, 3.75),
-                    (37088,  611.74, 4.75),
-                    ('inf', 1598.55, 5.99),
-                ),
-                'semi-annually': (
-                    (32625,    0.00, 3.75),
-                    (74175, 1223.44, 4.75),
-                    ('inf', 3197.07, 5.99),
-                ),
-                'annually': (
-                    ( 65250,    0.00, 3.75),
-                    (148350, 2446.88, 4.75),
-                    ( 'inf', 6394.13, 5.99),
-                ),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ri_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- Page 8 http://www.tax.ri.gov/forms/2021/Withholding/2021%20Withholding%20Tax%20Booklet.pdf -->
-        <record id="rule_parameter_us_ri_sit_tax_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly': (
-                    ( 1273,   0.00, 3.75),
-                    ( 2895,  47.74, 4.75),
-                    ('inf', 124.79, 5.99),
-                ),
-                'bi-weekly': (
-                    ( 2546,   0.00, 3.75),
-                    ( 5790,  95.48, 4.75),
-                    ('inf', 249.57, 5.99),
-                ),
-                'semi-monthly': (
-                    ( 2758,   0.00, 3.75),
-                    ( 6273, 103.43, 4.75),
-                    ('inf', 270.39, 5.99),
-                ),
-                'monthly': (
-                    ( 5517,   0.00, 3.75),
-                    (12546, 206.89, 4.75),
-                    ('inf', 540.77, 5.99),
-                ),
-                'quarterly': (
-                    (16550,    0.00, 3.75),
-                    (37638,  620.63, 4.75),
-                    ('inf', 1622.31, 5.99),
-                ),
-                'semi-annually': (
-                    (33100,    0.00, 3.75),
-                    (75275, 1241.25, 4.75),
-                    ('inf', 3244.56, 5.99),
-                ),
-                'annually': (
-                    ( 66200,    0.00, 3.75),
-                    (150550, 2482.50, 4.75),
-                    ( 'inf', 6489.13, 5.99),
-                ),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ri_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ri_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly': (
+                ( 1255,   0.00, 3.75),
+                ( 2853,  47.06, 4.75),
+                ('inf', 122.97, 5.99),
+            ),
+            'bi-weekly': (
+                ( 2510,   0.00, 3.75),
+                ( 5706,  94.13, 4.75),
+                ('inf', 245.94, 5.99),
+            ),
+            'semi-monthly': (
+                ( 2719,   0.00, 3.75),
+                ( 6181, 101.96, 4.75),
+                ('inf', 266.41, 5.99),
+            ),
+            'monthly': (
+                ( 5438,   0.00, 3.75),
+                (12363, 203.93, 4.75),
+                ('inf', 532.87, 5.99),
+            ),
+            'quarterly': (
+                (16313,    0.00, 3.75),
+                (37088,  611.74, 4.75),
+                ('inf', 1598.55, 5.99),
+            ),
+            'semi-annually': (
+                (32625,    0.00, 3.75),
+                (74175, 1223.44, 4.75),
+                ('inf', 3197.07, 5.99),
+            ),
+            'annually': (
+                ( 65250,    0.00, 3.75),
+                (148350, 2446.88, 4.75),
+                ( 'inf', 6394.13, 5.99),
+            ),
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ri_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_ri_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/sc_south_carolina.xml b/l10n_us_hr_payroll/data/state/sc_south_carolina.xml
index 04a10d70..9dcf9911 100644
--- a/l10n_us_hr_payroll/data/state/sc_south_carolina.xml
+++ b/l10n_us_hr_payroll/data/state/sc_south_carolina.xml
@@ -6,14 +6,11 @@
         <field name="code">us_sc_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://dew.sc.gov/employers/unemployment-insurance-tax-programs/tax-rate -->
         <record id="rule_parameter_us_sc_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">14000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_sc_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+        <field name="parameter_value">14000.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_sc_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_sc_suta_rate" model="hr.rule.parameter">
@@ -22,8 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Tax rate from https://taxnews.ey.com/news/2019-2183-south-carolina-2020-sui-tax-rates-to-decrease-due-to-elimination-of-the-variable-solvency-surcharge-wage-base-unchanged -->
-        <!-- Unchanged in 2021 https://dew.sc.gov/employers/unemployment-insurance-tax-programs/tax-rate -->
         <record id="rule_parameter_us_sc_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">0.55</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_sc_suta_rate"/>
@@ -36,83 +31,40 @@
         <field name="code">us_sc_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_sc_sit_tax_rate_2019" model="hr.rule.parameter.value">
-            <field name="parameter_value">[
-                ( 2450, 1.1,    0.0),
-                ( 4900, 3.0,  26.95),
-                ( 7350, 4.0, 100.45),
-                ( 9800, 5.0, 198.45),
-                (12250, 6.0, 320.95),
-                ('inf', 7.0, 467.95),
-            ]</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2019, 1, 1).date()"/>
-        </record>
-        <!-- Substraction Method table from https://dor.sc.gov/forms-site/Forms/WH1603F_2020.pdf-->
-        <record id="rule_parameter_us_sc_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">[
-                ( 2620, 0.8,    0.0),
-                ( 5240, 3.0,  57.64),
-                ( 7860, 4.0, 110.04),
-                (10490, 5.0, 188.64),
-                (13110, 6.0, 293.54),
-                ('inf', 7.0, 424.64),
-            ]</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- Substraction Method table from https://dor.sc.gov/forms-site/Forms/WH1603F_2021.pdf -->
-        <record id="rule_parameter_us_sc_sit_tax_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">[
-                ( 2800, 0.5,    0.0),
-                ( 5610, 3.0,  70.00),
-                ( 8410, 4.0, 126.10),
-                (11220, 5.0, 210.20),
-                (14030, 6.0, 322.40),
-                ('inf', 7.0, 462.70),
-            ]</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_sc_sit_tax_rate_2019" model="hr.rule.parameter.value">
+        <field name="parameter_value">[
+            ( 2450, 1.1,    0.0),
+            ( 4900, 3.0,  26.95),
+            ( 7350, 4.0, 100.45),
+            ( 9800, 5.0, 198.45),
+            (12250, 6.0, 320.95),
+            ('inf', 7.0, 467.95),
+        ]</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2019, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_sc_sit_personal_exemption_rate" model="hr.rule.parameter">
         <field name="name">US SC South Carolina Personal Exemption Rate</field>
         <field name="code">us_sc_sit_personal_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_sc_sit_personal_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">2590</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_personal_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://dor.sc.gov/forms-site/Forms/WH1603F_2021.pdf -->
-        <record id="rule_parameter_us_sc_sit_personal_exemption_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">2670</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_personal_exemption_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_sc_sit_personal_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">2590</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_personal_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
     
     <record id="rule_parameter_us_sc_sit_standard_deduction_rate" model="hr.rule.parameter">
         <field name="name">US SC South Carolina Standard Deduction Rate</field>
         <field name="code">us_sc_sit_standard_deduction_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
         <record id="rule_parameter_us_sc_sit_standard_deduction_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">3820.0</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_standard_deduction_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <record id="rule_parameter_us_sc_sit_standard_deduction_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">4200</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_sc_sit_standard_deduction_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_sc_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/sd_south_dakota.xml b/l10n_us_hr_payroll/data/state/sd_south_dakota.xml
index 0b44d1c8..57af2daf 100644
--- a/l10n_us_hr_payroll/data/state/sd_south_dakota.xml
+++ b/l10n_us_hr_payroll/data/state/sd_south_dakota.xml
@@ -6,14 +6,11 @@
         <field name="code">us_sd_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged for 20201 https://dlr.sd.gov/ra/businesses/default.aspx#:~:text=The%20wage%20base%20for%20calendar,30%2C%202019. -->
-        <record id="rule_parameter_us_sd_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">15000.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_sd_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_sd_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">15000.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_sd_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_sd_suta_rate" model="hr.rule.parameter">
@@ -22,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Unchanged for 20201 https://dlr.sd.gov/ra/businesses/default.aspx#:~:text=The%20wage%20base%20for%20calendar,30%2C%202019. -->
         <record id="rule_parameter_us_sd_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">1.75</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_sd_suta_rate"/>
diff --git a/l10n_us_hr_payroll/data/state/tn_tennessee.xml b/l10n_us_hr_payroll/data/state/tn_tennessee.xml
index 31465dee..f5200853 100644
--- a/l10n_us_hr_payroll/data/state/tn_tennessee.xml
+++ b/l10n_us_hr_payroll/data/state/tn_tennessee.xml
@@ -6,13 +6,11 @@
         <field name="code">us_tn_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_tn_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">7000.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_tn_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_tn_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">7000.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_tn_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_tn_suta_rate" model="hr.rule.parameter">
diff --git a/l10n_us_hr_payroll/data/state/tx_texas.xml b/l10n_us_hr_payroll/data/state/tx_texas.xml
index d188e480..eae821e4 100644
--- a/l10n_us_hr_payroll/data/state/tx_texas.xml
+++ b/l10n_us_hr_payroll/data/state/tx_texas.xml
@@ -6,14 +6,11 @@
         <field name="code">us_tx_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.twc.texas.gov/businesses/your-tax-rates -->
-        <record id="rule_parameter_us_tx_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">9000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_tx_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_tx_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">9000.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_tx_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_tx_suta_rate" model="hr.rule.parameter">
@@ -22,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Unchanged for 2021 https://www.twc.texas.gov/businesses/new-texas-employer-information#newEmployerTaxRateInformation -->
         <record id="rule_parameter_us_tx_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">2.7</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_tx_suta_rate"/>
@@ -35,28 +31,22 @@
         <field name="code">us_tx_suta_oa_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.twc.texas.gov/businesses/your-tax-rates#:~:text=The%202020%20Obligation%20Assessment%20Ratio%20(%20OA%20Ratio)%20is%200.00%20percent. -->
-        <record id="rule_parameter_us_tx_suta_oa_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_tx_suta_oa_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_tx_suta_oa_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">0.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_tx_suta_oa_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_tx_suta_etia_rate" model="hr.rule.parameter">
         <field name="name">US TX Texas Employment &amp; Training Investment Assessment Rate</field>
         <field name="code">us_tx_suta_etia_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Unchanged in 2021 https://www.twc.texas.gov/businesses/your-tax-rates#:~:text=The%20fifth%20component%20of%20your,wages%20paid%20by%20an%20employer. -->
-        <record id="rule_parameter_us_tx_suta_etia_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.1</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_tx_suta_etia_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_tx_suta_etia_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">0.1</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_tx_suta_etia_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_tx_dor" model="res.partner">

From 4523b4c562e1b1b559565ee9e0566b9d3cd5c75e Mon Sep 17 00:00:00 2001
From: Mishael De La Cruz <mishael@hibou.io>
Date: Tue, 21 Dec 2021 17:35:22 -0600
Subject: [PATCH 7/7] [IMP] l10n_us_hr_payroll: NH, NJ, NM, NV, NY, OH

---
 .../data/state/nh_new_hampshire.xml           |   18 +-
 .../data/state/nj_newjersey.xml               | 1108 ++++++-----------
 .../data/state/nm_new_mexico.xml              |  733 ++++-------
 l10n_us_hr_payroll/data/state/nv_nevada.xml   |   18 +-
 l10n_us_hr_payroll/data/state/ny_new_york.xml |  647 +++-------
 l10n_us_hr_payroll/data/state/oh_ohio.xml     |   76 +-
 6 files changed, 837 insertions(+), 1763 deletions(-)

diff --git a/l10n_us_hr_payroll/data/state/nh_new_hampshire.xml b/l10n_us_hr_payroll/data/state/nh_new_hampshire.xml
index ed53b7e2..8dacbd4e 100644
--- a/l10n_us_hr_payroll/data/state/nh_new_hampshire.xml
+++ b/l10n_us_hr_payroll/data/state/nh_new_hampshire.xml
@@ -6,14 +6,11 @@
         <field name="code">us_nh_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- same for 2021 https://www.nhes.nh.gov/services/employers/claimtax.htm#:~:text=The%20Taxable%20Wage%20Base%20remains%20at%20%2414%2C000.&text=The%20state%20and%20federal%20governments,determine%20eligibility%20for%20unemployment%20benefits. -->
-        <record id="rule_parameter_us_nh_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">14000.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nh_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_nh_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">14000.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_nh_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_nh_suta_rate" model="hr.rule.parameter">
@@ -27,11 +24,6 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_nh_suta_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <record id="rule_parameter_us_nh_suta_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">2.7</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nh_suta_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
 
     <!-- Partners and Contribution Registers -->
diff --git a/l10n_us_hr_payroll/data/state/nj_newjersey.xml b/l10n_us_hr_payroll/data/state/nj_newjersey.xml
index 1fdafd96..e51885c3 100644
--- a/l10n_us_hr_payroll/data/state/nj_newjersey.xml
+++ b/l10n_us_hr_payroll/data/state/nj_newjersey.xml
@@ -6,29 +6,19 @@
         <field name="code">us_nj_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_nj_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">35300.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nj_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
-        <record id="rule_parameter_us_nj_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">36200.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nj_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_nj_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">35300.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_nj_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
-    <!-- SUTA -->
     <record id="rule_parameter_us_nj_suta_rate" model="hr.rule.parameter">
         <field name="name">US NJ New Jersey Employer Unemployment SUTA Rate</field>
         <field name="code">us_nj_suta_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- 2021 unchanged https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
         <record id="rule_parameter_us_nj_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">2.6825</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_nj_suta_rate"/>
@@ -42,7 +32,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- 2021 unchanged https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
         <record id="rule_parameter_us_nj_suta_ee_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">0.3825</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_nj_suta_ee_rate"/>
@@ -57,7 +46,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- 2021 unchanged https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
         <record id="rule_parameter_us_nj_sdi_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">0.5</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_nj_sdi_rate"/>
@@ -76,12 +64,6 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_nj_sdi_ee_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <!-- https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
-        <record id="rule_parameter_us_nj_sdi_ee_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.47</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nj_sdi_ee_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
     
     <!-- WF -->
@@ -91,7 +73,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- 2021 unchanged https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
         <record id="rule_parameter_us_nj_wf_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">0.1175</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_nj_wf_rate"/>
@@ -105,7 +86,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- 2021 unchanged https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
         <record id="rule_parameter_us_nj_wf_ee_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">0.0425</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_nj_wf_ee_rate"/>
@@ -120,7 +100,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- 2021 unchanged https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
         <record id="rule_parameter_us_nj_fli_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">0.0</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_nj_fli_rate"/>
@@ -139,12 +118,6 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_nj_fli_ee_rate"/>
             <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
         </record>
-        <!-- https://www.nj.gov/labor/ea/employer-services/rate-info/ -->
-        <record id="rule_parameter_us_nj_fli_ee_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.28</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nj_fli_ee_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
     </data>
 
     <!-- SIT -->
@@ -153,724 +126,371 @@
         <field name="code">us_nj_sit_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Table from Percentage Method Calculations https://www.state.nj.us/treasury/taxation/pdf/current/njwt.pdf -->
-        <record id="rule_parameter_us_nj_sit_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'A': {
-                    'weekly': (
-                        (  385,    0.00,  1.50),
-                        (  673,    5.77,  2.00),
-                        (  769,   11.54,  3.90),
-                        ( 1442,   15.29,  6.10),
-                        ( 9615,   56.34,  7.00),
-                        (96154,  628.46,  9.90),
-                        ('inf', 9195.77, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1346,    12.00,  2.00),
-                        (  1538,    23.00,  3.90),
-                        (  2885,    31.00,  6.10),
-                        ( 19231,   113.00,  7.00),
-                        (192308,  1257.00,  9.90),
-                        ( 'inf', 18392.00, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  1458,    13.00,  2.00),
-                        (  1667,    25.00,  3.90),
-                        (  3125,    33.00,  6.10),
-                        ( 20833,   122.00,  7.00),
-                        (208333,  1362.00,  9.90),
-                        ( 'inf', 19924.00, 11.80),
-                    ),
-                    'monthly': (
-                        (  1667,     0.00,  1.50),
-                        (  2917,    25.00,  2.00),
-                        (  3333,    50.00,  3.90),
-                        (  6250,    66.00,  6.10),
-                        ( 41667,   244.00,  7.00),
-                        (416667,  2723.00,  9.90),
-                        ( 'inf', 39848.00, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (   8750,     75.00,  2.00),
-                        (  10000,    150.00,  3.90),
-                        (  18750,    198.75,  6.10),
-                        ( 125000,    732.50,  7.00),
-                        (1250000,   8170.00,  9.90),
-                        (  'inf', 119545.00, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  17500,    150.00,  2.00),
-                        (  20000,    300.00,  3.90),
-                        (  37500,    397.50,  6.10),
-                        ( 250000,   1465.00,  7.00),
-                        (2500000,  16340.00,  9.90),
-                        (  'inf', 239090.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  35000,    300.00,  2.00),
-                        (  40000,    600.00,  3.90),
-                        (  75000,    795.00,  6.10),
-                        ( 500000,   2930.00,  7.00),
-                        (5000000,  32680.00,  9.90),
-                        (  'inf', 478180.00, 11.80),
-                    ),
-                },
-                'B': {
-                    'weekly': (
-                        (  385,    0.00,  1.50),
-                        (  962,    5.77,  2.00),
-                        ( 1346,   17.31,  2.70),
-                        ( 1538,   27.69,  3.90),
-                        ( 2885,   35.19,  6.10),
-                        ( 9615,  117.31,  7.00),
-                        (96154,  588.46,  9.90),
-                        ('inf', 9155.77, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1923,    12.00,  2.00),
-                        (  2692,    35.00,  2.70),
-                        (  3076,    55.00,  3.90),
-                        (  5769,    70.00,  6.10),
-                        ( 19231,   235.00,  7.00),
-                        (192308,  1177.00,  9.90),
-                        ( 'inf', 18312.00, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  2083,    12.50,  2.00),
-                        (  2917,    37.50,  2.70),
-                        (  3333,    59.99,  3.90),
-                        (  6250,    76.25,  6.10),
-                        ( 20833,   254.19,  7.00),
-                        (208333,  1275.00,  9.90),
-                        ( 'inf', 19838.00, 11.80),
-                    ),
-                    'monthly': (
-                        (  1667,     0.00,  1.50),
-                        (  4167,    25.00,  2.00),
-                        (  5833,    75.00,  2.70),
-                        (  6667,   120.00,  3.90),
-                        ( 12500,   153.00,  6.10),
-                        ( 41667,   508.00,  7.00),
-                        (416667,  2550.00,  9.90),
-                        ( 'inf', 39675.00, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (  12500,     75.00,  2.00),
-                        (  17500,    225.00,  2.70),
-                        (  20000,    360.00,  3.90),
-                        (  37500,    397.50,  6.10),
-                        ( 125000,   1525.00,  7.00),
-                        (1250000,   7650.00,  9.90),
-                        (  'inf', 119025.00, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  25000,    150.00,  2.00),
-                        (  35000,    450.00,  2.70),
-                        (  40000,    720.00,  3.90),
-                        (  75000,    915.00,  6.10),
-                        ( 250000,   3050.00,  7.00),
-                        (2500000,  15300.00,  9.90),
-                        (  'inf', 238050.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  50000,    300.00,  2.00),
-                        (  70000,    900.00,  2.70),
-                          (80000,   1440.00,  3.90),
-                        ( 150000,   1830.00,  6.10),
-                        ( 500000,   6100.00,  7.00),
-                        (5000000,  30600.00,  9.90),
-                        (  'inf', 476100.00, 11.80),
-                    ),
-                },
-                'C': {
-                    'weekly': (
-                        (  385,    0.00,  1.50),
-                        (  769,    5.77,  2.30),
-                        (  962,   14.62,  2.80),
-                        ( 1154,   20.00,  3.50),
-                        ( 2885,   26.73,  5.60),
-                        ( 9615,  123.65,  6.60),
-                        (96154,  567.88,  9.90),
-                        ('inf', 9135.19, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1538,    11.54,  2.30),
-                        (  1923,    29.23,  2.80),
-                        (  2308,    40.00,  3.50),
-                        (  5769,    53.46,  5.60),
-                        ( 19231,   247.31,  6.60),
-                        (192308,  1135.77,  9.90),
-                        ( 'inf', 18270.38, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  1667,    12.50,  2.30),
-                        (  2083,    31.67,  2.80),
-                        (  2500,    43.33,  3.50),
-                        (  6250,    57.92,  5.60),
-                        ( 20833,   267.92,  6.60),
-                        (208333,  1230.42,  9.90),
-                        ( 'inf', 19792.92, 11.80),
-                    ),
-                    'monthly': (
-                        (  1667,     0.00,  1.50),
-                        (  3333,    25.00,  2.30),
-                        (  4167,    63.33,  2.80),
-                        (  5000,    86.67,  3.50),
-                        ( 12500,   115.83,  5.60),
-                        ( 41667,   535.85,  6.60),
-                        (416667,  2460.83,  9.90),
-                        ( 'inf', 39585.83, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (  10000,     75.00,  2.30),
-                        (  12500,    190.00,  2.80),
-                        (  15000,    260.00,  3.50),
-                        (  37500,    347.50,  5.60),
-                        ( 125000,   1607.50,  6.60),
-                        (1250000,   7382.50,  9.90),
-                        (  'inf', 118757.50, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  20000,    150.00,  2.30),
-                        (  25000,    380.00,  2.80),
-                        (  30000,    520.00,  3.50),
-                        (  75000,    695.00,  5.60),
-                        ( 250000,   3215.00,  6.60),
-                        (2500000,  14765.00,  9.90),
-                        (  'inf', 237515.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  40000,    300.00,  2.30),
-                        (  50000,    760.00,  2.80),
-                        (  60000,   1040.00,  3.50),
-                        ( 150000,   1390.00,  5.60),
-                        ( 500000,   6430.00,  6.60),
-                        (5000000,  29530.00,  9.90),
-                        (  'inf', 475030.00, 11.80),
-                    ),
-                },
-                'D': {
-                    'weekly': (
-                        (   385,    0.00,  1.50),
-                        (   769,    5.77,  2.70),
-                        (   962,   16.15,  3.40),
-                        (  1154,   22.69,  4.30),
-                        (  2885,   30.96,  5.60),
-                        (  9615,  127.88,  6.50),
-                        ( 96154,  565.38,  9.90),
-                        ( 'inf', 9132.69, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1538,    11.54,  2.70),
-                        (  1923,    32.31,  3.40),
-                        (  2308,    45.38,  4.30),
-                        (  5769,    61.92,  5.60),
-                        ( 19231,   255.77,  6.50),
-                        (192308,  1130.77,  9.90),
-                        ( 'inf', 18265.38, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  1667,    12.50,  2.70),
-                        (  2083,    35.00,  3.40),
-                        (  2500,    49.17,  4.30),
-                        (  6250,    67.08,  5.60),
-                        ( 20833,   277.08,  6.50),
-                        (208333,  1225.00,  9.90),
-                        ( 'inf', 19787.50, 11.80),
-                    ),
-                    'monthly': (
-                        (  1667,     0.00,  1.50),
-                        (  3333,    25.00,  2.70),
-                        (  4167,    70.00,  3.40),
-                        (  5000,    98.33,  4.00),
-                        ( 12500,   134.17,  5.60),
-                        ( 41667,   554.17,  6.50),
-                        (416667,  2450.00,  9.90),
-                        ( 'inf', 39575.00, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (  10000,     75.00,  2.07),
-                        (  12500,    210.00,  3.40),
-                        (  15000,    295.00,  4.30),
-                        (  37500,    402.50,  5.60),
-                        ( 125000,   1662.50,  6.50),
-                        (1250000,   7350.00,  9.90),
-                        (  'inf', 118725.00, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  20000,    150.00,  2.70),
-                        (  25000,    420.00,  3.40),
-                        (  30000,    590.00,  4.30),
-                        (  75000,    805.00,  5.60),
-                        ( 250000,   3325.00,  6.50),
-                        (2500000,  14700.00,  9.90),
-                        (  'inf', 237450.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  40000,    300.00,  2.70),
-                        (  50000,    840.00,  3.40),
-                        (  60000,   1180.00,  4.30),
-                        ( 150000,   1610.00,  5.60),
-                        ( 250000,   6650.00,  6.50),
-                        (2500000,  29400.00,  9.90),
-                        (  'inf', 474900.00, 11.80),
-                    ),
-                },
-                'E': {
-                    'weekly': (
-                        (   385,    0.00,  1.50),
-                        (   673,    5.77,  2.00),
-                        (  1923,   11.54,  5.80),
-                        (  9615,   84.04,  6.50),
-                        ( 96154,  584.04,  9.90),
-                        ( 'inf', 9151.35, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1346,    12.00,  2.00),
-                        (  3846,    23.00,  5.80),
-                        ( 19231,   168.00,  6.50),
-                        (192308,  1168.00,  9.90),
-                        ( 'inf', 18303.00, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  1458,    13.00,  2.00),
-                        (  4167,    25.00,  5.80),
-                        ( 20833,   182.00,  6.50),
-                        (208333,  1265.00,  9.90),
-                        ( 'inf', 19828.00, 11.80),
-                    ),
-                    'monthly': (
-                        ( 1667,      0.00,  1.50),
-                        ( 2916,     25.00,  2.00),
-                        ( 8333,     50.00,  5.80),
-                        ( 41667,   364.00,  6.50),
-                        (416667,  2531.00,  9.90),
-                        ( 'inf', 39656.00, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (   8750,     75.00,  2.00),
-                        (  25000,    150.00,  5.80),
-                        ( 125000,   1092.50,  6.50),
-                        (1250000,   7592.50,  9.90),
-                        (  'inf', 118967.50, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  17500,    150.00,  2.00),
-                        (  50000,    300.00,  5.80),
-                        ( 250000,   2185.00,  6.50),
-                        (2500000,  15185.00,  9.90),
-                        (  'inf', 237935.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  35000,    300.00,  2.00),
-                        ( 100000,    600.00,  5.80),
-                        ( 500000,   4370.00,  6.50),
-                        (5000000,  30370.00,  9.90),
-                        (  'inf', 475870.00, 11.80),
-                    ),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nj_sit_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- Table from Percentage Method Calculations https://www.nj.gov/treasury/taxation/pdf/withholdingtables.pdf -->
-        <record id="rule_parameter_us_nj_sit_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'A': {
-                    'weekly': (
-                        (  385,    0.00,  1.50),
-                        (  673,    5.77,  2.00),
-                        (  769,   11.54,  3.90),
-                        ( 1442,   15.29,  6.10),
-                        ( 9615,   56.34,  7.00),
-                        (19231,  628.46,  9.90),
-                        ('inf', 1580.38, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1346,    12.00,  2.00),
-                        (  1538,    23.00,  3.90),
-                        (  2885,    31.00,  6.10),
-                        ( 19231,   113.00,  7.00),
-                        ( 38462,  1257.00,  9.90),
-                        ( 'inf',  3161.00, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  1458,    13.00,  2.00),
-                        (  1667,    25.00,  3.90),
-                        (  3125,    33.00,  6.10),
-                        ( 20833,   122.00,  7.00),
-                        ( 41667,  1362.00,  9.90),
-                        ( 'inf',  3424.00, 11.80),
-                    ),
-                    'monthly': (
-                        (  1667,     0.00,  1.50),
-                        (  2917,    25.00,  2.00),
-                        (  3333,    50.00,  3.90),
-                        (  6250,    66.00,  6.10),
-                        ( 41667,   244.00,  7.00),
-                        ( 83333,  2723.00,  9.90),
-                        ( 'inf',  6848.00, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (   8750,     75.00,  2.00),
-                        (  10000,    150.00,  3.90),
-                        (  18750,    198.75,  6.10),
-                        ( 125000,    732.50,  7.00),
-                        ( 250000,   8170.00,  9.90),
-                        (  'inf',  20545.00, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  17500,    150.00,  2.00),
-                        (  20000,    300.00,  3.90),
-                        (  37500,    397.50,  6.10),
-                        ( 250000,   1465.00,  7.00),
-                        ( 500000,  16340.00,  9.90),
-                        (  'inf',  41060.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  35000,    300.00,  2.00),
-                        (  40000,    600.00,  3.90),
-                        (  75000,    795.00,  6.10),
-                        ( 500000,   2930.00,  7.00),
-                        (1000000,  32680.00,  9.90),
-                        (  'inf',  82180.00, 11.80),
-                    ),
-                },
-                'B': {
-                    'weekly': (
-                        (  385,    0.00,  1.50),
-                        (  962,    5.77,  2.00),
-                        ( 1346,   17.31,  2.70),
-                        ( 1538,   27.69,  3.90),
-                        ( 2885,   35.19,  6.10),
-                        ( 9615,  117.31,  7.00),
-                        (19231,  588.46,  9.90),
-                        ('inf', 1540.38, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1923,    12.00,  2.00),
-                        (  2692,    35.00,  2.70),
-                        (  3076,    55.00,  3.90),
-                        (  5769,    70.00,  6.10),
-                        ( 19231,   235.00,  7.00),
-                        ( 38462,  1177.00,  9.90),
-                        ( 'inf',  3081.00, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  2083,    12.50,  2.00),
-                        (  2917,    37.50,  2.70),
-                        (  3333,    59.99,  3.90),
-                        (  6250,    76.25,  6.10),
-                        ( 20833,   254.19,  7.00),
-                        ( 41667,  1275.00,  9.90),
-                        ( 'inf',  3338.00, 11.80),
-                    ),
-                    'monthly': (
-                        (  1667,     0.00,  1.50),
-                        (  4167,    25.00,  2.00),
-                        (  5833,    75.00,  2.70),
-                        (  6667,   120.00,  3.90),
-                        ( 12500,   153.00,  6.10),
-                        ( 41667,   508.00,  7.00),
-                        ( 83333,  2550.00,  9.90),
-                        ( 'inf',  6675.00, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (  12500,     75.00,  2.00),
-                        (  17500,    225.00,  2.70),
-                        (  20000,    360.00,  3.90),
-                        (  37500,    397.50,  6.10),
-                        ( 125000,   1525.00,  7.00),
-                        ( 250000,   7650.00,  9.90),
-                        (  'inf',  20025.00, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  25000,    150.00,  2.00),
-                        (  35000,    450.00,  2.70),
-                        (  40000,    720.00,  3.90),
-                        (  75000,    915.00,  6.10),
-                        ( 250000,   3050.00,  7.00),
-                        ( 500000,  15300.00,  9.90),
-                        (  'inf',  40050.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  50000,    300.00,  2.00),
-                        (  70000,    900.00,  2.70),
-                          (80000,   1440.00,  3.90),
-                        ( 150000,   1830.00,  6.10),
-                        ( 500000,   6100.00,  7.00),
-                        (1000000,  30600.00,  9.90),
-                        (  'inf',  80100.00, 11.80),
-                    ),
-                },
-                'C': {
-                    'weekly': (
-                        (  385,    0.00,  1.50),
-                        (  769,    5.77,  2.30),
-                        (  962,   14.62,  2.80),
-                        ( 1154,   20.00,  3.50),
-                        ( 2885,   26.73,  5.60),
-                        ( 9615,  123.65,  6.60),
-                        (19231,  567.88,  9.90),
-                        ('inf', 1519.81, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1538,    11.54,  2.30),
-                        (  1923,    29.23,  2.80),
-                        (  2308,    40.00,  3.50),
-                        (  5769,    53.46,  5.60),
-                        ( 19231,   247.31,  6.60),
-                        ( 38462,  1135.77,  9.90),
-                        ( 'inf',  3039.62, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  1667,    12.50,  2.30),
-                        (  2083,    31.67,  2.80),
-                        (  2500,    43.33,  3.50),
-                        (  6250,    57.92,  5.60),
-                        ( 20833,   267.92,  6.60),
-                        ( 41667,  1230.42,  9.90),
-                        ( 'inf',  3292.92, 11.80),
-                    ),
-                    'monthly': (
-                        (  1667,     0.00,  1.50),
-                        (  3333,    25.00,  2.30),
-                        (  4167,    63.33,  2.80),
-                        (  5000,    86.67,  3.50),
-                        ( 12500,   115.83,  5.60),
-                        ( 41667,   535.85,  6.60),
-                        ( 83333,  2460.83,  9.90),
-                        ( 'inf',  6585.83, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (  10000,     75.00,  2.30),
-                        (  12500,    190.00,  2.80),
-                        (  15000,    260.00,  3.50),
-                        (  37500,    347.50,  5.60),
-                        ( 125000,   1607.50,  6.60),
-                        ( 250000,   7382.50,  9.90),
-                        (  'inf',  19757.50, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  20000,    150.00,  2.30),
-                        (  25000,    380.00,  2.80),
-                        (  30000,    520.00,  3.50),
-                        (  75000,    695.00,  5.60),
-                        ( 250000,   3215.00,  6.60),
-                        ( 500000,  14765.00,  9.90),
-                        (  'inf',  39515.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  40000,    300.00,  2.30),
-                        (  50000,    760.00,  2.80),
-                        (  60000,   1040.00,  3.50),
-                        ( 150000,   1390.00,  5.60),
-                        ( 500000,   6430.00,  6.60),
-                        (1000000,  29530.00,  9.90),
-                        (  'inf',  79030.00, 11.80),
-                    ),
-                },
-                'D': {
-                    'weekly': (
-                        (   385,    0.00,  1.50),
-                        (   769,    5.77,  2.70),
-                        (   962,   16.15,  3.40),
-                        (  1154,   22.69,  4.30),
-                        (  2885,   30.96,  5.60),
-                        (  9615,  127.88,  6.50),
-                        ( 19231,  565.38,  9.90),
-                        ( 'inf', 1517.31, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1538,    11.54,  2.70),
-                        (  1923,    32.31,  3.40),
-                        (  2308,    45.38,  4.30),
-                        (  5769,    61.92,  5.60),
-                        ( 19231,   255.77,  6.50),
-                        ( 38462,  1130.77,  9.90),
-                        ( 'inf',  3034.62, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  1667,    12.50,  2.70),
-                        (  2083,    35.00,  3.40),
-                        (  2500,    49.17,  4.30),
-                        (  6250,    67.08,  5.60),
-                        ( 20833,   277.08,  6.50),
-                        ( 41667,  1225.00,  9.90),
-                        ( 'inf',  3287.50, 11.80),
-                    ),
-                    'monthly': (
-                        (  1667,     0.00,  1.50),
-                        (  3333,    25.00,  2.70),
-                        (  4167,    70.00,  3.40),
-                        (  5000,    98.33,  4.00),
-                        ( 12500,   134.17,  5.60),
-                        ( 41667,   554.17,  6.50),
-                        ( 83333,  2450.00,  9.90),
-                        ( 'inf',  6575.00, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (  10000,     75.00,  2.07),
-                        (  12500,    210.00,  3.40),
-                        (  15000,    295.00,  4.30),
-                        (  37500,    402.50,  5.60),
-                        ( 125000,   1662.50,  6.50),
-                        ( 250000,   7350.00,  9.90),
-                        (  'inf',  19725.00, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  20000,    150.00,  2.70),
-                        (  25000,    420.00,  3.40),
-                        (  30000,    590.00,  4.30),
-                        (  75000,    805.00,  5.60),
-                        ( 250000,   3325.00,  6.50),
-                        ( 500000,  14700.00,  9.90),
-                        (  'inf',  39450.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  40000,    300.00,  2.70),
-                        (  50000,    840.00,  3.40),
-                        (  60000,   1180.00,  4.30),
-                        ( 150000,   1610.00,  5.60),
-                        ( 250000,   6650.00,  6.50),
-                        (1000000,  29400.00,  9.90),
-                        (  'inf',  78900.00, 11.80),
-                    ),
-                },
-                'E': {
-                    'weekly': (
-                        (   385,    0.00,  1.50),
-                        (   673,    5.77,  2.00),
-                        (  1923,   11.54,  5.80),
-                        (  9615,   84.04,  6.50),
-                        ( 19231,  584.04,  9.90),
-                        ( 'inf', 1535.96, 11.80),
-                    ),
-                    'bi-weekly': (
-                        (   769,     0.00,  1.50),
-                        (  1346,    12.00,  2.00),
-                        (  3846,    23.00,  5.80),
-                        ( 19231,   168.00,  6.50),
-                        ( 38462,  1168.00,  9.90),
-                        ( 'inf',  3072.00, 11.80),
-                    ),
-                    'semi-monthly': (
-                        (   833,     0.00,  1.50),
-                        (  1458,    13.00,  2.00),
-                        (  4167,    25.00,  5.80),
-                        ( 20833,   182.00,  6.50),
-                        ( 41667,  1265.00,  9.90),
-                        ( 'inf',  3328.00, 11.80),
-                    ),
-                    'monthly': (
-                        ( 1667,      0.00,  1.50),
-                        ( 2916,     25.00,  2.00),
-                        ( 8333,     50.00,  5.80),
-                        ( 41667,   364.00,  6.50),
-                        ( 83333,  2531.00,  9.90),
-                        ( 'inf',  6656.00, 11.80),
-                    ),
-                    'quarterly': (
-                        (   5000,      0.00,  1.50),
-                        (   8750,     75.00,  2.00),
-                        (  25000,    150.00,  5.80),
-                        ( 125000,   1092.50,  6.50),
-                        ( 250000,   7592.50,  9.90),
-                        (  'inf',  19967.50, 11.80),
-                    ),
-                    'semi-annual': (
-                        (  10000,      0.00,  1.50),
-                        (  17500,    150.00,  2.00),
-                        (  50000,    300.00,  5.80),
-                        ( 250000,   2185.00,  6.50),
-                        ( 500000,  15185.00,  9.90),
-                        (  'inf',  39935.00, 11.80),
-                    ),
-                    'annual': (
-                        (  20000,      0.00,  1.50),
-                        (  35000,    300.00,  2.00),
-                        ( 100000,    600.00,  5.80),
-                        ( 500000,   4370.00,  6.50),
-                        (1000000,  30370.00,  9.90),
-                        (  'inf',  79870.00, 11.80),
-                    ),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nj_sit_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_nj_sit_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'A': {
+                'weekly': (
+                    (  385,    0.00,  1.50),
+                    (  673,    5.77,  2.00),
+                    (  769,   11.54,  3.90),
+                    ( 1442,   15.29,  6.10),
+                    ( 9615,   56.34,  7.00),
+                    (96154,  628.46,  9.90),
+                    ('inf', 9195.77, 11.80),
+                ),
+                'bi-weekly': (
+                    (   769,     0.00,  1.50),
+                    (  1346,    12.00,  2.00),
+                    (  1538,    23.00,  3.90),
+                    (  2885,    31.00,  6.10),
+                    ( 19231,   113.00,  7.00),
+                    (192308,  1257.00,  9.90),
+                    ( 'inf', 18392.00, 11.80),
+                ),
+                'semi-monthly': (
+                    (   833,     0.00,  1.50),
+                    (  1458,    13.00,  2.00),
+                    (  1667,    25.00,  3.90),
+                    (  3125,    33.00,  6.10),
+                    ( 20833,   122.00,  7.00),
+                    (208333,  1362.00,  9.90),
+                    ( 'inf', 19924.00, 11.80),
+                ),
+                'monthly': (
+                    (  1667,     0.00,  1.50),
+                    (  2917,    25.00,  2.00),
+                    (  3333,    50.00,  3.90),
+                    (  6250,    66.00,  6.10),
+                    ( 41667,   244.00,  7.00),
+                    (416667,  2723.00,  9.90),
+                    ( 'inf', 39848.00, 11.80),
+                ),
+                'quarterly': (
+                    (   5000,      0.00,  1.50),
+                    (   8750,     75.00,  2.00),
+                    (  10000,    150.00,  3.90),
+                    (  18750,    198.75,  6.10),
+                    ( 125000,    732.50,  7.00),
+                    (1250000,   8170.00,  9.90),
+                    (  'inf', 119545.00, 11.80),
+                ),
+                'semi-annual': (
+                    (  10000,      0.00,  1.50),
+                    (  17500,    150.00,  2.00),
+                    (  20000,    300.00,  3.90),
+                    (  37500,    397.50,  6.10),
+                    ( 250000,   1465.00,  7.00),
+                    (2500000,  16340.00,  9.90),
+                    (  'inf', 239090.00, 11.80),
+                ),
+                'annual': (
+                    (  20000,      0.00,  1.50),
+                    (  35000,    300.00,  2.00),
+                    (  40000,    600.00,  3.90),
+                    (  75000,    795.00,  6.10),
+                    ( 500000,   2930.00,  7.00),
+                    (5000000,  32680.00,  9.90),
+                    (  'inf', 478180.00, 11.80),
+                ),
+            },
+            'B': {
+                'weekly': (
+                    (  385,    0.00,  1.50),
+                    (  962,    5.77,  2.00),
+                    ( 1346,   17.31,  2.70),
+                    ( 1538,   27.69,  3.90),
+                    ( 2885,   35.19,  6.10),
+                    ( 9615,  117.31,  7.00),
+                    (96154,  588.46,  9.90),
+                    ('inf', 9155.77, 11.80),
+                ),
+                'bi-weekly': (
+                    (   769,     0.00,  1.50),
+                    (  1923,    12.00,  2.00),
+                    (  2692,    35.00,  2.70),
+                    (  3076,    55.00,  3.90),
+                    (  5769,    70.00,  6.10),
+                    ( 19231,   235.00,  7.00),
+                    (192308,  1177.00,  9.90),
+                    ( 'inf', 18312.00, 11.80),
+                ),
+                'semi-monthly': (
+                    (   833,     0.00,  1.50),
+                    (  2083,    12.50,  2.00),
+                    (  2917,    37.50,  2.70),
+                    (  3333,    59.99,  3.90),
+                    (  6250,    76.25,  6.10),
+                    ( 20833,   254.19,  7.00),
+                    (208333,  1275.00,  9.90),
+                    ( 'inf', 19838.00, 11.80),
+                ),
+                'monthly': (
+                    (  1667,     0.00,  1.50),
+                    (  4167,    25.00,  2.00),
+                    (  5833,    75.00,  2.70),
+                    (  6667,   120.00,  3.90),
+                    ( 12500,   153.00,  6.10),
+                    ( 41667,   508.00,  7.00),
+                    (416667,  2550.00,  9.90),
+                    ( 'inf', 39675.00, 11.80),
+                ),
+                'quarterly': (
+                    (   5000,      0.00,  1.50),
+                    (  12500,     75.00,  2.00),
+                    (  17500,    225.00,  2.70),
+                    (  20000,    360.00,  3.90),
+                    (  37500,    397.50,  6.10),
+                    ( 125000,   1525.00,  7.00),
+                    (1250000,   7650.00,  9.90),
+                    (  'inf', 119025.00, 11.80),
+                ),
+                'semi-annual': (
+                    (  10000,      0.00,  1.50),
+                    (  25000,    150.00,  2.00),
+                    (  35000,    450.00,  2.70),
+                    (  40000,    720.00,  3.90),
+                    (  75000,    915.00,  6.10),
+                    ( 250000,   3050.00,  7.00),
+                    (2500000,  15300.00,  9.90),
+                    (  'inf', 238050.00, 11.80),
+                ),
+                'annual': (
+                    (  20000,      0.00,  1.50),
+                    (  50000,    300.00,  2.00),
+                    (  70000,    900.00,  2.70),
+                        (80000,   1440.00,  3.90),
+                    ( 150000,   1830.00,  6.10),
+                    ( 500000,   6100.00,  7.00),
+                    (5000000,  30600.00,  9.90),
+                    (  'inf', 476100.00, 11.80),
+                ),
+            },
+            'C': {
+                'weekly': (
+                    (  385,    0.00,  1.50),
+                    (  769,    5.77,  2.30),
+                    (  962,   14.62,  2.80),
+                    ( 1154,   20.00,  3.50),
+                    ( 2885,   26.73,  5.60),
+                    ( 9615,  123.65,  6.60),
+                    (96154,  567.88,  9.90),
+                    ('inf', 9135.19, 11.80),
+                ),
+                'bi-weekly': (
+                    (   769,     0.00,  1.50),
+                    (  1538,    11.54,  2.30),
+                    (  1923,    29.23,  2.80),
+                    (  2308,    40.00,  3.50),
+                    (  5769,    53.46,  5.60),
+                    ( 19231,   247.31,  6.60),
+                    (192308,  1135.77,  9.90),
+                    ( 'inf', 18270.38, 11.80),
+                ),
+                'semi-monthly': (
+                    (   833,     0.00,  1.50),
+                    (  1667,    12.50,  2.30),
+                    (  2083,    31.67,  2.80),
+                    (  2500,    43.33,  3.50),
+                    (  6250,    57.92,  5.60),
+                    ( 20833,   267.92,  6.60),
+                    (208333,  1230.42,  9.90),
+                    ( 'inf', 19792.92, 11.80),
+                ),
+                'monthly': (
+                    (  1667,     0.00,  1.50),
+                    (  3333,    25.00,  2.30),
+                    (  4167,    63.33,  2.80),
+                    (  5000,    86.67,  3.50),
+                    ( 12500,   115.83,  5.60),
+                    ( 41667,   535.85,  6.60),
+                    (416667,  2460.83,  9.90),
+                    ( 'inf', 39585.83, 11.80),
+                ),
+                'quarterly': (
+                    (   5000,      0.00,  1.50),
+                    (  10000,     75.00,  2.30),
+                    (  12500,    190.00,  2.80),
+                    (  15000,    260.00,  3.50),
+                    (  37500,    347.50,  5.60),
+                    ( 125000,   1607.50,  6.60),
+                    (1250000,   7382.50,  9.90),
+                    (  'inf', 118757.50, 11.80),
+                ),
+                'semi-annual': (
+                    (  10000,      0.00,  1.50),
+                    (  20000,    150.00,  2.30),
+                    (  25000,    380.00,  2.80),
+                    (  30000,    520.00,  3.50),
+                    (  75000,    695.00,  5.60),
+                    ( 250000,   3215.00,  6.60),
+                    (2500000,  14765.00,  9.90),
+                    (  'inf', 237515.00, 11.80),
+                ),
+                'annual': (
+                    (  20000,      0.00,  1.50),
+                    (  40000,    300.00,  2.30),
+                    (  50000,    760.00,  2.80),
+                    (  60000,   1040.00,  3.50),
+                    ( 150000,   1390.00,  5.60),
+                    ( 500000,   6430.00,  6.60),
+                    (5000000,  29530.00,  9.90),
+                    (  'inf', 475030.00, 11.80),
+                ),
+            },
+            'D': {
+                'weekly': (
+                    (   385,    0.00,  1.50),
+                    (   769,    5.77,  2.70),
+                    (   962,   16.15,  3.40),
+                    (  1154,   22.69,  4.30),
+                    (  2885,   30.96,  5.60),
+                    (  9615,  127.88,  6.50),
+                    ( 96154,  565.38,  9.90),
+                    ( 'inf', 9132.69, 11.80),
+                ),
+                'bi-weekly': (
+                    (   769,     0.00,  1.50),
+                    (  1538,    11.54,  2.70),
+                    (  1923,    32.31,  3.40),
+                    (  2308,    45.38,  4.30),
+                    (  5769,    61.92,  5.60),
+                    ( 19231,   255.77,  6.50),
+                    (192308,  1130.77,  9.90),
+                    ( 'inf', 18265.38, 11.80),
+                ),
+                'semi-monthly': (
+                    (   833,     0.00,  1.50),
+                    (  1667,    12.50,  2.70),
+                    (  2083,    35.00,  3.40),
+                    (  2500,    49.17,  4.30),
+                    (  6250,    67.08,  5.60),
+                    ( 20833,   277.08,  6.50),
+                    (208333,  1225.00,  9.90),
+                    ( 'inf', 19787.50, 11.80),
+                ),
+                'monthly': (
+                    (  1667,     0.00,  1.50),
+                    (  3333,    25.00,  2.70),
+                    (  4167,    70.00,  3.40),
+                    (  5000,    98.33,  4.00),
+                    ( 12500,   134.17,  5.60),
+                    ( 41667,   554.17,  6.50),
+                    (416667,  2450.00,  9.90),
+                    ( 'inf', 39575.00, 11.80),
+                ),
+                'quarterly': (
+                    (   5000,      0.00,  1.50),
+                    (  10000,     75.00,  2.07),
+                    (  12500,    210.00,  3.40),
+                    (  15000,    295.00,  4.30),
+                    (  37500,    402.50,  5.60),
+                    ( 125000,   1662.50,  6.50),
+                    (1250000,   7350.00,  9.90),
+                    (  'inf', 118725.00, 11.80),
+                ),
+                'semi-annual': (
+                    (  10000,      0.00,  1.50),
+                    (  20000,    150.00,  2.70),
+                    (  25000,    420.00,  3.40),
+                    (  30000,    590.00,  4.30),
+                    (  75000,    805.00,  5.60),
+                    ( 250000,   3325.00,  6.50),
+                    (2500000,  14700.00,  9.90),
+                    (  'inf', 237450.00, 11.80),
+                ),
+                'annual': (
+                    (  20000,      0.00,  1.50),
+                    (  40000,    300.00,  2.70),
+                    (  50000,    840.00,  3.40),
+                    (  60000,   1180.00,  4.30),
+                    ( 150000,   1610.00,  5.60),
+                    ( 250000,   6650.00,  6.50),
+                    (2500000,  29400.00,  9.90),
+                    (  'inf', 474900.00, 11.80),
+                ),
+            },
+            'E': {
+                'weekly': (
+                    (   385,    0.00,  1.50),
+                    (   673,    5.77,  2.00),
+                    (  1923,   11.54,  5.80),
+                    (  9615,   84.04,  6.50),
+                    ( 96154,  584.04,  9.90),
+                    ( 'inf', 9151.35, 11.80),
+                ),
+                'bi-weekly': (
+                    (   769,     0.00,  1.50),
+                    (  1346,    12.00,  2.00),
+                    (  3846,    23.00,  5.80),
+                    ( 19231,   168.00,  6.50),
+                    (192308,  1168.00,  9.90),
+                    ( 'inf', 18303.00, 11.80),
+                ),
+                'semi-monthly': (
+                    (   833,     0.00,  1.50),
+                    (  1458,    13.00,  2.00),
+                    (  4167,    25.00,  5.80),
+                    ( 20833,   182.00,  6.50),
+                    (208333,  1265.00,  9.90),
+                    ( 'inf', 19828.00, 11.80),
+                ),
+                'monthly': (
+                    ( 1667,      0.00,  1.50),
+                    ( 2916,     25.00,  2.00),
+                    ( 8333,     50.00,  5.80),
+                    ( 41667,   364.00,  6.50),
+                    (416667,  2531.00,  9.90),
+                    ( 'inf', 39656.00, 11.80),
+                ),
+                'quarterly': (
+                    (   5000,      0.00,  1.50),
+                    (   8750,     75.00,  2.00),
+                    (  25000,    150.00,  5.80),
+                    ( 125000,   1092.50,  6.50),
+                    (1250000,   7592.50,  9.90),
+                    (  'inf', 118967.50, 11.80),
+                ),
+                'semi-annual': (
+                    (  10000,      0.00,  1.50),
+                    (  17500,    150.00,  2.00),
+                    (  50000,    300.00,  5.80),
+                    ( 250000,   2185.00,  6.50),
+                    (2500000,  15185.00,  9.90),
+                    (  'inf', 237935.00, 11.80),
+                ),
+                'annual': (
+                    (  20000,      0.00,  1.50),
+                    (  35000,    300.00,  2.00),
+                    ( 100000,    600.00,  5.80),
+                    ( 500000,   4370.00,  6.50),
+                    (5000000,  30370.00,  9.90),
+                    (  'inf', 475870.00, 11.80),
+                ),
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_nj_sit_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_nj_sit_allowance_rate" model="hr.rule.parameter">
         <field name="name">US NJ NewJersey SIT Allowance Rate</field>
         <field name="code">us_nj_sit_allowance_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- Allownce Value table https://www.state.nj.us/treasury/taxation/pdf/current/njwt.pdf -->
-        <!-- Unchanged in 2021 https://www.nj.gov/treasury/taxation/pdf/withholdingtables.pdf -->
-        <record id="rule_parameter_us_nj_sit_allowance_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly':                     19.20,
-                'bi-weekly':                  38.40,
-                'semi-monthly':               41.60,
-                'monthly':                    83.30,
-                'quarterly':                 250.00,
-                'semi-annual':               500.00,
-                'annual':                   1000.00,
-                'daily or miscellaneous':      2.70,
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nj_sit_allowance_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_nj_sit_allowance_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly':                     19.20,
+            'bi-weekly':                  38.40,
+            'semi-monthly':               41.60,
+            'monthly':                    83.30,
+            'quarterly':                 250.00,
+            'semi-annual':               500.00,
+            'annual':                   1000.00,
+            'daily or miscellaneous':      2.70,
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_nj_sit_allowance_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_nj_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/nm_new_mexico.xml b/l10n_us_hr_payroll/data/state/nm_new_mexico.xml
index 970b1f48..107e88a5 100644
--- a/l10n_us_hr_payroll/data/state/nm_new_mexico.xml
+++ b/l10n_us_hr_payroll/data/state/nm_new_mexico.xml
@@ -6,19 +6,11 @@
         <field name="code">us_nm_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_nm_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">25800.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nm_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- https://www.dws.state.nm.us/en-us/Unemployment/UI-Tax-Claims-Info -->
-        <record id="rule_parameter_us_nm_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">27000.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nm_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_nm_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">25800.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_nm_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_nm_suta_rate" model="hr.rule.parameter">
@@ -27,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- Unchanged for 2021 https://www.dws.state.nm.us/Unemployment/Unemployment-for-a-Business/Unemployment-Insurance-Tax-Information/How-UI-Tax-Rates-Are-Calculated -->
         <record id="rule_parameter_us_nm_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">1.0</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_nm_suta_rate"/>
@@ -40,498 +31,228 @@
         <field name="code">us_nm_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <!-- http://www.tax.newmexico.gov/witholding-tax-historic-rates.aspx -->
-        <record id="rule_parameter_us_nm_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': (
-                        (  119,  0.00, 0.0),
-                        (  225,  0.00, 1.7),
-                        (  331,  1.80, 3.2),
-                        (  427,  5.18, 4.7),
-                        (  619,  9.70, 4.9),
-                        (  927, 19.13, 4.9),
-                        ( 1369, 34.20, 4.9),
-                        ('inf', 55.88, 4.9),
-                    ),
-                    'bi-weekly': (
-                        (  238,   0.00, 0.0),
-                        (  450,   0.00, 1.7),
-                        (  662,   3.60, 3.2),
-                        (  854,  10.37, 4.7),
-                        ( 1238,  19.40, 4.9),
-                        ( 1854,  38.25, 4.9),
-                        ( 2738,  68.40, 4.9),
-                        ('inf', 111.75, 4.9),
-                    ),
-                    'semi-monthly': (
-                        (  258,   0.00, 0.0),
-                        (  488,   0.00, 1.7),
-                        (  717,   3.90, 3.2),
-                        (  925,  11.23, 4.7),
-                        ( 1342,  21.02, 4.9),
-                        ( 2008,  41.44, 4.9),
-                        ( 2967,  74.10, 4.9),
-                        ('inf', 121.06, 4.9),
-                    ),
-                    'monthly': (
-                        (  517,   0.00, 0.0),
-                        (  975,   0.00, 1.7),
-                        ( 1433,   7.79, 3.2),
-                        ( 1850,  22.46, 4.7),
-                        ( 2683,  42.04, 4.9),
-                        ( 4017,  82.88, 4.9),
-                        ( 5933, 148.21, 4.9),
-                        ('inf', 242.13, 4.9),
-                    ),
-                    'quarterly': (
-                        (  1550,   0.00, 0.0),
-                        (  2925,   0.00, 1.7),
-                        (  4300,  23.38, 3.2),
-                        (  5550,  67.38, 4.7),
-                        (  8050, 126.13, 4.9),
-                        ( 12050, 248.63, 4.9),
-                        ( 17800, 444.63, 4.9),
-                        ( 'inf', 726.38, 4.9),
-                    ),
-                    'semi-annual': (
-                        ( 3100,    0.00, 0.0),
-                        ( 5850,    0.00, 1.7),
-                        ( 8600,   46.75, 3.2),
-                        (11100,  134.75, 4.7),
-                        (16100,  252.25, 4.9),
-                        (24100,  497.25, 4.9),
-                        (35600,  889.25, 4.9),
-                        ('inf', 1452.75, 4.9),
-                    ),
-                    'annually': (
-                        ( 6200,    0.00, 0.0),
-                        (11700,    0.00, 1.7),
-                        (17200,   93.50, 3.2),
-                        (22200,  269.50, 4.7),
-                        (32200,  504.50, 4.9),
-                        (48200,  994.50, 4.9),
-                        (71200, 1778.50, 4.9),
-                        ('inf', 2905.50, 4.9),
-                    ),
-                },
-                'married': {
-                    'weekly': (
-                        (  238,  0.00, 0.0),
-                        (  392,  0.00, 1.7),
-                        (  546,  2.62, 3.2),
-                        (  700,  7.54, 4.7),
-                        ( 1008, 14.77, 4.9),
-                        ( 1469, 29.85, 4.9),
-                        ( 2162, 52.46, 4.9),
-                        ('inf', 86.38, 4.9),
-                    ),
-                    'bi-weekly': (
-                        (  477,   0.00, 0.0),
-                        (  785,   0.00, 1.7),
-                        ( 1092,   5.23, 3.2),
-                        ( 1400,  15.08, 4.7),
-                         (2015,  29.54, 4.9),
-                        ( 2938,  59.69, 4.9),
-                        ( 4323, 104.92, 4.9),
-                        ('inf', 172.77, 4.9),
-                    ),
-                    'semi-monthly': (
-                        (  517,   0.00, 0.0),
-                        (  850,   0.00, 1.7),
-                        ( 1183,   5.67, 3.2),
-                        ( 1517,  16.33, 4.7),
-                        ( 2183,  32.00, 4.9),
-                        ( 3183,  64.67, 4.9),
-                        ( 4683, 113.67, 4.9),
-                        ('inf', 187.17, 4.9),
-                    ),
-                    'monthly': (
-                        ( 1033,   0.00, 0.0),
-                        ( 1700,   0.00, 1.7),
-                        ( 2367,  11.33, 3.2),
-                        ( 3033,  32.67, 4.7),
-                        ( 4367,  64.00, 4.9),
-                        ( 6367, 129.33, 4.9),
-                        ( 9367, 227.33, 4.9),
-                        ('inf', 374.33, 4.9),
-                    ),
-                    'quarterly': (
-                        ( 3100,    0.00, 0.0),
-                        ( 5100,    0.00, 1.7),
-                        ( 7100,   34.00, 3.2),
-                        ( 9100,   98.00, 4.7),
-                        (13100,  192.00, 4.9),
-                        (19100,  388.00, 4.9),
-                        (28100,  682.00, 4.9),
-                        ('inf', 1123.00, 4.9),
-                    ),
-                    'semi-annual': (
-                        ( 6200,    0.00, 0.0),
-                        (10200,    0.00, 1.7),
-                        (14200,   68.00, 3.2),
-                        (18200,  196.00, 4.7),
-                        (26200,  384.00, 4.9),
-                        (38200,  776.00, 4.9),
-                        (56200, 1364.00, 4.9),
-                        ('inf', 2246.00, 4.9),
-                    ),
-                    'annually': (
-                        ( 12400,    0.00, 0.0),
-                        ( 20400,    0.00, 1.7),
-                        ( 28400,  136.00, 3.2),
-                        ( 36400,  392.00, 4.7),
-                        ( 52400,  768.00, 4.9),
-                        ( 76400, 1552.00, 4.9),
-                        (112400, 2728.00, 4.9),
-                        ( 'inf', 4492.00, 4.9),
-                    ),
-                },
-                'married_as_single': {
-                    'weekly': (
-                        (  179,  0.00, 0.0),
-                        (  333,  0.00, 1.7),
-                        (  487,  2.62, 3.2),
-                        (  641,  7.54, 4.7),
-                        (  949, 14.77, 4.9),
-                        ( 1410, 29.85, 4.9),
-                        ( 2102, 52.46, 4.9),
-                        ('inf', 86.38, 4.9),
-                    ),
-                    'bi-weekly': (
-                        (  359,   0.00, 0.0),
-                        (  666,   0.00, 1.7),
-                        (  974,   5.23, 3.2),
-                        ( 1282,  15.08, 4.7),
-                        ( 1897,  29.54, 4.9),
-                        ( 2820,  59.69, 4.9),
-                        ( 4205, 104.92, 4.9),
-                        ('inf', 172.77, 4.9),
-                    ),
-                    'semi-monthly': (
-                        (  389,   0.00, 0.0),
-                        (  722,   0.00, 1.7),
-                        ( 1055,   5.67, 3.2),
-                        ( 1389,  16.33, 4.7),
-                        ( 2055,  32.00, 4.9),
-                        ( 3055,  64.67, 4.9),
-                        ( 4555, 113.67, 4.9),
-                        ('inf', 187.17, 4.9),
-                    ),
-                    'monthly': (
-                        (  777,   0.00, 0.0),
-                        ( 1444,   0.00, 1.7),
-                        ( 2110,  11.33, 3.2),
-                        ( 2777,  32.67, 4.7),
-                        ( 4110,  64.00, 4.9),
-                        ( 6110, 129.33, 4.9),
-                        ( 9110, 227.33, 4.9),
-                        ('inf', 374.33, 4.9),
-                    ),
-                    'quarterly': (
-                        (  2331,    0.00, 0.0),
-                        (  4331,    0.00, 1.7),
-                        (  6331,   34.00, 3.2),
-                        (  8331,   98.00, 4.7),
-                        ( 12331,  192.00, 4.9),
-                        ( 18331,  388.00, 4.9),
-                        ( 27331,  682.00, 4.9),
-                        ( 'inf', 1123.00, 4.9),
-                    ),
-                    'semi-annual': (
-                        (  4663,    0.00, 0.0),
-                        (  8663,    0.00, 1.7),
-                        ( 12663,   68.00, 3.2),
-                        ( 16663,  196.00, 4.7),
-                        ( 24663,  384.00, 4.9),
-                        ( 36663,  776.00, 4.9),
-                        ( 54663, 1364.00, 4.9),
-                        ( 'inf', 2246.00, 4.9),
-                    ),
-                    'annually': (
-                        (  9325,    0.00, 0.0),
-                        ( 17325,    0.00, 1.7),
-                        ( 25325,  136.00, 3.2),
-                        ( 33325,  392.00, 4.7),
-                        ( 49325,  768.00, 4.9),
-                        ( 73325, 1552.00, 4.9),
-                        (109325, 2728.00, 4.9),
-                        ( 'inf', 4492.00, 4.9),
-                    ),
-                }
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nm_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <!-- http://www.tax.newmexico.gov/witholding-tax-historic-rates.aspx -->
-        <!-- Table based on Percentage method from https://s3.amazonaws.com/realFile34821a95-73ca-43e7-b06d-fad20f5183fd/a86e6237-70f0-429c-b704-1b727b8169c0?response-content-disposition=filename%3D%22FYI-104.pdf%22&response-content-type=application%2Fpdf&AWSAccessKeyId=AKIAJBI25DHBYGD7I7TA&Signature=gMNJXjqoC6tOyw9EHaH00PCYShM%3D&Expires=1610553619 -->
-        <record id="rule_parameter_us_nm_sit_tax_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': (
-                        (  121,   0.00, 0.0),
-                        (  226,   0.00, 1.7),
-                        (  332,   1.80, 3.2),
-                        (  428,   5.18, 4.7),
-                        (  621,   9.70, 4.9),
-                        (  928,  19.13, 4.9),
-                        ( 1371,  34.20, 4.9),
-                        ( 2525,  55.88, 4.9),
-                        ( 4159, 112.41, 4.9),
-                        ('inf', 192.51, 5.9),
-                    ),
-                    'bi-weekly': (
-                        (  241,   0.00, 0.0),
-                        (  453,   0.00, 1.7),
-                        (  664,   3.60, 3.2),
-                        (  857,  10.37, 4.7),
-                        ( 1241,  19.40, 4.9),
-                        ( 1857,  38.25, 4.9),
-                        ( 2741,  68.40, 4.9),
-                        ( 5049, 111.75, 4.9),
-                        ( 8318, 224.83, 4.9),
-                        ('inf', 385.02, 5.9),
-                    ),
-                    'semi-monthly': (
-                        (  261,   0.00, 0.0),
-                        (  491,   0.00, 1.7),
-                        (  720,   3.90, 3.2),
-                        (  928,  11.23, 4.7),
-                        ( 1345,  21.02, 4.9),
-                        ( 2011,  41.44, 4.9),
-                        ( 2970,  74.10, 4.9),
-                        ( 2470, 121.06, 4.9),
-                        ( 9011, 243.56, 4.9),
-                        ('inf', 417.10, 5.9),
-                    ),
-                    'monthly': (
-                        (  523,   0.00, 0.0),
-                        (  981,   0.00, 1.7),
-                        ( 1440,   7.79, 3.2),
-                        ( 1856,  22.46, 4.7),
-                        ( 2690,  42.04, 4.9),
-                        ( 4023,  82.88, 4.9),
-                        ( 5940, 148.21, 4.9),
-                        (10940, 242.13, 4.9),
-                        (18023, 487.13, 4.9),
-                        ('inf', 834.21, 5.9),
-                    ),
-                    'quarterly': (
-                        (  1569,    0.00, 0.0),
-                        (  2944,    0.00, 1.7),
-                        (  4319,   23.38, 3.2),
-                        (  5569,   67.38, 4.7),
-                        (  8069,  126.13, 4.9),
-                        ( 12069,  248.63, 4.9),
-                        ( 17819,  444.63, 4.9),
-                        ( 32819,  726.38, 4.9),
-                        ( 54069, 1461.38, 4.9),
-                        ( 'inf', 2502.63, 5.9),
-                    ),
-                    'semi-annual': (
-                        (  3138,    0.00, 0.0),
-                        (  5888,    0.00, 1.7),
-                        (  8638,   46.75, 3.2),
-                        ( 11138,  134.75, 4.7),
-                        ( 16138,  252.25, 4.9),
-                        ( 24138,  497.25, 4.9),
-                        ( 35638,  889.25, 4.9),
-                        ( 65638, 1452.75, 4.9),
-                        (108138, 2922.75, 4.9),
-                        ('inf' , 5005.25, 5.9),
-                    ),
-                    'annually': (
-                        (  6275,     0.00, 0.0),
-                        ( 11775,     0.00, 1.7),
-                        ( 17275,    93.50, 3.2),
-                        ( 22275,   269.50, 4.7),
-                        ( 32275,   504.50, 4.9),
-                        ( 48275,   994.50, 4.9),
-                        ( 71275,  1778.50, 4.9),
-                        (131275,  2905.50, 4.9),
-                        (216275,  5845.50, 4.9),
-                        ( 'inf', 10010.50, 5.9),
-                    ),
-                },
-                'married': {
-                    'weekly': (
-                        (  241,   0.00, 0.0),
-                        (  395,   0.00, 1.7),
-                        (  549,   2.62, 3.2),
-                        (  703,   7.54, 4.7),
-                        ( 1011,  14.77, 4.9),
-                        ( 1472,  29.85, 4.9),
-                        ( 2164,  52.46, 4.9),
-                        ( 4088,  86.38, 4.9),
-                        ( 6299, 180.62, 4.9),
-                        ('inf', 288.98, 5.9),
-                    ),
-                    'bi-weekly': (
-                        (  483,   0.00, 0.0),
-                        (  790,   0.00, 1.7),
-                        ( 1089,   5.23, 3.2),
-                        ( 1406,  15.08, 4.7),
-                        ( 2021,  29.54, 4.9),
-                        ( 2944,  59.69, 4.9),
-                        ( 4329, 104.92, 4.9),
-                        ( 8175, 172.77, 4.9),
-                        (12598, 361.23, 4.9),
-                        ('inf', 577.96, 5.9),
-                    ),
-                    'semi-monthly': (
-                        (  523,   0.00, 0.0),
-                        (  856,   0.00, 1.7),
-                        ( 1190,   5.67, 3.2),
-                        ( 1523,  16.33, 4.7),
-                        ( 2190,  32.00, 4.9),
-                        ( 3190,  64.67, 4.9),
-                        ( 4690, 113.67, 4.9),
-                        ( 8856, 187.17, 4.9),
-                        (13648, 391.33, 4.9),
-                        ('inf', 626.13, 5.9),
-                    ),
-                    'monthly': (
-                        ( 1046,    0.00, 0.0),
-                        ( 1713,    0.00, 1.7),
-                        ( 2379,   11.33, 3.2),
-                        ( 3046,   32.67, 4.7),
-                        ( 4379,   64.00, 4.9),
-                        ( 6379,  129.33, 4.9),
-                        ( 9379,  227.33, 4.9),
-                        (17713,  374.33, 4.9),
-                        (27296,  782.67, 4.9),
-                        ('inf', 1252.25, 5.9),
-                    ),
-                    'quarterly': (
-                        ( 3138,    0.00, 0.0),
-                        ( 5138,    0.00, 1.7),
-                        ( 7138,   34.00, 3.2),
-                        ( 9138,   98.00, 4.7),
-                        (13138,  192.00, 4.9),
-                        (19138,  388.00, 4.9),
-                        (28138,  682.00, 4.9),
-                        (53138, 1123.00, 4.9),
-                        (81888, 2348.00, 4.9),
-                        ('inf', 3756.75, 5.9),
-                    ),
-                    'semi-annual': (
-                        (  6275,    0.00, 0.0),
-                        ( 10275,    0.00, 1.7),
-                        ( 14275,   68.00, 3.2),
-                        ( 18275,  196.00, 4.7),
-                        ( 26275,  384.00, 4.9),
-                        ( 38275,  776.00, 4.9),
-                        ( 56275, 1364.00, 4.9),
-                        (106275, 2246.00, 4.9),
-                        (163775, 4696.00, 4.9),
-                        ( 'inf', 7513.50, 5.9),
-                    ),
-                    'annually': (
-                        ( 12450,     0.00, 0.0),
-                        ( 20450,     0.00, 1.7),
-                        ( 28450,   136.00, 3.2),
-                        ( 36450,   392.00, 4.7),
-                        ( 52450,   768.00, 4.9),
-                        ( 76450,  1552.00, 4.9),
-                        (112450,  2728.00, 4.9),
-                        (212550,  4492.00, 4.9),
-                        (327550,  9392.00, 4.9),
-                        ( 'inf', 15027.00, 5.9),
-                    ),
-                },
-                'married_as_single': {
-                    'weekly': (
-                        (  181,   0.00, 0.0),
-                        (  335,   0.00, 1.7),
-                        (  488,   2.62, 3.2),
-                        (  642,   7.54, 4.7),
-                        (  950,  14.77, 4.9),
-                        ( 1412,  29.85, 4.9),
-                        ( 2104,  52.46, 4.9),
-                        ( 2027,  86.38, 4.9),
-                        ( 6238, 180.62, 4.9),
-                        ('inf', 288.98, 5.9),
-                    ),
-                    'bi-weekly': (
-                        (  362,   0.00, 0.0),
-                        (  669,   0.00, 1.7),
-                        (  977,   5.23, 3.2),
-                        ( 1285,  15.08, 4.7),
-                        ( 1900,  29.54, 4.9),
-                        ( 2823,  59.69, 4.9),
-                        ( 4208, 104.92, 4.9),
-                        ( 8054, 172.77, 4.9),
-                        (12477, 361.23, 4.9),
-                        ('inf', 577.96, 5.9),
-                    ),
-                    'semi-monthly': (
-                        (  392,   0.00, 0.0),
-                        (  725,   0.00, 1.7),
-                        ( 1058,   5.67, 3.2),
-                        ( 1392,  16.33, 4.7),
-                        ( 2058,  32.00, 4.9),
-                        ( 3058,  64.67, 4.9),
-                        ( 4558, 113.67, 4.9),
-                        ( 8725, 187.17, 4.9),
-                        (13517, 391.33, 4.9),
-                        ('inf', 626.13, 5.9),
-                    ),
-                    'monthly': (
-                        (  783,    0.00, 0.0),
-                        ( 1450,    0.00, 1.7),
-                        ( 2117,   11.33, 3.2),
-                        ( 2783,   32.67, 4.7),
-                        ( 4117,   64.00, 4.9),
-                        ( 6117,  129.33, 4.9),
-                        ( 9117,  227.33, 4.9),
-                        (17450,  374.33, 4.9),
-                        (27033,  782.67, 4.9),
-                        ('inf', 1252.25, 5.9),
-                    ),
-                    'quarterly': (
-                        (  2350,    0.00, 0.0),
-                        (  4350,    0.00, 1.7),
-                        (  6350,   34.00, 3.2),
-                        (  8350,   98.00, 4.7),
-                        ( 12350,  192.00, 4.9),
-                        ( 18350,  388.00, 4.9),
-                        ( 27350,  682.00, 4.9),
-                        ( 52350, 1123.00, 4.9),
-                        ( 81100, 2348.00, 4.9),
-                        ( 'inf', 3756.75, 5.9),
-                    ),
-                    'semi-annual': (
-                        (  4700,    0.00, 0.0),
-                        (  8700,    0.00, 1.7),
-                        ( 12700,   68.00, 3.2),
-                        ( 16700,  196.00, 4.7),
-                        ( 24700,  384.00, 4.9),
-                        ( 36700,  776.00, 4.9),
-                        ( 54700, 1364.00, 4.9),
-                        (104700, 2246.00, 4.9),
-                        (162200, 4696.00, 4.9),
-                        ( 'inf', 7513.50, 5.9),
-                    ),
-                    'annually': (
-                        (  9400,     0.00, 0.0),
-                        ( 17400,     0.00, 1.7),
-                        ( 25400,   136.00, 3.2),
-                        ( 33400,   392.00, 4.7),
-                        ( 49400,   768.00, 4.9),
-                        ( 73400,  1552.00, 4.9),
-                        (109400,  2728.00, 4.9),
-                        (209400,  4492.00, 4.9),
-                        (324400,  9392.00, 4.9),
-                        ( 'inf', 15027.00, 5.9),
-                    ),
-                }
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nm_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
-
+    <record id="rule_parameter_us_nm_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly': (
+                    (  119,  0.00, 0.0),
+                    (  225,  0.00, 1.7),
+                    (  331,  1.80, 3.2),
+                    (  427,  5.18, 4.7),
+                    (  619,  9.70, 4.9),
+                    (  927, 19.13, 4.9),
+                    ( 1369, 34.20, 4.9),
+                    ('inf', 55.88, 4.9),
+                ),
+                'bi-weekly': (
+                    (  238,   0.00, 0.0),
+                    (  450,   0.00, 1.7),
+                    (  662,   3.60, 3.2),
+                    (  854,  10.37, 4.7),
+                    ( 1238,  19.40, 4.9),
+                    ( 1854,  38.25, 4.9),
+                    ( 2738,  68.40, 4.9),
+                    ('inf', 111.75, 4.9),
+                ),
+                'semi-monthly': (
+                    (  258,   0.00, 0.0),
+                    (  488,   0.00, 1.7),
+                    (  717,   3.90, 3.2),
+                    (  925,  11.23, 4.7),
+                    ( 1342,  21.02, 4.9),
+                    ( 2008,  41.44, 4.9),
+                    ( 2967,  74.10, 4.9),
+                    ('inf', 121.06, 4.9),
+                ),
+                'monthly': (
+                    (  517,   0.00, 0.0),
+                    (  975,   0.00, 1.7),
+                    ( 1433,   7.79, 3.2),
+                    ( 1850,  22.46, 4.7),
+                    ( 2683,  42.04, 4.9),
+                    ( 4017,  82.88, 4.9),
+                    ( 5933, 148.21, 4.9),
+                    ('inf', 242.13, 4.9),
+                ),
+                'quarterly': (
+                    (  1550,   0.00, 0.0),
+                    (  2925,   0.00, 1.7),
+                    (  4300,  23.38, 3.2),
+                    (  5550,  67.38, 4.7),
+                    (  8050, 126.13, 4.9),
+                    ( 12050, 248.63, 4.9),
+                    ( 17800, 444.63, 4.9),
+                    ( 'inf', 726.38, 4.9),
+                ),
+                'semi-annual': (
+                    ( 3100,    0.00, 0.0),
+                    ( 5850,    0.00, 1.7),
+                    ( 8600,   46.75, 3.2),
+                    (11100,  134.75, 4.7),
+                    (16100,  252.25, 4.9),
+                    (24100,  497.25, 4.9),
+                    (35600,  889.25, 4.9),
+                    ('inf', 1452.75, 4.9),
+                ),
+                'annually': (
+                    ( 6200,    0.00, 0.0),
+                    (11700,    0.00, 1.7),
+                    (17200,   93.50, 3.2),
+                    (22200,  269.50, 4.7),
+                    (32200,  504.50, 4.9),
+                    (48200,  994.50, 4.9),
+                    (71200, 1778.50, 4.9),
+                    ('inf', 2905.50, 4.9),
+                ),
+            },
+            'married': {
+                'weekly': (
+                    (  238,  0.00, 0.0),
+                    (  392,  0.00, 1.7),
+                    (  546,  2.62, 3.2),
+                    (  700,  7.54, 4.7),
+                    ( 1008, 14.77, 4.9),
+                    ( 1469, 29.85, 4.9),
+                    ( 2162, 52.46, 4.9),
+                    ('inf', 86.38, 4.9),
+                ),
+                'bi-weekly': (
+                    (  477,   0.00, 0.0),
+                    (  785,   0.00, 1.7),
+                    ( 1092,   5.23, 3.2),
+                    ( 1400,  15.08, 4.7),
+                        (2015,  29.54, 4.9),
+                    ( 2938,  59.69, 4.9),
+                    ( 4323, 104.92, 4.9),
+                    ('inf', 172.77, 4.9),
+                ),
+                'semi-monthly': (
+                    (  517,   0.00, 0.0),
+                    (  850,   0.00, 1.7),
+                    ( 1183,   5.67, 3.2),
+                    ( 1517,  16.33, 4.7),
+                    ( 2183,  32.00, 4.9),
+                    ( 3183,  64.67, 4.9),
+                    ( 4683, 113.67, 4.9),
+                    ('inf', 187.17, 4.9),
+                ),
+                'monthly': (
+                    ( 1033,   0.00, 0.0),
+                    ( 1700,   0.00, 1.7),
+                    ( 2367,  11.33, 3.2),
+                    ( 3033,  32.67, 4.7),
+                    ( 4367,  64.00, 4.9),
+                    ( 6367, 129.33, 4.9),
+                    ( 9367, 227.33, 4.9),
+                    ('inf', 374.33, 4.9),
+                ),
+                'quarterly': (
+                    ( 3100,    0.00, 0.0),
+                    ( 5100,    0.00, 1.7),
+                    ( 7100,   34.00, 3.2),
+                    ( 9100,   98.00, 4.7),
+                    (13100,  192.00, 4.9),
+                    (19100,  388.00, 4.9),
+                    (28100,  682.00, 4.9),
+                    ('inf', 1123.00, 4.9),
+                ),
+                'semi-annual': (
+                    ( 6200,    0.00, 0.0),
+                    (10200,    0.00, 1.7),
+                    (14200,   68.00, 3.2),
+                    (18200,  196.00, 4.7),
+                    (26200,  384.00, 4.9),
+                    (38200,  776.00, 4.9),
+                    (56200, 1364.00, 4.9),
+                    ('inf', 2246.00, 4.9),
+                ),
+                'annually': (
+                    ( 12400,    0.00, 0.0),
+                    ( 20400,    0.00, 1.7),
+                    ( 28400,  136.00, 3.2),
+                    ( 36400,  392.00, 4.7),
+                    ( 52400,  768.00, 4.9),
+                    ( 76400, 1552.00, 4.9),
+                    (112400, 2728.00, 4.9),
+                    ( 'inf', 4492.00, 4.9),
+                ),
+            },
+            'married_as_single': {
+                'weekly': (
+                    (  179,  0.00, 0.0),
+                    (  333,  0.00, 1.7),
+                    (  487,  2.62, 3.2),
+                    (  641,  7.54, 4.7),
+                    (  949, 14.77, 4.9),
+                    ( 1410, 29.85, 4.9),
+                    ( 2102, 52.46, 4.9),
+                    ('inf', 86.38, 4.9),
+                ),
+                'bi-weekly': (
+                    (  359,   0.00, 0.0),
+                    (  666,   0.00, 1.7),
+                    (  974,   5.23, 3.2),
+                    ( 1282,  15.08, 4.7),
+                    ( 1897,  29.54, 4.9),
+                    ( 2820,  59.69, 4.9),
+                    ( 4205, 104.92, 4.9),
+                    ('inf', 172.77, 4.9),
+                ),
+                'semi-monthly': (
+                    (  389,   0.00, 0.0),
+                    (  722,   0.00, 1.7),
+                    ( 1055,   5.67, 3.2),
+                    ( 1389,  16.33, 4.7),
+                    ( 2055,  32.00, 4.9),
+                    ( 3055,  64.67, 4.9),
+                    ( 4555, 113.67, 4.9),
+                    ('inf', 187.17, 4.9),
+                ),
+                'monthly': (
+                    (  777,   0.00, 0.0),
+                    ( 1444,   0.00, 1.7),
+                    ( 2110,  11.33, 3.2),
+                    ( 2777,  32.67, 4.7),
+                    ( 4110,  64.00, 4.9),
+                    ( 6110, 129.33, 4.9),
+                    ( 9110, 227.33, 4.9),
+                    ('inf', 374.33, 4.9),
+                ),
+                'quarterly': (
+                    (  2331,    0.00, 0.0),
+                    (  4331,    0.00, 1.7),
+                    (  6331,   34.00, 3.2),
+                    (  8331,   98.00, 4.7),
+                    ( 12331,  192.00, 4.9),
+                    ( 18331,  388.00, 4.9),
+                    ( 27331,  682.00, 4.9),
+                    ( 'inf', 1123.00, 4.9),
+                ),
+                'semi-annual': (
+                    (  4663,    0.00, 0.0),
+                    (  8663,    0.00, 1.7),
+                    ( 12663,   68.00, 3.2),
+                    ( 16663,  196.00, 4.7),
+                    ( 24663,  384.00, 4.9),
+                    ( 36663,  776.00, 4.9),
+                    ( 54663, 1364.00, 4.9),
+                    ( 'inf', 2246.00, 4.9),
+                ),
+                'annually': (
+                    (  9325,    0.00, 0.0),
+                    ( 17325,    0.00, 1.7),
+                    ( 25325,  136.00, 3.2),
+                    ( 33325,  392.00, 4.7),
+                    ( 49325,  768.00, 4.9),
+                    ( 73325, 1552.00, 4.9),
+                    (109325, 2728.00, 4.9),
+                    ( 'inf', 4492.00, 4.9),
+                ),
+            }
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_nm_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_nm_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/nv_nevada.xml b/l10n_us_hr_payroll/data/state/nv_nevada.xml
index b5b85f1e..69b5e4c7 100644
--- a/l10n_us_hr_payroll/data/state/nv_nevada.xml
+++ b/l10n_us_hr_payroll/data/state/nv_nevada.xml
@@ -6,18 +6,11 @@
         <field name="code">us_nv_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_nv_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">32500.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nv_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_nv_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">33400.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_nv_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_nv_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">32500.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_nv_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_nv_suta_rate" model="hr.rule.parameter">
@@ -26,7 +19,6 @@
         <field name="country_id" ref="base.us"/>
     </record>
     <data noupdate="1">
-        <!-- same for 2021 https://ui.nv.gov/ESSHTML/ui_information.htm -->
         <record id="rule_parameter_us_nv_suta_rate_2020" model="hr.rule.parameter.value">
             <field name="parameter_value">2.95</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_nv_suta_rate"/>
diff --git a/l10n_us_hr_payroll/data/state/ny_new_york.xml b/l10n_us_hr_payroll/data/state/ny_new_york.xml
index 4bb0ac36..9f2f2a25 100644
--- a/l10n_us_hr_payroll/data/state/ny_new_york.xml
+++ b/l10n_us_hr_payroll/data/state/ny_new_york.xml
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <!-- Wage Base -->
-    <!--        https://www.tax.ny.gov/pdf/current_forms/wt/nys45i.pdf -->
     <record id="rule_parameter_us_ny_suta_wage_base" model="hr.rule.parameter">
         <field name="name">US NY New York SUTA Wage Base</field>
         <field name="code">us_ny_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ny_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">11600.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_ny_suta_wage_base_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">11800.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ny_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">11600.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
     <record id="rule_parameter_us_ny_suta_rate" model="hr.rule.parameter">
@@ -26,19 +18,12 @@
         <field name="code">us_ny_suta_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-<!--        todo: New york unemployment Rates are published in February and due quarterly-->
-<!--        https://dol.ny.gov/unemployment-insurance-rate-information-->
     <data noupdate="1">
         <record id="rule_parameter_us_ny_suta_rate_2019" model="hr.rule.parameter.value">
             <field name="parameter_value">2.5</field>
             <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_rate"/>
             <field name="date_from" eval="datetime(2019, 1, 1).date()"/>
         </record>
-        <record id="rule_parameter_us_ny_suta_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">2.5</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
     </data>
     
     <record id="rule_parameter_us_ny_suta_rsf_rate" model="hr.rule.parameter">
@@ -52,11 +37,6 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_rsf_rate"/>
             <field name="date_from" eval="datetime(2019, 1, 1).date()"/>
         </record>
-        <record id="rule_parameter_us_ny_suta_rsf_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.075</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_rsf_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
     </data>
     
     <record id="rule_parameter_us_ny_suta_mctmt_rate" model="hr.rule.parameter">
@@ -70,11 +50,6 @@
             <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_mctmt_rate"/>
             <field name="date_from" eval="datetime(2019, 1, 1).date()"/>
         </record>
-        <record id="rule_parameter_us_ny_suta_mctmt_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">0.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_suta_mctmt_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
     </data>
     
     <record id="rule_parameter_us_ny_sit_tax_rate" model="hr.rule.parameter">
@@ -82,427 +57,219 @@
         <field name="code">us_ny_sit_tax_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ny_sit_tax_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': (
-                        (  163, 0.0400,    0.00),
-                        (  225, 0.0450,    6.54),
-                        (  267, 0.0525,    9.31),
-                        (  412, 0.0590,   11.54),
-                        ( 1551, 0.0609,   20.04),
-                        ( 1862, 0.0641,   89.42),
-                        ( 2070, 0.0745,  109.35),
-                        ( 3032, 0.0795,  124.88),
-                        ( 4142, 0.0691,  201.33),
-                        ( 5104, 0.0925,  278.06),
-                        (20722, 0.0735,  367.00),
-                        (21684, 0.5208, 1514.94),
-                        ('inf', 0.0962, 2015.71),
-                    ),
-                    'bi-weekly': (
-                        (  327, 0.0400,    0.00),
-                        (  450, 0.0450,   13.08),
-                        (  535, 0.0525,   18.62),
-                        (  823, 0.0590,   23.08),
-                        ( 3102, 0.0609,   40.08),
-                        ( 3723, 0.0641,  178.85),
-                        ( 4140, 0.0745,  218.69),
-                        ( 6063, 0.0795,  249.77),
-                        ( 8285, 0.0691,  402.65),
-                        (10208, 0.0925,  556.12),
-                        (41444, 0.0735,  734.00),
-                        (43367, 0.5208, 3029.88),
-                        ('inf', 0.0962, 4031.42),
-                    ),
-                    'semi-monthly': (
-                        (  354, 0.0400,    0.00),
-                        (  488, 0.0450,   14.17),
-                        (  579, 0.0525,   20.17),
-                        (  892, 0.0590,   25.00),
-                        ( 3360, 0.0609,   43.42),
-                        ( 4033, 0.0641,  193.75),
-                        ( 4485, 0.0745,  236.92),
-                        ( 6569, 0.0795,  270.58),
-                        ( 8975, 0.0691,  436.21),
-                        (11058, 0.0925,  602.46),
-                        (44898, 0.0735,  795.17),
-                        (46981, 0.5208, 3282.38),
-                        ('inf', 0.0962, 4367.38),
-                    ),
-                    'monthly': (
-                        (  708, 0.0400,    0.00),
-                        (  975, 0.0450,   28.33),
-                        ( 1158, 0.0525,   40.33),
-                        ( 1783, 0.0590,   50.00),
-                        ( 6721, 0.0609,   86.83),
-                        ( 8067, 0.0641,  387.50),
-                        ( 8971, 0.0745,  473.83),
-                        (13138, 0.0795,  541.17),
-                        (17950, 0.0691,  872.42),
-                        (22117, 0.0925, 1204.92),
-                        (89796, 0.0735, 1590.33),
-                        (93963, 0.5208, 6564.75),
-                        ('inf', 0.0962, 8734.75),
-                    ),
-                    'annually': (
-                        (   8500, 0.0400,      0.00),
-                        (  11700, 0.0450,    340.00),
-                        (  13900, 0.0525,    484.00),
-                        (  21400, 0.0590,    600.00),
-                        (  80650, 0.0609,   1042.00),
-                        (  96800, 0.0641,   4650.00),
-                        ( 107650, 0.0745,   5686.00),
-                        ( 157650, 0.0795,   6494.00),
-                        ( 215400, 0.0691,  10469.00),
-                        ( 265400, 0.0925,  14459.00),
-                        (1077550, 0.0735,  19084.00),
-                        (1127550, 0.5208,  78777.00),
-                        (  'inf', 0.0962, 104817.00),
-                    ),
-                },
-                'married': {
-                    'weekly': (
-                        (  163, 0.0400,    0.00),
-                        (  225, 0.0450,    6.54),
-                        (  267, 0.0525,    9.31),
-                        (  412, 0.0590,   11.54),
-                        ( 1551, 0.0609,   20.04),
-                        ( 1862, 0.0641,   89.42),
-                        ( 2070, 0.0746,  109.35),
-                        ( 3032, 0.0796,  124.90),
-                        ( 4068, 0.0794,  201.44),
-                        ( 6215, 0.0691,  283.75),
-                        ( 7177, 0.1019,  432.12),
-                        (20722, 0.0735,  530.10),
-                        (41449, 0.0765, 1525.65),
-                        (42411, 0.9454, 3111.27),
-                        ('inf', 0.0962, 4020.31),
-                    ),
-                    'bi-weekly': (
-                        (  327, 0.0400,    0.00),
-                        (  450, 0.0450,   13.08),
-                        (  535, 0.0525,   18.62),
-                        (  823, 0.0590,   23.08),
-                        ( 3102, 0.0609,   40.08),
-                        ( 3723, 0.0641,  178.85),
-                        ( 4140, 0.0746,  218.69),
-                        ( 6063, 0.0796,  249.81),
-                        ( 8137, 0.0794,  402.88),
-                        (12431, 0.0691,  567.50),
-                        (14354, 0.1019,  864.23),
-                        (41444, 0.0735, 1060.19),
-                        (82898, 0.0765, 3051.31),
-                        (84821, 0.9454, 6222.54),
-                        ('inf', 0.0962, 8040.62),
-                    ),
-                    'semi-monthly': (
-                        (  354, 0.0400,    0.00),
-                        (  488, 0.0450,   14.17),
-                        (  579, 0.0525,   20.17),
-                        (  892, 0.0590,   25.00),
-                        ( 3360, 0.0609,   43.42),
-                        ( 4033, 0.0641,  193.75),
-                        ( 4485, 0.0746,  236.92),
-                        ( 6569, 0.0796,  270.63),
-                        ( 8815, 0.0794,  436.46),
-                        (13467, 0.0691,  614.79),
-                        (15550, 0.1019,  936.25),
-                        (44898, 0.0735, 1148.54),
-                        (89806, 0.0765, 3305.58),
-                        (91890, 0.9454, 6741.08),
-                        ('inf', 0.0962, 8710.67),
-                    ),
-                    'monthly': (
-                        (   708, 0.0400,     0.00),
-                        (   975, 0.0450,    28.33),
-                        (  1158, 0.0525,    40.33),
-                        (  1783, 0.0590,    50.00),
-                        (  6721, 0.0609,    86.83),
-                        (  8067, 0.0641,   387.50),
-                        (  8971, 0.0746,   473.83),
-                        ( 13138, 0.0796,   541.25),
-                        ( 17629, 0.0794,   872.92),
-                        ( 26933, 0.0691,  1229.58),
-                        ( 31100, 0.1019,  1872.50),
-                        ( 89796, 0.0735,  2297.08),
-                        (179613, 0.0765,  6611.17),
-                        (183779, 0.9454, 13482.17),
-                        ( 'inf', 0.0962, 17421.33),
-                    ),
-                    'annually': (
-                        (   8500, 0.0400,      0.00),
-                        (  11700, 0.0450,    340.00),
-                        (  13900, 0.0525,    484.00),
-                        (  21400, 0.0590,    600.00),
-                        (  80650, 0.0609,   1042.00),
-                        (  96800, 0.0641,   4650.00),
-                        ( 107650, 0.0746,   5686.00),
-                        ( 157650, 0.0796,   6495.00),
-                        ( 211550, 0.0794,  10475.00),
-                        ( 323200, 0.0691,  14755.00),
-                        ( 373200, 0.1019,  22470.00),
-                        (1077550, 0.0735,  27565.00),
-                        (2155350, 0.0765,  79334.00),
-                        (2205350, 0.9454, 161786.00),
-                        (  'inf', 0.0962, 209056.00),
-                    ),
-                }
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-<!--        https://www.tax.ny.gov/pdf/publications/withholding/nys50_t_nys_121.pdf-->
-        <record id="rule_parameter_us_ny_sit_tax_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly': (
-                        (  163, 0.0400,    0.00),
-                        (  225, 0.0450,    6.54),
-                        (  267, 0.0525,    9.31),
-                        (  412, 0.0590,   11.54),
-                        ( 1551, 0.0597,   20.04),
-                        ( 1862, 0.0633,   88.06),
-                        ( 2070, 0.0738,  107.73),
-                        ( 3032, 0.0788,  123.12),
-                        ( 4142, 0.0683,  198.88),
-                        ( 5104, 0.0959,  274.75),
-                        (20722, 0.0735,  366.96),
-                        (21684, 0.5208, 1514.90),
-                        ('inf', 0.0962, 2015.67),
-                    ),
-                    'bi-weekly': (
-                        (  327, 0.0400,    0.00),
-                        (  450, 0.0450,   13.08),
-                        (  535, 0.0525,   18.62),
-                        (  823, 0.0590,   23.08),
-                        ( 3102, 0.0597,   40.08),
-                        ( 3723, 0.0633,  176.12),
-                        ( 4140, 0.0738,  215.46),
-                        ( 6063, 0.0788,  246.23),
-                        ( 8285, 0.0683,  397.77),
-                        (10208, 0.0959,  549.50),
-                        (41444, 0.0735,  733.92),
-                        (43367, 0.5208, 3029.81),
-                        ('inf', 0.0962, 4031.45),
-                    ),
-                    'semi-monthly': (
-                        (  354, 0.0400,    0.00),
-                        (  488, 0.0450,   14.17),
-                        (  579, 0.0525,   20.17),
-                        (  892, 0.0590,   25.00),
-                        ( 3360, 0.0597,   43.42),
-                        ( 4033, 0.0633,  190.79),
-                        ( 4485, 0.0738,  233.42),
-                        ( 6569, 0.0788,  266.75),
-                        ( 8975, 0.0683,  430.92),
-                        (11058, 0.0959,  595.29),
-                        (44898, 0.0735,  795.08),
-                        (46981, 0.5208, 3282.29),
-                        ('inf', 0.0962, 4367.29),
-                    ),
-                    'monthly': (
-                        (  708, 0.0400,    0.00),
-                        (  975, 0.0450,   28.33),
-                        ( 1158, 0.0525,   40.33),
-                        ( 1783, 0.0590,   50.00),
-                        ( 6721, 0.0597,   86.83),
-                        ( 8067, 0.0633,  381.58),
-                        ( 8971, 0.0738,  466.83),
-                        (13138, 0.0788,  533.50),
-                        (17950, 0.0683,  861.83),
-                        (22117, 0.0959, 1190.58),
-                        (89796, 0.0735, 1590.17),
-                        (93963, 0.5208, 6564.58),
-                        ('inf', 0.0962, 8734.58),
-                    ),
-                    'annually': (
-                        (   8500, 0.0400,      0.00),
-                        (  11700, 0.0450,    340.00),
-                        (  13900, 0.0525,    484.00),
-                        (  21400, 0.0590,    600.00),
-                        (  80650, 0.0597,   1042.00),
-                        (  96800, 0.0633,   4579.00),
-                        ( 107650, 0.0738,   5602.00),
-                        ( 157650, 0.0788,   6402.00),
-                        ( 215400, 0.0683,  10342.00),
-                        ( 265400, 0.0959,  14287.00),
-                        (1077550, 0.0735,  19082.00),
-                        (1127550, 0.5208,  78775.00),
-                        (  'inf', 0.0962, 104815.00),
-                    ),
-                },
-                'married': {
-                    'weekly': (
-                        (  163, 0.0400,    0.00),
-                        (  225, 0.0450,    6.54),
-                        (  267, 0.0525,    9.31),
-                        (  412, 0.0590,   11.54),
-                        ( 1551, 0.0597,   20.04),
-                        ( 1862, 0.0633,   88.06),
-                        ( 2070, 0.0728,  107.73),
-                        ( 3032, 0.0778,  122.90),
-                        ( 4068, 0.0799,  197.71),
-                        ( 6215, 0.0683,  280.54),
-                        ( 7177, 0.1071,  427.19),
-                        (20722, 0.0735,  530.17),
-                        (41449, 0.0765, 1525.73),
-                        (42411, 0.9454, 3111.35),
-                        ('inf', 0.0962, 4020.38),
-                    ),
-                    'bi-weekly': (
-                        (  327, 0.0400,    0.00),
-                        (  450, 0.0450,   13.08),
-                        (  535, 0.0525,   18.62),
-                        (  823, 0.0590,   23.08),
-                        ( 3102, 0.0597,   40.08),
-                        ( 3723, 0.0633,  176.12),
-                        ( 4140, 0.0728,  215.46),
-                        ( 6063, 0.0778,  245.81),
-                        ( 8137, 0.0799,  395.42),
-                        (12431, 0.0683,  561.08),
-                        (14354, 0.1071,  854.38),
-                        (41444, 0.0735, 1060.35),
-                        (82898, 0.0765, 3051.46),
-                        (84821, 0.9454, 6222.69),
-                        ('inf', 0.0962, 8040.77),
-                    ),
-                    'semi-monthly': (
-                        (  354, 0.0400,    0.00),
-                        (  488, 0.0450,   14.17),
-                        (  579, 0.0525,   20.17),
-                        (  892, 0.0590,   25.00),
-                        ( 3360, 0.0597,   43.42),
-                        ( 4033, 0.0633,  190.79),
-                        ( 4485, 0.0728,  233.42),
-                        ( 6569, 0.0778,  266.29),
-                        ( 8815, 0.0799,  428.38),
-                        (13467, 0.0683,  607.83),
-                        (15550, 0.1071,  925.58),
-                        (44898, 0.0735, 1148.71),
-                        (89806, 0.0765, 3305.75),
-                        (91890, 0.9454, 6741.25),
-                        ('inf', 0.0962, 8710.83),
-                    ),
-                    'monthly': (
-                        (   708, 0.0400,     0.00),
-                        (   975, 0.0450,    28.33),
-                        (  1158, 0.0525,    40.33),
-                        (  1783, 0.0590,    50.00),
-                        (  6721, 0.0597,    86.83),
-                        (  8067, 0.0633,   381.58),
-                        (  8971, 0.0728,   466.83),
-                        ( 13138, 0.0778,   532.58),
-                        ( 17629, 0.0799,   856.75),
-                        ( 26933, 0.0683,  1215.67),
-                        ( 31100, 0.1071,  1851.17),
-                        ( 89796, 0.0735,  2297.42),
-                        (179613, 0.0765,  6611.50),
-                        (183779, 0.9454, 13482.50),
-                        ( 'inf', 0.0962, 17421.67),
-                    ),
-                    'annually': (
-                        (   8500, 0.0400,      0.00),
-                        (  11700, 0.0450,    340.00),
-                        (  13900, 0.0525,    484.00),
-                        (  21400, 0.0590,    600.00),
-                        (  80650, 0.0597,   1042.00),
-                        (  96800, 0.0633,   4579.00),
-                        ( 107650, 0.0728,   5602.00),
-                        ( 157650, 0.0778,   6391.00),
-                        ( 211550, 0.0799,  10281.00),
-                        ( 323200, 0.0683,  14588.00),
-                        ( 373200, 0.1071,  22214.00),
-                        (1077550, 0.0735,  27569.00),
-                        (2155350, 0.0765,  79338.00),
-                        (2205350, 0.9454, 161790.00),
-                        (  'inf', 0.0962, 209060.00),
-                    ),
-                }
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_tax_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ny_sit_tax_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly': (
+                    (  163, 0.0400,    0.00),
+                    (  225, 0.0450,    6.54),
+                    (  267, 0.0525,    9.31),
+                    (  412, 0.0590,   11.54),
+                    ( 1551, 0.0609,   20.04),
+                    ( 1862, 0.0641,   89.42),
+                    ( 2070, 0.0745,  109.35),
+                    ( 3032, 0.0795,  124.88),
+                    ( 4142, 0.0691,  201.33),
+                    ( 5104, 0.0925,  278.06),
+                    (20722, 0.0735,  367.00),
+                    (21684, 0.5208, 1514.94),
+                    ('inf', 0.0962, 2015.71),
+                ),
+                'bi-weekly': (
+                    (  327, 0.0400,    0.00),
+                    (  450, 0.0450,   13.08),
+                    (  535, 0.0525,   18.62),
+                    (  823, 0.0590,   23.08),
+                    ( 3102, 0.0609,   40.08),
+                    ( 3723, 0.0641,  178.85),
+                    ( 4140, 0.0745,  218.69),
+                    ( 6063, 0.0795,  249.77),
+                    ( 8285, 0.0691,  402.65),
+                    (10208, 0.0925,  556.12),
+                    (41444, 0.0735,  734.00),
+                    (43367, 0.5208, 3029.88),
+                    ('inf', 0.0962, 4031.42),
+                ),
+                'semi-monthly': (
+                    (  354, 0.0400,    0.00),
+                    (  488, 0.0450,   14.17),
+                    (  579, 0.0525,   20.17),
+                    (  892, 0.0590,   25.00),
+                    ( 3360, 0.0609,   43.42),
+                    ( 4033, 0.0641,  193.75),
+                    ( 4485, 0.0745,  236.92),
+                    ( 6569, 0.0795,  270.58),
+                    ( 8975, 0.0691,  436.21),
+                    (11058, 0.0925,  602.46),
+                    (44898, 0.0735,  795.17),
+                    (46981, 0.5208, 3282.38),
+                    ('inf', 0.0962, 4367.38),
+                ),
+                'monthly': (
+                    (  708, 0.0400,    0.00),
+                    (  975, 0.0450,   28.33),
+                    ( 1158, 0.0525,   40.33),
+                    ( 1783, 0.0590,   50.00),
+                    ( 6721, 0.0609,   86.83),
+                    ( 8067, 0.0641,  387.50),
+                    ( 8971, 0.0745,  473.83),
+                    (13138, 0.0795,  541.17),
+                    (17950, 0.0691,  872.42),
+                    (22117, 0.0925, 1204.92),
+                    (89796, 0.0735, 1590.33),
+                    (93963, 0.5208, 6564.75),
+                    ('inf', 0.0962, 8734.75),
+                ),
+                'annually': (
+                    (   8500, 0.0400,      0.00),
+                    (  11700, 0.0450,    340.00),
+                    (  13900, 0.0525,    484.00),
+                    (  21400, 0.0590,    600.00),
+                    (  80650, 0.0609,   1042.00),
+                    (  96800, 0.0641,   4650.00),
+                    ( 107650, 0.0745,   5686.00),
+                    ( 157650, 0.0795,   6494.00),
+                    ( 215400, 0.0691,  10469.00),
+                    ( 265400, 0.0925,  14459.00),
+                    (1077550, 0.0735,  19084.00),
+                    (1127550, 0.5208,  78777.00),
+                    (  'inf', 0.0962, 104817.00),
+                ),
+            },
+            'married': {
+                'weekly': (
+                    (  163, 0.0400,    0.00),
+                    (  225, 0.0450,    6.54),
+                    (  267, 0.0525,    9.31),
+                    (  412, 0.0590,   11.54),
+                    ( 1551, 0.0609,   20.04),
+                    ( 1862, 0.0641,   89.42),
+                    ( 2070, 0.0746,  109.35),
+                    ( 3032, 0.0796,  124.90),
+                    ( 4068, 0.0794,  201.44),
+                    ( 6215, 0.0691,  283.75),
+                    ( 7177, 0.1019,  432.12),
+                    (20722, 0.0735,  530.10),
+                    (41449, 0.0765, 1525.65),
+                    (42411, 0.9454, 3111.27),
+                    ('inf', 0.0962, 4020.31),
+                ),
+                'bi-weekly': (
+                    (  327, 0.0400,    0.00),
+                    (  450, 0.0450,   13.08),
+                    (  535, 0.0525,   18.62),
+                    (  823, 0.0590,   23.08),
+                    ( 3102, 0.0609,   40.08),
+                    ( 3723, 0.0641,  178.85),
+                    ( 4140, 0.0746,  218.69),
+                    ( 6063, 0.0796,  249.81),
+                    ( 8137, 0.0794,  402.88),
+                    (12431, 0.0691,  567.50),
+                    (14354, 0.1019,  864.23),
+                    (41444, 0.0735, 1060.19),
+                    (82898, 0.0765, 3051.31),
+                    (84821, 0.9454, 6222.54),
+                    ('inf', 0.0962, 8040.62),
+                ),
+                'semi-monthly': (
+                    (  354, 0.0400,    0.00),
+                    (  488, 0.0450,   14.17),
+                    (  579, 0.0525,   20.17),
+                    (  892, 0.0590,   25.00),
+                    ( 3360, 0.0609,   43.42),
+                    ( 4033, 0.0641,  193.75),
+                    ( 4485, 0.0746,  236.92),
+                    ( 6569, 0.0796,  270.63),
+                    ( 8815, 0.0794,  436.46),
+                    (13467, 0.0691,  614.79),
+                    (15550, 0.1019,  936.25),
+                    (44898, 0.0735, 1148.54),
+                    (89806, 0.0765, 3305.58),
+                    (91890, 0.9454, 6741.08),
+                    ('inf', 0.0962, 8710.67),
+                ),
+                'monthly': (
+                    (   708, 0.0400,     0.00),
+                    (   975, 0.0450,    28.33),
+                    (  1158, 0.0525,    40.33),
+                    (  1783, 0.0590,    50.00),
+                    (  6721, 0.0609,    86.83),
+                    (  8067, 0.0641,   387.50),
+                    (  8971, 0.0746,   473.83),
+                    ( 13138, 0.0796,   541.25),
+                    ( 17629, 0.0794,   872.92),
+                    ( 26933, 0.0691,  1229.58),
+                    ( 31100, 0.1019,  1872.50),
+                    ( 89796, 0.0735,  2297.08),
+                    (179613, 0.0765,  6611.17),
+                    (183779, 0.9454, 13482.17),
+                    ( 'inf', 0.0962, 17421.33),
+                ),
+                'annually': (
+                    (   8500, 0.0400,      0.00),
+                    (  11700, 0.0450,    340.00),
+                    (  13900, 0.0525,    484.00),
+                    (  21400, 0.0590,    600.00),
+                    (  80650, 0.0609,   1042.00),
+                    (  96800, 0.0641,   4650.00),
+                    ( 107650, 0.0746,   5686.00),
+                    ( 157650, 0.0796,   6495.00),
+                    ( 211550, 0.0794,  10475.00),
+                    ( 323200, 0.0691,  14755.00),
+                    ( 373200, 0.1019,  22470.00),
+                    (1077550, 0.0735,  27565.00),
+                    (2155350, 0.0765,  79334.00),
+                    (2205350, 0.9454, 161786.00),
+                    (  'inf', 0.0962, 209056.00),
+                ),
+            }
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_tax_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_ny_sit_over_10_exemption_rate" model="hr.rule.parameter">
         <field name="name">US NY New York Over 10 Exemption Rate</field>
         <field name="code">us_ny_sit_over_10_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ny_sit_over_10_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly':       (142.30, 152.90, 19.25),
-                'bi-weekly':    (284.60, 305.80, 38.50),
-                'semi-monthly': (308.35, 331.25, 41.65),
-                'monthly':      (616.70, 662.50, 83.30),
-                'annual':       (7400, 7950, 1000),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_over_10_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_ny_sit_over_10_exemption_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'weekly':       (142.30, 152.90, 19.25),
-                'bi-weekly':    (284.60, 305.80, 38.50),
-                'semi-monthly': (308.35, 331.25, 41.65),
-                'monthly':      (616.70, 662.50, 83.30),
-                'annual':       (7400, 7950, 1000),
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_over_10_exemption_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
-    <!-- Table A - Combined deduction and exemption allowance (Step 1) -->
+    <record id="rule_parameter_us_ny_sit_over_10_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'weekly':       (142.30, 152.90, 19.25),
+            'bi-weekly':    (284.60, 305.80, 38.50),
+            'semi-monthly': (308.35, 331.25, 41.65),
+            'monthly':      (616.70, 662.50, 83.30),
+            'annual':       (7400, 7950, 1000),
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_over_10_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
+
     <record id="rule_parameter_us_ny_sit_deduction_exemption_rate" model="hr.rule.parameter">
         <field name="name">US NY New York Deduction Exemption Rate</field>
         <field name="code">us_ny_sit_deduction_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_ny_sit_deduction_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly':       (142.30, 161.55, 180.80, 200.05, 219.30, 238.55, 257.80, 277.05, 296.30, 315.55, 334.80),
-                    'bi-weekly':    (284.60, 323.10, 361.60, 400.10, 438.60, 477.10, 515.60, 544.10, 592.60, 631.10, 669.60),
-                    'semi-monthly': (308.35, 350.0, 391.65, 433.30, 474.95, 516.60, 558.25, 599.90, 641.55, 683.20, 724.85),
-                    'monthly':      (616.70, 700, 783.30, 866.60, 949.90, 1033.20, 1116.50, 1199.80, 1283.10, 1366.40, 1449.70),
-                    'annually':     (7400, 8400, 9400, 10400, 11400, 12400, 13400, 14400, 15400, 16400, 17400),
-                },
-                'married': {
-                    'weekly':       (152.90, 172.15, 191.40, 210.65, 229.90, 249.15, 268.40, 287.65, 306.90, 326.15, 345.40),
-                    'bi-weekly':    (305.80, 344.30, 382.80, 421.30, 459.80, 498.30, 536.80, 575.30, 613.80, 652.30, 690.80),
-                    'semi-monthly': (331.25, 372.90, 414.55, 456.20, 497.85, 539.50, 581.15, 622.80, 664.45, 706.10, 747.75),
-                    'monthly':      (662.50, 745.80, 829.10, 912.40, 995.70, 1079.00, 1162.30, 1245.60, 1328.90, 1412.20, 1495.50),
-                    'annually':     (7950, 8950, 9950, 10950, 11950, 12950, 13950, 14950, 15950, 16950, 17950),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_deduction_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_ny_sit_deduction_exemption_rate_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">{
-                'single': {
-                    'weekly':       (142.30, 161.55, 180.80, 200.05, 219.30, 238.55, 257.80, 277.05, 296.30, 315.55, 334.80),
-                    'bi-weekly':    (284.60, 323.10, 361.60, 400.10, 438.60, 477.10, 515.60, 544.10, 592.60, 631.10, 669.60),
-                    'semi-monthly': (308.35, 350.0, 391.65, 433.30, 474.95, 516.60, 558.25, 599.90, 641.55, 683.20, 724.85),
-                    'monthly':      (616.70, 700, 783.30, 866.60, 949.90, 1033.20, 1116.50, 1199.80, 1283.10, 1366.40, 1449.70),
-                    'annually':     (7400, 8400, 9400, 10400, 11400, 12400, 13400, 14400, 15400, 16400, 17400),
-                },
-                'married': {
-                    'weekly':       (152.90, 172.15, 191.40, 210.65, 229.90, 249.15, 268.40, 287.65, 306.90, 326.15, 345.40),
-                    'bi-weekly':    (305.80, 344.30, 382.80, 421.30, 459.80, 498.30, 536.80, 575.30, 613.80, 652.30, 690.80),
-                    'semi-monthly': (331.25, 372.90, 414.55, 456.20, 497.85, 539.50, 581.15, 622.80, 664.45, 706.10, 747.75),
-                    'monthly':      (662.50, 745.80, 829.10, 912.40, 995.70, 1079.00, 1162.30, 1245.60, 1328.90, 1412.20, 1495.50),
-                    'annually':     (7950, 8950, 9950, 10950, 11950, 12950, 13950, 14950, 15950, 16950, 17950),
-                },
-            }</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_deduction_exemption_rate"/>
-            <field name="date_from" eval="datetime(2021, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_ny_sit_deduction_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">{
+            'single': {
+                'weekly':       (142.30, 161.55, 180.80, 200.05, 219.30, 238.55, 257.80, 277.05, 296.30, 315.55, 334.80),
+                'bi-weekly':    (284.60, 323.10, 361.60, 400.10, 438.60, 477.10, 515.60, 544.10, 592.60, 631.10, 669.60),
+                'semi-monthly': (308.35, 350.0, 391.65, 433.30, 474.95, 516.60, 558.25, 599.90, 641.55, 683.20, 724.85),
+                'monthly':      (616.70, 700, 783.30, 866.60, 949.90, 1033.20, 1116.50, 1199.80, 1283.10, 1366.40, 1449.70),
+                'annually':     (7400, 8400, 9400, 10400, 11400, 12400, 13400, 14400, 15400, 16400, 17400),
+            },
+            'married': {
+                'weekly':       (152.90, 172.15, 191.40, 210.65, 229.90, 249.15, 268.40, 287.65, 306.90, 326.15, 345.40),
+                'bi-weekly':    (305.80, 344.30, 382.80, 421.30, 459.80, 498.30, 536.80, 575.30, 613.80, 652.30, 690.80),
+                'semi-monthly': (331.25, 372.90, 414.55, 456.20, 497.85, 539.50, 581.15, 622.80, 664.45, 706.10, 747.75),
+                'monthly':      (662.50, 745.80, 829.10, 912.40, 995.70, 1079.00, 1162.30, 1245.60, 1328.90, 1412.20, 1495.50),
+                'annually':     (7950, 8950, 9950, 10950, 11950, 12950, 13950, 14950, 15950, 16950, 17950),
+            },
+        }</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_ny_sit_deduction_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_ny_dor" model="res.partner">
diff --git a/l10n_us_hr_payroll/data/state/oh_ohio.xml b/l10n_us_hr_payroll/data/state/oh_ohio.xml
index f3275f0e..3d0ec265 100644
--- a/l10n_us_hr_payroll/data/state/oh_ohio.xml
+++ b/l10n_us_hr_payroll/data/state/oh_ohio.xml
@@ -6,16 +6,13 @@
         <field name="code">us_oh_suta_wage_base</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_oh_suta_wage_base_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">9000.00</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_oh_suta_wage_base"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_oh_suta_wage_base_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">9000.00</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_oh_suta_wage_base"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Rate -->
-<!--    https://jfs.ohio.gov/ouio/uctax/rates.stm#:~:text=If%20an%20employer's%20account%20is,and%20the%202021%20rate%20is-->
     <record id="rule_parameter_us_oh_suta_rate" model="hr.rule.parameter">
         <field name="name">US OH Ohio SUTA Rate</field>
         <field name="code">us_oh_suta_rate</field>
@@ -29,62 +26,47 @@
         </record>
     </data>
 
-<!--        rates effective From Jan 1, 2020 until december 31, 2021-->
-<!--        https://tax.ohio.gov/wps/portal/gov/tax/business/ohio-business-taxes/employer-withholding/employer-withholding-tables-010120-->
     <record id="rule_parameter_us_oh_sit_rate" model="hr.rule.parameter">
         <field name="name">US OH Ohio SIT Rate Table</field>
         <field name="code">us_oh_sit_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_oh_sit_rate_2020" model="hr.rule.parameter.value">
-            <!-- https://www.tax.ohio.gov/Portals/0/employer_withholding/2020%20tables/WTH_OptionalComputerFormula_2020.pdf -->
-            <!-- wage_less_than, base_amount, rate_over -->
-            <field name="parameter_value">[
-                    (   5000.00,       0.0,  0.005),
-                    (  10000.00,      25.0,  0.010),
-                    (  15000.00,      75.0,  0.020),
-                    (  20000.00,     175.0,  0.025),
-                    (  40000.00,     300.0,  0.030),
-                    (  80000.00,     900.0,  0.035),
-                    ( 100000.00,    2300.0,  0.040),
-                    (     'inf',    3100.0,  0.050),
-                ]</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_oh_sit_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_oh_sit_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">[
+                (   5000.00,       0.0,  0.005),
+                (  10000.00,      25.0,  0.010),
+                (  15000.00,      75.0,  0.020),
+                (  20000.00,     175.0,  0.025),
+                (  40000.00,     300.0,  0.030),
+                (  80000.00,     900.0,  0.035),
+                ( 100000.00,    2300.0,  0.040),
+                (     'inf',    3100.0,  0.050),
+            ]</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_oh_sit_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_oh_sit_exemption_rate" model="hr.rule.parameter">
         <field name="name">US OH Ohio SIT Exemption Rate</field>
         <field name="code">us_oh_sit_exemption_rate</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_oh_sit_exemption_rate_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">650.0</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_oh_sit_exemption_rate"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_oh_sit_exemption_rate_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">650.0</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_oh_sit_exemption_rate"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <record id="rule_parameter_us_oh_sit_multiplier" model="hr.rule.parameter">
         <field name="name">US OH Ohio SIT Multiplier Value</field>
         <field name="code">us_oh_sit_multiplier</field>
         <field name="country_id" ref="base.us"/>
     </record>
-    <data noupdate="1">
-        <record id="rule_parameter_us_oh_sit_multiplier_2020" model="hr.rule.parameter.value">
-            <field name="parameter_value">1.032</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_oh_sit_multiplier"/>
-            <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
-        </record>
-        <record id="rule_parameter_us_oh_sit_multiplier_2021" model="hr.rule.parameter.value">
-            <field name="parameter_value">1.001</field>
-            <field name="rule_parameter_id" ref="rule_parameter_us_oh_sit_multiplier"/>
-            <field name="date_from" eval="datetime(2029, 9, 1).date()"/>
-        </record>
-    </data>
+    <record id="rule_parameter_us_oh_sit_multiplier_2020" model="hr.rule.parameter.value">
+        <field name="parameter_value">1.032</field>
+        <field name="rule_parameter_id" ref="rule_parameter_us_oh_sit_multiplier"/>
+        <field name="date_from" eval="datetime(2020, 1, 1).date()"/>
+    </record>
 
     <!-- Partners and Contribution Registers -->
     <record id="res_partner_us_oh_dor" model="res.partner">