diff --git a/pyaccuwage/record.py b/pyaccuwage/record.py index c24f93f..4cd845f 100644 --- a/pyaccuwage/record.py +++ b/pyaccuwage/record.py @@ -8,6 +8,7 @@ __all__ = RECORD_TYPES = ['SubmitterRecord', 'EmployerRecord', 'StateTotalRecord', 'FinalRecord', 'StateWageRecord'] class SubmitterRecord(model.Model): + # year=2012 record_identifier = 'RA' required = True @@ -79,6 +80,7 @@ class SubmitterRecord(model.Model): class EmployerRecord(model.Model): + # year=2012 record_identifier = 'RE' required = True @@ -137,6 +139,7 @@ class EmployerRecord(model.Model): class EmployeeWageRecord(model.Model): + # year=2012 record_identifier = 'RW' required = True @@ -180,7 +183,7 @@ class EmployeeWageRecord(model.Model): deferred_compensation_409a = MoneyField(max_length=11, required=False) designated_roth_contrib_401k = MoneyField(max_length=11, required=False) designated_roth_contrib_403b = MoneyField(max_length=11, required=False) - blank3 = BlankField(max_length=23) + blank3 = BlankField(max_length=12) statutory_employee_indicator = BooleanField() blank4 = BlankField(max_length=1) retirement_plan_indicator = BooleanField() @@ -194,6 +197,7 @@ class EmployeeWageRecord(model.Model): class OptionalEmployeeWageRecord(model.Model): + # year=2012 record_identifier = 'RO' required = False @@ -207,7 +211,8 @@ class OptionalEmployeeWageRecord(model.Model): uncollected_medicare_life_ins = MoneyField(max_length=11) income_under_409a = MoneyField(max_length=11) hire_exempt_wages_and_tips = MoneyField(max_length=11) - blank2 = BlankField(max_length=164) + designated_roth_contrib_457b = MoneyField(max_length=11) + blank2 = BlankField(max_length=153) wages_subject_to_puerto_rico_tax = MoneyField(max_length=11, required=False) commissions_subject_to_puerto_rico_tax = MoneyField(max_length=11, required=False) allowances_subject_to_puerto_rico_tax = MoneyField(max_length=11, required=False) @@ -220,10 +225,9 @@ class OptionalEmployeeWageRecord(model.Model): virgin_islands_income_tax_withheld = MoneyField(max_length=11, required=False) blank4 = BlankField(max_length=128) - - class StateWageRecord(model.Model): + # year=2012 record_identifier = 'RS' required = False @@ -273,6 +277,7 @@ class StateWageRecord(model.Model): class TotalRecord(model.Model): + #year=2012 record_identifier = 'RT' required = True @@ -291,12 +296,12 @@ class TotalRecord(model.Model): deferred_compensation_408k = MoneyField(max_length=15, required=False) deferred_compensation_457b = MoneyField(max_length=15, required=False) deferred_compensation_501c = MoneyField(max_length=15, required=False) - military_pay = MoneyField(max_length=15, required=False) + blank1 = BlankField(max_length=15) non_qualified_457 = MoneyField(max_length=15, required=False) employer_contrib_to_hsa = MoneyField(max_length=15, required=False) non_qualified_not_457 = MoneyField(max_length=15, required=False) nontaxable_combat_pay = MoneyField(max_length=15, required=False) - blank1 = BlankField(max_length=15) + employer_sponsored_health = MoneyField(max_length=15, required=False) employer_cost_term_life_ins = MoneyField(max_length=15, required=False) income_tax_wh_sick_pay = MoneyField(max_length=15, required=False) income_exercise_nonstat_stock_opts = MoneyField(max_length=15, required=False) @@ -307,6 +312,7 @@ class TotalRecord(model.Model): class OptionalTotalRecord(model.Model): + #year= record_identifier = 'RU' required = False @@ -320,7 +326,8 @@ class OptionalTotalRecord(model.Model): uncollected_medicare_life_ins = MoneyField(max_length=15) income_under_409a = MoneyField(max_length=15) hire_exempt_wages_and_tips = MoneyField(max_length=15) - blank1 = BlankField(max_length=210) + designated_roth_contrib_457b = MoneyField(max_length=15) + blank1 = BlankField(max_length=195) wages_subject_to_puerto_rico_tax = MoneyField(max_length=15, required=False) commissions_subject_to_puerto_rico_tax = MoneyField(max_length=15, required=False) allowances_subject_to_puerto_rico_tax = MoneyField(max_length=15, required=False) @@ -334,12 +341,14 @@ class OptionalTotalRecord(model.Model): class StateTotalRecord(model.Model): + #year=2012 record_identifier = 'RV' required = False supplemental_data = TextField(max_length=510) class FinalRecord(model.Model): + #year=2012 record_identifier = 'RF' required = True