[Koha-cvs] koha admin/auth_subfields_structure.pl admin/ma...
paul poulain
paul at koha-fr.org
Tue Jun 5 10:54:22 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/06/05 08:54:21
Modified files:
admin : auth_subfields_structure.pl
marc_subfields_structure.pl
authorities : blinddetail-biblio-search.pl
circ : transferstoreceive.pl waitingreserves.pl
koha-tmpl/errors: 400.pl 401.pl 402.pl 403.pl 404.pl 500.pl
koha-tmpl/intranet-tmpl/prog/en/authorities:
blinddetail-biblio-search.tmpl
koha-tmpl/intranet-tmpl/prog/en/serials: claims.tmpl
koha-tmpl/intranet-tmpl/prog/en/tools: export.tmpl
koha-tmpl/intranet-tmpl/prog/fr/admin: branches.tmpl
koha-tmpl/intranet-tmpl/prog/fr/authorities:
blinddetail-biblio-search.tmpl
koha-tmpl/intranet-tmpl/prog/fr/catalogue: advsearch.tmpl
koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder:
marc21_leader.tmpl
koha-tmpl/intranet-tmpl/prog/fr/circ: branchoverdues.tmpl
koha-tmpl/intranet-tmpl/prog/fr/includes: menu-acqui.inc
menu-admin.inc
menu-catalogue.inc
menu-circ.inc
menu-members.inc
menu-serials.inc
menus.inc
koha-tmpl/intranet-tmpl/prog/fr/includes/calendar:
calendar-setup.js
calendar.js
koha-tmpl/intranet-tmpl/prog/fr/serials: checkexpiration.tmpl
claims.tmpl
subscription-add.tmpl
subscription-detail.tmpl
koha-tmpl/intranet-tmpl/prog/fr/tools: export.tmpl
members : mancredit.pl maninvoice.pl
reserve : renewscript.pl
serials : claims.pl
Log message:
some (minor, functionnaly speaking) bugfixes
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_subfields_structure.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/admin/marc_subfields_structure.pl?cvsroot=koha&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/koha/authorities/blinddetail-biblio-search.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/circ/transferstoreceive.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/circ/waitingreserves.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/errors/400.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/errors/401.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/errors/402.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/errors/403.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/errors/404.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/errors/500.pl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/members/mancredit.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/members/maninvoice.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/renewscript.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/serials/claims.pl?cvsroot=koha&r1=1.5&r2=1.6
Patches:
Index: admin/auth_subfields_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- admin/auth_subfields_structure.pl 24 Apr 2007 13:54:28 -0000 1.12
+++ admin/auth_subfields_structure.pl 5 Jun 2007 08:54:17 -0000 1.13
@@ -132,6 +132,7 @@
push (@value_builder,$line);
}
}
+ @value_builder= sort {$a cmp $b} @value_builder;
closedir DIR;
# build values list
@@ -240,14 +241,8 @@
-checked => $data->{'isurl'}?'checked':'',
-value => 1,
-label => '');
- $row_data{link} = CGI::checkbox( -name => "link$i",
- -id => "link$i",
- -checked => $data->{'link'}?'checked':'',
- -value => 1,
- -label => '');
$row_data{row} = $i;
$row_data{toggle} = $toggle;
- # $row_data{link} = CGI::escapeHTML($data->{'link'});
push(@loop_data, \%row_data);
$i++;
}
@@ -345,12 +340,6 @@
-tabindex=>'',
-multiple=>0,
);
- $row_data{link} = CGI::checkbox( -name => "link",
- -id => "link$i",
- -checked => '',
- -value => 1,
- -label => '');
- # $row_data{link} = CGI::escapeHTML($data->{'link'});
$row_data{toggle} = $toggle;
$row_data{row} = $i;
push(@loop_data, \%row_data);
@@ -369,12 +358,12 @@
} elsif ($op eq 'add_validate') {
my $dbh = C4::Context->dbh;
$template->param(tagfield => "$input->param('tagfield')");
- my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl, link)
- values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+ my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl)
+ values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
my @tagsubfield = $input->param('tagsubfield');
my @liblibrarian = $input->param('liblibrarian');
my @libopac = $input->param('libopac');
- my @kohafield = $input->param('kohafield');
+ my @kohafield = ''.$input->param('kohafield');
my @tab = $input->param('tab');
my @seealso = $input->param('seealso');
my @hidden;
@@ -385,7 +374,6 @@
my $authtypecode = $input->param('authtypecode');
my @frameworkcodes = $input->param('frameworkcode');
my @value_builder =$input->param('value_builder');
- my @link =$input->param('link');
for (my $i=0; $i<= $#tagsubfield ; $i++) {
my $tagfield =$input->param('tagfield');
my $tagsubfield =$tagsubfield[$i];
@@ -402,7 +390,6 @@
my $value_builder=$value_builder[$i];
my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
my $isurl = $input->param("isurl$i")?1:0;
- my $link = $input->param("link$i")?1:0;
if ($liblibrarian) {
unless (C4::Context->config('demo') eq 1) {
$sth->execute($authtypecode,
@@ -420,7 +407,6 @@
$value_builder,
$hidden,
$isurl,
- $link,
);
}
}
@@ -485,7 +471,6 @@
$row_data{value_builder} = $results->[$i]{'value_builder'};
$row_data{hidden} = $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
$row_data{isurl} = $results->[$i]{'isurl'};
- $row_data{link} = $results->[$i]{'link'};
$row_data{delete} = "$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield=".$results->[$i]{'tagsubfield'}."&authtypecode=$authtypecode";
$row_data{toggle} = $toggle;
if ($row_data{tab} eq -1) {
Index: admin/marc_subfields_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- admin/marc_subfields_structure.pl 4 May 2007 16:24:08 -0000 1.44
+++ admin/marc_subfields_structure.pl 5 Jun 2007 08:54:17 -0000 1.45
@@ -155,6 +155,7 @@
push( @value_builder, $line );
}
}
+ @value_builder= sort {$a cmp $b} @value_builder;
closedir DIR;
# build values list
Index: authorities/blinddetail-biblio-search.pl
===================================================================
RCS file: /sources/koha/koha/authorities/blinddetail-biblio-search.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- authorities/blinddetail-biblio-search.pl 24 Apr 2007 13:54:29 -0000 1.12
+++ authorities/blinddetail-biblio-search.pl 5 Jun 2007 08:54:18 -0000 1.13
@@ -60,10 +60,8 @@
my $tagslib = &GetTagsLabels(1,$authtypecode);
my $auth_type = GetAuthType($authtypecode);
- warn "XX = ".$auth_type->{auth_tag_to_report};
my $record =GetAuthority($authid);
- warn "record auth :".$record->as_formatted;
# open template
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "authorities/blinddetail-biblio-search.tmpl",
Index: circ/transferstoreceive.pl
===================================================================
RCS file: /sources/koha/koha/circ/transferstoreceive.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- circ/transferstoreceive.pl 22 May 2007 09:13:55 -0000 1.4
+++ circ/transferstoreceive.pl 5 Jun 2007 08:54:18 -0000 1.5
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: transferstoreceive.pl,v 1.4 2007/05/22 09:13:55 tipaul Exp $
+# $Id: transferstoreceive.pl,v 1.5 2007/06/05 08:54:18 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -29,7 +29,6 @@
use C4::Biblio;
use C4::Circulation;
use C4::Members;
-#use C4::Interface::CGI::Output;
use Date::Calc qw(
Today
Add_Delta_Days
Index: circ/waitingreserves.pl
===================================================================
RCS file: /sources/koha/koha/circ/waitingreserves.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- circ/waitingreserves.pl 4 May 2007 10:18:00 -0000 1.4
+++ circ/waitingreserves.pl 5 Jun 2007 08:54:18 -0000 1.5
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: waitingreserves.pl,v 1.4 2007/05/04 10:18:00 alaurin Exp $
+# $Id: waitingreserves.pl,v 1.5 2007/06/05 08:54:18 tipaul Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -37,7 +37,6 @@
);
use C4::Reserves;
use C4::Koha;
-# use C4::Interface::CGI::Output;
my $input = new CGI;
Index: koha-tmpl/errors/400.pl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/errors/400.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/errors/400.pl 9 Mar 2007 14:41:32 -0000 1.3
+++ koha-tmpl/errors/400.pl 5 Jun 2007 08:54:18 -0000 1.4
@@ -4,7 +4,6 @@
use CGI;
use C4::Auth;
use C4::Output;
-use C4::Interface::CGI::Output;
use C4::Context;
Index: koha-tmpl/errors/401.pl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/errors/401.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/errors/401.pl 9 Mar 2007 14:41:32 -0000 1.3
+++ koha-tmpl/errors/401.pl 5 Jun 2007 08:54:18 -0000 1.4
@@ -4,7 +4,6 @@
use CGI;
use C4::Auth;
use C4::Output;
-use C4::Interface::CGI::Output;
use C4::Context;
Index: koha-tmpl/errors/402.pl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/errors/402.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/errors/402.pl 9 Mar 2007 14:41:32 -0000 1.3
+++ koha-tmpl/errors/402.pl 5 Jun 2007 08:54:18 -0000 1.4
@@ -4,7 +4,6 @@
use CGI;
use C4::Auth;
use C4::Output;
-use C4::Interface::CGI::Output;
use C4::Context;
Index: koha-tmpl/errors/403.pl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/errors/403.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/errors/403.pl 9 Mar 2007 14:41:32 -0000 1.3
+++ koha-tmpl/errors/403.pl 5 Jun 2007 08:54:18 -0000 1.4
@@ -4,7 +4,6 @@
use CGI;
use C4::Auth;
use C4::Output;
-use C4::Interface::CGI::Output;
use C4::Context;
Index: koha-tmpl/errors/404.pl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/errors/404.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/errors/404.pl 9 Mar 2007 14:41:32 -0000 1.3
+++ koha-tmpl/errors/404.pl 5 Jun 2007 08:54:18 -0000 1.4
@@ -4,7 +4,6 @@
use CGI;
use C4::Auth;
use C4::Output;
-use C4::Interface::CGI::Output;
use C4::Context;
Index: koha-tmpl/errors/500.pl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/errors/500.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/errors/500.pl 9 Mar 2007 14:41:32 -0000 1.3
+++ koha-tmpl/errors/500.pl 5 Jun 2007 08:54:18 -0000 1.4
@@ -4,7 +4,6 @@
use CGI;
use C4::Auth;
use C4::Output;
-use C4::Interface::CGI::Output;
use C4::Context;
Index: koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl 16 Mar 2007 01:25:09 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl 5 Jun 2007 08:54:18 -0000 1.4
@@ -1,4 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<Title>Koha -- Authority details</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<script type="text/javascript">
function go()
@@ -53,4 +56,4 @@
<script language="javascript" type="text/javascript">
window.onload = go();
</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom" -->
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
Index: koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl 22 May 2007 09:13:58 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl 5 Jun 2007 08:54:19 -0000 1.7
@@ -29,6 +29,7 @@
<p>
<form name="claims" action="claims.pl" method="post">
<!-- TMPL_VAR name="CGIsupplier" -->
+ <input type="submit" value="OK" />
<!-- TMPL_IF name="phone" -->Phone: <!-- TMPL_VAR name="phone" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="booksellerfax" -->Fax: <!-- TMPL_VAR name="booksellerfax" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="bookselleremail" --></p><p><a href="mailto:<!-- TMPL_VAR name="bookselleremail" -->"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF -->
@@ -53,7 +54,7 @@
<!-- TMPL_IF NAME="missingissues" -->
<h3>Missing Issues</h3>
- <table cellpadding="0" cellspacing="0" border="0" class="collapse">
+ <table>
<tr>
<!--TMPL_IF Name=letter-->
<th class="cell-header"> </th>
@@ -69,7 +70,7 @@
<tr>
<!--TMPL_IF Name=letter-->
<td class="cell">
- <input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->" onclick="document.claims.op='send_alert';">
+ <input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->" onclick="document.claims.op='send_alert';" />
</td>
<!--/TMPL_IF-->
<td class="cell">
@@ -98,7 +99,7 @@
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_ELSE -->
- <p>There are no missing issues to claim</p>
+ <p>Select a supplier</p>
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="singlesupplier"-->
@@ -146,7 +147,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="missingissues" -->
<h3>Missing Issues</h3>
- <table cellpadding="0" cellspacing="4" border="0" width="550" class="collapse">
+ <table>
<tr>
<td class="cell"><b>Supplier<b></td>
<td class="cell"><b>Title</b></td>
Index: koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl 11 Mar 2007 21:08:14 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl 5 Jun 2007 08:54:19 -0000 1.7
@@ -1,13 +1,13 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-</title>Koha › MARC biblio export</title>
+<title>Koha › MARC biblio export</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
-<h2>Select biblios to export</h2>
+<h1>Select biblios to export</h1>
<p>
- <b>Note : The items are exported by this tool.</b>
+ <b>Note : The items are exported by this tool unless specified.</b>
</p>
<form method="post" action="/cgi-bin/koha/tools/export.pl">
@@ -18,6 +18,8 @@
<p>
<label for="start">from biblio number</label>
<input id="start" type="text" name="StartingBiblionumber" size="5" />
+ <p>
+ </p>
<label for="end">to biblio number :</label>
<input id="end" type="text" name="EndingBiblionumber" size="5" />
</p>
@@ -50,6 +52,8 @@
<p>
<label for="startcn">from itemcallnumber</label>
<input id="startcn" type="text" name="start_callnumber" size="5" />
+ </p>
+ <p>
<label for="endcn">to itemcallnumber : </label>
<input id="endcn" type="text" name="end_callnumber" size="5" />
</p>
@@ -58,13 +62,15 @@
<legend>
Options
</legend>
+ <p>
<label for="dont_export_item">Don't export items</label>
<input id="dont_export_item" type="checkbox" name="dont_export_item" />
- <br />
+ </p>
+ <p>
<label for="dont_export_fields">Don't export fields</label>
<input id="dont_export_fields" type="text" name="dont_export_fields" />
<i>splitted by a blank. (for example: 100a 200 606)</i>
- <br />
+ </p>
</fieldset>
<fieldset>
<legend>
Index: koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl 23 May 2007 09:55:28 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl 5 Jun 2007 08:54:19 -0000 1.2
@@ -46,7 +46,7 @@
<p><label>Téléphone</label><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></p>
<p><label>Fax</label><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></p>
<p><label>Email</label><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></p>
- <p><label>Identifiant site </label><input type="text" name="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /></p>
+ <p><label>Adresses IP du site </label><input type="text" name="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /></p>
<p><label>Imprimante du site</label>
<select id="branchprinter" name="branchprinter">
<option value="">Aucun</option>
@@ -90,7 +90,7 @@
<th>Code</th>
<th>Adresse</th>
<th>Catégorie</th>
- <th>Identifiant site </th>
+ <th>Adresses IP du site </th>
<th>Imprimante du site</th>
<th> </th>
<th> </th>
Index: koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl 23 May 2007 09:55:30 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl 5 Jun 2007 08:54:19 -0000 1.2
@@ -1,4 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<Title>Koha -- Détails autorité</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
<script type="text/javascript">
function go()
@@ -53,4 +56,4 @@
<script language="javascript" type="text/javascript">
window.onload = go();
</script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom" -->
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
Index: koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl 23 May 2007 09:55:32 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl 5 Jun 2007 08:54:19 -0000 1.2
@@ -73,7 +73,7 @@
<option value="nt" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Remarques/Commentaires</option>
<option value="pb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Editeur</option>
<option value="pl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Lieu de publication</option>
- <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
+ <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Date de publication</option>
<option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Numéro normalisé</option>
<option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> ISBN</option>
<option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->> ISSN</option>
Index: koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl 23 May 2007 10:13:40 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl 5 Jun 2007 08:54:19 -0000 1.2
@@ -7,7 +7,7 @@
<title>Constructeur du label</title>
</head>
<body>
-<form name="f_pop" onSubmit="javascript:report()">
+<form name="f_pop">
<table>
<tr>
<td>1-4 Taille enregistrement</td>
@@ -307,7 +307,7 @@
<td>(auto-rempli)</td>
<tr>
- <tr><td colspan=2><input type="submit" value="OK"></td></tr>
+ <tr><td colspan=2><input type="button" value="OK" onClick="javascript:report()"></td></tr>
</table>
</form>
<script>
Index: koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl 23 May 2007 09:55:34 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl 5 Jun 2007 08:54:20 -0000 1.2
@@ -22,7 +22,7 @@
<p>Sélectionnez une localisation
<form name="selectlocation" action="branchoverdues.pl" method="post">
<select id="location" name="location">
- <option value="">Tous les sites</option>
+ <option value="">Toutes les localisations</option>
<!-- TMPL_LOOP NAME="locationsloop" -->
<option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
<!-- /TMPL_LOOP -->
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc 30 May 2007 09:33:20 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc 5 Jun 2007 08:54:20 -0000 1.3
@@ -1,5 +1,5 @@
<div id="submenu">
- <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Add supplier</a> <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a> <a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a> <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Manage suggestions</a> <a href="/cgi-bin/koha/admin/aqbookfund.pl">Parameters</a>
+ <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Ajout fournisseur</a> <a href="/cgi-bin/koha/acqui/lateorders.pl">Commandes en retard</a> <a href="/cgi-bin/koha/acqui/histsearch.pl">Recherche historique</a> <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Gestion suggestions</a> <a href="/cgi-bin/koha/admin/aqbookfund.pl">Paramètres</a>
</div>
<div id="main">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc 30 May 2007 09:33:20 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc 5 Jun 2007 08:54:20 -0000 1.3
@@ -1,9 +1,9 @@
<div id="submenu">
<p>
- <a href="/cgi-bin/koha/admin/branches.pl">Branches</a> <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a> <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a> <a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a> <a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a>
+ <a href="/cgi-bin/koha/admin/branches.pl">Sites</a><a href="/cgi-bin/koha/admin/aqbookfund.pl">Budgets</a><a href="/cgi-bin/koha/admin/itemtypes.pl">Types documents</a> <a href="/cgi-bin/koha/admin/categorie.pl">Catégories d'adhérent</a><a href="/cgi-bin/koha/admin/issuingrules.pl">Règles de prêt</a>
</p>
<p>
- <a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a> <a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Framework</a> <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a>
+ <a href="/cgi-bin/koha/admin/biblio_framework.pl">Grilles catalogage</a> <a href="/cgi-bin/koha/admin/authtypes.pl">Grilles Autorités</a> <a href="/cgi-bin/koha/admin/authorised_values.pl">Valeurs autorisées</a>
</p>
</div>
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc 30 May 2007 09:33:20 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc 5 Jun 2007 08:54:20 -0000 1.3
@@ -1,5 +1,5 @@
<div id="submenu">
- <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a>
+ <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Gérer les commentaire</a>
</div>
<div id="main">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc 30 May 2007 09:33:20 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc 5 Jun 2007 08:54:20 -0000 1.3
@@ -1,5 +1,5 @@
<div id="submenu">
- <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a> <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="reserves waiting to have an item affected">Pending reserves</a> <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="reserves waiting for member pickup">Waiting reserves</a> <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transfers to do</a> <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transfers to receive</a> <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues</a> <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a>
+ <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Choix du site</a> <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="reserves waiting to have an item affected">Réservations à traiter</a> <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="reserves waiting for member pickup">Réservations en attente</a> <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transferts à faire</a> <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transferts à recevoir</a> <a href="/cgi-bin/koha/circ/branchoverdues.pl">Retards</a> <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Etat de caisse (aujourd'hui)</a>
</div>
<div id="main">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc 30 May 2007 09:33:20 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc 5 Jun 2007 08:54:20 -0000 1.3
@@ -1,5 +1,5 @@
<div id="submenu">
- <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A">Add adult</a> <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C">Add child</a> <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P">Add professional</a> <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I">Add organisation</a>
+ <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A">Inscription adulte</a><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C">Inscription enfant</a><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P">Inscription professionnel</a><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I">Inscription collectivité</a>
</div>
<div id="main">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc 23 May 2007 10:03:55 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc 5 Jun 2007 08:54:20 -0000 1.2
@@ -1,5 +1,5 @@
<div id="submenu">
- <a href="/cgi-bin/koha/serials/serials-home.pl">Accueil</a> <a href="/cgi-bin/koha/serials/claims.pl">Réclamations</a> <a href="/cgi-bin/koha/serials/subscription-add.pl">Ajout abonnement</a> <a href="/cgi-bin/koha/serials/checkexpiration.pl">Dates d'expiration</a>
+ <a href="/cgi-bin/koha/serials/serials-home.pl">Accueil</a> <a href="/cgi-bin/koha/serials/claims.pl">Réclamations</a> <a href="/cgi-bin/koha/serials/subscription-add.pl">Ajout abonnement</a> <a href="/cgi-bin/koha/serials/checkexpiration.pl">Expirations</a>
</div>
<div id="main">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc 23 May 2007 10:03:55 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc 5 Jun 2007 08:54:20 -0000 1.2
@@ -78,9 +78,9 @@
<!-- TMPL_IF NAME="loggedinusername" -->
<ul>
<li>
- <b> Login information</b>
+ <b> Information de connexion</b>
</li>
- <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b> at <b><!-- TMPL_VAR NAME="LoginBranchname" --></b></li>
+ <li>Connecté en tant que : <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b> à <b><!-- TMPL_VAR NAME="LoginBranchname" --></b></li>
<!-- TMPL_IF NAME="AutoLocation" -->
<li>autolocalisation activée</li>
<!-- TMPL_ELSE -->
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js 30 May 2007 09:33:20 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js 5 Jun 2007 08:54:20 -0000 1.4
@@ -19,7 +19,7 @@
* than modifying calendar.js itself).
*/
-// $Id: calendar-setup.js,v 1.3 2007/05/30 09:33:20 tipaul Exp $
+// $Id: calendar-setup.js,v 1.4 2007/06/05 08:54:20 tipaul Exp $
/**
* This function "patches" an input field (or other element) to use a calendar
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js 30 May 2007 09:33:21 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js 5 Jun 2007 08:54:20 -0000 1.4
@@ -10,7 +10,7 @@
* Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
*/
-// $Id: calendar.js,v 1.3 2007/05/30 09:33:21 tipaul Exp $
+// $Id: calendar.js,v 1.4 2007/06/05 08:54:20 tipaul Exp $
/** The Calendar object constructor. */
Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
Index: koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl 23 May 2007 09:55:41 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl 5 Jun 2007 08:54:20 -0000 1.2
@@ -1,5 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Dates d'expiration</title>
+<title>Koha › Expiration des abonnements</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- Additions to enable Calendar system -->
Index: koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl 23 May 2007 09:55:42 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl 5 Jun 2007 08:54:20 -0000 1.2
@@ -29,6 +29,7 @@
<p>
<form name="claims" action="claims.pl" method="post">
<!-- TMPL_VAR name="CGIsupplier" -->
+ <input type="submit" value="OK" />
<!-- TMPL_IF name="phone" -->Téléphone : <!-- TMPL_VAR name="phone" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="booksellerfax" -->Fax : <!-- TMPL_VAR name="booksellerfax" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="bookselleremail" --></p><p><a href="mailto:<!-- TMPL_VAR name="bookselleremail" -->"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF -->
@@ -53,7 +54,7 @@
<!-- TMPL_IF NAME="missingissues" -->
<h3>Liste des numéros attendus, en retard et manquants</h3>
- <table cellpadding="0" cellspacing="0" border="0" class="collapse">
+ <table>
<tr>
<!--TMPL_IF Name=letter-->
<th class="cell-header"> </th>
@@ -69,7 +70,7 @@
<tr>
<!--TMPL_IF Name=letter-->
<td class="cell">
- <input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->" onclick="document.claims.op='send_alert';">
+ <input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->" onclick="document.claims.op='send_alert';" />
</td>
<!--/TMPL_IF-->
<td class="cell">
@@ -98,7 +99,7 @@
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_ELSE -->
- <p>Il n'y a pas de numéros manquants à réclamer</p>
+ <p>Select a supplier</p>
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="singlesupplier"-->
@@ -134,7 +135,7 @@
Email : <!-- TMPL_VAR NAME="contemail" --><br />
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="accountnumber" -->
- A/C: <!-- TMPL_VAR NAME="accountnumber" --></p>
+ A/C : <!-- TMPL_VAR NAME="accountnumber" --></p>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="contact" -->
<p>Cher <!-- TMPL_VAR NAME="contact" --></p>
@@ -146,7 +147,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="missingissues" -->
<h3>Liste des numéros attendus, en retard et manquants</h3>
- <table cellpadding="0" cellspacing="4" border="0" width="550" class="collapse">
+ <table>
<tr>
<td class="cell"><b>Fournisseur<b></td>
<td class="cell"><b>Titre</b></td>
Index: koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl 30 May 2007 09:33:21 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl 5 Jun 2007 08:54:21 -0000 1.4
@@ -435,7 +435,7 @@
}
error=errortext;
} else {
- errortext +=expected+_("numéro(s) attendu(s)")+rollover+_("sont entrés. <br \\/>Merci de signaler à quelle(s) date(s) vous n'attendez pas de numéro <br \\/>");
+ errortext +=expected+_("uméro(s) attendu(s)")+rollover+_("sont entrés. <br \\/>Merci de signaler à quelle(s) date(s) vous n'attendez pas de numéro <br \\/>");
var count=0;
for(var i=rollover;i<expected;i++){
errortext +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
@@ -447,11 +447,11 @@
}
}
if(toobig){
- errortext +=expectedover+_("numéro(s) attendu(s)")+rollover+_("sont entrés.<br \\/>Vous sembler avoir signalé plus de numéros par an que prévu.");
+ errortext +=expectedover+_("uméro(s) attendu(s)")+rollover+_("sont entrés.<br \\/>Vous sembler avoir signalé plus de numéros par an que prévu.");
error=errortext;
}
if(error.length ==0){
- error=_('Pas d'irrégularités détectées');
+ error=_('Pas d irrégularités détectées');
}
display_example(expected);
document.getElementById("irregularity").innerHTML = error;
Index: koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl 25 May 2007 16:27:58 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl 5 Jun 2007 08:54:21 -0000 1.3
@@ -138,7 +138,7 @@
<h1>Abonnement N°<!--TMPL_VAR name="subscriptionid"--></h1>
<!--TMPL_IF Name="abouttoexpire"--><div class="problem">L'abonnement va expirer. Il faut le renouveller.</div><!--/TMPL_IF-->
<div id="action">
- <a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a> <a href="subscription-add.pl?op=dup&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a> <a href="subscription-renew.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Renew </a> <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&serstatus=1">Receive</a> <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a>
+ <a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Modifier</a> <a href="subscription-add.pl?op=dup&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Dupliquer</a> <a href="subscription-renew.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Renouveller</a> <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&serstatus=1">Bulletiner</a><a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Etat de collection</a>
<!-- TMPL_IF NAME="routing" -->
<a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Modifier la liste de circulation</a>
<!-- TMPL_ELSE -->
@@ -209,7 +209,7 @@
</p>
<p><label>Modèle de numérotation : </label>
<!-- TMPL_IF name="numberpattern1" -->
- Number only
+ Nombre seulement
<!-- /TMPL_IF -->
<!-- TMPL_IF name="numberpattern2" -->
Volume, Numéro, Fascicule
Index: koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl 23 May 2007 09:55:44 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl 5 Jun 2007 08:54:21 -0000 1.2
@@ -1,13 +1,13 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-</title>Koha › Exportation de notice MARC</title>
+<title>Koha › Exportation de notice MARC</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
-<h2>Sélectionnez les notices à exporter : </h2>
+<h1>Sélectionnez les notices à exporter : </h1>
<p>
- <b>Remarque : les exemplaires sont exportés par cet outil.</b>
+ <b>Note : The items are exported by this tool unless specified.</b>
</p>
<form method="post" action="/cgi-bin/koha/tools/export.pl">
@@ -18,6 +18,8 @@
<p>
<label for="start">à partir de la notice numéro</label>
<input id="start" type="text" name="StartingBiblionumber" size="5" />
+ <p>
+ </p>
<label for="end">à la notice N° : </label>
<input id="end" type="text" name="EndingBiblionumber" size="5" />
</p>
@@ -50,6 +52,8 @@
<p>
<label for="startcn">Ã partir de la cote</label>
<input id="startcn" type="text" name="start_callnumber" size="5" />
+ </p>
+ <p>
<label for="endcn">Ã la cote : </label>
<input id="endcn" type="text" name="end_callnumber" size="5" />
</p>
@@ -58,12 +62,14 @@
<legend>
Options
</legend>
+ <p>
<label for="dont_export_item">Ne pas exporter les exemplaires</label>
<input id="dont_export_item" type="checkbox" name="dont_export_item" />
- <br />
+ </p>
+ <p>
<label for="dont_export_fields">Ne pas exporter les champs</label>
<input id="dont_export_fields" type="text" name="dont_export_fields" /> <i>séparé par un blanc. (par exemple : 100a 200 606)</i>
- <br />
+ </p>
</fieldset>
<fieldset>
<legend>
Index: members/mancredit.pl
===================================================================
RCS file: /sources/koha/koha/members/mancredit.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- members/mancredit.pl 24 Apr 2007 13:54:29 -0000 1.9
+++ members/mancredit.pl 5 Jun 2007 08:54:21 -0000 1.10
@@ -59,7 +59,7 @@
surname => $data->{'surname'},
);
print $input->header(
- -type => guesstype($template->output),
+ -type => 'utf-8',
-cookie => $cookie
),$template->output;
Index: members/maninvoice.pl
===================================================================
RCS file: /sources/koha/koha/members/maninvoice.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- members/maninvoice.pl 24 Apr 2007 13:54:29 -0000 1.9
+++ members/maninvoice.pl 5 Jun 2007 08:54:21 -0000 1.10
@@ -59,7 +59,7 @@
surname => $data->{'surname'},
);
print $input->header(
- -type => guesstype($template->output),
+ -type => 'utf-8',
-cookie => $cookie
),$template->output;
}
Index: reserve/renewscript.pl
===================================================================
RCS file: /sources/koha/koha/reserve/renewscript.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- reserve/renewscript.pl 30 May 2007 09:33:22 -0000 1.8
+++ reserve/renewscript.pl 5 Jun 2007 08:54:21 -0000 1.9
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: renewscript.pl,v 1.8 2007/05/30 09:33:22 tipaul Exp $
+# $Id: renewscript.pl,v 1.9 2007/06/05 08:54:21 tipaul Exp $
#written 18/1/2000 by chris at katipo.co.nz
#script to renew items from the web
@@ -48,14 +48,14 @@
foreach my $itemno (@data) {
#check status before renewing issue
- warn "CanBookbeRenewed";
+# warn "CanBookbeRenewed";
if (CanBookBeRenewed($borrowernumber,$itemno)){
- warn "$itemno can be renewed for $borrowernumber";
+# warn "$itemno can be renewed for $borrowernumber";
AddRenewal($borrowernumber,$itemno);
- warn "renewal added";
- }else {
- warn "cannot renew";
- }
+# warn "renewal added";
+# }else {
+# warn "cannot renew";
+# }
}
#
Index: serials/claims.pl
===================================================================
RCS file: /sources/koha/koha/serials/claims.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- serials/claims.pl 24 Apr 2007 13:54:30 -0000 1.5
+++ serials/claims.pl 5 Jun 2007 08:54:21 -0000 1.6
@@ -17,7 +17,6 @@
my $claimletter = $input->param('claimletter');
my $supplierid = $input->param('supplierid');
my $order = $input->param('order');
-warn "order :$order";
my %supplierlist = GetSuppliersWithLateIssues;
my @select_supplier;
@@ -28,9 +27,14 @@
push @select_supplier, $supplierid
}
-my @letters = GetLetters("claimissues");
+my $letters = GetLetters("claimissues");
+my @letters;
+foreach (keys %$letters){
+ push @letters ,{code=>$_,name=> $letters->{$_}};
+}
+
my $letter=((scalar(@letters)>1)||($letters[0]->{name}||$letters[0]->{code}));
-my ($count2, @missingissues) = GetLateOrMissingIssues($supplierid,$serialid,$order);
+my ($count2, @missingissues) = GetLateOrMissingIssues($supplierid,$serialid,$order) if $supplierid;
my $CGIsupplier=CGI::scrolling_list( -name => 'supplierid',
-values => \@select_supplier,
More information about the Koha-cvs
mailing list