NPO-Accounting/conservancy_beancount Changeset - 29d4325c7abd

Changeset - 29d4325c7abd

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-08-17 19:26:55
brettcsmith@brettcsmith.org

balance_sheet: Add activity report.

3 files changed with 228 insertions and 41 deletions:

conservancy_beancount/reports/balance_sheet.py

224

setup.py

tests/test_reports_balance_sheet.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/balance_sheet.py

➞

Show inline comments

@@ ... / @@ -24,2 +24,3 @@ import sys @@
 from decimal import Decimal
 from pathlib import Path
@@ ... / @@ -27,2 +28,4 @@ from pathlib import Path @@
 from typing import (
     Any,
     Dict,
     Hashable,
@@ ... / @@ -30,2 +33,3 @@ from typing import ( @@
     Iterator,
     List,
     Mapping,
@@ ... @@
-class Fund(enum.Enum):
+class Fund(enum.IntFlag):
     RESTRICTED = enum.auto()
     UNRESTRICTED = enum.auto()
     ANY = RESTRICTED | UNRESTRICTED
-class Period(enum.Enum):
+class Period(enum.IntFlag):
     OPENING = enum.auto()
     PRIOR = enum.auto()
     PERIOD = enum.auto()
     BEFORE_PERIOD = OPENING | PRIOR
     ANY = OPENING | PRIOR | PERIOD
@@ ... / @@ -83,3 +91,3 @@ class Balances: @@
     ) -> None:
-        self.opening_range = ranges.DateRange(
+        self.prior_range = ranges.DateRange(
             cliutil.diff_year(start_date, -1),
@@ ... / @@ -87,3 +95,3 @@ class Balances: @@
+        )
-        assert self.opening_range.stop <= start_date
+        assert self.prior_range.stop <= start_date
         self.period_range = ranges.DateRange(start_date, stop_date)
@@ ... / @@ -95,3 +103,5 @@ class Balances: @@
                 period = Period.PERIOD
             elif post_date < self.period_range.start:
             elif post_date in self.prior_range:
                 period = Period.PRIOR
             elif post_date < self.prior_range.start:
                 period = Period.OPENING
@@ ... / @@ -99,2 +109,6 @@ class Balances: @@
                 continue
             if post.account == 'Expenses:CurrencyConversion':
                 account = data.Account('Income:CurrencyConversion')
             else:
                 account = post.account
             if post.meta.get(fund_key) == unrestricted_fund_value:
@@ ... / @@ -104,3 +118,3 @@ class Balances: @@
             try:
-                classification_s = post.account.meta['classification']
                 classification_s = account.meta['classification']
                 if isinstance(classification_s, str):
@@ ... / @@ -110,8 +124,8 @@ class Balances: @@
             except (KeyError, TypeError):
-                classification = post.account
                 classification = account
             try:
-                post_type = post.meta[self.POST_TYPES[post.account.root_part()]]
                 post_type = post.meta[self.POST_TYPES[account.root_part()]]
             except KeyError:
                 post_type = None
-            key = BalanceKey(post.account, classification, period, fund, post_type)
             key = BalanceKey(account, classification, period, fund, post_type)
             self.balances[key] += post.at_cost()
@@ ... / @@ -121,4 +135,4 @@ class Balances: @@
               classification: Optional[str]=None,
               period: Optional[Period]=None,
               fund: Optional[Fund]=None,
               period: int=Period.ANY,
               fund: int=Fund.ANY,
               post_type: Optional[str]=None,
@@ ... / @@ -132,5 +146,5 @@ class Balances: @@
                 pass
-            elif not (period is None or period is key.period):
+            elif not period & key.period:
                 pass
-            elif not (fund is None or fund is key.fund):
+            elif not fund & key.fund:
                 pass
@@ ... / @@ -142,3 +156,6 @@ class Balances: @@
     def classifications(self, account: str) -> Sequence[data.Account]:
     def classifications(self,
                         account: str,
                         sort_period: int=Period.PERIOD,
     ) -> Sequence[data.Account]:
         class_bals: Mapping[data.Account, core.MutableBalance] \
@@ ... / @@ -146,4 +163,9 @@ class Balances: @@
         for key, balance in self.balances.items():
             if key.account.is_under(account):
             if not key.account.is_under(account):
                 pass
             elif key.period & sort_period:
                 class_bals[key.classification] += balance
             else:
                 # Ensure the balance exists in the mapping
                 class_bals[key.classification]
         norm_func = core.normalize_amount_func(f'{account}:RootsOK')
@@ ... / @@ -152,3 +174,6 @@ class Balances: @@
             balance = norm_func(class_bals[acct])
             max_bal = max(amount.number for amount in balance.values())
             try:
                 max_bal = max(amount.number for amount in balance.values())
             except ValueError:
                 max_bal = Decimal(0)
             return prefix, -max_bal
@@ ... / @@ -158,2 +183,6 @@ class Balances: @@
 class Report(core.BaseODS[Sequence[None], None]):
     C_SATISFIED = 'Satisfaction of program restrictions'
     EQUITY_ACCOUNTS = ['Equity', 'Income', 'Expenses']
     NO_BALANCE = core.Balance()
     def __init__(self,
@@ ... / @@ -168,3 +197,3 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         self.period_name = date.strftime(date_fmt)
-        date = balances.opening_range.stop - one_day
+        date = balances.prior_range.stop - one_day
         self.opening_name = date.strftime(date_fmt)
@@ ... / @@ -190,2 +219,3 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         self.write_financial_position()
         self.write_activities()
@@ ... / @@ -203,5 +233,10 @@ class Report(core.BaseODS[Sequence[None], None]): @@
     def walk_classifications_by_account(self, account: str) \
         -> Iterator[Tuple[str, Optional[data.Account]]]:
         return self.walk_classifications(self.balances.classifications(account))
     def walk_classifications_by_account(
             self,
             account: str,
             sort_period: int=Period.PERIOD,
     ) -> Iterator[Tuple[str, Optional[data.Account]]]:
         return self.walk_classifications(self.balances.classifications(
             account, sort_period,
         ))
@@ ... / @@ -229,3 +264,3 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         self.add_row()
         for text, classification in self.walk_classifications_by_account('Assets'):
+        for text, classification in self.walk_classifications_by_account('Assets', Period.ANY):
             text_cell = self.string_cell(text)
@@ ... / @@ -234,6 +269,4 @@ class Report(core.BaseODS[Sequence[None], None]): @@
             else:
                 prior_bal = self.balances.total(
                     classification=classification, period=Period.OPENING,
+                )
                 period_bal = prior_bal + self.balances.total(
                 period_bal = self.balances.total(classification=classification)
                 prior_bal = period_bal - self.balances.total(
                     classification=classification, period=Period.PERIOD,
@@ ... / @@ -263,3 +296,3 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         self.add_row()
         for text, classification in self.walk_classifications_by_account('Liabilities'):
+        for text, classification in self.walk_classifications_by_account('Liabilities', Period.ANY):
             text_cell = self.string_cell(text)
@@ ... / @@ -268,6 +301,4 @@ class Report(core.BaseODS[Sequence[None], None]): @@
             else:
                 prior_bal = -self.balances.total(
                     classification=classification, period=Period.OPENING,
+                )
                 period_bal = prior_bal - self.balances.total(
                 period_bal = -self.balances.total(classification=classification)
                 prior_bal = period_bal + self.balances.total(
                     classification=classification, period=Period.PERIOD,
@@ ... / @@ -293,12 +324,11 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         self.add_row()
         accounts = ['Equity', 'Income', 'Expenses']
         for fund in [Fund.UNRESTRICTED, Fund.RESTRICTED]:
             preposition = "Without" if fund is Fund.UNRESTRICTED else "With"
             prior_bal = -sum(
                 (self.balances.total(account=account, period=Period.OPENING, fund=fund)
                  for account in accounts), core.MutableBalance(),
             period_bal = -sum(
                 (self.balances.total(account=account, fund=fund)
                  for account in self.EQUITY_ACCOUNTS), core.MutableBalance(),
+            )
             period_bal = prior_bal - sum(
                 (self.balances.total(account=account, period=Period.PERIOD, fund=fund)
                  for account in accounts), core.MutableBalance(),
             prior_bal = period_bal + sum(
                 (self.balances.total(account=account, fund=fund, period=Period.PERIOD)
                  for account in self.EQUITY_ACCOUNTS), core.MutableBalance(),
+            )
@@ ... / @@ -325,2 +355,159 @@ class Report(core.BaseODS[Sequence[None], None]): @@
     def write_activities(self) -> None:
         self.use_sheet("Activities")
         bal_kwargs: Sequence[Dict[str, Any]] = [
             {'period': Period.PERIOD, 'fund': Fund.UNRESTRICTED},
             {'period': Period.PERIOD, 'fund': Fund.RESTRICTED},
             {'period': Period.PERIOD},
             {'period': Period.PRIOR},
+        ]
         col_count = len(bal_kwargs) + 1
         for index in range(col_count):
             col_style = self.column_style(1.5 if index else 3)
             self.sheet.addElement(odf.table.TableColumn(stylename=col_style))
         self.add_row(
             self.multiline_cell([
                 "DRAFT Statement of Activities",
                 self.period_name,
             ], numbercolumnsspanned=col_count, stylename=self.style_header)
+        )
         self.add_row()
         self.add_row(
             odf.table.TableCell(),
             self.multiline_cell(["Without Donor", "Restrictions"],
                                 stylename=self.style_huline),
             self.multiline_cell(["With Donor", "Restrictions"],
                                 stylename=self.style_huline),
             self.multiline_cell(["Total Year Ended", self.period_name],
                                 stylename=self.style_huline),
             self.multiline_cell(["Total Year Ended", self.opening_name],
                                 stylename=self.style_huline),
+        )
         totals = [core.MutableBalance() for _ in bal_kwargs]
         self.add_row(self.string_cell("Support and Revenue", stylename=self.style_bold))
         self.add_row()
         for text, classification in self.walk_classifications_by_account('Income'):
             text_cell = self.string_cell(text)
             if classification is None:
                 self.add_row(text_cell)
             elif classification == self.C_SATISFIED:
                 continue
             else:
                 balances = [
                     -self.balances.total(classification=classification, **kwargs)
                     for kwargs in bal_kwargs
+                ]
                 self.add_row(
                     text_cell,
                     *(self.balance_cell(bal) for bal in balances),
+                )
                 for total, bal in zip(totals, balances):
                     total += bal
         self.add_row(
             odf.table.TableCell(),
             *(self.balance_cell(total, stylename=self.style_subtotline)
               for total in totals),
+        )
         self.add_row()
         self.add_row(
             self.string_cell("Net Assets released from restrictions:"),
+        )
         released = self.balances.total(
             account='Expenses', period=Period.PERIOD, fund=Fund.RESTRICTED,
         ) - self.balances.total(
             classification=self.C_SATISFIED, period=Period.PERIOD, fund=Fund.RESTRICTED,
+        )
         totals[0] += released
         totals[1] -= released
         self.add_row(
             self.string_cell(self.C_SATISFIED),
             self.balance_cell(released),
             self.balance_cell(-released),
             self.balance_cell(self.NO_BALANCE),
             self.balance_cell(self.NO_BALANCE),
+        )
         self.add_row()
         self.add_row(
             self.string_cell("Total Support and Revenue"),
             *(self.balance_cell(total, stylename=self.style_totline)
               for total in totals),
+        )
         period_expenses = core.MutableBalance()
         prior_expenses = core.MutableBalance()
         self.add_row()
         self.add_row(self.string_cell("Expenses", stylename=self.style_bold))
         self.add_row()
         for text, type_value in [
                 ("Program services", 'program'),
                 ("Management and administrative services", 'management'),
                 ("Fundraising", 'fundraising'),
         ]:
             period_bal = self.balances.total(
                 account='Expenses', period=Period.PERIOD, post_type=type_value,
+            )
             prior_bal = self.balances.total(
                 account='Expenses', period=Period.PRIOR, post_type=type_value,
+            )
             self.add_row(
                 self.string_cell(text),
                 self.balance_cell(period_bal),
                 self.balance_cell(self.NO_BALANCE),
                 self.balance_cell(period_bal),
                 self.balance_cell(prior_bal),
+            )
             period_expenses += period_bal
             prior_expenses += prior_bal
         period_bal = self.balances.total(account='Expenses', period=Period.PERIOD)
         if (period_expenses - period_bal).clean_copy(1).is_zero():
             period_bal = period_expenses
         else:
             logger.warning("Period functional expenses do not match total; math in columns B+D is wrong")
         prior_bal = self.balances.total(account='Expenses', period=Period.PRIOR)
         if (prior_expenses - prior_bal).clean_copy(1).is_zero():
             prior_bal = prior_expenses
         else:
             logger.warning("Prior functional expenses do not match total; math in column E is wrong")
         self.add_row(
             self.string_cell("Total Expenses"),
             self.balance_cell(period_bal, stylename=self.style_totline),
             self.balance_cell(self.NO_BALANCE, stylename=self.style_totline),
             self.balance_cell(period_bal, stylename=self.style_totline),
             self.balance_cell(prior_bal, stylename=self.style_totline),
+        )
         totals[0] -= period_bal
         totals[2] -= period_bal
         totals[3] -= prior_bal
         self.add_row()
         self.add_row(
             self.string_cell("Change in Net Assets"),
             *(self.balance_cell(total) for total in totals),
+        )
         for kwargs in bal_kwargs:
             if kwargs['period'] is Period.PERIOD:
                 kwargs['period'] = Period.BEFORE_PERIOD
             else:
                 kwargs['period'] = Period.OPENING
         beginnings = [
             -sum((self.balances.total(account=account, **kwargs)
                   for account in self.EQUITY_ACCOUNTS), core.MutableBalance())
             for kwargs in bal_kwargs
+        ]
         self.add_row()
         self.add_row(
             self.string_cell("Beginning Net Assets"),
             *(self.balance_cell(beg_bal) for beg_bal in beginnings),
+        )
         self.add_row()
         self.add_row(
             self.string_cell("Ending Net Assets"),
             *(self.balance_cell(beg_bal + tot_bal, stylename=self.style_bottomline)
               for beg_bal, tot_bal in zip(beginnings, totals)),
+        )

setup.py

➞

Show inline comments

@@ ... / @@ -7,3 +7,3 @@ setup( @@
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.7.2',
+    version='1.7.3',
     author='Software Freedom Conservancy',

tests/test_reports_balance_sheet.py

➞

Show inline comments

@@ ... / @@ -85,3 +85,3 @@ def income_expense_balances(): @@
     ({'classification': 'Nonexistent'}, None),
-    ({'period': Period.OPENING, 'account': 'Income'}, '-9.60'),
+    ({'period': Period.PRIOR, 'account': 'Income'}, '-9.60'),
     ({'period': Period.PERIOD, 'account': 'Expenses'}, 26),
@@ ... / @@ -93,6 +93,6 @@ def income_expense_balances(): @@
     ({'post_type': 'Nonexistent'}, None),
-    ({'period': Period.OPENING, 'post_type': 'RBI'}, '-4.80'),
+    ({'period': Period.PRIOR, 'post_type': 'RBI'}, '-4.80'),
     ({'fund': Fund.RESTRICTED, 'post_type': 'program'}, 10),
     ({'period': Period.PERIOD, 'fund': Fund.UNRESTRICTED, 'post_type': 'RBI'}, '-2.60'),
-    ({'period': Period.OPENING, 'fund': Fund.RESTRICTED, 'post_type': 'program'}, '4.80'),
+    ({'period': Period.PRIOR, 'fund': Fund.RESTRICTED, 'post_type': 'program'}, '4.80'),
     ({'period': Period.PERIOD, 'fund': Fund.RESTRICTED, 'post_type': 'ø'}, None),

0 comments (0 inline, 0 general)