NPO-Accounting/conservancy_beancount Changeset - 950536e4f19b

Changeset - 950536e4f19b

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-08-18 17:22:07
brettcsmith@brettcsmith.org

balance_sheet: Transform "chart of accounts" into trial balances.

It was mostly this already, just needed to add a column and change the
title.

2 files changed with 17 insertions and 12 deletions:

conservancy_beancount/reports/balance_sheet.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/balance_sheet.py

➞

Show inline comments

@@ ... / @@ -239,13 +239,13 @@ class Report(core.BaseODS[Sequence[None], None]): @@
     def write_all(self) -> None:
         self.write_financial_position()
         self.write_activities()
         self.write_functional_expenses()
         self.write_cash_flows()
-        self.write_chart_of_accounts()
+        self.write_trial_balances()
     def walk_classifications(self, cseq: Iterable[data.Account]) \
         -> Iterator[Tuple[str, Optional[data.Account]]]:
         last_prefix: Sequence[str] = []
         for classification in cseq:
             parts = classification.split(':')
@@ ... / @@ -562,49 +562,54 @@ class Report(core.BaseODS[Sequence[None], None]): @@
         self.write_totals_row(
             "Ending Cash",
             period_totals, begin_totals,
             stylename=self.style_bottomline,
+        )
-    def write_chart_of_accounts(self) -> None:
+    def write_trial_balances(self) -> None:
         self.start_sheet(
             "Chart of Accounts",
             ["Account Name"], ["Classification"],
             "Trial Balances",
             ["Account Name"],
             ["Classification"],
             ["Balance Ending", self.opening_name],
             totals_prefix=["Change During", "Year Ending"],
             title_fmt="{sheet_name}",
+            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)
         # Patch up header row text
         header_row = self.sheet.lastChild
         header_row.removeChild(header_row.firstChild)
-        header_row.addElement(self.multiline_cell(
+        header_row.insertBefore(self.multiline_cell(
             ["Balance Ending", self.period_name],
             stylename=header_row.lastChild.getAttribute('stylename'),
         ))
+        ), header_row.lastChild)
         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):
                 period_bal = self.balances.total(account=account, period=Period.PERIOD)
                 prior_bal = self.balances.total(account=account, period=Period.PRIOR)
                 if want_balance:
                     total_bal = self.balances.total(account=account)
                     total_cell = self.balance_cell(norm_func(total_bal))
                     close_bal = self.balances.total(account=account)
                     close_cell = self.balance_cell(norm_func(close_bal))
                     open_cell = self.balance_cell(norm_func(close_bal - period_bal))
                 else:
                     total_cell = odf.table.TableCell()
                     close_cell = odf.table.TableCell()
                     open_cell = odf.table.TableCell()
                 self.add_row(
                     self.string_cell(account),
                     self.string_cell(account.meta.get('classification', '')),
                     open_cell,
                     self.balance_cell(norm_func(period_bal)),
                     close_cell,
                     self.balance_cell(norm_func(prior_bal)),
                     total_cell,
+                )
 def parse_arguments(arglist: Optional[Sequence[str]]=None) -> argparse.Namespace:
     parser = argparse.ArgumentParser(prog=PROGNAME)
     cliutil.add_version_argument(parser)

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.1',
+    version='1.8.2',
     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)