X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fcheck_parent_total.pl;h=f0f8c9b85a9f3f3b2897c791ce5fe7ffc66fb694;hb=b2a649cfd8172f97958837b40e9894c7a6cdd30c;hp=d5b784d6a883da25775b6d29457ea2b0fc1a1e6f;hpb=aaa0cdb9e82930b2d920ee02b71673e6e236b5f8;p=koha.git diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl index d5b784d6a8..f0f8c9b85a 100755 --- a/admin/check_parent_total.pl +++ b/admin/check_parent_total.pl @@ -62,7 +62,13 @@ my ($sub_unalloc , $period_sum, $budget_period_unalloc); if ($parent) { my $query = " SELECT SUM(budget_amount) as sum FROM aqbudgets where budget_parent_id = ? "; my $sth = $dbh->prepare($query); - $sth->execute( $parent->{'budget_id'} ); + my @sql_params; + push @sql_params, $parent->{'budget_id'} ; + if ($budget_id){ + $query.=qq| and budget_id <> ? |; + push @sql_params,$budget_id; + } + $sth->execute( @sql_params ); my $sum = $sth->fetchrow_hashref; $sth->finish; @@ -75,10 +81,16 @@ if ($parent) { # ELSE , IF NO PARENT PASSED, THEN CHECK UNALLOCATED FOR PERIOD, IF NOT THEN RETURN 2 else { my $query = qq| SELECT SUM(budget_amount) as sum - FROM aqbudgets WHERE budget_period_id = ? and budget_parent_id IS NULL|; + FROM aqbudgets WHERE budget_period_id = ? and budget_parent_id IS NULL |; + my @sql_params; + push @sql_params, $period_id; + if ($budget_id){ + $query.=qq| and budget_id <> ? |; + push @sql_params,$budget_id; + } - my $sth = $dbh->prepare($query); - $sth->execute( $period_id ); + my $sth = $dbh->prepare($query); + $sth->execute(@sql_params); $period_sum = $sth->fetchrow_hashref; $sth->finish; $budget_period_unalloc = $period->{'budget_period_total'} - $period_sum->{'sum'} if $period->{'budget_period_total'};