X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FBookfund.pm;h=7c00067501fe56916d717de0bc63223749c43aeb;hb=3de59aba2776184a6fd2e9943d86a7c66e8f7648;hp=4368ef5cf75755deed4750f966b0d00773854c66;hpb=04a108482dafd286a1c6bd8c4becc8cf56e1a46a;p=koha_gimpoz

diff --git a/C4/Bookfund.pm b/C4/Bookfund.pm
index 4368ef5cf7..7c00067501 100644
--- a/C4/Bookfund.pm
+++ b/C4/Bookfund.pm
@@ -17,15 +17,14 @@ package C4::Bookfund;
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 use strict;
-
+# use Smart::Comments;
 
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = 3.00;
 
 =head1 NAME
 
@@ -228,7 +227,7 @@ sub GetBookFundBreakdown {
         FROM   aqorders
         LEFT JOIN aqorderbreakdown ON aqorders.ordernumber=aqorderbreakdown.ordernumber
         LEFT JOIN aqbookfund ON (aqorderbreakdown.bookfundid=aqbookfund.bookfundid and aqorderbreakdown.branchcode=aqbookfund.branchcode)
-        LEFT JOIN aqbudget ON (aqbudget.bookfundid=aqbookfund.bookfundid and aqbudget.branchcode=aqbudget.branchcode)
+        LEFT JOIN aqbudget ON (aqbudget.bookfundid=aqbookfund.bookfundid and aqbudget.branchcode=aqbookfund.branchcode)
         WHERE  aqorderbreakdown.bookfundid=?
             AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
             AND ((budgetdate >= ? and budgetdate < ?) OR (startdate>=? and enddate<=?))
@@ -316,36 +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,$branchcode) = @_;
+    my ($bookfundname,$bookfundid,$current_branch, $branchcode) = @_;
+
     my $dbh = C4::Context->dbh;
-    my $query = "
-        UPDATE aqbookfund
-        SET    bookfundname = ?
-        WHERE  bookfundid = ?
-        AND branchcode= ?
-    ";
-    warn "name : $bookfundname";
-    my $sth=$dbh->prepare($query);
-    $sth->execute($bookfundname,$bookfundid,"$branchcode");
-# budgets depending on a bookfund must have the same branchcode
-# if the bookfund branchcode is set
-    if (defined $branchcode) {
-        $query = "
-            UPDATE aqbudget
-            SET branchcode = ?
-        ";
-        $sth=$dbh->prepare($query);
-        $sth->execute($branchcode);
+
+    my $retval = $dbh->do("
+     UPDATE aqbookfund
+        SET    bookfundname = '$bookfundname', 
+               branchcode = '$branchcode'
+        WHERE  bookfundid = '$bookfundid'
+        AND branchcode = '$current_branch'
+    ");
+
+    ### $retval
+
+    # budgets depending on a bookfund must have the same branchcode
+
+    # 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 = ? ";
+
+        my $sth=$dbh->prepare($query);
+        $sth->execute($branchcode, $bookfundid) ;
     }
 }
 
+
+
 #-------------------------------------------------------------#
 
 =head3 SearchBookFund
@@ -446,7 +451,7 @@ sub Countbookfund {
         AND   branchcode = ?
     ";
     my $sth = $dbh->prepare($query);
-    $sth->execute($bookfundid,$branchcode);
+    $sth->execute($bookfundid,"$branchcode");
     return $sth->fetchrow;
 }