From 5e295f1024aeb3249a8722c3b8e1fb0e4ee6d1c1 2020-06-17 19:32:08 From: Brett Smith Date: 2020-06-17 19:32:08 Subject: [PATCH] accrual: Change args.since default. This default makes more since with the way we're going to stop having opening balances in open books. --- diff --git a/conservancy_beancount/reports/accrual.py b/conservancy_beancount/reports/accrual.py index b116a9969204a929fc3b2df5fc770da6f8519304..59359c8e01cdc991160bbf30d212b194c4c447c7 100644 --- a/conservancy_beancount/reports/accrual.py +++ b/conservancy_beancount/reports/accrual.py @@ -19,10 +19,10 @@ criteria:: # Report all accruals with the invoice link Invoice980.pdf. accrual-report Invoice980.pdf -By default, to stay fast, accrual-report only looks for postings from the -beginning of the last fiscal year. You can search further back in history -by passing the ``--since`` argument. The argument can be a fiscal year, or -a negative number of how many years back to search:: +By default, to stay fast, accrual-report only looks at unaudited books. You +can search further back in history by passing the ``--since`` argument. The +argument can be a fiscal year, or a negative number of how many years back +to search:: # Search for accruals since 2016 accrual-report --since 2016 [search terms …] @@ -601,11 +601,11 @@ and `balance` any other time. '--since', metavar='YEAR', type=int, - default=-1, + default=0, help="""How far back to search the books for related transactions. You can either specify a fiscal year, or a negative offset from the current -fiscal year, to start loading entries from. The default is -1 (start from the -previous fiscal year). +fiscal year, to start loading entries from. The default is to load the current, +unaudited books. """) parser.add_argument( '--output-file', '-O', @@ -650,10 +650,9 @@ def main(arglist: Optional[Sequence[str]]=None, books_loader = config.books_loader() if books_loader is None: entries, load_errors, _ = books.Loader.load_none(config.config_file_path()) - elif args.report_type is ReportType.AGING: - entries, load_errors, _ = books_loader.load_all() else: - entries, load_errors, _ = books_loader.load_all(args.since) + load_since = None if args.report_type == ReportType.AGING else args.since + entries, load_errors, _ = books_loader.load_all(load_since) filters.remove_opening_balance_txn(entries) for error in load_errors: bc_printer.print_error(error, file=stderr)