NPO-Accounting/conservancy_beancount Changeset - 2c3438ba0f89

Changeset - 2c3438ba0f89

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-09-03 21:01:28
brettcsmith@brettcsmith.org

balance_sheet: Add account code column to chart of accounts.

2 files changed with 8 insertions and 2 deletions:

conservancy_beancount/reports/balance_sheet.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/balance_sheet.py

➞

Show inline comments

@@ ... / @@ -195,13 +195,13 @@ class Balances: @@
                 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) -> Sequence[data.Account]:
+    def iter_accounts(self, root: Optional[str]=None) -> Sequence[data.Account]:
         start_date = self.period_range.start
         stop_date = self.period_range.stop
         return sorted(
             account
             for account in data.Account.iter_accounts(root)
             if account.meta.open_date < stop_date
@@ ... / @@ -570,12 +570,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
     def write_trial_balances(self) -> None:
         self.start_sheet(
             "Trial Balances",
             ["Account Name"],
             ["Classification"],
             ["Account Code"],
             ["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)
@@ ... / @@ -585,12 +586,16 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         header_row = self.sheet.lastChild
         header_row.removeChild(header_row.firstChild)
         header_row.insertBefore(self.multiline_cell(
             ["Balance Ending", self.period_name],
             stylename=header_row.lastChild.getAttribute('stylename'),
         ), header_row.lastChild)
         # Hide account code if it's not ready.
         # FIXME: This code can be removed once codes are fully established.
         if not any(acct.meta.get('account-code') for acct in self.balances.iter_accounts()):
             self.sheet.childNodes[2].setAttribute('visibility', 'collapse')
         for acct_root in ['Assets', 'Liabilities', 'Income', 'Expenses', 'Equity']:
             norm_func = core.normalize_amount_func(f'{acct_root}:Dummy')
             want_balance = acct_root not in EQUITY_ACCOUNTS
             self.add_row()
             for account in self.balances.iter_accounts(acct_root):
@@ ... / @@ -603,12 +608,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
                 else:
                     close_cell = odf.table.TableCell()
                     open_cell = odf.table.TableCell()
                 self.add_row(
                     self.string_cell(account),
                     self.string_cell(account.meta.get('classification', '')),
                     self.string_cell(account.meta.get('account-code', '')),
                     open_cell,
                     self.balance_cell(norm_func(period_bal)),
                     close_cell,
                     self.balance_cell(norm_func(prior_bal)),
+                )

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.9.4',
+    version='1.9.5',
     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)