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

@@ ... / @@ -94,2 +94,3 @@ class LedgerODS(core.BaseODS[data.Posting, None]): @@
         ('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']),

setup.py

➞

Show inline comments

@@ ... / @@ -7,3 +7,3 @@ setup( @@
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.15.4',
+    version='1.15.5',
     author='Software Freedom Conservancy',

tests/books/ledger.beancount

➞

Show inline comments

@@ ... / @@ -11,2 +11,4 @@ @@
   classification: "Other expenses"
 -01-01 open Expenses:Payroll
   classification: "Payroll expenses"
 -01-01 open Income:Other

tests/test_reports_ledger.py

➞

Show inline comments

@@ ... / @@ -36,2 +36,3 @@ DEFAULT_REPORT_SHEETS = [ @@
     'Income',
     'Expenses:Payroll',
     'Expenses',
@@ ... / @@ -44,3 +45,5 @@ DEFAULT_REPORT_SHEETS = [ @@
+]
 PROJECT_REPORT_SHEETS = DEFAULT_REPORT_SHEETS[:5] + [
 PROJECT_REPORT_SHEETS = [
     *DEFAULT_REPORT_SHEETS[:2],
     *DEFAULT_REPORT_SHEETS[3:6],
     'Assets:Prepaid',
@@ ... @@
             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:

0 comments (0 inline, 0 general)