NPO-Accounting/conservancy_beancount Changeset - a0ff9e6834aa

Changeset - a0ff9e6834aa

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-08-18 19:15:02
brettcsmith@brettcsmith.org

balance_sheet: Support arbitrary date ranges.

This lets you do year-over-year comparisons of smaller ranges of time, like
a quarter.

2 files changed with 33 insertions and 19 deletions:

conservancy_beancount/reports/balance_sheet.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/balance_sheet.py

➞

Show inline comments

@@ ... / @@ -68,15 +68,17 @@ class Fund(enum.IntFlag): @@
     ANY = RESTRICTED | UNRESTRICTED
 class Period(enum.IntFlag):
     OPENING = enum.auto()
     PRIOR = enum.auto()
     MIDDLE = enum.auto()
     PERIOD = enum.auto()
     BEFORE_PERIOD = OPENING | PRIOR
     ANY = OPENING | PRIOR | PERIOD
     THRU_PRIOR = OPENING | PRIOR
     THRU_MIDDLE = THRU_PRIOR | MIDDLE
     ANY = THRU_MIDDLE | PERIOD
 class BalanceKey(NamedTuple):
     account: data.Account
     classification: data.Account
     period: Period
@@ ... / @@ -89,30 +91,41 @@ class Balances: @@
                  postings: Iterable[data.Posting],
                  start_date: datetime.date,
                  stop_date: datetime.date,
                  fund_key: str='project',
                  unrestricted_fund_value: str='Conservancy',
     ) -> None:
         self.prior_range = ranges.DateRange(
             cliutil.diff_year(start_date, -1),
             cliutil.diff_year(stop_date, -1),
+        )
         assert self.prior_range.stop <= start_date
         year_diff = (stop_date - start_date).days // 365
         if year_diff == 0:
             self.prior_range = ranges.DateRange(
                 cliutil.diff_year(start_date, -1),
                 cliutil.diff_year(stop_date, -1),
+            )
             self.period_desc = "Period"
         else:
             self.prior_range = ranges.DateRange(
                 cliutil.diff_year(start_date, -year_diff),
                 start_date,
+            )
             self.period_desc = f"Year{'s' if year_diff > 1 else ''}"
         self.middle_range = ranges.DateRange(self.prior_range.stop, start_date)
         self.period_range = ranges.DateRange(start_date, stop_date)
         self.balances: Mapping[BalanceKey, core.MutableBalance] \
             = collections.defaultdict(core.MutableBalance)
         for post in postings:
             post_date = post.meta.date
             if post_date in self.period_range:
             if post_date >= stop_date:
                 continue
             elif post_date in self.period_range:
                 period = Period.PERIOD
             elif post_date in self.middle_range:
                 period = Period.MIDDLE
             elif post_date in self.prior_range:
                 period = Period.PRIOR
             elif post_date < self.prior_range.start:
                 period = Period.OPENING
             else:
-                continue
+                period = Period.OPENING
             if post.account == 'Expenses:CurrencyConversion':
                 account = data.Account('Income:CurrencyConversion')
             else:
                 account = post.account
             if post.meta.get(fund_key) == unrestricted_fund_value:
                 fund = Fund.UNRESTRICTED
@@ ... / @@ -211,12 +224,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
                  balances: Balances,
                  *,
                  date_fmt: str='%B %d, %Y',
     ) -> None:
         super().__init__()
         self.balances = balances
         self.period_desc = balances.period_desc
         self.date_fmt = date_fmt
         one_day = datetime.timedelta(days=1)
         date = balances.period_range.stop - one_day
         self.period_name = date.strftime(date_fmt)
         date = balances.prior_range.stop - one_day
         self.opening_name = date.strftime(date_fmt)
