diff --git a/payroll/forms/tax_forms.py b/payroll/forms/tax_forms.py index e622bdc45..f07eff6ea 100644 --- a/payroll/forms/tax_forms.py +++ b/payroll/forms/tax_forms.py @@ -104,9 +104,9 @@ class FilingStatusForm(ModelForm): ] = """ if($(this).is(':checked')){ $('#oc-editor').show(); - $("#objectCreateModal #objectCreateModalTarget").css("max-width","90%") + //$("#objectCreateModal #objectCreateModalTarget").css("max-width","90%") }else{ - $("#objectCreateModal #objectCreateModalTarget").css("max-width","650px") + //$("#objectCreateModal #objectCreateModalTarget").css("max-width","650px") $('#oc-editor').hide(); } """ diff --git a/payroll/methods/tax_calc.py b/payroll/methods/tax_calc.py index c2d7f0232..058162002 100644 --- a/payroll/methods/tax_calc.py +++ b/payroll/methods/tax_calc.py @@ -41,6 +41,8 @@ def calculate_taxable_amount(**kwargs): employee_id=employee, contract_status="active" ).first() filing = contract.filing_status + if not filing: + return 0 federal_tax_for_period = 0 tax_brackets = TaxBracket.objects.filter(filing_status_id=filing).order_by( "min_income"