NPO-Accounting/conservancy_beancount Changeset - 087b3274e7d2

Changeset - 087b3274e7d2

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Brett Smith - 3 years ago 2021-01-19 19:23:51
brettcsmith@brettcsmith.org

ledger: Dedicated reporting tab for Expenses:Payroll.

To better accommodate the new payroll-type metadata.

4 files changed with 13 insertions and 2 deletions:

conservancy_beancount/reports/ledger.py

setup.py

tests/books/ledger.beancount

tests/test_reports_ledger.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/ledger.py

➞

Show inline comments

@@ ... / @@ -89,12 +89,13 @@ class LedgerODS(core.BaseODS[data.Posting, None]): @@
         'Description',
         'Original Amount',
         'Booked Amount',
+    ]
     ACCOUNT_COLUMNS: Dict[str, Sequence[str]] = collections.OrderedDict([
         ('Income', ['project', 'rt-id', 'receipt', 'income-type', 'memo']),
         ('Expenses:Payroll', ['project', 'rt-id', 'payroll-type', 'expense-type', 'receipt', 'approval']),
         ('Expenses', ['project', 'rt-id', 'receipt', 'approval', 'expense-type']),
         ('Equity', ['project', 'rt-id']),
         ('Assets:Receivable', ['project', 'rt-id', 'invoice', 'approval', 'contract', 'purchase-order']),
         ('Liabilities:Payable', ['project', 'rt-id', 'invoice', 'approval', 'contract', 'purchase-order']),
         ('Assets:PayPal', ['rt-id', 'paypal-id', 'receipt', 'approval']),
         ('Assets', ['rt-id', 'receipt', 'approval', 'bank-statement']),

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.15.4',
+    version='1.15.5',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',
     install_requires=[
         'babel>=2.6',  # Debian:python3-babel

tests/books/ledger.beancount

➞

Show inline comments

@@ ... / @@ -6,12 +6,14 @@ @@
 -01-01 open Assets:Prepaid
   classification: "Prepaid expenses"
 -01-01 open Assets:Receivable:Accounts
   classification: "Accounts receivable"
 -01-01 open Expenses:Other
   classification: "Other expenses"
 -01-01 open Expenses:Payroll
   classification: "Payroll expenses"
 -01-01 open Income:Other
   classification: "Other income"
 -01-01 open Liabilities:CreditCard
   classification: "Accounts payable"
 -01-01 open Liabilities:Payable:Accounts
   classification: "Accounts payable"

tests/test_reports_ledger.py

➞

Show inline comments

@@ ... @@
 Acct = data.Account
 _ledger_load = bc_loader.load_file(testutil.test_path('books/ledger.beancount'))
 DEFAULT_REPORT_SHEETS = [
     'Balance',
     'Income',
     'Expenses:Payroll',
     'Expenses',
     'Equity',
     'Assets:Receivable',
     'Liabilities:Payable',
     'Assets:PayPal',
     'Assets',
     'Liabilities',
+]
 PROJECT_REPORT_SHEETS = DEFAULT_REPORT_SHEETS[:5] + [
 PROJECT_REPORT_SHEETS = [
     *DEFAULT_REPORT_SHEETS[:2],
     *DEFAULT_REPORT_SHEETS[3:6],
     'Assets:Prepaid',
     'Liabilities:UnearnedIncome',
     'Liabilities:Payable',
+]
 OVERSIZE_RE = re.compile(
     r'^([A-Za-z0-9:]+) has ([0-9,]+) rows, over size ([0-9,]+)$'
@@ ... @@
     postings, report = build_report(ledger_entries, START_DATE, STOP_DATE,
                                     accounts, **report_kwargs)
     expected = dict(ExpectedPostings.group_by_account(postings))
     for account in iter_accounts(ledger_entries):
         if not account.startswith(accounts):
             ExpectedPostings.check_not_in_report(report.document, account)
         # This account is reportable but has no postings
         elif account == 'Expenses:Payroll':
             ExpectedPostings.check_in_report(
                 report.document, account, START_DATE, STOP_DATE, txn_filter,
+            )
         elif txn_filter is None:
             expected[account].check_report(report.document, START_DATE, STOP_DATE)
         else:
             expected[account].check_txn_report(
                 report.document, txn_filter, START_DATE, STOP_DATE,
+            )

0 comments (0 inline, 0 general)