sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Formatting adaptations for Ledger 3.

Browse source 
This includes addition of currency-forcing options such as -V and -X $,
as well as corrections to the formatting string options for Ledger 3.
This commit is contained in:
Bradley M. Kuhn 2012-11-21 14:00:58 -05:00
parent cf969fcbb4
commit 5305642e4d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/non-profit-audit-reports/fund-report.plx
View file

@ -25,7 +25,7 @@ use warnings;
use Math::BigFloat; use Math::BigFloat;
my $LEDGER_CMD = "/usr/bin/ledger"; my $LEDGER_CMD = "/usr/local/bin/ledger";
my $ACCT_WIDTH = 70; my $ACCT_WIDTH = 70;
@ -45,8 +45,8 @@ my($startDate, $endDate, @mainLedgerOptions) = @ARGV;
# First, get fund list from ending balance # First, get fund list from ending balance
my(@ledgerOptions) = (@mainLedgerOptions, my(@ledgerOptions) = (@mainLedgerOptions,
'--wide-register-format', "%-.70A %22.108t\n", '-w', '-s', '-V', '-X', '$', '-F', "%-.70A %22.108t\n", '-s',
'-e', $endDate, 'reg', '^Funds:Restricted:'); '-e', $endDate, 'reg', '/^Funds:Restricted:/');
my %funds; my %funds;
@ -55,7 +55,7 @@ open(LEDGER_FUNDS, "-|", $LEDGER_CMD, @ledgerOptions)
or die "Unable to run $LEDGER_CMD for funds: $!"; or die "Unable to run $LEDGER_CMD for funds: $!";
while (my $fundLine = <LEDGER_FUNDS>) { while (my $fundLine = <LEDGER_FUNDS>) {
die "Unable to parse output line from funds command: $fundLine" die "Unable to parse output line from funds command: \"$fundLine\""
unless $fundLine =~ /^\s*([^\$]+)\s+\$\s*\s*([\d\.\,]+)/; unless $fundLine =~ /^\s*([^\$]+)\s+\$\s*\s*([\d\.\,]+)/;
my($account, $amount) = ($1, $2); my($account, $amount) = ($1, $2);
$amount = ParseNumber($amount); $amount = ParseNumber($amount);
@ -66,7 +66,7 @@ close LEDGER_FUNDS;
# First, get fund list from ending balance # First, get fund list from ending balance
@ledgerOptions = (@mainLedgerOptions, @ledgerOptions = (@mainLedgerOptions,
'--wide-register-format', "%-.70A %22.108t\n", '-w', '-s', '-V', '-X', '$', '-F', "%-.70A %22.108t\n", '-w', '-s',
'-e', $startDate, 'reg', '^Funds:Restricted:'); '-e', $startDate, 'reg', '^Funds:Restricted:');
open(LEDGER_FUNDS, "-|", $LEDGER_CMD, @ledgerOptions) open(LEDGER_FUNDS, "-|", $LEDGER_CMD, @ledgerOptions)
@ -88,7 +88,7 @@ foreach my $fund (keys %funds) {
} }
@ledgerOptions = (@mainLedgerOptions, @ledgerOptions = (@mainLedgerOptions,
'--wide-register-format', "%-.70A %22.108t\n", '-w', '-s', '-V', '-X', '$', '-F', "%-.70A %22.108t\n", '-w', '-s',
'-b', $startDate, '-e', $endDate, 'reg'); '-b', $startDate, '-e', $endDate, 'reg');
foreach my $type ('Income', 'Expenses') { foreach my $type ('Income', 'Expenses') {