NPO-Accounting/conservancy_beancount Changeset - 5c7cf9cd2a84

Changeset - 5c7cf9cd2a84

Parent rev.

Child rev.

[Not reviewed]

0 2 0

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

balance_sheet: Sort trial balance accounts.

They were previously sorted by date, then name, which is slightly less
helpful.

2 files changed with 9 insertions and 7 deletions:

conservancy_beancount/reports/balance_sheet.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/balance_sheet.py

➞

Show inline comments

@@ ... / @@ -168,56 +168,58 @@ class Balances: @@
                 sort_period = Period.PERIOD
             else:
                 sort_period = Period.ANY
         class_bals: Mapping[data.Account, core.MutableBalance] \
             = collections.defaultdict(core.MutableBalance)
         for key, balance in self.balances.items():
             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')
         def sortkey(acct: data.Account) -> Hashable:
             prefix, _, _ = acct.rpartition(':')
             balance = norm_func(class_bals[acct])
             try:
                 max_bal = max(amount.number for amount in balance.values())
             except ValueError:
                 max_bal = Decimal(0)
             return prefix, -max_bal
         return sorted(class_bals, key=sortkey)
-    def iter_accounts(self, root: str) -> Iterable[data.Account]:
+    def iter_accounts(self, root: str) -> Sequence[data.Account]:
         start_date = self.period_range.start
         stop_date = self.period_range.stop
         for account in data.Account.iter_accounts(root):
             meta = account.meta
             if (meta.open_date < stop_date
                 and (meta.close_date is None or meta.close_date > start_date)):
                 yield account
         return sorted(
             account
             for account in data.Account.iter_accounts(root)
             if account.meta.open_date < stop_date
             and (account.meta.close_date is None
                  or account.meta.close_date > start_date)
+        )
 class Report(core.BaseODS[Sequence[None], None]):
     C_CASH = 'Cash'
     C_SATISFIED = 'Satisfaction of program restrictions'
     NO_BALANCE = core.Balance()
     SPACE = ' ' * 4
     def __init__(self,
                  balances: Balances,
                  *,
                  date_fmt: str='%B %d, %Y',
     ) -> None:
         super().__init__()
         self.balances = balances
         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)
         self.last_totals_row = odf.table.TableRow()
     def section_key(self, row: Sequence[None]) -> None:

setup.py

➞

Show inline comments

 #!/usr/bin/env python3
 from setuptools import setup
 setup(
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.8.2',
+    version='1.8.3',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',
     install_requires=[
         'babel>=2.6',  # Debian:python3-babel
         'beancount>=2.2',  # Debian:beancount
         'GitPython>=2.0',  # Debian:python3-git
         # 1.4.1 crashes when trying to save some documents.
         'odfpy>=1.4.0,!=1.4.1',  # Debian:python3-odf
         'PyYAML>=3.0',  # Debian:python3-yaml
         'regex',  # Debian:python3-regex
         'rt>=2.0',
     ],
     setup_requires=[
         'pytest-mypy',
         'pytest-runner',  # Debian:python3-pytest-runner
     ],
     tests_require=[
         'mypy>=0.770',  # Debian:python3-mypy
         'pytest',  # Debian:python3-pytest
     ],
     packages=[

0 comments (0 inline, 0 general)