diff --git a/f20-budget.pl b/f20-budget.pl index d3de811..3f33f62 100644 --- a/f20-budget.pl +++ b/f20-budget.pl @@ -12,7 +12,7 @@ no warnings qw(experimental::smartmatch); # # ############################################################################## -do "f20-budget.config.pl"; +do "./f20-budget.config.pl"; ############################################################################## # # @@ -817,7 +817,7 @@ END
OUTGOINGS: / money requested or supplied
END - print_subtitle("Fees"); + print_subtitle("Labour / paid"); while (my $recordef = $sthef->fetchrow_hashref) { my $cost = $recordef->{cost}; @@ -830,18 +830,14 @@ END END } - print_subtitle("Materials"); + print_subtitle("Resources / remunerated"); while (my $recordem = $sthem->fetchrow_hashref) { my $cost = $recordem->{cost}; $display_cost = sprintf "%.2f",$cost; $display_cost =~ s/(\d)(?=(\d{3})+(\D|$))/$1\,/g; ## add commma - print < -

$recordem->{item}

-

$recordem->{currency}$display_cost

- -END + + print_item("$recordem->{item}","$recordem->{currency}$display_cost"); } print_subtitle("Miscellaneous"); @@ -851,19 +847,16 @@ END $display_cost = sprintf "%.2f",$cost; $display_cost =~ s/(\d)(?=(\d{3})+(\D|$))/$1\,/g; ## add commma - print_item("$recordex->{item}", ">$recordex->{currency}$display_cost") + print_item("$recordex->{item}", ">$recordex->{currency}$display_cost"); } - print < -
- INCOME: / donations, contributions, sums, funds -
-
-END + + + print_subtotal("INCOME: / donations, contributions, sums, funds"); while (my $recordf = $sthf->fetchrow_hashref) { - print(qq(€$recordf->{amount}  )); + print_item("€$recordf->{amount}"); } + print(qq(
)); ## actual paid deposits