NPO-Accounting/conservancy_beancount Changeset - 5a3ee2458905

Changeset - 5a3ee2458905

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-08-18 20:26:12
brettcsmith@brettcsmith.org

balance_sheet: Correct "release from restrictions" calculation.

The old version was causing Income:Donations:Released postings to be
"double-released." This version gets the bottom line numbers for
Net Assets With/out Donor Restrictions match the corresponding numbers
in the fund report.

2 files changed with 8 insertions and 6 deletions:

conservancy_beancount/reports/balance_sheet.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/balance_sheet.py

➞

Show inline comments

@@ ... / @@ -433,14 +433,16 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         self.add_row(
             self.string_cell("Net Assets released from restrictions:"),
+        )
-        released = self.balances.total(
+        released_expenses = self.balances.total(
             account='Expenses', period=Period.PERIOD, fund=Fund.RESTRICTED,
         ) - self.balances.total(
             classification=self.C_SATISFIED, period=Period.PERIOD, fund=Fund.RESTRICTED,
+        )
         other_totals = [core.MutableBalance() for _ in bal_kwargs]
         other_totals[0] += released
         other_totals[1] -= released
         other_totals[0] += released_expenses - self.balances.total(
             classification=self.C_SATISFIED, period=Period.PERIOD, fund=Fund.UNRESTRICTED,
+        )
         other_totals[1] -= released_expenses + self.balances.total(
             classification=self.C_SATISFIED, period=Period.PERIOD, fund=Fund.RESTRICTED,
+        )
         self.write_totals_row(self.C_SATISFIED, other_totals)
         self.write_totals_row(
             "Total Support and Revenue",

setup.py

➞

Show inline comments

@@ ... / @@ -5,7 +5,7 @@ from setuptools import setup @@
 setup(
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.8.4',
+    version='1.8.5',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',

0 comments (0 inline, 0 general)