From 577a7bf0943533d17a5e5c6fe90ef044db06ca03 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 5 Jun 2007 08:54:17 +0000
Subject: [PATCH] some (minor, functionnaly speaking) bugfixes

---
 admin/auth_subfields_structure.pl             | 23 +-----
 admin/marc_subfields_structure.pl             |  1 +
 authorities/blinddetail-biblio-search.pl      |  2 -
 circ/transferstoreceive.pl                    |  1 -
 circ/waitingreserves.pl                       |  1 -
 koha-tmpl/errors/400.pl                       |  1 -
 koha-tmpl/errors/401.pl                       |  1 -
 koha-tmpl/errors/402.pl                       |  1 -
 koha-tmpl/errors/403.pl                       |  1 -
 koha-tmpl/errors/404.pl                       |  1 -
 koha-tmpl/errors/500.pl                       |  1 -
 .../blinddetail-biblio-search.tmpl            |  5 +-
 .../intranet-tmpl/prog/en/serials/claims.tmpl | 11 +--
 .../intranet-tmpl/prog/en/tools/export.tmpl   | 80 ++++++++++---------
 .../intranet-tmpl/prog/fr/admin/branches.tmpl |  4 +-
 .../blinddetail-biblio-search.tmpl            |  5 +-
 .../prog/fr/catalogue/advsearch.tmpl          |  2 +-
 .../value_builder/marc21_leader.tmpl          |  4 +-
 .../prog/fr/circ/branchoverdues.tmpl          |  2 +-
 .../prog/fr/includes/menu-acqui.inc           |  2 +-
 .../prog/fr/includes/menu-admin.inc           |  4 +-
 .../prog/fr/includes/menu-catalogue.inc       |  2 +-
 .../prog/fr/includes/menu-circ.inc            |  2 +-
 .../prog/fr/includes/menu-members.inc         |  2 +-
 .../prog/fr/includes/menu-serials.inc         |  2 +-
 .../intranet-tmpl/prog/fr/includes/menus.inc  |  4 +-
 .../prog/fr/serials/checkexpiration.tmpl      |  2 +-
 .../intranet-tmpl/prog/fr/serials/claims.tmpl | 13 +--
 .../prog/fr/serials/subscription-add.tmpl     |  6 +-
 .../prog/fr/serials/subscription-detail.tmpl  |  4 +-
 .../intranet-tmpl/prog/fr/tools/export.tmpl   | 80 ++++++++++---------
 members/mancredit.pl                          |  2 +-
 members/maninvoice.pl                         |  2 +-
 reserve/renewscript.pl                        | 12 +--
 serials/claims.pl                             | 10 ++-
 35 files changed, 148 insertions(+), 148 deletions(-)

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 6e465b64f6..b1e8b63914 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -132,6 +132,7 @@ if ($op eq 'add_form') {
 			push (@value_builder,$line);
 		}
 	}
+        @value_builder= sort {$a cmp $b} @value_builder;
 	closedir DIR;
 
 	# build values list
