[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/C4/Circulation Fines.pm [rel_3_0]
From: |
Bruno Toumi |
Subject: |
[Koha-cvs] koha/C4/Circulation Fines.pm [rel_3_0] |
Date: |
Mon, 30 Oct 2006 11:20:18 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Bruno Toumi <btoumi> 06/10/30 11:20:18
Modified files:
C4/Circulation : Fines.pm
Log message:
remove function getnexaccountno form Fines.pm because this function
always exist in Accounts2.pm
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Fines.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.14.2.3&r2=1.14.2.4
Patches:
Index: Fines.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -b -r1.14.2.3 -r1.14.2.4
--- Fines.pm 24 Oct 2006 08:46:26 -0000 1.14.2.3
+++ Fines.pm 30 Oct 2006 11:20:17 -0000 1.14.2.4
@@ -1,6 +1,6 @@
package C4::Circulation::Fines;
-# $Id: Fines.pm,v 1.14.2.3 2006/10/24 08:46:26 btoumi Exp $
+# $Id: Fines.pm,v 1.14.2.4 2006/10/30 11:20:17 btoumi Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -25,6 +25,7 @@
use C4::Context;
use Date::Manip qw/UnixDate/;
use vars qw($VERSION @ISA @EXPORT);
+use C4::Accounts2;
# set the version for version checking
@@ -60,7 +61,6 @@
&CheckBorrowerDebarred
&GetIssuesIteminfo
&GetNextIdNotify
- &GetMaxAccountno
&GetOverdueDelays
&GetOverduerules
&GetFine
@@ -425,8 +425,8 @@
# my @accountno = $sth3->fetchrow_array;
# $sth3->finish;
# $accountno[0]++;
- my $accountno=GetMaxAccountno();
- $accountno++;
+# begin transaction
+ my $nextaccntno = getnextacctno(undef,$bornum,$dbh);
my $sth2 = $dbh->prepare(
"Insert into accountlines
(borrowernumber,itemnumber,date,amount,
@@ -435,7 +435,7 @@
);
$sth2->execute( $bornum, $itemnum, $amount,
"$type $title->{'title'} $due",
- $amount, $accountno );
+ $amount, $nextaccntno);
$sth2->finish;
}
$sth->finish;
@@ -557,27 +557,6 @@
}
-=item GetMaxAccountno
-
- $accountno = &GetMaxAccountno();
-
-Looks up for Next Account number.
-
-=cut
-
-#'
-sub GetMaxAccountno {
- my $dbh = C4::Context->dbh;
- my $query=qq|SELECT max(accountno)
- FROM accountlines|;
- my $sth = $dbh->prepare($query);
- $sth->execute();
- my $accountnomax = $sth->fetchrow_array;
- $sth->finish;
- return ($accountnomax);
-}
-
-
sub ReplacementCost2 {
my ( $itemnum, $bornum ) = @_;
@@ -759,16 +738,16 @@
sub CreateItemAccountLine {
my
($borrowernumber,$itemnumber,$date,$amount,$description,$accounttype,$amountoutstanding,$timestamp,$notify_id,$level)address@hidden;
- my $accountno=GetMaxAccountno();
- $accountno++;
-
+ my $dbh = C4::Context->dbh;
+ my $nextaccntno = getnextacctno(undef,$borrowernumber,$dbh);
my $query= qq|INSERT into accountlines
(borrowernumber,accountno,itemnumber,date,amount,description,accounttype,amountoutstanding,timestamp,notify_id,notify_level)
VALUES
(?,?,?,?,?,?,?,?,?,?,?)|;
- my $dbh = C4::Context->dbh;
+
+
my $sth=$dbh->prepare($query);
-
$sth->execute($borrowernumber,$accountno,$itemnumber,$date,$amount,$description,$accounttype,$amountoutstanding,$timestamp,$notify_id,$level);
+
$sth->execute($borrowernumber,$nextaccntno,$itemnumber,$date,$amount,$description,$accounttype,$amountoutstanding,$timestamp,$notify_id,$level);
$sth->finish;
}