[Koha-cvs] koha C4/Koha.pm C4/Circulation/Circ2.pm circ/br...
Joshua Ferraro
jmf at liblime.com
Sat Mar 10 07:28:07 CET 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: Joshua Ferraro <kados> 07/03/10 06:28:07
Modified files:
C4 : Koha.pm
C4/Circulation : Circ2.pm
circ : branchoverdues.pl
koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder:
unimarc_field_100.tmpl
Log message:
finish fixing spelling error on department
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchoverdues.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl?cvsroot=koha&r1=1.2&r2=1.3
Patches:
Index: C4/Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- C4/Koha.pm 9 Mar 2007 14:31:47 -0000 1.48
+++ C4/Koha.pm 10 Mar 2007 06:28:06 -0000 1.49
@@ -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.48 2007/03/09 14:31:47 tipaul Exp $
+# $Id: Koha.pm,v 1.49 2007/03/10 06:28:06 kados Exp $
use strict;
require Exporter;
@@ -25,7 +25,7 @@
use C4::Output;
use vars qw($VERSION @ISA @EXPORT);
-$VERSION = do { my @v = '$Revision: 1.48 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.49 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -70,8 +70,8 @@
&getitemtypeimagesrcfromurl
&get_infos_of
&get_notforloan_label_of
- &GetDepartements
- &GetDepartementLib
+ &GetDepartments
+ &GetDepartmentLib
&getitemtypeimagedir
&getitemtypeimagesrc
&GetAuthorisedValues
@@ -1088,24 +1088,24 @@
return; #$secondary_servers_loop;
}
-sub GetDepartements {
+sub GetDepartments {
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(
"SELECT authorised_value,lib FROM authorised_values WHERE category='DPT'
"
);
$sth->execute;
- my @getdepartements;
+ my @getdepartments;
my $i = 0;
while ( my $data = $sth->fetchrow_hashref ) {
- $getdepartements[$i] = $data;
+ $getdepartments[$i] = $data;
$i++;
}
$sth->finish;
- return (@getdepartements);
+ return (@getdepartments);
}
-sub GetDepartementLib {
+sub GetDepartmentLib {
my ($authorisedvalue) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare(
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- C4/Circulation/Circ2.pm 9 Mar 2007 23:30:17 -0000 1.125
+++ C4/Circulation/Circ2.pm 10 Mar 2007 06:28:07 -0000 1.126
@@ -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.125 2007/03/09 23:30:17 kados Exp $
+# $Id: Circ2.pm,v 1.126 2007/03/10 06:28:07 kados Exp $
use strict;
require Exporter;
@@ -41,7 +41,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.125 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.126 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -2900,14 +2900,14 @@
=head2 GetOverduesForBranch
Sql request for display all information for branchoverdues.pl
-2 possibilities : with or without departement .
+2 possibilities : with or without department .
display is filtered by branch
=cut
sub GetOverduesForBranch {
- my ( $branch, $departement) = @_;
- if ( not $departement ) {
+ my ( $branch, $department) = @_;
+ if ( not $department ) {
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("
SELECT
@@ -2998,7 +2998,7 @@
AND (issues.date_due <= NOW())
ORDER BY borrowers.surname
" );
- $sth->execute( $branch, $departement);
+ $sth->execute( $branch, $department);
my @getoverdues;
my $i = 0;
while ( my $data = $sth->fetchrow_hashref ) {
Index: circ/branchoverdues.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchoverdues.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- circ/branchoverdues.pl 10 Mar 2007 06:22:52 -0000 1.3
+++ circ/branchoverdues.pl 10 Mar 2007 06:28:07 -0000 1.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: branchoverdues.pl,v 1.3 2007/03/10 06:22:52 kados Exp $
+# $Id: branchoverdues.pl,v 1.4 2007/03/10 06:28:07 kados Exp $
#
# This file is part of Koha.
#
@@ -24,7 +24,7 @@
use C4::Auth;
use C4::Date;
use C4::Circulation::Circ2; # AddNotifyLine
-use C4::Koha; # GetDepartement...
+use C4::Koha; # GetDepartment...
use Mail::Sendmail;
use Getopt::Long;
use Date::Calc qw/Today Today_and_Now Now/;
@@ -104,7 +104,7 @@
# filter by department
if ($department) {
- my ( $departmentlib, $departmentValue ) = GetDepartementLib($department);
+ my ( $departmentlib, $departmentValue ) = GetDepartmentLib($department);
$template->param(
department => $departmentlib,
departmentValue => $departmentValue,
@@ -113,7 +113,7 @@
else {
# initiate the selector of departments .....
- my @getdepartments = GetDepartements();
+ my @getdepartments = GetDepartments();
my @departmentsloop;
foreach my $dpt (@getdepartments) {
my %department;
Index: koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl 9 Mar 2007 15:39:04 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_100.tmpl 10 Mar 2007 06:28:07 -0000 1.3
@@ -320,9 +320,9 @@
<option value="b">etat/province</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="f8c" -->
- <option value="c" SELECTED>compte/departement</option>
+ <option value="c" SELECTED>compte/department</option>
<!-- TMPL_ELSE -->
- <option value="c">compte/departement</option>
+ <option value="c">compte/department</option>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="f8d" -->
<option value="d"
@@ -332,10 +332,10 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF name="f8e" -->
<option value="e"
- SELECTED>multi-local(inter-departemental,
+ SELECTED>multi-local(inter-departmental,
etc. sous le niveau national)</option>
<!-- TMPL_ELSE -->
- <option value="e">multi-local(inter-departemental,
+ <option value="e">multi-local(inter-departmental,
etc. sous le niveau national)</option>
<!-- /TMPL_IF -->
More information about the Koha-cvs
mailing list