IMP l10n_us_ca_hr_payroll to use a single contribution register.

Migration in the README
This commit is contained in:
Jared Kipe
2018-11-02 12:24:49 -07:00
parent 7e024c5261
commit 03b342eab6
4 changed files with 44 additions and 22 deletions

View File

@@ -41,6 +41,22 @@ New Payslip Categories for:
* California Unemployment Insurance Tax * California Unemployment Insurance Tax
* California Employee Training Tax * California Employee Training Tax
Upgrading to 11.0.2018.1.0
==========================
If you were using this prior to November 2018, then you have more Contribution registers
and partners than you need! Simply run the following before installing the new code and upgrading.
Odoo Shell code::
main_cr = env.ref('l10n_us_ca_hr_payroll.contrib_register_cador_uit')
old_1 = env.ref('l10n_us_ca_hr_payroll.contrib_register_cador_withhold')
old_2 = env.ref('l10n_us_ca_hr_payroll.contrib_register_cador_ett')
old_3 = env.ref('l10n_us_ca_hr_payroll.contrib_register_cador_sdi')
lines = env['hr.payslip.line'].search([('register_id', 'in', [old_1.id, old_2.id, old_3.id])])
lines.write({'register_id': main_cr.id})
env.cr.commit()
======= =======
License License

View File

@@ -4,7 +4,7 @@
'license': 'AGPL-3', 'license': 'AGPL-3',
'category': 'Localization', 'category': 'Localization',
'depends': ['l10n_us_hr_payroll'], 'depends': ['l10n_us_hr_payroll'],
'version': '11.0.2018.0.0', 'version': '11.0.2018.1.0',
'description': """ 'description': """
USA::California Payroll Rules. USA::California Payroll Rules.
============================== ==============================

View File

@@ -3,7 +3,7 @@
<data> <data>
<!-- CONTRIBUTION REGISTERS --> <!-- CONTRIBUTION REGISTERS -->
<record id="res_partner_cador_uit" model="res.partner"> <record id="res_partner_cador_uit" model="res.partner">
<field name="name">California Department of Taxation - Unemployment Insurance Tax</field> <field name="name">California Department of Taxation (CA DE88)</field>
<field name="supplier">1</field> <field name="supplier">1</field>
<field eval="0" name="customer"/> <field eval="0" name="customer"/>
</record> </record>
@@ -11,38 +11,44 @@
<field name="name">California Department of Taxation - Income Tax Withholding</field> <field name="name">California Department of Taxation - Income Tax Withholding</field>
<field name="supplier">1</field> <field name="supplier">1</field>
<field eval="0" name="customer"/> <field eval="0" name="customer"/>
<field eval="False" name="active"/>
</record> </record>
<record id="res_partner_cador_ett" model="res.partner"> <record id="res_partner_cador_ett" model="res.partner">
<field name="name">California Department of Taxation - Employment Training Tax</field> <field name="name">California Department of Taxation - Employment Training Tax</field>
<field name="supplier">1</field> <field name="supplier">1</field>
<field eval="0" name="customer"/> <field eval="0" name="customer"/>
<field eval="False" name="active"/>
</record> </record>
<record id="res_partner_cador_sdi" model="res.partner"> <record id="res_partner_cador_sdi" model="res.partner">
<field name="name">California Department of Taxation - State Disability Insurance</field> <field name="name">California Department of Taxation - State Disability Insurance</field>
<field name="supplier">1</field> <field name="supplier">1</field>
<field eval="0" name="customer"/> <field eval="0" name="customer"/>
<field eval="False" name="active"/>
</record> </record>
<record id="contrib_register_cador_uit" model="hr.contribution.register"> <record id="contrib_register_cador_uit" model="hr.contribution.register">
<field name="name">California Unemployment Insurance Tax</field> <field name="name">California (CA DE88)</field>
<field name="note">California Department of Taxation - Unemployment Insurance Tax</field> <field name="note">California Department of Taxation (CA DE88)</field>
<field name="partner_id" ref="res_partner_cador_uit"/> <field name="partner_id" ref="res_partner_cador_uit"/>
</record> </record>
<record id="contrib_register_cador_withhold" model="hr.contribution.register">
<field name="name">California Income Tax Withholding</field> <!-- These are deprecated in favor of a single grouped register for CA DE88 -->
<field name="note">California Department of Taxation - Income Tax Withholding</field> <!-- They are left here in case their details or structure is needed later. -->
<field name="partner_id" ref="res_partner_cador_withhold"/> <!--<record id="contrib_register_cador_withhold" model="hr.contribution.register">-->
</record> <!--<field name="name">California Income Tax Withholding</field>-->
<record id="contrib_register_cador_ett" model="hr.contribution.register"> <!--<field name="note">California Department of Taxation - Income Tax Withholding</field>-->
<field name="name">Employment Training Tax</field> <!--<field name="partner_id" ref="res_partner_cador_withhold"/>-->
<field name="note">California Department of Taxation - Employment Training Tax</field> <!--</record>-->
<field name="partner_id" ref="res_partner_cador_ett"/> <!--<record id="contrib_register_cador_ett" model="hr.contribution.register">-->
</record> <!--<field name="name">Employment Training Tax</field>-->
<record id="contrib_register_cador_sdi" model="hr.contribution.register"> <!--<field name="note">California Department of Taxation - Employment Training Tax</field>-->
<field name="name">State Disability Insurance</field> <!--<field name="partner_id" ref="res_partner_cador_ett"/>-->
<field name="note">California Department of Taxation - State Disability Insurance</field> <!--</record>-->
<field name="partner_id" ref="res_partner_cador_sdi"/> <!--<record id="contrib_register_cador_sdi" model="hr.contribution.register">-->
</record> <!--<field name="name">State Disability Insurance</field>-->
<!--<field name="note">California Department of Taxation - State Disability Insurance</field>-->
<!--<field name="partner_id" ref="res_partner_cador_sdi"/>-->
<!--</record>-->
<!-- HR SALARY RULE CATEGORIES--> <!-- HR SALARY RULE CATEGORIES-->

View File

@@ -87,7 +87,7 @@ result = categories.CA_ETT_WAGES
if result_rate == 0.0: if result_rate == 0.0:
result = 0.0 result = 0.0
</field> </field>
<field name="register_id" ref="contrib_register_cador_ett"/> <field name="register_id" ref="contrib_register_cador_uit"/>
<field name="appears_on_payslip" eval="False"/> <field name="appears_on_payslip" eval="False"/>
</record> </record>
@@ -131,7 +131,7 @@ result = categories.CA_SDI_WAGES
if result_rate == 0.0: if result_rate == 0.0:
result = 0.0 result = 0.0
</field> </field>
<field name="register_id" ref="contrib_register_cador_sdi"/> <field name="register_id" ref="contrib_register_cador_uit"/>
<field name="appears_on_payslip" eval="False"/> <field name="appears_on_payslip" eval="False"/>
</record> </record>
@@ -569,7 +569,7 @@ if not low_income:
result = -tax result = -tax
</field> </field>
<field name="register_id" ref="contrib_register_cador_withhold"/> <field name="register_id" ref="contrib_register_cador_uit"/>
</record> </record>
</data> </data>