From ed2c3ea51fb361647c7b67193023c043680aafee Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Mon, 30 Apr 2018 08:15:31 -0700
Subject: [PATCH 1/2] Adding all from 11.0
 https://github.com/hibou-io/odoo-hr-payroll

hr_payroll_holidays
hr_payroll_input_name_report
hr_payroll_input_report
hr_payroll_payment
hr_payroll_timesheet
hr_payslip_line_date
l10n_us_fl_hr_payroll
l10n_us_hr_payroll
l10n_us_mo_hr_payroll
l10n_us_oh_hr_payroll
l10n_us_va_hr_payroll
---
 l10n_us_hr_payroll_account/__init__.py        |  2 +
 l10n_us_hr_payroll_account/__manifest__.py    | 22 +++++
 .../l10n_us_hr_payroll_account_data.xml       | 87 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100755 l10n_us_hr_payroll_account/__init__.py
 create mode 100755 l10n_us_hr_payroll_account/__manifest__.py
 create mode 100755 l10n_us_hr_payroll_account/l10n_us_hr_payroll_account_data.xml

diff --git a/l10n_us_hr_payroll_account/__init__.py b/l10n_us_hr_payroll_account/__init__.py
new file mode 100755
index 00000000..633f8661
--- /dev/null
+++ b/l10n_us_hr_payroll_account/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+
diff --git a/l10n_us_hr_payroll_account/__manifest__.py b/l10n_us_hr_payroll_account/__manifest__.py
new file mode 100755
index 00000000..3115906a
--- /dev/null
+++ b/l10n_us_hr_payroll_account/__manifest__.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+{
+    'name': 'USA - Payroll with Accounting',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'license': 'AGPL-3',
+    'category': 'Localization',
+    'depends': ['l10n_us_hr_payroll', 'hr_payroll_account'],
+    'version': '11.0.2017.0.0',
+    'description': """
+USA Payroll Accounting hooks.
+=============================
+
+    * Links Rules to Accounts based on US Accounting Localization
+    """,
+
+    'auto_install': False,
+    'website': 'https://hibou.io/',
+    'data':[
+        'l10n_us_hr_payroll_account_data.xml',
+    ],
+    'installable': True
+}
diff --git a/l10n_us_hr_payroll_account/l10n_us_hr_payroll_account_data.xml b/l10n_us_hr_payroll_account/l10n_us_hr_payroll_account_data.xml
new file mode 100755
index 00000000..ab94d434
--- /dev/null
+++ b/l10n_us_hr_payroll_account/l10n_us_hr_payroll_account_data.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!-- Basic -->
+        <record id="hr_payroll.hr_rule_basic" model="hr.salary.rule">
+            <!-- Salary Expense -->
+            <field name="account_debit" search="[('code', 'like', '212100%')]"/>
+        </record>
+        <record id="hr_payroll.hr_rule_net" model="hr.salary.rule">
+            <!-- Salary Payable / Accounts Payable -->
+            <field name="account_credit" search="[('code', 'like', '111100%')]"/>
+        </record>
+
+        <!-- Employee Deductions FICA & Federal Withholding -->
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_ss_2016" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_2016" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_add_2016" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2016_single" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2016_married" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+
+        <!-- Company Contributions FICA & FUTA -->
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_comp_ss" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+            <!-- Salary Expense -->
+            <field name="account_credit" search="[('code', 'like', '220000%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_comp_m" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+            <!-- Salary Expense -->
+            <field name="account_credit" search="[('code', 'like', '220000%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_futa_2016" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+            <!-- Salary Expense -->
+            <field name="account_credit" search="[('code', 'like', '220000%')]"/>
+        </record>
+
+        <!-- 2017 -->
+        <!-- Employee Deductions FICA & Federal Withholding -->
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_ss_2017" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_2017" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_add_2017" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2017_single" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2017_married" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+        </record>
+        <!-- Company Contributions FICA & FUTA -->
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_futa_2017" model="hr.salary.rule">
+            <!-- Accounts Payable -->
+            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
+            <!-- Salary Expense -->
+            <field name="account_credit" search="[('code', 'like', '220000%')]"/>
+        </record>
+
+    </data>
+</odoo>

From eb2fef9d4267d63ca1da8cd9aa7b7d2e7e4365ea Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sun, 10 Feb 2019 15:06:12 -0800
Subject: [PATCH 2/2] MIG `l10n_us_hr_payroll_account` to 12.0 and 2019

