From 076efd4036ce78607cac70b8cfa75ea28e70d8f0 Mon Sep 17 00:00:00 2001 From: Binh Van Nguyen Date: Sat, 29 Oct 2011 14:58:59 -0500 Subject: [PATCH] 0.0.6, fixed field types --- pyaccuwage/__init__.py | 2 +- pyaccuwage/record.py | 88 +++++++++++++++++++++--------------------- setup.py | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/pyaccuwage/__init__.py b/pyaccuwage/__init__.py index 04404ce..749fffa 100644 --- a/pyaccuwage/__init__.py +++ b/pyaccuwage/__init__.py @@ -1,6 +1,6 @@ from record import * -VERSION = (0, 0, 5) +VERSION = (0, 0, 6) RECORD_TYPES = [ 'SubmitterRecord', diff --git a/pyaccuwage/record.py b/pyaccuwage/record.py index 6ab4226..6f05d86 100644 --- a/pyaccuwage/record.py +++ b/pyaccuwage/record.py @@ -276,33 +276,33 @@ class TotalRecord(model.Model): record_identifier = 'RT' required = True - number_of_rw_records = NumericField(max_length=7) - wages_tips = NumericField(max_length=15) - federal_income_tax_withheld = NumericField(max_length=15) - social_security_wages = NumericField(max_length=15) - social_security_tax_withheld = NumericField(max_length=15) - medicare_wages_and_tips = NumericField(max_length=15) - medicare_tax_withheld = NumericField(max_length=15) - social_security_tips = NumericField(max_length=15) - advance_eic = NumericField(max_length=15) - dependent_care_benefits = NumericField(max_length=15) - deferred_compensation_401k = NumericField(max_length=15) - deferred_compensation_403b = NumericField(max_length=15) - deferred_compensation_408k = NumericField(max_length=15) - deferred_compensation_457b = NumericField(max_length=15) - deferred_compensation_501c = NumericField(max_length=15) - military_pay = NumericField(max_length=15) - non_qualified_457 = NumericField(max_length=15) - employer_contrib_to_hsa = NumericField(max_length=15) - non_qualified_not_457 = NumericField(max_length=15) - nontaxable_combat_pay = NumericField(max_length=15) + number_of_rw_records = MoneyField(max_length=7) + wages_tips = MoneyField(max_length=15) + federal_income_tax_withheld = MoneyField(max_length=15) + social_security_wages = MoneyField(max_length=15) + social_security_tax_withheld = MoneyField(max_length=15) + medicare_wages_and_tips = MoneyField(max_length=15) + medicare_tax_withheld = MoneyField(max_length=15) + social_security_tips = MoneyField(max_length=15) + advance_eic = MoneyField(max_length=15, required=False) + dependent_care_benefits = MoneyField(max_length=15, required=False) + deferred_compensation_401k = MoneyField(max_length=15, required=False) + deferred_compensation_403b = MoneyField(max_length=15, required=False) + 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) + 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_cost_term_life_ins = NumericField(max_length=15) - income_tax_wh_sick_pay = NumericField(max_length=15) - income_exercise_nonstat_stock_opts = NumericField(max_length=15) - deferred_409a_compensation_plan = NumericField(max_length=15) - designated_roth_contribs_401k = NumericField(max_length=15) - disignated_roth_contribs_403b = NumericField(max_length=15) + 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) + deferred_409a_compensation_plan = MoneyField(max_length=15, required=False) + designated_roth_contribs_401k = MoneyField(max_length=15, required=False) + designated_roth_contribs_403b = MoneyField(max_length=15, required=False) blank2 = BlankField(max_length=113) @@ -311,25 +311,25 @@ class OptionalTotalRecord(model.Model): required = False number_of_ro_records = NumericField(max_length=7) - allocated_tips = NumericField(max_length=15) - uncollected_tax_on_tips = NumericField(max_length=15) - medical_savings_account = NumericField(max_length=15) - simple_retirement_account = NumericField(max_length=15) - qualified_adoption_expenses = NumericField(max_length=15) - uncollected_ss_life_ins = NumericField(max_length=15) - uncollected_medicare_life_ins = NumericField(max_length=15) - income_under_409a = NumericField(max_length=15) - hire_exempt_wages_and_tips = NumericField(max_length=15) + allocated_tips = MoneyField(max_length=15) + uncollected_tax_on_tips = MoneyField(max_length=15) + medical_savings_account = MoneyField(max_length=15) + simple_retirement_account = MoneyField(max_length=15) + qualified_adoption_expenses = MoneyField(max_length=15) + uncollected_ss_life_ins = MoneyField(max_length=15) + 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) - wages_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False) - commissions_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False) - allowances_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False) - tips_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False) - total_wages_subject_to_puerto_rico_tax = NumericField(max_length=15, required=False) - puerto_rico_tax_withheld = NumericField(max_length=15, required=False) - retirement_fund_contrib = NumericField(max_length=15, required=False) - total_wages_tips_virgin_islands = NumericField(max_length=15, required=False) - virgin_islands_income_tax_withheld = NumericField(max_length=15, required=False) + 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) + tips_subject_to_puerto_rico_tax = MoneyField(max_length=15, required=False) + total_wages_subject_to_puerto_rico_tax = MoneyField(max_length=15, required=False) + puerto_rico_tax_withheld = MoneyField(max_length=15, required=False) + retirement_fund_contrib = MoneyField(max_length=15, required=False) + total_wages_tips_virgin_islands = MoneyField(max_length=15, required=False) + virgin_islands_income_tax_withheld = MoneyField(max_length=15, required=False) blank2 = BlankField(max_length=23) diff --git a/setup.py b/setup.py index b18ecb2..c65292c 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from distutils.core import setup setup(name='pyaccuwage', - version='0.0.5', + version='0.0.6', packages=['pyaccuwage'], zip_safe=True, )