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

@@ ... / @@ -425,33 +425,40 @@ it will issue a warning. @@
 The default is `LedgerReport_<StartDate>_<StopDate>.ods`.
 """)
     cliutil.add_loglevel_argument(parser)
     parser.add_argument(
         'search_terms',
         metavar='FILTER',
         type=cliutil.SearchTerm.arg_parser('project', 'rt-id'),
         nargs=argparse.ZERO_OR_MORE,
         help="""Report on postings that match this criteria. The format is
 NAME=TERM. TERM is a link or word that must exist in a posting's NAME
 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
     try:
         return date.replace(year=new_year)
     except ValueError:
         # The original date is Feb 29, which doesn't exist in the new year.
         if diff < 0:
             return datetime.date(new_year, 2, 28)
         else:
             return datetime.date(new_year, 3, 1)
 def main(arglist: Optional[Sequence[str]]=None,

setup.py

➞

Show inline comments

 #!/usr/bin/env python3
 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
         'beancount>=2.2',  # Debian:beancount
         # 1.4.1 crashes when trying to save some documents.
         'odfpy>=1.4.0,!=1.4.1',  # Debian:python3-odf
         'PyYAML>=3.0',  # Debian:python3-yaml
         'regex',  # Debian:python3-regex
         'rt>=2.0',
     ],
     setup_requires=[
         'pytest-mypy',
         'pytest-runner',  # Debian:python3-pytest-runner

tests/test_reports_ledger.py

➞

Show inline comments

@@ ... @@
 DEFAULT_REPORT_SHEETS = [
     'Balance',
     'Income',
     'Expenses',
     'Equity',
     'Assets:Receivable',
     'Liabilities:Payable',
     'Assets:PayPal',
     'Assets',
     'Liabilities',
+]
 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)
 MID_DATE = datetime.date(2019, 3, 1)
 STOP_DATE = datetime.date(2020, 3, 1)
 @pytest.fixture
 def ledger_entries():
     return copy.deepcopy(_ledger_load[0])
 class NotFound(Exception): pass
 class NoSheet(NotFound): pass
 class NoHeader(NotFound): pass

0 comments (0 inline, 0 general)