---
 l10n_us_hr_payroll_account/__init__.py        |  1 -
 l10n_us_hr_payroll_account/__manifest__.py    |  3 +-
 .../l10n_us_hr_payroll_account_data.xml       | 45 ++++---------------
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/l10n_us_hr_payroll_account/__init__.py b/l10n_us_hr_payroll_account/__init__.py
index 633f8661..8b137891 100755
--- a/l10n_us_hr_payroll_account/__init__.py
+++ b/l10n_us_hr_payroll_account/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 
diff --git a/l10n_us_hr_payroll_account/__manifest__.py b/l10n_us_hr_payroll_account/__manifest__.py
index 3115906a..a66b7c4a 100755
--- a/l10n_us_hr_payroll_account/__manifest__.py
+++ b/l10n_us_hr_payroll_account/__manifest__.py
@@ -1,11 +1,10 @@
-# -*- encoding: utf-8 -*-
 {
     'name': 'USA - Payroll with Accounting',
     'author': 'Hibou Corp. <hello@hibou.io>',
     'license': 'AGPL-3',
     'category': 'Localization',
     'depends': ['l10n_us_hr_payroll', 'hr_payroll_account'],
-    'version': '11.0.2017.0.0',
+    'version': '12.0.2019.0.0',
     'description': """
 USA Payroll Accounting hooks.
 =============================
diff --git a/l10n_us_hr_payroll_account/l10n_us_hr_payroll_account_data.xml b/l10n_us_hr_payroll_account/l10n_us_hr_payroll_account_data.xml
index ab94d434..c1f4c54c 100755
--- a/l10n_us_hr_payroll_account/l10n_us_hr_payroll_account_data.xml
+++ b/l10n_us_hr_payroll_account/l10n_us_hr_payroll_account_data.xml
@@ -12,28 +12,28 @@
         </record>
 
         <!-- Employee Deductions FICA & Federal Withholding -->
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_ss_2016" model="hr.salary.rule">
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_ss_2018" model="hr.salary.rule">
             <!-- Accounts Payable -->
             <field name="account_debit" search="[('code', 'like', '111100%')]"/>
         </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_2016" model="hr.salary.rule">
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_2018" model="hr.salary.rule">
             <!-- Accounts Payable -->
             <field name="account_debit" search="[('code', 'like', '111100%')]"/>
         </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_add_2016" model="hr.salary.rule">
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_add_2018" model="hr.salary.rule">
             <!-- Accounts Payable -->
             <field name="account_debit" search="[('code', 'like', '111100%')]"/>
         </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2016_single" model="hr.salary.rule">
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2018_single" model="hr.salary.rule">
             <!-- Accounts Payable -->
             <field name="account_debit" search="[('code', 'like', '111100%')]"/>
         </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2016_married" model="hr.salary.rule">
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2018_married" model="hr.salary.rule">
             <!-- Accounts Payable -->
             <field name="account_debit" search="[('code', 'like', '111100%')]"/>
         </record>
 
-        <!-- Company Contributions FICA & FUTA -->
+        <!-- Company Contributions FICA -->
         <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_comp_ss" model="hr.salary.rule">
             <!-- Accounts Payable -->
             <field name="account_debit" search="[('code', 'like', '111100%')]"/>
@@ -46,37 +46,8 @@
             <!-- Salary Expense -->
             <field name="account_credit" search="[('code', 'like', '220000%')]"/>
         </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_futa_2016" model="hr.salary.rule">
-            <!-- Accounts Payable -->
-            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
-            <!-- Salary Expense -->
-            <field name="account_credit" search="[('code', 'like', '220000%')]"/>
-        </record>
-
-        <!-- 2017 -->
-        <!-- Employee Deductions FICA & Federal Withholding -->
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_ss_2017" model="hr.salary.rule">
-            <!-- Accounts Payable -->
-            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
-        </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_2017" model="hr.salary.rule">
-            <!-- Accounts Payable -->
-            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
-        </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fica_emp_m_add_2017" model="hr.salary.rule">
-            <!-- Accounts Payable -->
-            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
-        </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2017_single" model="hr.salary.rule">
-            <!-- Accounts Payable -->
-            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
-        </record>
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_fed_inc_withhold_2017_married" model="hr.salary.rule">
-            <!-- Accounts Payable -->
-            <field name="account_debit" search="[('code', 'like', '111100%')]"/>
-        </record>
-        <!-- Company Contributions FICA & FUTA -->
-        <record id="l10n_us_hr_payroll.hr_payroll_rules_futa_2017" model="hr.salary.rule">
+        <!-- Company Contributions FUTA -->
+        <record id="l10n_us_hr_payroll.hr_payroll_rules_futa_2018" model="hr.salary.rule">
             <!-- Accounts Payable -->
             <field name="account_debit" search="[('code', 'like', '111100%')]"/>
             <!-- Salary Expense -->