From 6f25208c766c0343c54ace22a2ae2876690bfb84 Mon Sep 17 00:00:00 2001
From: Kristen Marie Kulha <kristen@hibou.io>
Date: Thu, 3 May 2018 15:24:28 -0700
Subject: [PATCH] Improved US Payroll form views

---
 .../us_fl_hr_payroll_view.xml                 | 15 +++++++++++++
 .../l10n_us_hr_payroll_view.xml               | 21 ++++++++++++-------
 l10n_us_mo_hr_payroll/hr_payroll_view.xml     | 14 +++++++------
 l10n_us_oh_hr_payroll/hr_payroll_view.xml     |  8 ++++---
 l10n_us_va_hr_payroll/hr_payroll_view.xml     | 10 +++++----
 l10n_us_wa_hr_payroll/hr_payroll_view.xml     |  8 ++++---
 6 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml b/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml
index aa19a733..458f4b84 100755
--- a/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml
+++ b/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml
@@ -16,5 +16,20 @@
             </data>
             </field>
         </record>
+        <record id="hr_contract_form_l10n_us_fl_inherit" model="ir.ui.view">
+            <field name="name">hr.contract.form.inherit</field>
+            <field name="model">hr.contract</field>
+            <field name="priority">110</field>
+            <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//group[@name='state_filing']" position="inside">
+                    <group string="Florida" name="fl">
+                        <p>No additional fields.</p>
+                    </group>
+                </xpath>
+            </data>
+            </field>
+        </record>
     </data>
 </odoo>
diff --git a/l10n_us_hr_payroll/l10n_us_hr_payroll_view.xml b/l10n_us_hr_payroll/l10n_us_hr_payroll_view.xml
index 9280da73..962c0909 100755
--- a/l10n_us_hr_payroll/l10n_us_hr_payroll_view.xml
+++ b/l10n_us_hr_payroll/l10n_us_hr_payroll_view.xml
@@ -9,16 +9,23 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="//page[@name='other']" position="before">
-                    <page string="US Filing" name="us_filing">
+                    <page string="US Federal Filing">
                         <group>
-                            <field name="w4_filing_status"/>
-                            <field name="w4_allowances"/>
-                            <field name="w4_additional_withholding"/>
-                            <field name="w4_is_nonresident_alien"/>
-                            <field name="external_wages"/>
-                            <field name="futa_type"/>
+                            <group string="W4" name="w4">
+                                <field name="w4_filing_status" string="Filing Status"/>
+                                <field name="w4_allowances" string="Allowances"/>
+                                <field name="w4_additional_withholding" string="Additional Withholding"/>
+                                <field name="w4_is_nonresident_alien" string="Non-resident Alien"/>
+                            </group>
+                            <group string="Other" name="other">
+                                <field name="external_wages" string="External YTD Wages"/>
+                                <field name="futa_type" string="Unemployment Tax Type (FUTA)"/>
+                            </group>
                         </group>
                     </page>
+                    <page string="US State Filing">
+                        <group name="state_filing"/>
+                    </page>
                 </xpath>
             </data>
             </field>
diff --git a/l10n_us_mo_hr_payroll/hr_payroll_view.xml b/l10n_us_mo_hr_payroll/hr_payroll_view.xml
index 8ede964b..0212ebc2 100755
--- a/l10n_us_mo_hr_payroll/hr_payroll_view.xml
+++ b/l10n_us_mo_hr_payroll/hr_payroll_view.xml
@@ -17,15 +17,17 @@
         <record id="hr_contract_form_l10n_us_mo_inherit" model="ir.ui.view">
             <field name="name">hr.contract.form.inherit</field>
             <field name="model">hr.contract</field>
-            <field name="priority">64</field>
+            <field name="priority">138</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='w4_filing_status']" position="before">
-                    <field name="mo_mow4_filing_status"/>
-                    <field name="mo_mow4_exemptions"/>
-                    <field name="mo_mow4_spouse_employed"/>
-                    <field name="mo_mow4_additional_withholding"/>
+                <xpath expr="//group[@name='state_filing']" position="inside">
+                    <group string="Missouri" name="mo">
+                        <field name="mo_mow4_filing_status" string="Filing Status"/>
+                        <field name="mo_mow4_exemptions" string="Exceptions"/>
+                        <field name="mo_mow4_spouse_employed" string="Spouse Employed"/>
+                        <field name="mo_mow4_additional_withholding" string="Additional Withholding"/>
+                    </group>
                 </xpath>
             </data>
             </field>
diff --git a/l10n_us_oh_hr_payroll/hr_payroll_view.xml b/l10n_us_oh_hr_payroll/hr_payroll_view.xml
index 6e44deee..ea1e722d 100755
--- a/l10n_us_oh_hr_payroll/hr_payroll_view.xml
+++ b/l10n_us_oh_hr_payroll/hr_payroll_view.xml
@@ -19,12 +19,14 @@
         <record id="hr_contract_form_l10n_us_oh_inherit" model="ir.ui.view">
             <field name="name">hr.contract.form.inherit</field>
             <field name="model">hr.contract</field>
-            <field name="priority">64</field>
+            <field name="priority">130</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='w4_filing_status']" position="before">
-                    <field name="oh_income_allowances"/>
+                <xpath expr="//group[@name='state_filing']" position="inside">
+                    <group string="Ohio" name="oh">
+                        <field name="oh_income_allowances" string="Allowances"/>
+                    </group>
                 </xpath>
             </data>
             </field>
diff --git a/l10n_us_va_hr_payroll/hr_payroll_view.xml b/l10n_us_va_hr_payroll/hr_payroll_view.xml
index 337b9b7e..d435157c 100755
--- a/l10n_us_va_hr_payroll/hr_payroll_view.xml
+++ b/l10n_us_va_hr_payroll/hr_payroll_view.xml
@@ -17,13 +17,15 @@
         <record id="hr_contract_form_l10n_us_va_inherit" model="ir.ui.view">
             <field name="name">hr.contract.form.inherit</field>
             <field name="model">hr.contract</field>
-            <field name="priority">64</field>
+            <field name="priority">147</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='w4_filing_status']" position="before">
-                    <field name="va_va4_exemptions"/>
-                    <field name="va_va4p_exemptions"/>
+                <xpath expr="//group[@name='state_filing']" position="inside">
+                    <group string="Virginia" name="va">
+                        <field name="va_va4_exemptions" string="VA-4 Exemptions"/>
+                        <field name="va_va4p_exemptions" string="VA-4P Exemptions"/>
+                    </group>
                 </xpath>
             </data>
             </field>
diff --git a/l10n_us_wa_hr_payroll/hr_payroll_view.xml b/l10n_us_wa_hr_payroll/hr_payroll_view.xml
index 519391bc..3f502872 100755
--- a/l10n_us_wa_hr_payroll/hr_payroll_view.xml
+++ b/l10n_us_wa_hr_payroll/hr_payroll_view.xml
@@ -17,12 +17,14 @@
         <record id="hr_contract_form_l10n_us_wa_inherit" model="ir.ui.view">
             <field name="name">hr.contract.form.inherit</field>
             <field name="model">hr.contract</field>
-            <field name="priority">64</field>
+            <field name="priority">148</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='w4_filing_status']" position="before">
-                    <field name="wa_lni"/>
+                <xpath expr="//group[@name='state_filing']" position="inside">
+                    <group string="Washington" name="wa">
+                        <field name="wa_lni" string="LNI"/>
+                    </group>
                 </xpath>
             </data>
             </field>