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

diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl
index ec5dd8b6c3..f0f8c9b85a 100755
--- 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,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;
     
@@ -74,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 = ?|;
+                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'};
@@ -94,7 +107,6 @@ if ( $parent_id) {
     $returncode = 0;
 }
 
-$template->param( return => $returncode );
 
-output_html_with_http_headers $input, $cookie, $template->output;
+output_html_with_http_headers $input, $cookie, $returncode;
 1;