From 8835a33ae02a0b8d8993d46ee688b8f63f83aac8 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Tue, 17 Mar 2020 19:30:46 -0400
Subject: [PATCH] Include US debt instrument interest as 1040/2b.

---
 src/fed2019/Form1040.test.ts | 5 +++--
 src/fed2019/Form1040.ts      | 6 +++++-
 src/fed2019/Form1099INT.ts   | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/fed2019/Form1040.test.ts b/src/fed2019/Form1040.test.ts
index 6bdb027..7ae22de 100644
--- a/src/fed2019/Form1040.test.ts
+++ b/src/fed2019/Form1040.test.ts
@@ -54,7 +54,8 @@ test('interest income', () => {
     payer: 'Bank',
     payee: p,
     interest: 100,
-    taxExemptInterest: 0
+    taxExemptInterest: 0,
+    interestOnUsSavingsBondOrTreas: 30
   }));
   tr.addForm(new Form1099INT({
     payer: 'Bank 2',
@@ -67,7 +68,7 @@ test('interest income', () => {
   tr.addForm(f1040);
 
   expect(f1040.getValue(tr, '2a')).toBe(95);
-  expect(f1040.getValue(tr, '2b')).toBe(103.5);
+  expect(f1040.getValue(tr, '2b')).toBe(133.5);
 });
 
 test('dividend income', () => {
diff --git a/src/fed2019/Form1040.ts b/src/fed2019/Form1040.ts
index a4ace87..95bf92e 100644
--- a/src/fed2019/Form1040.ts
+++ b/src/fed2019/Form1040.ts
@@ -39,7 +39,11 @@ export default class Form1040 extends Form<Form1040['_lines'], Form1040Input> {
                     (new AccumulatorLine(Form1099DIV, '11')).value(tr);
       return value;
     }, 'Tax-exempt interest'),
-    '2b': new AccumulatorLine(Form1099INT, '1', 'Taxable interest'),
+    '2b': new ComputedLine((tr): number => {
+      const value = (new AccumulatorLine(Form1099INT, '1')).value(tr) +
+                    (new AccumulatorLine(Form1099INT, '3')).value(tr);
+      return value;
+    }, 'Taxable interest'),
     '3a': new AccumulatorLine(Form1099DIV, '1b', 'Qualified dividends'),
     '3b': new AccumulatorLine(Form1099DIV, '1a', 'Ordinary dividends'),
     '4a': new ComputedLine((tr): number => {
diff --git a/src/fed2019/Form1099INT.ts b/src/fed2019/Form1099INT.ts
index 9e34733..e339031 100644
--- a/src/fed2019/Form1099INT.ts
+++ b/src/fed2019/Form1099INT.ts
@@ -38,7 +38,7 @@ export default class Form1099INT extends Form<Form1099INT['_lines'], Form1099INT
     'recipient': new Input('payee'),
     '1': new Input('interest'),
     '2': new Input('earlyWithdrawalPenalty'),
-    '3': new Input('interestOnUsSavingsBondOrTreas'),
+    '3': new Input('interestOnUsSavingsBondOrTreas', undefined, 0),
     '4': new Input('fedIncomeTax', undefined, 0),
     '5': new Input('investmentExpenses'),
     '6': new Input('foreignTaxPaid', undefined, 0),
-- 
2.22.5