diff --git a/f20-budget.pl b/f20-budget.pl index e0b3b62..88ba266 100644 --- a/f20-budget.pl +++ b/f20-budget.pl @@ -817,7 +817,7 @@ END while (my $recordr = $sthr->fetchrow_hashref) { print<\n)); +
@@ -889,12 +889,8 @@ END my $cost = $recordex->{cost}; $display_cost = sprintf "%.2f",$cost; $display_cost =~ s/(\d)(?=(\d{3})+(\D|$))/$1\,/g; ## add commma - print < -

$recordex->{item}

-

$recordex->{currency}$display_cost

- -END + + print_item("$recordex->{item}", ">$recordex->{currency}$display_cost") } print < @@ -916,12 +912,8 @@ END $running = $sum[0]+$deposits; $display_running = sprintf "%.2f",$running; $display_running =~ s/(\d)(?=(\d{3})+(\D|$))/$1\,/g; ## add commma - print < -
RUNNING total IN:
-
€$display_running
- -END + + print_subtotal("RUNNING total IN:", "€$display_running"); } } @@ -963,6 +955,7 @@ END print_subtitle("Resources / deployed"); + $sthdr->execute; while (my $record = $sthdr->fetchrow_hashref) { $record->{item} =~ s/^([a-z])/\U$1/; ## capitalise first letter my $first=$record->{firstname} ; @@ -992,6 +985,7 @@ END print_subtitle("Resources / offered"); + $sthor->execute; while (my $record = $sthor->fetchrow_hashref) { $record->{item} =~ s/^([a-z])/\U$1/; ## capitalise first letter my $first=$record->{firstname} ;