diff --git a/tests/test_reports_fund.py b/tests/test_reports_fund.py index 298ec5740d2c58c32f37b4a15f9870faf2ed762d..42c6ed8ea2973662fad8005e9e1f504b6a680e1f 100644 --- a/tests/test_reports_fund.py +++ b/tests/test_reports_fund.py @@ -60,6 +60,7 @@ BALANCES_BY_YEAR = { ('Conservancy', 2019): [ ('Income:Other', 42), ('Expenses:Other', Decimal('-4.20')), + ('Equity:Funds:Unrestricted', 100), ('Equity:Realized:CurrencyConversion', Decimal('6.20')), ('Assets:Receivable:Accounts', -40), ('Liabilities:Payable:Accounts', -4), @@ -81,6 +82,9 @@ BALANCES_BY_YEAR = { ('Bravo', 2019): [ ('Income:Other', 200), ], + ('Charlie', 2019): [ + ('Equity:Funds:Restricted', -100), + ], ('Delta', 2018): [ ('Income:Other', Decimal('.40')), ], @@ -138,6 +142,8 @@ def check_text_report(output, project, start_date, stop_date): assert open_amt == format_amount(balance_amount) balance_amount += check_text_balances( actual, expected, + 'Equity:Funds:Restricted', + 'Equity:Funds:Unrestricted', 'Equity:Realized:CurrencyConversion', 'Income:Other', 'Expenses:Other', @@ -173,7 +179,7 @@ def check_ods_sheet(sheet, account_balances, *, full): if key != 'Conservancy' and any(v >= .5 for v in balances.values()) } totals = {key: Decimal() for key in - ['opening', 'Income', 'Expenses', 'Equity:Realized']} + ['opening', 'Income', 'Expenses', 'Equity']} for fund, balances in account_bals.items(): for key in totals: totals[key] += balances[key] @@ -190,11 +196,15 @@ def check_ods_sheet(sheet, account_balances, *, full): pytest.fail(f"report included unexpected fund {fund}") check_cell_balance(next(cells), balances['opening']) check_cell_balance(next(cells), balances['Income']) - check_cell_balance(next(cells), -balances['Expenses']) if full: - check_cell_balance(next(cells), balances['Equity:Realized']) + check_cell_balance(next(cells), -balances['Expenses']) + check_cell_balance(next(cells), balances['Equity']) + else: + check_cell_balance( + next(cells), -sum(balances[key] for key in ['Expenses', 'Equity']), + ) check_cell_balance(next(cells), sum(balances[key] for key in [ - 'opening', 'Income', 'Expenses', 'Equity:Realized', + 'opening', 'Income', 'Expenses', 'Equity', ])) if full: check_cell_balance(next(cells), balances['Assets:Receivable']) @@ -209,7 +219,7 @@ def check_ods_report(ods, start_date, stop_date): 'opening': Decimal(amount), 'Income': Decimal(0), 'Expenses': Decimal(0), - 'Equity:Realized': Decimal(0), + 'Equity': Decimal(0), 'Assets:Receivable': Decimal(0), 'Assets:Prepaid': Decimal(0), 'Liabilities:Payable': Decimal(0), @@ -222,8 +232,11 @@ def check_ods_report(ods, start_date, stop_date): pass else: for account, amount in amounts: - if year < start_date.year and account.startswith(EQUITY_ROOT_ACCOUNTS): - acct_key = 'opening' + if account.startswith(EQUITY_ROOT_ACCOUNTS): + if year < start_date.year: + acct_key = 'opening' + else: + acct_key, _, _ = account.partition(':') else: acct_key, _, _ = account.rpartition(':') account_bals[fund][acct_key] += amount