[Koha-cvs] koha/C4 Biblio.pm Serials.pm Circulation/Circ2.pm [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        07/01/10 16:46:28

Modified files:
        C4             : Biblio.pm Serials.pm 
        C4/Circulation : Circ2.pm 

Log message:
        Theses modules need to use C4::Log.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.178.2.46&r2=1.178.2.47
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Serials.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.5.2.20&r2=1.5.2.21
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.30&r2=1.114.2.31

Patches:
Index: Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.178.2.46
retrieving revision 1.178.2.47
diff -u -b -r1.178.2.46 -r1.178.2.47
--- Biblio.pm   10 Jan 2007 16:31:15 -0000      1.178.2.46
+++ Biblio.pm   10 Jan 2007 16:46:27 -0000      1.178.2.47
@@ -28,10 +28,12 @@
 use C4::Koha;
 use C4::Date;
 use utf8;
+use C4::Log; # logaction
+
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.178.2.46 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.178.2.47 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA = qw( Exporter );
 
@@ -3667,8 +3669,11 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.178.2.46 2007/01/10 16:31:15 toins Exp $
+# $Id: Biblio.pm,v 1.178.2.47 2007/01/10 16:46:27 toins Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.178.2.47  2007/01/10 16:46:27  toins
+# Theses modules need to use C4::Log.
+#
 # Revision 1.178.2.46  2007/01/10 16:31:15  toins
 # new systems preferences :
 #  - CataloguingLog (log the update/creation/deletion of a notice if set to 1)

Index: Serials.pm
===================================================================
RCS file: /sources/koha/koha/C4/Serials.pm,v
retrieving revision 1.5.2.20
retrieving revision 1.5.2.21
diff -u -b -r1.5.2.20 -r1.5.2.21
--- Serials.pm  10 Jan 2007 16:31:15 -0000      1.5.2.20
+++ Serials.pm  10 Jan 2007 16:46:28 -0000      1.5.2.21
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Serials.pm,v 1.5.2.20 2007/01/10 16:31:15 toins Exp $
+# $Id: Serials.pm,v 1.5.2.21 2007/01/10 16:46:28 toins Exp $
 
 use strict;
 use C4::Date;
@@ -28,12 +28,14 @@
 use C4::Biblio;
 use C4::Search;
 use C4::Letters;
+use C4::Log; # logaction
+
 require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.5.2.20 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.5.2.21 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 

Index: Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.30
retrieving revision 1.114.2.31
diff -u -b -r1.114.2.30 -r1.114.2.31
--- Circulation/Circ2.pm        10 Jan 2007 16:31:15 -0000      1.114.2.30
+++ Circulation/Circ2.pm        10 Jan 2007 16:46:28 -0000      1.114.2.31
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Circ2.pm,v 1.114.2.30 2007/01/10 16:31:15 toins Exp $
+# $Id: Circ2.pm,v 1.114.2.31 2007/01/10 16:46:28 toins Exp $
 
 use strict;
 require Exporter;
@@ -36,11 +36,12 @@
 );
 use POSIX qw(strftime);
 use C4::Branch; # GetBranches
+use C4::Log; # logaction
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.30 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.31 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1375,7 +1376,7 @@
         );
     }
     
-    
&logaction(C4::Context->userenv->{'number'},"CIRCULATION","ISSUE","barcode=".$barcode,"borrower=".$borrower)
 
+    
&logaction(C4::Context->userenv->{'number'},"CIRCULATION","ISSUE",$borrower->{'borrowernumber'},$barcode)
 
         if C4::Context->preference("IssueLog");
     
 }
@@ -1651,7 +1652,7 @@
         $borrower->{'borrowernumber'}
     );
     
-    
&logaction(C4::Context->userenv->{'number'},"CIRCULATION","RETURN","barcode=".$barcode."
 borrower=".$borrower,$messages) 
+    
&logaction(C4::Context->userenv->{'number'},"CIRCULATION","RETURN",$borrower->{'borrowernumber'},$barcode)
 
         if C4::Context->preference("ReturnLog");
         
     return ( $doreturn, $messages, $iteminformation, $borrower );