diff --git a/pyaccuwage/fields.py b/pyaccuwage/fields.py index 5b79e91..9e38448 100644 --- a/pyaccuwage/fields.py +++ b/pyaccuwage/fields.py @@ -93,9 +93,9 @@ class EmailField(TextField): return super(EmailField, self).__init__(name=name, max_length=max_length, required=required, uppercase=False) -class NumericField(TextField): +class IntegerField(TextField): def validate(self): - super(NumericField, self).validate() + super(IntegerField, self).validate() if self.value: try: int(self.value) diff --git a/pyaccuwage/record.py b/pyaccuwage/record.py index 8952f81..d626d36 100644 --- a/pyaccuwage/record.py +++ b/pyaccuwage/record.py @@ -11,7 +11,7 @@ class SubmitterRecord(model.Model): record_identifier = 'RA' required = True - submitter_ein = NumericField(max_length=9) + submitter_ein = IntegerField(max_length=9) user_id = TextField(max_length=8) software_vendor = TextField(max_length=4, required=False) blank1 = BlankField(max_length=5) @@ -82,7 +82,7 @@ class EmployerRecord(model.Model): record_identifier = 'RE' required = True - tax_year = NumericField(max_length=4) + tax_year = IntegerField(max_length=4) agent_indicator = TextField(max_length=1, required=False) employer_ein = TextField(max_length=9) agent_for_ein = TextField(max_length=9, required=False) @@ -140,7 +140,7 @@ class EmployeeWageRecord(model.Model): record_identifier = 'RW' required = True - ssn = NumericField(max_length=9, required=False) + ssn = IntegerField(max_length=9, required=False) employee_first_name = TextField(max_length=15) employee_middle_name = TextField(max_length=15) employee_last_name = TextField(max_length=20) @@ -229,7 +229,7 @@ class StateWageRecord(model.Model): state_code = StateField(use_numeric=True) taxing_entity_code = TextField(max_length=5, required=False) - ssn = NumericField(max_length=9, required=False) + ssn = IntegerField(max_length=9, required=False) employee_first_name = TextField(max_length=15) employee_middle_name = TextField(max_length=15) employee_last_name = TextField(max_length=20) @@ -248,11 +248,11 @@ class StateWageRecord(model.Model): reporting_period = MonthYearField() quarterly_unemp_ins_wages = MoneyField(max_length=11) quarterly_unemp_ins_taxable_wages = MoneyField(max_length=11) - number_of_weeks_worked = NumericField(max_length=2) + number_of_weeks_worked = IntegerField(max_length=2) date_first_employed = DateField(required=False) date_of_separation = DateField(required=False) blank2 = BlankField(max_length=5) - state_employer_account_num = NumericField(max_length=20) + state_employer_account_num = IntegerField(max_length=20) blank3 = BlankField(max_length=6) state_code_2 = StateField(use_numeric=True) state_taxable_wages = MoneyField(max_length=11) @@ -261,7 +261,7 @@ class StateWageRecord(model.Model): tax_type_code = TextField(max_length=1) # VALIDATE C, D, E, or F local_taxable_wages = MoneyField(max_length=11) local_income_tax_wh = MoneyField(max_length=11) - state_control_number = NumericField(max_length=7, required=False) + state_control_number = IntegerField(max_length=7, required=False) supplemental_data1 = TextField(max_length=75, required=False) supplemental_data2 = TextField(max_length=75, required=False) blank4 = BlankField(max_length=25) @@ -276,7 +276,7 @@ class TotalRecord(model.Model): record_identifier = 'RT' required = True - number_of_rw_records = NumericField(max_length=7) + number_of_rw_records = IntegerField(max_length=7) wages_tips = MoneyField(max_length=15) federal_income_tax_withheld = MoneyField(max_length=15) social_security_wages = MoneyField(max_length=15) @@ -310,7 +310,7 @@ class OptionalTotalRecord(model.Model): record_identifier = 'RU' required = False - number_of_ro_records = NumericField(max_length=7) + number_of_ro_records = IntegerField(max_length=7) allocated_tips = MoneyField(max_length=15) uncollected_tax_on_tips = MoneyField(max_length=15) medical_savings_account = MoneyField(max_length=15) @@ -344,5 +344,5 @@ class FinalRecord(model.Model): required = True blank1 = BlankField(max_length=5) - number_of_rw_records = NumericField(max_length=9) + number_of_rw_records = IntegerField(max_length=9) blank2 = BlankField(max_length=496)