[Koha-cvs] koha acqui/orderreceive.pl C4/Koha.pm [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Henri-Damien LAURENT <hdl>	07/02/09 17:11:53

Modified files:
	acqui          : orderreceive.pl 
	C4             : Koha.pm 

Log message:
	Bug Fixing : Abiding by Coding dev rules.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/orderreceive.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.5&r2=1.2.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.40.2.35&r2=1.40.2.36

Patches:
Index: acqui/orderreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/Attic/orderreceive.pl,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.5 -r1.2.2.6
--- acqui/orderreceive.pl	25 Jan 2007 09:36:08 -0000	1.2.2.5
+++ acqui/orderreceive.pl	9 Feb 2007 17:11:52 -0000	1.2.2.6
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: orderreceive.pl,v 1.2.2.5 2007/01/25 09:36:08 tipaul Exp $
+# $Id: orderreceive.pl,v 1.2.2.6 2007/02/09 17:11:52 hdl Exp $
 
 #script to recieve orders
 #written by chris at katipo.co.nz 24/2/2000
@@ -115,7 +115,7 @@
     $template->param(itemtypeloop => \@itemtypesloop);
 
 
-    my $locations = GetKohaAuthorisedValues( $dbh, 'items.location' );
+    my $locations = GetKohaAuthorisedValues( 'items.location' );
     if ($locations) {
         my @location_codes = keys %$locations;
         my $CGIlocation    = CGI::scrolling_list(

Index: C4/Koha.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Koha.pm,v
retrieving revision 1.40.2.35
retrieving revision 1.40.2.36
diff -u -b -r1.40.2.35 -r1.40.2.36
--- C4/Koha.pm	9 Feb 2007 09:11:31 -0000	1.40.2.35
+++ C4/Koha.pm	9 Feb 2007 17:11:52 -0000	1.40.2.36
@@ -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: Koha.pm,v 1.40.2.35 2007/02/09 09:11:31 tipaul Exp $
+# $Id: Koha.pm,v 1.40.2.36 2007/02/09 17:11:52 hdl Exp $
 
 use strict;
 require Exporter;
@@ -25,7 +25,7 @@
 use C4::Output;
 use vars qw($VERSION @ISA @EXPORT);
 
-$VERSION = do { my @v = '$Revision: 1.40.2.35 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.40.2.36 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1563,7 +1563,7 @@
 =cut
 
 sub GetKohaAuthorisedValues {
-	my ($dbh, $kohafield) = @_;
+	my ($kohafield) = @_;
 	my %values;
     my   $sthnflstatus = $dbh->prepare('select authorised_value from marc_subfield_structure where kohafield=?');
         $sthnflstatus->execute($kohafield);