X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fcheck_parent_total.pl;h=cd3678b389ae7a918722f632a50759485dfba5bc;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=f0f8c9b85a9f3f3b2897c791ce5fe7ffc66fb694;hpb=2ea6fdec156419fbbdd5f64da927d0b2b45e751c;p=koha_fer

diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl
index f0f8c9b85a..cd3678b389 100755
--- a/admin/check_parent_total.pl
+++ b/admin/check_parent_total.pl
@@ -61,19 +61,12 @@ 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);
     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 $sth   = $dbh->prepare($query);
+    $sth->execute( $parent->{'budget_id'} );
     my $sum = $sth->fetchrow_hashref;
     $sth->finish;
-    
     $sub_unalloc = $parent->{'budget_amount'} - $sum->{sum};
-        
 #    TRICKY.. , IF THE PARENT IS THE CURRENT PARENT  - THEN SUBSTRACT CURRENT BUDGET FROM TOTAL
     $sub_unalloc           += $budget->{'budget_amount'} if ( $budget->{'budget_parent_id'} == $parent_id ) ;
 }
@@ -96,6 +89,14 @@ else {
     $budget_period_unalloc = $period->{'budget_period_total'} - $period_sum->{'sum'} if $period->{'budget_period_total'};
 }
 
+# FIXME - we really need a better way to do this consistently
+# and across the board, be it bigints, Math::FixedPoint, a
+# modernized version of Math::Curency that isn't tied to the system
+# locale, or something else.
+$total                 = sprintf( "%.2f", $total );
+$sub_unalloc           = sprintf( "%.2f", $sub_unalloc );
+$budget_period_unalloc = sprintf( "%.2f", $budget_period_unalloc );
+
 if ( $parent_id) {
     if ( ($total > $sub_unalloc ) && $sub_unalloc )  {
         $returncode = 1;