diff --git a/f20-budget.pl b/f20-budget.pl index 068980e..fe63a61 100644 --- a/f20-budget.pl +++ b/f20-budget.pl @@ -694,9 +694,11 @@ sub input_money { } - -############################################################################### -# compile budget: lay out the whole budget as it assembles +############################################################################## +# # +# compile budget: lay out the whole budget as it assembles # +# # +############################################################################## sub compile_budget { @@ -801,7 +803,9 @@ sub compile_budget { END if ($agent_id ne "") { while (my $recordfc = $sthfc->fetchrow_hashref) { - print(qq(Contributing agents [$recordfc->{count}]. This budget will remain open for editing until $recordb->{end_date}. Monetary items will be kept anonymous (although identifable to the budget r/administrators). Labour & resources will be tagged with the name of the contributor.)); + print <[$recordfc->{count}]. This budget will remain open for editing until $recordb->{end_date}. Monetary items will be kept anonymous (although identifable to the budget r/administrators). Labour & resources will be tagged with the name of the contributor. +END } } print <{item} [$first_init$last_init]") + print_item("$record->{item} [$first_init$last_init]"); } print_subsection("Resources / deployed"); @@ -975,7 +979,7 @@ END $first_init =~ s/^([a-z])/\U$1/; ## capitalise first letter $last_init =~ s/^([a-z])/\U$1/; ## capitalise first letter - print_item("$record->{item} [$first_init$last_init]") + print_item("$record->{item} [$first_init$last_init]"); } print_subtitle("Labour / offered"); @@ -990,7 +994,7 @@ END $first_init =~ s/^([a-z])/\U$1/; ## capitalise first letter $last_init =~ s/^([a-z])/\U$1/; ## capitalise first letter - print_item("$record->{item} [$first_init$last_init]") + print_item("$record->{item} [$first_init$last_init]"); } print_subtitle("Resources / offered"); @@ -1004,7 +1008,7 @@ END $first_init =~ s/^([a-z])/\U$1/; ## capitalise first letter $last_init =~ s/^([a-z])/\U$1/; ## capitalise first letter - print_item("$record->{item} [$first_init$last_init]") + print_item("$record->{item} [$first_init$last_init]"); } print(qq()); @@ -1012,16 +1016,13 @@ END $dbh->disconnect; &print_footer; - } + sub print_subtitle { my $string = shift; print < -

$string

-

- +
$string

END } @@ -1036,6 +1037,7 @@ sub print_item { END } + ############################################################################ # prepare expenditure