Bug 8435: DBRev 3.13.00.038

[koha.git] / admin / check_parent_total.pl

diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl
index ac75346..f0f8c9b 100755 (executable)
--- a/admin/check_parent_total.pl
+++ b/admin/check_parent_total.pl
@@ -13,18 +13,19 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Context;
 use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 DESCRIPTION
 
 This script checks the amount unallocated from the new parent budget , or the period - if no parent_id is given
 
@@ -61,43 +62,51 @@ 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;
-
-    $sub_unalloc = $parent->{'budget_amount_sublevel'} - $sum->{sum};
-
+    
+    $sub_unalloc = $parent->{'budget_amount'} - $sum->{sum};
+        
 #    TRICKY.. , IF THE PARENT IS THE CURRENT PARENT  - THEN SUBSTRACT CURRENT BUDGET FROM TOTAL
-    if ( $budget->{'budget_parent_id'} == $parent_id ) {
-        $sub_unalloc           += ( $budget->{'budget_amount'} + $budget->{'budget_amount_sublevel'} );
-        $budget_period_unalloc += ( $budget->{'budget_amount'} + $budget->{'budget_amount_sublevel'} );
-    }
+    $sub_unalloc           += $budget->{'budget_amount'} if ( $budget->{'budget_parent_id'} == $parent_id ) ;
 }
 
 # ELSE , IF NO PARENT PASSED, THEN CHECK UNALLOCATED FOR PERIOD, IF NOT THEN RETURN 2
 else {
-    my $query = qq| SELECT (SUM(budget_amount_sublevel) +  SUM(budget_amount)) as sum
-                FROM aqbudgets WHERE budget_period_id = ?|;
+    my $query = qq| SELECT SUM(budget_amount) as sum
+                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->{'budget_period_total'}  ); 
+    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'};
+    $budget_period_unalloc = $period->{'budget_period_total'} - $period_sum->{'sum'} if $period->{'budget_period_total'};
 }
 
 if ( $parent_id) {
-    if (  $total > $sub_unalloc ) {
+    if ( ($total > $sub_unalloc ) && $sub_unalloc )  {
         $returncode = 1;
     }
-} elsif ( $total > $budget_period_unalloc ) {
+} elsif ( ( $total > $budget_period_unalloc ) && $budget_period_unalloc ) {
     $returncode = 2;
 
 } else {
     $returncode = 0;
 }
 
-$template->param( return => $returncode );
 
-output_html_with_http_headers $input, $cookie, $template->output;
+output_html_with_http_headers $input, $cookie, $returncode;
 1;