Merge pull request #774 from hdoupe/tc_upgrade_0140

merged #774

conda-requirements.txt

@@ -1,5 +1,5 @@
 nomkl
-taxcalc==0.13.2
+taxcalc==0.14.0
 btax==0.1.9
 numba==0.33.0
 pandas

webapp/apps/taxbrain/forms.py

@@ -299,6 +299,7 @@ class Meta:
             "_II_no_em_nu18",
             "_ID_AmountCap_Switch",
             "_CTC_new_for_all",
+            "_CTC_new_refund_limited_all_payroll",
             "_PT_wages_active_income",
             "_PT_top_stacking",
             "_DependentCredit_before_CTC"

webapp/apps/taxbrain/migrations/0058_taxsaveinputs_ctc_new_refund_limited_all_payroll.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taxbrain', '0057_jsonreformtaxcalculator_errors_warnings_text'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='taxsaveinputs',
+            name='CTC_new_refund_limited_all_payroll',
+            field=models.CharField(default=b'False', max_length=50, null=True, blank=True),
+        ),
+    ]

webapp/apps/taxbrain/models.py

@@ -678,6 +678,7 @@ class TaxSaveInputs(models.Model):
     CG_nodiff = models.CharField(default="False", blank=True, null=True, max_length=50)
     EITC_indiv = models.CharField(default="False", blank=True, null=True, max_length=50)
     CTC_new_refund_limited = models.CharField(default="False", blank=True, null=True, max_length=50)
+    CTC_new_refund_limited_all_payroll = models.CharField(default="False", blank=True, null=True, max_length=50)
     II_no_em_nu18 = models.CharField(default="False", blank=True, null=True, max_length=50)
 
     # Inflation adjustments

webapp/apps/taxbrain/views.py

@@ -63,7 +63,7 @@
 
 TAXCALC_VERSION = tcversion_info['version']
 
-JOB_PROC_TIME_IN_SECONDS = 50
+JOB_PROC_TIME_IN_SECONDS = 30
 
 OUT_OF_RANGE_ERROR_MSG = ("Some fields have errors. Values outside of suggested "
                           "ranges will be accepted if they only cause warnings "