@@ -240,14 +241,8 @@ if ($op eq 'add_form') {
 			-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 @@ if ($op eq 'add_form') {
 		 			-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 @@ if ($op eq 'add_form') {
 } 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 @@ if ($op eq 'add_form') {
 	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 @@ if ($op eq 'add_form') {
 		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 @@ if ($op eq 'add_form') {
                               $value_builder,
                               $hidden,
                               $isurl,
-                              $link,
 					      );
 			}
 		}
@@ -485,7 +471,6 @@ if ($op eq 'add_form') {
 		$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&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&authtypecode=$authtypecode";
 		$row_data{toggle} = $toggle;
 		if ($row_data{tab} eq -1) {
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 376273e0a5..456db3c136 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -155,6 +155,7 @@ if ( $op eq 'add_form' ) {
             push( @value_builder, $line );
         }
     }
+    @value_builder= sort {$a cmp $b} @value_builder;
     closedir DIR;
 
     # build values list
diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index 9d57c8e8d5..a97248886e 100755
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -60,10 +60,8 @@ my $authtypecode = &GetAuthTypeCode($authid);
 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",
diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index dd31ead0e0..34d3cc897b 100644
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -29,7 +29,6 @@ use C4::Date;
 use C4::Biblio;
 use C4::Circulation;
 use C4::Members;
-#use C4::Interface::CGI::Output;
 use Date::Calc qw(
   Today
   Add_Delta_Days
diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index fea193529c..f3a0f6f328 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -37,7 +37,6 @@ use Date::Calc qw(
 );
 use C4::Reserves;
 use C4::Koha;
-# use C4::Interface::CGI::Output;
 
 my $input = new CGI;
 
diff --git a/koha-tmpl/errors/400.pl b/koha-tmpl/errors/400.pl
index cf328e6fa7..a804b4a448 100755
--- a/koha-tmpl/errors/400.pl
+++ b/koha-tmpl/errors/400.pl
@@ -4,7 +4,6 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 
diff --git a/koha-tmpl/errors/401.pl b/koha-tmpl/errors/401.pl
index ed02d4e0e0..bd0e8fc6f7 100755
--- a/koha-tmpl/errors/401.pl
+++ b/koha-tmpl/errors/401.pl
@@ -4,7 +4,6 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 
diff --git a/koha-tmpl/errors/402.pl b/koha-tmpl/errors/402.pl
index 632d3a6970..de7a2157eb 100755
--- a/koha-tmpl/errors/402.pl
+++ b/koha-tmpl/errors/402.pl
@@ -4,7 +4,6 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 
diff --git a/koha-tmpl/errors/403.pl b/koha-tmpl/errors/403.pl
index 9760c467f5..073b3fb56a 100755
--- a/koha-tmpl/errors/403.pl
+++ b/koha-tmpl/errors/403.pl
@@ -4,7 +4,6 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 
diff --git a/koha-tmpl/errors/404.pl b/koha-tmpl/errors/404.pl
index 95dc494d43..1af16f76bd 100755
--- a/koha-tmpl/errors/404.pl
+++ b/koha-tmpl/errors/404.pl
@@ -4,7 +4,6 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 
diff --git a/koha-tmpl/errors/500.pl b/koha-tmpl/errors/500.pl
index 72d14ea32e..0847d16d6c 100755
--- a/koha-tmpl/errors/500.pl
+++ b/koha-tmpl/errors/500.pl
@@ -4,7 +4,6 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
 use C4::Context;
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
index 0f73869a2d..afbad4fe7e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
@@ -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 @@ while (i>=0) {
 <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
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
index fa81273d20..30d8ac30f8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
@@ -28,7 +28,8 @@ function Setorder(myorder){
 
 	<p>
 	<form name="claims" action="claims.pl" method="post">
-	<!-- TMPL_VAR name="CGIsupplier" -->
+    <!-- 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 @@ function Setorder(myorder){
 
 		<!-- 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">&nbsp;</th>
@@ -69,7 +70,7 @@ function Setorder(myorder){
 				<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 @@ function Setorder(myorder){
 			<!-- /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 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
 	<!-- /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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
index 0540627183..af7a9891b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
@@ -1,13 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-</title>Koha &rsaquo; MARC biblio export</title>
+<title>Koha &rsaquo; 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">
@@ -15,15 +15,17 @@
     <legend>
         Records
     </legend>
-    	<p>
-    	    <label for="start">from biblio number</label>
-    	    <input id="start" type="text" name="StartingBiblionumber" size="5" />
-    	    <label for="end">to biblio number :</label>
-    	    <input id="end" type="text" name="EndingBiblionumber" size="5" />
-    	</p>
-    	
-    	<p>
-    	    <label for="itemtypes" >Document type</label>
+        <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>
+        
+        <p>
+            <label for="itemtypes" >Document type</label>
             <select name="itemtype">
                 <option value="">-- All --</option>
                 <!-- TMPL_LOOP NAME="itemtypeloop" -->
@@ -33,54 +35,58 @@
                     </option>
                 <!-- /TMPL_LOOP -->
             </select>
-    	</p>
-    	
-    	<p>
-    	    <label for="branch">Branch</label>
-    	    <select id="branch" name="branch">
-    	    <option value="">-- All --</option>
+        </p>
+        
+        <p>
+            <label for="branch">Branch</label>
+            <select id="branch" name="branch">
+            <option value="">-- All --</option>
                 <!-- TMPL_LOOP name="branchloop" -->
                     <option value="<!-- TMPL_VAR name="value" -->"
-                     <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                    <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
                         <!-- TMPL_VAR name="branchname" -->
                     </option>
                     <!-- /TMPL_LOOP -->
                 </select>
         </p>
-    	<p>
-    	    <label for="startcn">from itemcallnumber</label>
-    	    <input id="startcn" type="text" name="start_callnumber" size="5" />
-        	<label for="endcn">to itemcallnumber : </label>
-        	<input id="endcn" type="text" name="end_callnumber" size="5" />
+        <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>
     </fieldset>
     <fieldset>
     <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>
         Output format
     </legend>
-    	<p>
-    	    <label for="output_format">into </label>
-    	    <select id="output_format" name="output_format">
-    	        <option value="marc">marc</option>
-    	        <option value="xml">xml</option>
-    	    </select>
-    	    format.
-    	</p>
-	</fieldset>
-	<input type="hidden" name="op" value="export" />
-	<input type="submit" value="Export" class="button" />
+        <p>
+            <label for="output_format">into </label>
+            <select id="output_format" name="output_format">
+                <option value="marc">marc</option>
+                <option value="xml">xml</option>
+            </select>
+            format.
+        </p>
+    </fieldset>
+    <input type="hidden" name="op" value="export" />
+    <input type="submit" value="Export" class="button" />
 </form>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl
index e4d55699a3..db7694dc40 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/admin/branches.tmpl
@@ -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>&nbsp;</th>
             <th>&nbsp;</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl
index 0f73869a2d..503be495e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl
@@ -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 @@ while (i>=0) {
 <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
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl
index db8aebc15a..556c9a6df2 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/advsearch.tmpl
@@ -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 -->>&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
     <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl
index 73e401b936..f6c7527b6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/value_builder/marc21_leader.tmpl
@@ -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>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl
index b486fa3de7..fd0c42cab9 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/circ/branchoverdues.tmpl
@@ -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 -->
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc
index cbf43b3b44..5f7c645e7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc
@@ -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">
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc
index 80498e442e..54cdfdd039 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc
@@ -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>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc
index ce1d962613..1592443441 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc
@@ -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">
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc
index 5f382bba80..853dec8166 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc
@@ -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">
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc
index e567d506e4..80afef43b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a>  <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a>  <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a>  <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Inscription adulte</a><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Inscription enfant</a><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Inscription professionnel</a><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Inscription collectivité</a>
 </div>
 
 <div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc
index 68254a4eab..15a93457a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-serials.inc
@@ -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">
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc
index cca7ef4900..2ddd5f18fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc
@@ -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 -->
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl
index 885b80f3fa..14af14230a 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/checkexpiration.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Dates d'expiration</title>
+<title>Koha &rsaquo; Expiration des abonnements</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl
index 52ab9eb5ec..6510cc634f 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl
@@ -28,7 +28,8 @@ function Setorder(myorder){
 
 	<p>
 	<form name="claims" action="claims.pl" method="post">
-	<!-- TMPL_VAR name="CGIsupplier" -->
+    <!-- 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 @@ function Setorder(myorder){
 
 		<!-- 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">&nbsp;</th>
@@ -69,7 +70,7 @@ function Setorder(myorder){
 				<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 @@ function Setorder(myorder){
 			<!-- /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 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
 		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 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let
 	<!-- /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>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
index 76e93ab7c2..800ce47f30 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
@@ -435,7 +435,7 @@ function irregularity_check(){
             }
             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 @@ function irregularity_check(){
         }
     }
     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;
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl
index ac96d504e6..8ddbd3ec1a 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl
@@ -138,7 +138,7 @@ function irregularity(){
     <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&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>  <a href="subscription-add.pl?op=dup&amp;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" -->&amp;serstatus=1">Receive</a>  <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a>
+        <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Modifier</a> <a href="subscription-add.pl?op=dup&amp;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" -->&amp;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 @@ function irregularity(){
             </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
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl
index c8bf997b5e..e1b448ccd1 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl
@@ -1,13 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-</title>Koha &rsaquo; Exportation de notice MARC</title>
+<title>Koha &rsaquo; 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">
@@ -15,15 +15,17 @@
     <legend>
         Notices
     </legend>
-    	<p>
-    	    <label for="start">à partir de la notice numéro</label>
-    	    <input id="start" type="text" name="StartingBiblionumber" size="5" />
-    	    <label for="end">à la notice N° : </label>
-    	    <input id="end" type="text" name="EndingBiblionumber" size="5" />
-    	</p>
-    	
-    	<p>
-    	    <label for="itemtypes" >Type document</label>
+        <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>
+        
+        <p>
+            <label for="itemtypes" >Type document</label>
             <select name="itemtype">
                 <option value="">-- Tout --</option>
                 <!-- TMPL_LOOP NAME="itemtypeloop" -->
@@ -33,53 +35,57 @@
                     </option>
                 <!-- /TMPL_LOOP -->
             </select>
-    	</p>
-    	
-    	<p>
-    	    <label for="branch">Site</label>
-    	    <select id="branch" name="branch">
-    	    <option value="">-- Tout --</option>
+        </p>
+        
+        <p>
+            <label for="branch">Site</label>
+            <select id="branch" name="branch">
+            <option value="">-- Tout --</option>
                 <!-- TMPL_LOOP name="branchloop" -->
                     <option value="<!-- TMPL_VAR name="value" -->"
-                     <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                    <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
                         <!-- TMPL_VAR name="branchname" -->
                     </option>
                     <!-- /TMPL_LOOP -->
                 </select>
         </p>
-    	<p>
-    	    <label for="startcn">à partir de la cote</label>
-    	    <input id="startcn" type="text" name="start_callnumber" size="5" />
-        	<label for="endcn">à la cote :  </label>
-        	<input id="endcn" type="text" name="end_callnumber" size="5" />
+        <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>
     </fieldset>
     <fieldset>
     <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>
         Format de sortie
     </legend>
-    	<p>
-    	    <label for="output_format">en </label>
-    	    <select id="output_format" name="output_format">
-    	        <option value="marc">marc</option>
-    	        <option value="xml">xml</option>
-    	    </select>
-    	    format.
-    	</p>
-	</fieldset>
-	<input type="hidden" name="op" value="export" />
-	<input type="submit" value="Exportation" class="button">
+        <p>
+            <label for="output_format">en </label>
+            <select id="output_format" name="output_format">
+                <option value="marc">marc</option>
+                <option value="xml">xml</option>
+            </select>
+            format.
+        </p>
+    </fieldset>
+    <input type="hidden" name="op" value="export" />
+    <input type="submit" value="Exportation" class="button">
 </form>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/members/mancredit.pl b/members/mancredit.pl
index 54678635cb..4f2fe508f3 100755
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -59,7 +59,7 @@ if ($add){
                     surname  => $data->{'surname'},
     );
 	print $input->header(
-	    -type => guesstype($template->output),
+	    -type => 'utf-8',
 	    -cookie => $cookie
 	),$template->output;
 
diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 6ff6c26e76..a09f308ced 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -59,7 +59,7 @@ if ($add){
                     surname  => $data->{'surname'},
     );
     print $input->header(
-	    -type => guesstype($template->output),
+	    -type => 'utf-8',
 	    -cookie => $cookie
     ),$template->output;
 }
diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
index 26dea47fea..198139f911 100755
--- a/reserve/renewscript.pl
+++ b/reserve/renewscript.pl
@@ -48,14 +48,14 @@ my $borrowernumber = $input->param("borrowernumber");
 
 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";
+#	}
 }
 
 #
diff --git a/serials/claims.pl b/serials/claims.pl
index be12b9c268..da8ae3ada6 100755
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -17,7 +17,6 @@ my $op = $input->param('op');
 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 @@ foreach my $supplierid (keys %supplierlist){
 	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,
-- 
2.39.2