@@ ... / @@ -356,13 +370,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         return self.last_totals_row
     def write_financial_position(self) -> None:
         self.start_sheet("Financial Position")
         balance_kwargs: Sequence[KWArgs] = [
             {'period': Period.ANY},
-            {'period': Period.BEFORE_PERIOD},
+            {'period': Period.THRU_PRIOR},
+        ]
         asset_totals = self.write_classifications_by_account('Assets', balance_kwargs)
         self.write_totals_row(
             "Total Assets", asset_totals, stylename=self.style_bottomline,
+        )
@@ ... / @@ -397,13 +411,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
     def write_activities(self) -> None:
         self.start_sheet(
             "Activities",
             ["Without Donor", "Restrictions"],
             ["With Donor", "Restrictions"],
-            totals_prefix=["Total Year Ended"],
+            totals_prefix=[f"Total {self.period_desc} Ended"],
+        )
         bal_kwargs: Sequence[Dict[str, Any]] = [
             {'period': Period.PERIOD, 'fund': Fund.UNRESTRICTED},
             {'period': Period.PERIOD, 'fund': Fund.RESTRICTED},
             {'period': Period.PERIOD},
             {'period': Period.PRIOR},
@@ ... / @@ -479,13 +493,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         other_totals[2] -= period_bal
         other_totals[3] -= prior_bal
         self.write_totals_row("Change in Net Assets", income_totals, other_totals)
         for kwargs in bal_kwargs:
             if kwargs['period'] is Period.PERIOD:
-                kwargs['period'] = Period.BEFORE_PERIOD
+                kwargs['period'] = Period.THRU_MIDDLE
             else:
                 kwargs['period'] = Period.OPENING
         equity_totals = [
             -self.balances.total(account=EQUITY_ACCOUNTS, **kwargs)
             for kwargs in bal_kwargs
+        ]
@@ ... / @@ -499,13 +513,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
     def write_functional_expenses(self) -> None:
         self.start_sheet(
             "Functional Expenses",
             ["Program", "Services"],
             ["Management and", "Administrative"],
             ["Fundraising"],
-            totals_prefix=["Total Year Ended"],
+            totals_prefix=[f"Total {self.period_desc} Ended"],
+        )
         totals = self.write_classifications_by_account('Expenses', [
             {'period': Period.PERIOD, 'post_type': 'program'},
             {'period': Period.PERIOD, 'post_type': 'management'},
             {'period': Period.PERIOD, 'post_type': 'fundraising'},
             {'period': Period.PERIOD},
@@ ... / @@ -555,13 +569,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
             period_totals,
             stylename=self.style_totline,
+        )
         self.write_totals_row("Net Increase in Cash", period_totals)
         begin_totals = [
             self.balances.total(classification=self.C_CASH, period=period)
-            for period in [Period.BEFORE_PERIOD, Period.OPENING]
+            for period in [Period.THRU_MIDDLE, Period.OPENING]
+        ]
         self.write_totals_row("Beginning Cash", begin_totals)
         self.write_totals_row(
             "Ending Cash",
             period_totals, begin_totals,
             stylename=self.style_bottomline,
@@ ... / @@ -569,14 +583,14 @@ class Report(core.BaseODS[Sequence[None], None]): @@
     def write_trial_balances(self) -> None:
         self.start_sheet(
             "Trial Balances",
             ["Account Name"],
             ["Classification"],
             ["Balance Ending", self.opening_name],
             totals_prefix=["Change During", "Year Ending"],
             ["Balance Beginning", self.balances.period_range.start.strftime(self.date_fmt)],
             totals_prefix=["Change During", f"{self.period_desc} Ending"],
             title_fmt="Chart of Accounts with DRAFT {sheet_name}",
+        )
         # Widen text columns
         col_style = self.column_style(3.5)
         for col in self.sheet.childNodes[:2]:
             col.setAttribute('stylename', col_style)

setup.py

➞

Show inline comments

@@ ... / @@ -2,13 +2,13 @@ @@
 from setuptools import setup
 setup(
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.8.3',
+    version='1.8.4',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',
     install_requires=[
         'babel>=2.6',  # Debian:python3-babel

0 comments (0 inline, 0 general)