NPO-Accounting/conservancy_beancount Changeset - 0e8745bf512d

Changeset - 0e8745bf512d

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-07-15 14:14:46
brettcsmith@brettcsmith.org

ledger: Include all fund accounts in default project ledger reports.

This brings the reporting into sync with the fund report.

3 files changed with 11 insertions and 2 deletions:

conservancy_beancount/reports/ledger.py

setup.py

tests/test_reports_ledger.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/ledger.py

➞

Show inline comments

@@ ... @@
 metadata to match. A single ticket number is a shortcut for
 `rt-id=rt:NUMBER`. Any other word is a shortcut for `project=TERM`.
 """)
     args = parser.parse_args(arglist)
     if args.sheet_names is None:
         if any(term.meta_key == 'project' for term in args.search_terms):
             args.sheet_names = ['Income', 'Expenses', 'Assets:Receivable', 'Liabilities:Payable']
             args.sheet_names = [
                 'Income',
                 'Expenses',
                 'Assets:Receivable',
                 'Assets:Prepaid',
                 'Liabilities:UnearnedIncome',
                 'Liabilities:Payable',
+            ]
         else:
             args.sheet_names = list(LedgerODS.ACCOUNT_COLUMNS)
     return args
 def diff_year(date: datetime.date, diff: int) -> datetime.date:
     new_year = date.year + diff

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

tests/test_reports_ledger.py

➞

Show inline comments

@@ ... / @@ -49,12 +49,14 @@ DEFAULT_REPORT_SHEETS = [ @@
+]
 PROJECT_REPORT_SHEETS = [
     'Balance',
     'Income',
     'Expenses',
     'Assets:Receivable',
     'Assets:Prepaid',
     'Liabilities:UnearnedIncome',
     'Liabilities:Payable',
+]
 OVERSIZE_RE = re.compile(
     r'^([A-Za-z0-9:]+) has ([0-9,]+) rows, over size ([0-9,]+)$'
+)
 START_DATE = datetime.date(2018, 3, 1)

0 comments (0 inline, 0 general)