Better mapping of taxsim s corp income to taxcalc

[jdebacker]

When doing the validation between TAXSIM and taxcalc, one needs to add the scorp income (which under TAXSIM is defined as active s-corp income) and otherprop (which in TAXSIM includes passive s corp income + some other items on Sch E) together to get e02000, which represents all Sch E income in taxcalc.

[codecov[bot]]

Codecov Report

Merging #2696 (0ce7072) into master (10821c8) will not change coverage. Report is 1 commits behind head on master. The diff coverage is n/a.

Additional details and impacted files

[](https://app.codecov.io/gh/PSLmodels/Tax-Calculator/pull/2696?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) ```diff @@ Coverage Diff @@ ## master #2696 +/- ## ======================================= Coverage 98.54% 98.54% ======================================= Files 14 14 Lines 2609 2609 ======================================= Hits 2571 2571 Misses 38 38 ``` | [Flag](https://app.codecov.io/gh/PSLmodels/Tax-Calculator/pull/2696/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/PSLmodels/Tax-Calculator/pull/2696/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) | `98.54% <ø> (ø)` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels#carryforward-flags-in-the-pull-request-comment) to find out more.

[bodiyang]

@jdebacker thanks Jason, looks good to me

[jdebacker]

Thanks for review @bodiyang. Merging