searchdesc improvements, more opac fixes

[koha_fer] / C4 / Bookfund.pm

diff --git a/C4/Bookfund.pm b/C4/Bookfund.pm
index 50bd464..7c00067 100644 (file)
--- a/C4/Bookfund.pm
+++ b/C4/Bookfund.pm
@@ -19,7 +19,7 @@ package C4::Bookfund;
 
 
 use strict;
-
+# use Smart::Comments;
 
 use vars qw($VERSION @ISA @EXPORT);
 
@@ -315,56 +315,42 @@ sub NewBookFund{
 
 =head3 ModBookFund
 
-&ModBookFund($bookfundname,$branchcode,$bookfundid);
-this function update the bookfundname and the branchcode on aqbookfund table
-on database.
+&ModBookFund($bookfundname,$bookfundid,$current_branch, $branchcode) =
+this function update the bookfundname and the branchcode on aqbookfund table on database.
 
 =cut
 
+
 sub ModBookFund {
     my ($bookfundname,$bookfundid,$current_branch, $branchcode) = @_;
 
     my $dbh = C4::Context->dbh;
-=c
-    my $query = "
-        UPDATE aqbookfund
-        SET    bookfundname = ?,
-               branchcode = ?
-        WHERE  bookfundid = ?
-        AND branchcode= ?
-    ";
-    warn "$bookfundname,$branchcode, $bookfundid,$current_branch";
-
-    my $sth=$dbh->prepare($query);
-    $sth->execute($bookfundname,"$branchcode", $bookfundid,"$current_branch");
-=cut
 
- my $retval = $dbh->do('
+    my $retval = $dbh->do("
      UPDATE aqbookfund
-        SET    bookfundname = $bookfundname, 
-               branchcode = $branchcode
-        WHERE  bookfundid = $bookfundid
-        AND branchcode= $current_branch
-    ');
-
-    warn "$bookfundname,$branchcode, $bookfundid,$current_branch";
-### $retval
+        SET    bookfundname = '$bookfundname', 
+               branchcode = '$branchcode'
+        WHERE  bookfundid = '$bookfundid'
+        AND branchcode = '$current_branch'
+    ");
 
+    ### $retval
 
+    # budgets depending on a bookfund must have the same branchcode
 
-# budgets depending on a bookfund must have the same branchcode
-# if the bookfund branchcode is set
-    if (defined $branchcode) {
-        $query = "
-            UPDATE  aqbudget
+    # if the bookfund branchcode is set, and previous update is successfull, then update aqbudget.branchcode too.
+    if (defined $branchcode && $retval > 0) {
+        my $query = "UPDATE  aqbudget  
             SET     branchcode = ?
-            WHERE   bookfundid = ?
-        ";
-        $sth=$dbh->prepare($query);
+            WHERE   bookfundid = ? ";
+
+        my $sth=$dbh->prepare($query);
         $sth->execute($branchcode, $bookfundid) ;
     }
 }
 
+
+
 #-------------------------------------------------------------#
 
 =head3 SearchBookFund