diff --git a/conservancy_beancount/reports/ledger.py b/conservancy_beancount/reports/ledger.py index 77f840a6b71f33adf6660f9a555c803b2fe3538e..10018513881873cf05c0733dbbbb10abb921230b 100644 --- a/conservancy_beancount/reports/ledger.py +++ b/conservancy_beancount/reports/ledger.py @@ -95,12 +95,12 @@ class LedgerODS(core.BaseODS[data.Posting, None]): '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']), + ('Income', ['project', 'rt-id', 'program', 'income-type', 'receipt', 'memo']), + ('Expenses:Payroll', ['project', 'rt-id', 'program', 'payroll-type', 'receipt', 'approval']), + ('Expenses', ['project', 'rt-id', 'program', 'expense-type', 'receipt', 'approval']), + ('Equity', ['project', 'rt-id', 'program']), + ('Assets:Receivable', ['project', 'rt-id', 'program', 'invoice', 'approval', 'contract', 'purchase-order']), + ('Liabilities:Payable', ['project', 'rt-id', 'program', 'invoice', 'approval', 'contract', 'purchase-order']), ('Assets:PayPal', ['rt-id', 'paypal-id', 'receipt', 'approval']), ('Assets', ['rt-id', 'receipt', 'approval', 'bank-statement']), ('Liabilities', ['rt-id', 'receipt', 'approval', 'bank-statement']), diff --git a/setup.py b/setup.py index a29bfe1d64d3b7637bf7d05f815892b64ad7f806..9e661f166c050d94741fce67303dc8a8fffd84be 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup setup( name='conservancy_beancount', description="Plugin, library, and reports for reading Conservancy's books", - version='1.18.0', + version='1.18.1', author='Software Freedom Conservancy', author_email='info@sfconservancy.org', license='GNU AGPLv3+',