From 231ea7c341caf316a93f7515eb0ce4597b2eabc6 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Sat, 12 Dec 2009 22:50:02 +1300 Subject: [PATCH] Bug 2505 enabling warnings --- about.pl | 2 +- acqui/acqui-home.pl | 14 ++++++++++---- mainpage.pl | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/about.pl b/about.pl index 735138cdc5..17316bf6f6 100755 --- a/about.pl +++ b/about.pl @@ -16,7 +16,7 @@ # Suite 330, Boston, MA 02111-1307 USA use strict; - +use warnings; use C4::Output; # contains gettemplate use C4::Auth; use C4::Context; diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index 291383e272..8c6fcc8d74 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -41,6 +41,7 @@ thus, it can be REJECTED, ACCEPTED, ORDERED, ASKED, AVAIBLE =cut use strict; +use warnings; use Number::Format; use CGI; @@ -146,14 +147,19 @@ foreach my $result (@results) { $result->{'budget_branchname'} = GetBranchName( $result->{'budget_branchcode'} ); my $member = GetMember( $result->{'budget_owner_id'} ); - my $member_full = $member->{'firstname'} . ' ' . $member->{'surname'}; + my $member_full = $member->{'firstname'} . ' ' . $member->{'surname'} if $member; $result->{'budget_owner'} = $member_full; - $result->{'budget_avail'} = $result->{'budget_amount'} - $result->{'budget_spent'}; + if ($result->{'budget_spent'}){ + $result->{'budget_avail'} = $result->{'budget_amount'} - $result->{'budget_spent'}; + } + else { + $result->{'budget_avail'} = $result->{'budget_amount'}; + } $result->{'budget_spent'} = GetBudgetSpent( $result->{'budget_id'} ); $total += $result->{'budget_amount'}; - $totspent += $result->{'budget_spent'}; + $totspent += $result->{'budget_spent'} if $result->{'budget_spent'}; $totavail += $result->{'budget_avail'}; $result->{'budget_amount'} = $num->format_price( $result->{'budget_amount'} ); @@ -164,7 +170,7 @@ foreach my $result (@results) { # $result->{'budget_spent_percent'} = sprintf( "%00d", $spent_percent ); my $borrower = &GetMember( $result->{budget_owner_id} ); - $result->{budget_owner_name} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'}; + $result->{budget_owner_name} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'} if $borrower; push( @loop_budget, { %{$result}, toggle => $toggle++ % 2, } ); } diff --git a/mainpage.pl b/mainpage.pl index 8116eebdb0..b5c0b1e1a9 100755 --- a/mainpage.pl +++ b/mainpage.pl @@ -17,7 +17,7 @@ # use strict; - +use warnings; use CGI; use C4::Output; use C4::Auth; -- 2.20.1