From mjr at towers.org.uk  Sun Jul  1 20:43:57 2007
From: mjr at towers.org.uk (MJR)
Date: Sun, 01 Jul 2007 18:43:57 +0000
Subject: [Koha-cvs] koha/installer install.pl
Message-ID: <E1I54Or-0001hH-JP@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	MJR <slef>	07/07/01 18:43:57

Modified files:
	installer      : install.pl 

Log message:
	Use DBI not mysql command-line to load the database tables

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/installer/install.pl?cvsroot=koha&r1=1.9&r2=1.10

Patches:
Index: install.pl
===================================================================
RCS file: /sources/koha/koha/installer/install.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- install.pl	26 Jun 2007 14:30:22 -0000	1.9
+++ install.pl	1 Jul 2007 18:43:57 -0000	1.10
@@ -334,13 +334,14 @@
     $template->param($op=>1)
   }elsif ($op && $op eq 'importdatastructure'){
     #Import data structure and show errors if any
-    my $filename="kohastructure.sql";
-    undef $/;
-    my $strcmd="mysql ".($info{hostname}?"-h $info{hostname} ":"").($info{port}?"-P $info{port} ":"").($info{user}?"-u $info{user} ":"").($info{password}?"-p$info{password}":"")." $info{dbname} ";
-    my $str = qx($strcmd < $filename 2>&1);
-    $str=~s/\n|\r/<br \/>/g;
-    $template->param("error"=>$str ,
+	#Uses DBI to read the file [MJR 2007-07-01]
+    my $dbh= DBI->connect("DBI:$info{dbms}:$info{dbname}:$info{hostname}".($info{port}?":$info{port}":""),$info{'user'}, $info{'password'});
+    open(INPUT,"<kohastructure.sql");
+    map { $dbh->do($_); } split(/;/,join('',<INPUT>));
+    close(INPUT);
+	$template->param("error"=>$dbh->errstr ,
 	                 "$op"=> 1, );
+    $dbh->disconnect;
   } else {
     #Check if there are enough tables.
     # Version 2_2 was 74 tables, so we check if there is more than 75




From crc at liblime.com  Mon Jul  2 00:05:33 2007
From: crc at liblime.com (Chris Cormack)
Date: Sun, 01 Jul 2007 22:05:33 +0000
Subject: [Koha-cvs] koha koha-tmpl/intranet-tmpl/default/en/reports...
	[rel_2_2]
Message-ID: <E1I57Xx-0005hM-RC@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Chris Cormack <rangi>	07/07/01 22:05:33

Modified files:
	koha-tmpl/intranet-tmpl/default/en/reports: reports-home.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/reports: reports-home.tmpl 
Added files:
	reports        : processing_report.pl 
	koha-tmpl/intranet-tmpl/default/en/reports: 
	                                            processing_report.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/reports: processing_report.tmpl 

Log message:
	Adding Processing orders report

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/reports/processing_report.pl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.2&r2=1.9.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl?cvsroot=koha&only_with_tag=rel_2_2&rev=1.1.2.1

Patches:
Index: koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/Attic/reports-home.tmpl,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -b -r1.9.2.2 -r1.9.2.3
--- koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl	7 Apr 2005 10:17:45 -0000	1.9.2.2
+++ koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl	1 Jul 2007 22:05:33 -0000	1.9.2.3
@@ -31,6 +31,7 @@
 	<ul>
 		<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
 		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
+		<li><a href="/cgi-bin/koha/reports/processing_report.pl">Orders Processing report</a></li>
 	</ul>
 	<p>on issues</p>
 	<ul>

Index: koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/Attic/reports-home.tmpl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl	21 Apr 2005 19:38:11 -0000	1.4.2.2
+++ koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl	1 Jul 2007 22:05:33 -0000	1.4.2.3
@@ -19,6 +19,7 @@
 	<ul>
 		<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
 		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
+		<li><a href="/cgi-bin/koha/reports/processing_report.pl">Orders Processing report</a></li>
 	</ul>
 </div>
 

Index: reports/processing_report.pl
===================================================================
RCS file: reports/processing_report.pl
diff -N reports/processing_report.pl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ reports/processing_report.pl	1 Jul 2007 22:05:33 -0000	1.1.2.1
@@ -0,0 +1,230 @@
+#!/usr/bin/perl
+
+# $Id: processing_report.pl,v 1.1.2.1 2007/07/01 22:05:33 rangi Exp $
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+# test comment
+
+use strict;
+use C4::Auth;
+use CGI;
+use C4::Context;
+use HTML::Template;
+use C4::Koha;
+use C4::Interface::CGI::Output;
+use Date::Manip;
+use C4::Date;
+
+#use Data::Dumper;
+
+my $dbh = C4::Context->dbh;
+
+my $input          = new CGI;
+my $do_it          = $input->param('do_it');
+my $fullreportname = "reports/processing_report.tmpl";
+my $from           = $input->param("from");
+my $to             = $input->param("to");
+my $branch         = $input->param("branch");
+my $notreceived    = $input->param("notreceived");
+
+#warn "from=$from, to=$to, branch=$branch=";
+
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => $fullreportname,
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 1,
+        flagsrequired   => { editcatalogue => 1 },
+        debug           => 1,
+    }
+);
+$template->param( do_it => $do_it );
+
+my $dbh = C4::Context->dbh;
+my @values;
+my %labels;
+my %select;
+my @select;
+
+# id to and from are blank, populate with min and max amount, to return all results.
+
+$branch = 'All'        if ( !$branch );
+$from   = '0000-00-00' if ( !$from );
+$to     = '9999-99-99' if ( !$to );
+
+my $req;
+
+# get real branches (with a valid branchename), not mending, transit etc...
+$req = $dbh->prepare(
+    "   SELECT branches.branchcode, branchname
+        FROM branches, branchrelations
+        WHERE categorycode = 'RE' AND
+        branches.branchcode = branchrelations.branchcode "
+);
+
+$req->execute;
+undef @select;
+undef %select;
+push @select, "All";
+$select{"All"} = "All";
+
+while ( my ( $value, $desc ) = $req->fetchrow ) {
+    push @select, $value;
+    $select{$value} = $desc;
+}
+my $CGIBranches = CGI::scrolling_list(
+    -name     => 'branch',
+    -id       => 'branch',
+    -values   => \@select,
+    -labels   => \%select,
+    -size     => 1,
+    -multiple => 0
+);
+
+$template->param( CGIBranches => $CGIBranches, );
+
+#--------------------------------------------------------
+if ($do_it) {
+
+    my @orders;
+    my @resultloop;
+    my $toggle;
+    my $i = 0;
+    my @results;
+    my $results;
+    my $count = 0;
+
+    # get all the orders from startdate to enddate....
+    my $query = " select * from aqorders, aqorderbreakdown  where ";
+    $query .= "entrydate > ? and " if ($from);
+
+    if ($to) {
+        $query .= "(datereceived < ? ";
+        $query .= "or datereceived is null" if ( $notreceived eq 'on' );
+        $query .= ") ";
+
+    }
+
+    $query .= " and aqorders.ordernumber = aqorderbreakdown.ordernumber";
+    $query .= " ORDER by title";
+
+
+    #warn "query = $query";
+
+    my $sth = $dbh->prepare($query);
+    $sth->execute( $from, $to );
+
+    while ( my $data = $sth->fetchrow_hashref ) {
+        my $datereceived     = $data->{'datereceived'};
+        my $biblioitemnumber = $data->{'biblioitemnumber'};
+
+        # lets get some item info (if an item has been created
+        # and get some issue info too
+
+        $DB::single = 1;
+        my $query1 =
+"select * from items where biblioitemnumber = ? and dateaccessioned  = ? limit 1";
+        my $sth1 = $dbh->prepare($query1);
+        $sth1->execute( $biblioitemnumber, $datereceived );
+        my $data1 = $sth1->fetchrow_hashref;
+
+        if ( $data1->{'homebranch'} eq $branch || $branch eq 'All' ) {
+            $data->{'homebranch'}      = $data1->{'homebranch'};
+            $data->{'itemnumber'}      = $data1->{'itemnumber'};
+            $data->{'dateaccessioned'} = $data1->{'dateaccessioned'};
+            $sth1->finish;
+            my $query2 = "select  datetime from statistics where 
+		itemnumber = ? and (type = 'return' or type = 'issue') 
+		order by datetime limit 1";
+            my $sth2 = $dbh->prepare($query2);
+            $sth2->execute( $data->{'itemnumber'} );
+            my $data2 = $sth2->fetchrow_array;
+
+            $data->{'shelvedate'} = datetime_to_date($data2);
+            $sth2->finish;
+
+            # lets work out the number of total days in processing;
+
+            my $date1 = &ParseDate( $data->{'datereceived'} );
+            my $date2 = &ParseDate( $data->{'shelvedate'} );
+            if ( $data->{'shelvedate'} && $data->{'datereceived'} ) {
+                my $err;
+                my $delta = &DateCalc( $date1, $date2, \$err );
+                my $delta = &Delta_Format( $delta, 'exact', '%dt' );
+                my @delta = split /\./, $delta;
+
+                $data->{'delta'} = $delta[0];
+            }
+
+	    $date1 = &ParseDate( $data->{'entrydate'} );
+            $date2 = &ParseDate( $data->{'datereceived'} );
+            if ( $data->{'entrydate'} && $data->{'datereceived'} ) {
+                my $err;
+                my $delta = &DateCalc( $date1, $date2, \$err );
+                my $delta = &Delta_Format( $delta, 'exact', '%dt' );
+                my @delta = split /\./, $delta;
+
+                $data->{'onorder'} = $delta[0];
+            }
+            
+
+            $results[$count] = $data;
+            $count++;
+        }
+
+    }
+    $sth->finish;
+
+    #--------------------------------------------------------
+
+    for ( my $i = 0 ; $i < $count ; $i++ ) {
+        $toggle = $i % 2 ? 0 : 1;
+        my %line;
+        $line{'ordernumber'}     = $results[$i]->{'ordernumber'};
+        $line{'title'}           = $results[$i]->{'title'};
+        $line{'biblionumber'}    = $results[$i]->{'biblionumber'};
+        $line{'homebranch'}      = $results[$i]->{'homebranch'};
+        $line{'entrydate'}       = $results[$i]->{'entrydate'};
+        $line{'datereceived'}    = $results[$i]->{'datereceived'};
+        $line{'returndate'}      = $results[$i]->{'returndate'};
+        $line{'dateaccessioned'} = $results[$i]->{'dateaccessioned'};
+        $line{'shelvedate'}      = $results[$i]->{'shelvedate'};
+        $line{'delta'}           = $results[$i]->{'delta'};
+        $line{'onorder'}           = $results[$i]->{'onorder'};
+        $line{'toggle'}          = $toggle;
+
+        #warn Dumper %line;
+        push( @resultloop, \%line );
+    }
+
+    #warn Dumper @resultloop;
+
+    $template->param(
+        from        => $from,
+        to          => $to,
+        branch      => $branch,
+        count       => $count,
+        notreceived => $notreceived,
+        resultloop  => \@resultloop,
+
+    );
+}
+
+output_html_with_http_headers $input, $cookie, $template->output;

Index: koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl
diff -N koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/default/en/reports/processing_report.tmpl	1 Jul 2007 22:05:33 -0000	1.1.2.1
@@ -0,0 +1,104 @@
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->      
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+<div id="main" >
+
+
+        <h1 class = "reports">Koha : Orders Processing Report </h1>
+        <form method="post">
+        <table>
+                <thead>
+                        <tr>
+                        <th class="reports">Start Date</th>
+                        <th class="reports">End Date</th>
+                        <th class="reports">Branch</th>
+                        </tr>
+                </thead>
+                <tbody>
+<!---------------------------------------------------------------------------------------------------------------------------------------->
+                        <tr class="hilighted">
+                                <td > From <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" >
+                                            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;"  />
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField     :    "from",
+                                                ifFormat       :    "%Y-%m-%d",
+                                                button         :    "buttonfrom1",
+                                                align          :    "Tl"
+                                            });
+                                        </script>
+                                </td>
+
+
+                                <td> To <input type="text" size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" >
+                                            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="buttonto1" style="cursor: pointer;"  />
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField     :    "to",
+                                                ifFormat       :    "%Y-%m-%d",
+                                                button         :    "buttonto1",
+                                                align          :    "Tl"
+                                            });
+                                        </script>
+                                </td>
+<td ><!-- TMPL_VAR NAME="CGIBranches" -->
+
+        <input TYPE="submit" value="OK" class="button reports">
+        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
+        <input type="hidden" name="do_it" value="1">
+        </form>
+
+                                </td>
+                        </tr>
+
+		     <tr>
+		<td>Include 'not yet received' items</td>
+		<td><input type="checkbox" name="notreceived"></td>
+                        </tr>
+                </tbody>
+        </table>
+
+<br>
+<br>
+<!-- TMPL_IF NAME="do_it" -->
+<!-- Startdate= ><!-- TMPL_VAR NAME="from" -->, enddate=><!-- TMPL_VAR NAME="to" -->,  branch=><!-- TMPL_VAR NAME="branch" --> -->
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+<tr valign="top">
+   <td class="cell-header">Order</td>
+   <td class="cell-header">Title</td>
+	<td class="cell-header">Order Placed</td>
+ <td class="cell-header">Date Recieved</td>
+ <td class="cell-header">Date Shelved</td>
+ <td class="cell-header">Days on Order</td>
+ <td class="cell-header">Processing Days</td>
+ <td class="cell-header">Branch</td>
+</tr>
+
+<!--TMPL_LOOP NAME="resultloop"-->
+
+<!--TMPL_IF name="toggle"-->
+		<tr valign="top" class="hilighted">
+	<!--TMPL_ELSE-->
+		<tr valign="top" class="hilighted2">
+	<!--/TMPL_IF-->
+		<td class="cell"><a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!--TMPL_VAR NAME="ordernumber"-->><!--TMPL_VAR NAME="ordernumber"--></a> </td>
+		<td class="cell"><a href=/cgi-bin/koha/detail.pl?type=intra&bib=<!--TMPL_VAR NAME="biblionumber"-->><!--TMPL_VAR NAME="title"--></a> </td>
+		<td class="cell">			<!--TMPL_VAR NAME="entrydate"-->			</td>
+       		<td class="cell">                        <!--TMPL_VAR NAME="datereceived"-->                </td>
+       		<td class="cell">                        <!--TMPL_VAR NAME="shelvedate"-->                </td>
+		<td class="cell">                        <!--TMPL_VAR NAME="onorder"-->                </td>
+		<td class="cell">                        <!--TMPL_VAR NAME="delta"-->                </td>
+ 		<td class="cell">                        <!--TMPL_VAR NAME="homebranch"-->                </td>
+</tr>
+
+<!--/TMPL_LOOP"-->
+</table>
+
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->

Index: koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl
diff -N koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/npl/en/reports/processing_report.tmpl	1 Jul 2007 22:05:33 -0000	1.1.2.1
@@ -0,0 +1,106 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Orders Processing Report<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
+<div id="main" >
+
+
+        <h1 class = "reports">Koha : Orders Processing Report </h1>
+        <form method="post">
+        <table>
+                <thead>
+                        <tr>
+                        <th class="reports">Start Date</th>
+                        <th class="reports">End Date</th>
+                        <th class="reports">Branch</th>
+                        </tr>
+                </thead>
+                <tbody>
+<!---------------------------------------------------------------------------------------------------------------------------------------->
+                        <tr class="hilighted">
+                                <td > From <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="from" -->" >
+                                            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;"  />
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField     :    "from",
+                                                ifFormat       :    "%Y-%m-%d",
+                                                button         :    "buttonfrom1",
+                                                align          :    "Tl"
+                                            });
+                                        </script>
+                                </td>
+
+
+                                <td> To <input type="text" size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" >
+                                            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="buttonto1" style="cursor: pointer;"  />
+                                        <script type="text/javascript">
+                                            Calendar.setup({
+                                                inputField     :    "to",
+                                                ifFormat       :    "%Y-%m-%d",
+                                                button         :    "buttonto1",
+                                                align          :    "Tl"
+                                            });
+                                        </script>
+                                </td>
+<td ><!-- TMPL_VAR NAME="CGIBranches" -->
+
+        <input TYPE="submit" value="OK" class="button reports">
+        <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
+        <input type="hidden" name="do_it" value="1">
+        </form>
+
+                                </td>
+                        </tr>
+
+		     <tr>
+		<td>Include 'not yet received' items</td>
+		<td><input type="checkbox" name="notreceived"></td>
+                        </tr>
+                </tbody>
+        </table>
+
+<br>
+<br>
+<!-- TMPL_IF NAME="do_it" -->
+<!-- Startdate= ><!-- TMPL_VAR NAME="from" -->, enddate=><!-- TMPL_VAR NAME="to" -->,  branch=><!-- TMPL_VAR NAME="branch" --> -->
+<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
+<tr valign="top">
+   <td class="cell-header">Order</td>
+   <td class="cell-header">Title</td>
+	<td class="cell-header">Order Placed</td>
+ <td class="cell-header">Date Recieved</td>
+ <td class="cell-header">Date Shelved</td>
+ <td class="cell-header">Days on Order</td>
+ <td class="cell-header">Processing Days</td>
+ <td class="cell-header">Branch</td>
+</tr>
+
+<!--TMPL_LOOP NAME="resultloop"-->
+
+<!--TMPL_IF name="toggle"-->
+		<tr valign="top" class="hilighted">
+	<!--TMPL_ELSE-->
+		<tr valign="top" class="hilighted2">
+	<!--/TMPL_IF-->
+		<td class="cell"><a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!--TMPL_VAR NAME="ordernumber"-->><!--TMPL_VAR NAME="ordernumber"--></a> </td>
+		<td class="cell"><a href=/cgi-bin/koha/detail.pl?type=intra&bib=<!--TMPL_VAR NAME="biblionumber"-->><!--TMPL_VAR NAME="title"--></a> </td>
+		<td class="cell">			<!--TMPL_VAR NAME="entrydate"-->			</td>
+       		<td class="cell">                        <!--TMPL_VAR NAME="datereceived"-->                </td>
+       		<td class="cell">                        <!--TMPL_VAR NAME="shelvedate"-->                </td>
+		<td class="cell">                        <!--TMPL_VAR NAME="onorder"-->                </td>
+		<td class="cell">                        <!--TMPL_VAR NAME="delta"-->                </td>
+ 		<td class="cell">                        <!--TMPL_VAR NAME="homebranch"-->                </td>
+</tr>
+
+<!--/TMPL_LOOP"-->
+</table>
+
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From crc at liblime.com  Mon Jul  2 01:56:44 2007
From: crc at liblime.com (Chris Cormack)
Date: Sun, 01 Jul 2007 23:56:44 +0000
Subject: [Koha-cvs] koha/C4 Circulation.pm
Message-ID: <E1I59HY-0008Ew-67@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Chris Cormack <rangi>	07/07/01 23:56:44

Modified files:
	C4             : Circulation.pm 

Log message:
	Making transferbook update the last seen date of the item transfered

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation.pm?cvsroot=koha&r1=1.28&r2=1.29

Patches:
Index: Circulation.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- Circulation.pm	30 May 2007 09:12:36 -0000	1.28
+++ Circulation.pm	1 Jul 2007 23:56:43 -0000	1.29
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Circulation.pm,v 1.28 2007/05/30 09:12:36 tipaul Exp $
+# $Id: Circulation.pm,v 1.29 2007/07/01 23:56:43 rangi Exp $
 
 use strict;
 require Exporter;
@@ -45,7 +45,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.28 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.29 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -275,6 +275,7 @@
 
         # don't need to update MARC anymore, we do it in batch now
         $messages->{'WasTransfered'} = 1;
+		ModDateLastSeen( $itemnumber );
     }
     return ( $dotransfer, $messages, $biblio );
 }




From crc at liblime.com  Mon Jul  2 02:24:37 2007
From: crc at liblime.com (Chris Cormack)
Date: Mon, 02 Jul 2007 00:24:37 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/fr/includes s...
Message-ID: <E1I59iX-0003is-IH@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Chris Cormack <rangi>	07/07/02 00:24:37

Modified files:
	koha-tmpl/intranet-tmpl/prog/fr/includes: san-op.css 

Log message:
	Fix for layout problem with css

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/san-op.css?cvsroot=koha&r1=1.1&r2=1.2

Patches:
Index: san-op.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/san-op.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- san-op.css	23 May 2007 10:03:56 -0000	1.1
+++ san-op.css	2 Jul 2007 00:24:37 -0000	1.2
@@ -283,7 +283,7 @@
 }
 /* submenus styles */
 #submenu {
-    margin-left:0%;
+    margin-left:20%;
     font-weight : normal;
     /*display:left;*/
 }




From crc at liblime.com  Mon Jul  2 02:38:18 2007
From: crc at liblime.com (Chris Cormack)
Date: Mon, 02 Jul 2007 00:38:18 +0000
Subject: [Koha-cvs] koha C4/Members.pm members/deletemem.pl
Message-ID: <E1I59vm-00055c-BB@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Chris Cormack <rangi>	07/07/02 00:38:18

Modified files:
	C4             : Members.pm 
	members        : deletemem.pl 

Log message:
	Fix for bug 1365

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&r1=1.15&r2=1.16

Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- C4/Members.pm	13 Jun 2007 13:04:24 -0000	1.53
+++ C4/Members.pm	2 Jul 2007 00:38:17 -0000	1.54
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Members.pm,v 1.53 2007/06/13 13:04:24 toins Exp $
+# $Id: Members.pm,v 1.54 2007/07/02 00:38:17 rangi Exp $
 
 use strict;
 require Exporter;
@@ -31,7 +31,7 @@
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.53 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.54 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1620,6 +1620,8 @@
        WHERE borrowernumber = ?
    ";
     $sth = $dbh->prepare($query);
+    $sth->execute($borrowernumber);
+    $sth->finish;
     &logaction(C4::Context->userenv->{'number'},"MEMBERS","DELETE",$borrowernumber,"") 
         if C4::Context->preference("BorrowersLog");
     return $sth->rows;

Index: members/deletemem.pl
===================================================================
RCS file: /sources/koha/koha/members/deletemem.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- members/deletemem.pl	25 Apr 2007 14:07:34 -0000	1.15
+++ members/deletemem.pl	2 Jul 2007 00:38:18 -0000	1.16
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: deletemem.pl,v 1.15 2007/04/25 14:07:34 hdl Exp $
+# $Id: deletemem.pl,v 1.16 2007/07/02 00:38:18 rangi Exp $
 
 #script to delete items
 #written 2/5/00
@@ -46,10 +46,7 @@
 my %member2;
 $member2{'borrowernumber'}=$member;
 my ($countissues,$issues)=GetPendingIssues($member);
-my $i=0;
-foreach (sort keys %$issues) {
-	$i++;
-}
+
 my ($bor,$flags)=GetMemberDetails($member,'');
 if (C4::Context->preference("IndependantBranches")) {
 	my $userenv = C4::Context->userenv;
@@ -66,8 +63,8 @@
 $sth->execute($member);
 my $data=$sth->fetchrow_hashref;
 $sth->finish;
-if ($i > 0 or $flags->{'CHARGES'}  or $data->{'borrowernumber'}){
-warn"je suis rentre dans la boucle";
+if ($countissues > 0 or $flags->{'CHARGES'}  or $data->{'borrowernumber'}){
+
 	my ($template, $borrowernumber, $cookie)
 		= get_template_and_user({template_name => "members/deletemem.tmpl",
 					query => $input,
@@ -78,8 +75,8 @@
 					});
 	#   print $input->header;
 	$template->param(borrowernumber => $member);
-	if ($i >0) {
-		$template->param(ItemsOnIssues => $i);
+	if ($countissues >0) {
+		$template->param(ItemsOnIssues => $countissues);
 	}
 	if ($flags->{'CHARGES'} ne '') {
 		$template->param(charges => $flags->{'CHARGES'}->{'message'});




From crc at liblime.com  Mon Jul  2 02:44:25 2007
From: crc at liblime.com (Chris Cormack)
Date: Mon, 02 Jul 2007 00:44:25 +0000
Subject: [Koha-cvs] koha/C4 Accounts.pm
Message-ID: <E1I5A1h-0001Oe-RP@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Chris Cormack <rangi>	07/07/02 00:44:25

Modified files:
	C4             : Accounts.pm 

Log message:
	Fix for bug 1314 manual credits broken

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Accounts.pm?cvsroot=koha&r1=1.22&r2=1.23

Patches:
Index: Accounts.pm
===================================================================
RCS file: /sources/koha/koha/C4/Accounts.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Accounts.pm	23 Apr 2007 14:06:18 -0000	1.22
+++ Accounts.pm	2 Jul 2007 00:44:25 -0000	1.23
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Accounts.pm,v 1.22 2007/04/23 14:06:18 tipaul Exp $
+# $Id: Accounts.pm,v 1.23 2007/07/02 00:44:25 rangi Exp $
 
 use strict;
 require Exporter;
@@ -28,7 +28,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.22 $' =~ /\d+/g; 
+$VERSION = do { my @v = '$Revision: 1.23 $' =~ /\d+/g; 
 shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -273,7 +273,7 @@
 sub manualinvoice{
   my ($borrowernumber,$itemnum,$desc,$type,$amount,$user)=@_;
   my $dbh = C4::Context->dbh;
-  my $notifyid;
+  my $notifyid=0;
   my $insert;
   $itemnum=~ s/ //g;
   my $accountno=getnextacctno($borrowernumber);




From crc at liblime.com  Mon Jul  2 04:30:17 2007
From: crc at liblime.com (Chris Cormack)
Date: Mon, 02 Jul 2007 02:30:17 +0000
Subject: [Koha-cvs] koha admin/systempreferences.pl koha-tmpl/intra...
Message-ID: <E1I5Bg9-0003PE-Am@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Chris Cormack <rangi>	07/07/02 02:30:17

Modified files:
	admin          : systempreferences.pl 
	koha-tmpl/intranet-tmpl/prog/en/members: memberentryA.tmpl 
	                                         memberentryC.tmpl 
	                                         memberentryP.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/members: memberentryA.tmpl 
	members        : memberentry.pl 
	updater        : updatedatabase 

Log message:
	Fix for bug 1296, making surnames uppercase a systems preference

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&r1=1.170&r2=1.171

Patches:
Index: admin/systempreferences.pl
===================================================================
RCS file: /sources/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- admin/systempreferences.pl	4 May 2007 16:24:08 -0000	1.40
+++ admin/systempreferences.pl	2 Jul 2007 02:30:15 -0000	1.41
@@ -127,6 +127,7 @@
     $tabsysprefs{BorrowersTitles}="Members";    
     $tabsysprefs{patronimages}="Members";
     $tabsysprefs{MinPasswordLength}="Members";
+    $tabsysprefs{uppercasesurnames}="Members";
     
 # OPAC
     $tabsysprefs{AmazonAssocTag}="OPAC";

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl	16 Mar 2007 01:25:09 -0000	1.18
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl	2 Jul 2007 02:30:15 -0000	1.19
@@ -138,7 +138,11 @@
 		<label>
 		<!-- /TMPL_IF-->
 		Surname</label>
+		<! --TMPL_IF NAME="uppercasesurnames" -->
 		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<!-- TMPL_ELSE -->
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<!-- /TMPL_IF -->
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="mandatoryfirstname" -->

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl	27 Jun 2007 13:01:38 -0000	1.18
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl	2 Jul 2007 02:30:16 -0000	1.19
@@ -137,7 +137,11 @@
 		<label>
 		<!-- /TMPL_IF-->
 		Surname</label>
+		<! --TMPL_IF NAME="uppercasesurnames" -->                                
 		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+        <!-- TMPL_ELSE -->                       
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >   
+        <!-- /TMPL_IF --> 
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="mandatoryfirstname" -->

Index: koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl	16 Mar 2007 01:25:09 -0000	1.14
+++ koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl	2 Jul 2007 02:30:16 -0000	1.15
@@ -132,7 +132,11 @@
         <label>
         <!-- /TMPL_IF-->
         Surname</label>
+		<! --TMPL_IF NAME="uppercasesurnames" -->                                
         <input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+        <!-- TMPL_ELSE -->                       
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >   
+        <!-- /TMPL_IF --> 
         </p>
         <p>
         <!-- TMPL_IF NAME="mandatoryfirstname" -->

Index: koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl	23 May 2007 09:55:39 -0000	1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl	2 Jul 2007 02:30:16 -0000	1.2
@@ -132,7 +132,14 @@
 		<label>
 		<!-- /TMPL_IF-->
 		Nom de famille</label>
+		<! --TMPL_IF NAME="uppercasesurnames" -->                                
 		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+        <!-- TMPL_ELSE -->                       
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >   
+        <!-- /TMPL_IF --> 
+
+
+
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="mandatoryfirstname" -->

Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- members/memberentry.pl	30 May 2007 08:47:57 -0000	1.45
+++ members/memberentry.pl	2 Jul 2007 02:30:16 -0000	1.46
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.45 2007/05/30 08:47:57 tipaul Exp $
+# $Id: memberentry.pl,v 1.46 2007/07/02 02:30:16 rangi Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -83,6 +83,8 @@
 # NOTE: Alert for ethnicity and ethnotes fields, they are unvalided in all borrowers form
 my $borrower_data;
 
+$template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnames'));
+
 #function  to automatic setup the mandatory  fields (visual with css)
 my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
 my @field_check=split(/\|/,$check_BorrowerMandatoryField);

Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- updater/updatedatabase	26 Jun 2007 13:25:37 -0000	1.170
+++ updater/updatedatabase	2 Jul 2007 02:30:16 -0000	1.171
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: updatedatabase,v 1.170 2007/06/26 13:25:37 tipaul Exp $
+# $Id: updatedatabase,v 1.171 2007/07/02 02:30:16 rangi Exp $
 
 # Database Updater
 # This script checks for required updates to the database.
@@ -519,6 +519,14 @@
             explanation         => "Enter a specific hash for NoZebra indexes. Enter : 'indexname' => '100a,245a,500*','index2' => '...'",
             type                => 'Free',
         },
+        {
+            uniquefieldrequired => 'variable',
+            variable            => 'uppercasesurnames',
+            value               => '0',
+            forceupdate         => {'explanation' => 1, 'type' => 1},
+            explanation         => "Force Surnames to be uppercase",
+            type                => 'YesNo',
+        },
     ],
     userflags => [
         {
@@ -2048,6 +2056,9 @@
 exit;
 
 # $Log: updatedatabase,v $
+# Revision 1.171  2007/07/02 02:30:16  rangi
+# Fix for bug 1296, making surnames uppercase a systems preference
+#
 # Revision 1.170  2007/06/26 13:25:37  tipaul
 # removing some useless tables from updatedatabase
 #




From paul at koha-fr.org  Mon Jul  2 10:50:56 2007
From: paul at koha-fr.org (paul poulain)
Date: Mon, 02 Jul 2007 08:50:56 +0000
Subject: [Koha-cvs] koha/C4 Search.pm
Message-ID: <E1I5HcW-0000vp-Ly@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/07/02 08:50:56

Modified files:
	C4             : Search.pm 

Log message:
	don t display the 1 in location column if there is only 1 item : it's useless & confusing for users

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&r1=1.149&r2=1.150

Patches:
Index: Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- Search.pm	26 Jun 2007 15:43:55 -0000	1.149
+++ Search.pm	2 Jul 2007 08:50:56 -0000	1.150
@@ -25,7 +25,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.149 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.150 $' =~ /\d+/g;
     shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
 };
 
@@ -975,7 +975,7 @@
             my $this_item = {
                 branchname     => $branches{$items->{$key}->{branchcode}},
                 branchcode     => $items->{$key}->{branchcode},
-                count          => $items->{$key}->{count},
+                count          => $items->{$key}->{count}==1 ?"":$items->{$key}->{count},
                 itemcallnumber => $items->{$key}->{itemcallnumber},
                 location => $items->{$key}->{location},
             };




From paul at koha-fr.org  Mon Jul  2 11:13:23 2007
From: paul at koha-fr.org (paul poulain)
Date: Mon, 02 Jul 2007 09:13:23 +0000
Subject: [Koha-cvs] koha/C4 Biblio.pm
Message-ID: <E1I5HyF-00029z-4I@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/07/02 09:13:23

Modified files:
	C4             : Biblio.pm 

Log message:
	unimarc bugfix : the encoding is in field 100 in UNIMARC. when TransformHTMLtoXML on an item, you must not automatically add a 100 field in items, otherwise there will be 2 100 fields in the biblio, which is wrong

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&r1=1.213&r2=1.214

Patches:
Index: Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -b -r1.213 -r1.214
--- Biblio.pm	25 Jun 2007 15:01:45 -0000	1.213
+++ Biblio.pm	2 Jul 2007 09:13:22 -0000	1.214
@@ -33,7 +33,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.213 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.214 $' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 @ISA = qw( Exporter );
 
@@ -1985,8 +1985,12 @@
 
 =over 4
 
-$xml = TransformHtmlToXml( $tags, $subfields, $values, $indicator, $ind_tag )
+$xml = TransformHtmlToXml( $tags, $subfields, $values, $indicator, $ind_tag, $auth_type )
 
+$auth_type contains :
+- nothing : rebuild a biblio, un UNIMARC the encoding is in 100$a pos 26/27
+- UNIMARCAUTH : rebuild an authority. In UNIMARC, the encoding is in 100$a pos 13/14
+- ITEM : rebuild an item : in UNIMARC, 100$a, it's in the biblio ! (otherwise, we would get 2 100 fields !)
 =back
 
 =cut
@@ -2000,6 +2004,7 @@
     # check that there is one, otherwise the 
     # MARC::Record->new_from_xml will fail (and Koha will die)
     my $unimarc_and_100_exist=0;
+    $unimarc_and_100_exist=1 if $auth_type eq 'ITEM'; # if we rebuild an item, no need of a 100 field
     my $prevvalue;
     my $prevtag = -1;
     my $first   = 1;
@@ -3952,8 +3957,11 @@
 
 =cut
 
-# $Id: Biblio.pm,v 1.213 2007/06/25 15:01:45 tipaul Exp $
+# $Id: Biblio.pm,v 1.214 2007/07/02 09:13:22 tipaul Exp $
 # $Log: Biblio.pm,v $
+# Revision 1.214  2007/07/02 09:13:22  tipaul
+# unimarc bugfix : the encoding is in field 100 in UNIMARC. when TransformHTMLtoXML on an item, you must not automatically add a 100 field in items, otherwise there will be 2 100 fields in the biblio, which is wrong
+#
 # Revision 1.213  2007/06/25 15:01:45  tipaul
 # bugfixes on unimarc 100 handling (the field used for encoding)
 #




From paul at koha-fr.org  Mon Jul  2 11:14:09 2007
From: paul at koha-fr.org (paul poulain)
Date: Mon, 02 Jul 2007 09:14:09 +0000
Subject: [Koha-cvs] koha/C4 Overdues.pm
Message-ID: <E1I5Hyz-0002LG-6y@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/07/02 09:14:09

Modified files:
	C4             : Overdues.pm 

Log message:
	minor code rewritte

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Overdues.pm?cvsroot=koha&r1=1.4&r2=1.5

Patches:
Index: Overdues.pm
===================================================================
RCS file: /sources/koha/koha/C4/Overdues.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Overdues.pm	18 Apr 2007 17:00:14 -0000	1.4
+++ Overdues.pm	2 Jul 2007 09:14:09 -0000	1.5
@@ -1,6 +1,6 @@
 package C4::Overdues;
 
-# $Id: Overdues.pm,v 1.4 2007/04/18 17:00:14 tipaul Exp $
+# $Id: Overdues.pm,v 1.5 2007/07/02 09:14:09 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -29,7 +29,7 @@
 use C4::Log; # logaction
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.4 $' =~ /\d+/g; 
+$VERSION = do { my @v = '$Revision: 1.5 $' =~ /\d+/g; 
 shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -125,18 +125,13 @@
     );
     $sth->execute;
 
-    # FIXME - Use push @results
-    my $i = 0;
     my @results;
     while ( my $data = $sth->fetchrow_hashref ) {
-        $results[$i] = $data;
-        $i++;
+        push @results, $data;
     }
     $sth->finish;
 
-    #  print @results;
-    # FIXME - Bogus API.
-    return ( $i, \@results );
+    return \@results;
 }
 
 =head2 checkoverdues




From paul at koha-fr.org  Mon Jul  2 11:14:52 2007
From: paul at koha-fr.org (paul poulain)
Date: Mon, 02 Jul 2007 09:14:52 +0000
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en circ/overd...
Message-ID: <E1I5Hzg-0002WX-NQ@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/07/02 09:14:52

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/circ: overdue.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/includes: intranet2.css 
	                                          menu-circ.inc 

Log message:
	minor template changes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/overdue.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc?cvsroot=koha&r1=1.10&r2=1.11

Patches:
Index: circ/overdue.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/overdue.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- circ/overdue.tmpl	11 Mar 2007 21:08:12 -0000	1.3
+++ circ/overdue.tmpl	2 Jul 2007 09:14:52 -0000	1.4
@@ -15,7 +15,7 @@
 
 <!-- TMPL_LOOP NAME="overdueloop" -->
     <tr>
-        <td width="15%"><!-- TMPL_VAR NAME="duedate" --></td>
+        <td><!-- TMPL_VAR NAME="duedate" --></td>
         <!-- TMPL_IF NAME="email" -->
         <td><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="name" --></a> (<!-- TMPL_VAR NAME="phone" -->)</td>
         <!-- TMPL_ELSE -->

Index: includes/intranet2.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- includes/intranet2.css	6 Jun 2007 13:08:36 -0000	1.4
+++ includes/intranet2.css	2 Jul 2007 09:14:52 -0000	1.5
@@ -26,6 +26,7 @@
     border-collapse : inherit;
     border : 1px solid #CCCCCC;
     margin : 1em 0 1em 20px;
+    margin-right : 5%;
     border-collapse:collapse;
 }
 

Index: includes/menu-circ.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- includes/menu-circ.inc	30 May 2007 09:33:19 -0000	1.10
+++ includes/menu-circ.inc	2 Jul 2007 09:14:52 -0000	1.11
@@ -4,7 +4,8 @@
     <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/overdue.pl">Overdues</a>
+    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Fines</a>
     <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a>
 </div>
 




From paul at koha-fr.org  Mon Jul  2 11:15:48 2007
From: paul at koha-fr.org (paul poulain)
Date: Mon, 02 Jul 2007 09:15:48 +0000
Subject: [Koha-cvs] koha misc/translator/po/prog_intranet_fr_FR.po ...
Message-ID: <E1I5I0a-0002kH-6x@cvs.savannah.gnu.org>

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/07/02 09:15:46

Modified files:
	misc/translator/po: prog_intranet_fr_FR.po prog_opac_fr.po 
	koha-tmpl/opac-tmpl/prog/fr: opac-MARCdetail.tmpl 
	                             opac-advsearch.tmpl 
	                             opac-authorities-home.tmpl 
	                             opac-authoritiesdetail.tmpl 
	                             opac-detail.tmpl 
	koha-tmpl/opac-tmpl/prog/fr/includes: masthead.inc 
	                                      navigation.inc opac.css 
	                                      opac.css~ 
	koha-tmpl/intranet-tmpl/prog/fr: auth.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/admin: auth_tag_structure.tmpl 
	                                       authtypes.tmpl 
	                                       biblio_framework.tmpl 
	                                       cities.tmpl 
	                                       itemtypes.tmpl 
	                                       marc_subfields_structure.tmpl 
	                                       marctagstructure.tmpl 
	                                       roadtype.tmpl 
	                                       systempreferences.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/authorities: authorities.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/bookshelves: shelves.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/catalogue: detail.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/cataloguing: addbiblio.tmpl 
	                                             additem.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/circ: circulation.tmpl 
	                                      overdue.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/includes: doc-head-close.inc 
	                                          error-top.inc 
	                                          intranet2.css 
	                                          intranet2.css~ 
	                                          members.js 
	                                          menu-catalogue.inc 
	                                          menu-circ.inc 
	                                          menus.inc san-op.css 
	koha-tmpl/intranet-tmpl/prog/fr/includes/calendar: 
	                                                   calendar-setup.js 
	                                                   calendar.js 
	koha-tmpl/intranet-tmpl/prog/fr/includes/javascript: members.js 
	koha-tmpl/intranet-tmpl/prog/fr/members: memberentryA.tmpl 
	                                         memberentryC.tmpl 
	                                         memberentryP.tmpl 
	                                         moremember.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/reports: borrowers_stats.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/serials: serials-edit.tmpl 
	                                         serials-home.tmpl 
	                                         subscription-add.tmpl 
	                                         subscription-detail.tmpl 
	koha-tmpl/intranet-tmpl/prog/fr/tools: letter.tmpl 

Log message:
	french translations

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/translator/po/prog_intranet_fr_FR.po?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/misc/translator/po/prog_opac_fr.po?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-authorities-home.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-authoritiesdetail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-detail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/includes/masthead.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/includes/navigation.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css%126?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/auth.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/auth_tag_structure.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/authtypes.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/biblio_framework.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/cities.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/itemtypes.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/marc_subfields_structure.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/marctagstructure.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/roadtype.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/admin/systempreferences.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/bookshelves/shelves.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/detail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbiblio.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/additem.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/circ/circulation.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/circ/overdue.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/doc-head-close.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/error-top.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css%126?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/members.js?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/san-op.css?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/javascript/members.js?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryA.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryC.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/members/memberentryP.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/reports/borrowers_stats.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-home.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.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-detail.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/tools/letter.tmpl?cvsroot=koha&r1=1.1&r2=1.2

Patches:
Index: misc/translator/po/prog_intranet_fr_FR.po
===================================================================
RCS file: /sources/koha/koha/misc/translator/po/prog_intranet_fr_FR.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- misc/translator/po/prog_intranet_fr_FR.po	25 Jun 2007 15:03:03 -0000	1.5
+++ misc/translator/po/prog_intranet_fr_FR.po	2 Jul 2007 09:15:40 -0000	1.6
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: prog_intranet_fr_FR\n"
-"POT-Creation-Date: 2007-06-07 10:35+0200\n"
-"PO-Revision-Date: 2007-06-19 16:32+0200\n"
+"POT-Creation-Date: 2007-07-02 10:20+0200\n"
+"PO-Revision-Date: 2007-07-02 10:23+0200\n"
 "Last-Translator: paul POULAIN <paul at koha-fr.org>\n"
 "Language-Team:  <fr at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 msgid " issues expected "
 msgstr "numéro(s) attendu(s)"
 
@@ -36,10 +36,10 @@
 #
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl:397
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl:325
-#: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl:283
+#: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl:396
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-edit.tmpl:324
+#: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl:282
 msgid " mandatory fields empty (see bold subfields)"
 msgstr "champs obligatoires vides (voir les sous-champs en gras)"
 
@@ -47,13 +47,13 @@
 #
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl:397
-#: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl:283
+#: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl:396
+#: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl:282
 msgid " mandatory tags empty"
 msgstr "Champ(s) obligatoire(s) non renseigné(s)"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 msgid ""
 " were entered. <br \\/>Please indicate which date(s) an issue is not "
 "expected<br \\/>"
@@ -62,7 +62,7 @@
 "pas de numéro <br \\/>"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 msgid ""
 " were entered.<br \\/> You seem to have indicated more issues per year than "
 "expected."
@@ -242,20 +242,20 @@
 
 #. %1$S: type=text name=biblionumber
 #. %2$S: type=text name=title
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:677
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:676
 #, c-format
 msgid "%S (%S) <a1>Search for Biblio</a>"
 msgstr "%S (%S) <a1>Rechercher notice biblio</a>"
 
 #. %1$S: type=text name=aqbooksellerid
 #. %2$S: type=text name=aqbooksellername
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:672
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:671
 #, c-format
 msgid "%S (%S) <a1>Search for a Supplier</a>"
 msgstr "%S (%S) <a1>Rechercher fournisseur</a>"
 
 #. %1$S: type=text name=sublength
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:909
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:908
 #, c-format
 msgid "%S (*) (enter amount in numerals)"
 msgstr "%S (*) (Entrer la quantité en nombre)"
@@ -267,13 +267,13 @@
 msgstr "%S (exemple pour 200a : '200c','200d','200e'...)"
 
 #. %1$S: type=text name=link
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:64
 #, c-format
 msgid "%S (exemple:200b)"
 msgstr "%S (exemple : 200b)"
 
 #. %1$S: type=text name=hidden
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:62
 #, c-format
 msgid "%S (see online help)"
 msgstr "%S (voir aide en ligne)"
@@ -281,7 +281,7 @@
 #. For the first occurrence,
 #. %1$S: type=text name=histstartdate
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl:254
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:987
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:986
 #, c-format
 msgid "%S (the date of the 1st subscription)"
 msgstr "%S (Date du premier abonnement)"
@@ -367,7 +367,7 @@
 msgstr "%S ans"
 
 #. %1$S: type=text name=prefoptions
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:108
 #, c-format
 msgid "%S(a choice list for Choice (separated by |) or cols|rows for Texarea)"
 msgstr ""
@@ -377,7 +377,7 @@
 #. For the first occurrence,
 #. %1$S: type=text name=enddate
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl:255
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:991
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:990
 #, c-format
 msgid "%S(if empty : subscription still active)"
 msgstr "%S (si vide : l'abonnement est en cours)"
@@ -397,7 +397,7 @@
 msgstr "%S <a1>[Aller à la configuration de l'imprimante]</a>"
 
 #. %1$S: type=text name=auth_tag_to_report
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:80
 #, c-format
 msgid ""
 "%SEnter here the number of the tag that will be reported in the biblio "
@@ -500,8 +500,8 @@
 #. %2$p: type=radio name=sex value=M
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:110
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:113
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:120
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:112
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:115
 #, c-format
@@ -534,9 +534,9 @@
 #. %1$p: type=radio name=<!-- TMPL_VAR NAME="name" --> value=1
 #. %2$p: type=radio name=<!-- TMPL_VAR NAME="name" --> value=0
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:458
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:598
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:649
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:645
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:602
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:651
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:649
 #: ../../koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl:110
 #, c-format
 msgid "%pYes %pNo"
@@ -620,7 +620,7 @@
 msgstr "%s (<b>%s</b>)"
 
 #. %1$s: TMPL_VAR name=isurl
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:63
 #, c-format
 msgid "%s (if checked, it means that the subfield is an URL and can be clicked"
 msgstr " %s (coché, indique que le sous-champ est une URL valide et peut être cliqué"
@@ -633,8 +633,8 @@
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:75
 #, c-format
 msgid ""
 "%s (if you select a value here, the indicators will be limited to the "
@@ -645,7 +645,7 @@
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=tab
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl:24
 #, c-format
 msgid "%s (ignore means that the subfield is NOT managed by Koha)"
@@ -673,7 +673,7 @@
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=module
 #. %2$s: TMPL_VAR name=code
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:264
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:263
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl:26
@@ -1065,7 +1065,7 @@
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:242
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:241
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl:134
@@ -1109,10 +1109,10 @@
 msgid "&lt;&lt; Prev"
 msgstr "<< Prdt."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl:302
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:139
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:123
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl:301
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:196
 msgid "&lt;&lt; Previous"
 msgstr "&lt;&lt; Précédent"
 
@@ -1234,14 +1234,14 @@
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=notes
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:78
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:122
 #: ../../koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl:47
 #, c-format
 msgid "(%s)"
 msgstr "(%s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:107
 msgid "(Choice, YesNo, Integer, Textarea, Float, Themes, or Languages)"
 msgstr "(Choice, YesNo,Integer,Textarea,Float,Themes, Languages)"
 
@@ -1310,7 +1310,7 @@
 msgid "(auto-filled)"
 msgstr "(auto-rempli)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:65
 msgid "(choose one)"
 msgstr "(en choisir un)"
 
@@ -1340,9 +1340,9 @@
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=innerloop1
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:308
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:310
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:312
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:314
 #, c-format
 msgid "(is %s)"
 msgstr "(est %s)"
@@ -1353,7 +1353,7 @@
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=timestamp
-#: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl:253
+#: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl:252
 #: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl:82
 #, c-format
 msgid "(modified on %s)"
@@ -1381,11 +1381,11 @@
 msgid "(order #%s)"
 msgstr "(Commande N°%s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:695
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:694
 msgid "(select a branch)"
 msgstr "(Sélectionnez un site)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:714
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:713
 msgid ""
 "(select a letter &amp; patrons will be able to \"follow\" this subscription "
 "and recieve a mail on every new issue)"
@@ -1403,9 +1403,9 @@
 
 #. INPUT type=text name=password
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:446
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:586
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:637
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:633
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:590
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:639
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:637
 msgid "****"
 msgstr "****"
 
@@ -1415,11 +1415,17 @@
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:174
 #, c-format
 msgid ", %s"
 msgstr ", %s"
 
+#. %1$s: TMPL_VAR name=emailpro
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl:135
+#, c-format
+msgid ", <a1>%s</a>"
+msgstr ", <a1>%s</a>"
+
 #: ../../koha-tmpl/intranet-tmpl/prog/en/about.tmpl:45
 msgid ", France"
 msgstr ", France"
@@ -1440,7 +1446,7 @@
 "funding)"
 msgstr ", France (grilles de catalogage, autorités, panier OPAC, bulletinage)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:174
 msgid ", Mandatory"
 msgstr ", Obligatoire"
 
@@ -1456,7 +1462,7 @@
 "1.0)"
 
 #. %1$s: TMPL_VAR name=seealso
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:174
 #, c-format
 msgid ", See %s"
 msgstr ", Voir %s"
@@ -1484,7 +1490,7 @@
 msgid ", by %s"
 msgstr ", par %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:174
 msgid ", repeatable"
 msgstr ", répétable"
 
@@ -1525,8 +1531,8 @@
 msgid "-- Choose a reason --"
 msgstr "-- Choisir un motif --"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:762
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:830
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:761
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:829
 msgid "-- please choose --"
 msgstr "-- Choisir --"
 
@@ -1669,87 +1675,87 @@
 msgstr "1-4 Taille enregistrement"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:102
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:192
 msgid "1/2 Months (6/year)"
 msgstr "Bimestriel (6/an)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:791
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:793
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:790
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:792
 msgid "1/2 months (6/year)"
 msgstr "Bimestriel (6/an)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:93
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:181
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:183
 msgid "1/2 weeks"
 msgstr "Bimensuel"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:776
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:775
 msgid "1/2 weeks (2/month)"
 msgstr " Bimensuel"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:778
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:777
 msgid "1/2 weeks (2/months)"
 msgstr "Bimensuel (2/mois)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:117
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:818
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:820
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:205
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:817
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:819
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:207
 msgid "1/2 years"
 msgstr "Bisannuel"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:796
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:798
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:795
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:797
 msgid "1/3 months (1/quarter)"
 msgstr "Trimestriel (4/an)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:781
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:783
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:184
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:780
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:782
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:186
 msgid "1/3 weeks"
 msgstr "1/3 semaines"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:99
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:187
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:189
 msgid "1/Month"
 msgstr "Mensuel"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:87
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:766
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:768
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:175
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:765
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:767
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:177
 msgid "1/day"
 msgstr "Quotidien"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:786
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:788
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:785
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:787
 msgid "1/month"
 msgstr "Mensuel (1/mois)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:108
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:193
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:198
 msgid "1/quarter"
 msgstr "Trimestriel"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:802
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:804
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:801
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:803
 msgid "1/quarter (seasonal)"
 msgstr "Trimestriel (1/trimestre)"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:90
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:771
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:773
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:178
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:770
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:772
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:180
 msgid "1/week"
 msgstr "Hebdomadaire"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:813
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:815
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:202
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:812
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:814
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:204
 msgid "1/year"
 msgstr "Annuel"
 
@@ -1804,12 +1810,12 @@
 msgstr "2 ans"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:810
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:199
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:809
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:201
 msgid "2/year"
 msgstr "Semestriel "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:808
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:807
 msgid "2/years"
 msgstr "Semestriel (2/an)"
 
@@ -1905,7 +1911,6 @@
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=notes
-#: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl:251
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/prog/en/acqui/neworderbiblio.tmpl:44
@@ -1940,7 +1945,7 @@
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=place
 #: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl:248
-#: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl:252
+#: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl:251
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/result.tmpl:56
@@ -1987,7 +1992,7 @@
 "TMPL_ELSE -->Ajout catégorie<!-- /TMPL_IF -->"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:102
 msgid ""
 "<!-- TMPL_IF NAME=\"modify\" -->Save Changes<!-- TMPL_ELSE -->Add this "
 "Preference<!-- /TMPL_IF -->"
@@ -2186,7 +2191,7 @@
 "<a1>Ajout fournisseur</a> <a2>Commandes en retard</a> <a3>Recherche "
 "historique</a> <a4>Gestion suggestions</a> <a5>Paramètres</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:149
 #, c-format
 msgid ""
 "<a1>Admin</a> <a2>Acquisitions</a> <a3>Authorities</a> <a4>Catalogue</a> "
@@ -2238,14 +2243,14 @@
 msgid "<a1>Edit</a> <a2>Delete</a> <a3>Add budget</a>"
 msgstr "<a1>Modifier</a> <a2>Supprimer</a> <a3>Ajouter un budget</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:141
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:142
 #, c-format
 msgid ""
-"<a1>Edit</a> <a2>Duplicate </a> <a3>Renew </a> <a4>Receive</a> <a5>Serial "
-"Collection</a>"
+"<a1>Edit</a> <a2>Duplicate </a> <a3>Renew </a> <a4>Receive</a> <a5> Delete </"
+"a>"
 msgstr ""
 "<a1>Modifier</a> <a2>Dupliquer</a> <a3>Renouveller</a> <a4>Bulletiner</"
-"a><a5>Etat de collection</a>"
+"a><a5>Supprimer</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl:8
 #, c-format
@@ -2330,11 +2335,11 @@
 msgid ""
 "<a1>Set branch</a> <a2>Pending reserves</a> <a3>Waiting reserves</a> "
 "<a4>Transfers to do</a> <a5>Transfers to receive</a> <a6>Overdues</a> "
-"<a7>Daily reconciliation</a>"
+"<a7>Fines</a> <a8>Daily reconciliation</a>"
 msgstr ""
 "<a1>Choix du site</a> <a2>Réservations à traiter</a> <a3>Réservations en "
 "attente</a> <a4>Transferts à faire</a> <a5>Transferts à recevoir</a> "
-"<a6>Retards</a> <a7>Etat de caisse (aujourd'hui)</a> "
+"<a6>Retards</a> <a7>Amendes</a7> <a8>Etat de caisse (aujourd'hui)</a> "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl:10
 #, c-format
@@ -2659,7 +2664,7 @@
 "justifiant."
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 msgid "<b>Warning irregularity detected<\\/b><br \\/>"
 msgstr "<b>Attention irrégularité repérée<\\/b><br \\/>"
 
@@ -2927,7 +2932,7 @@
 
 #. %1$s: TMPL_VAR name=biblionumber
 #. %2$s: TMPL_VAR name=bibliotitle
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:163
 #, c-format
 msgid "<i>(%s)</i> <a1>%s</a>"
 msgstr "<i>(%s)</i> <a1>%s</a>"
@@ -3151,8 +3156,8 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:927
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:288
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:926
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:290
 #: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl:123
 msgid "Add"
 msgstr "Ajouter"
@@ -3276,8 +3281,8 @@
 msgstr "Ajouter une notice sans recherche"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:186
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:204
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:185
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:203
 msgid "Add Tag"
 msgstr "Ajouter un champ"
 
@@ -3322,7 +3327,7 @@
 msgstr "Ajouter un code pays"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:184
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:183
 msgid "Add a new System Preference"
 msgstr "Ajouter une préférence système"
 
@@ -3331,17 +3336,17 @@
 msgid "Add a new shelf"
 msgstr "Ajouter une nouvelle étagère"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:161
 msgid "Add a new subscription"
 msgstr "Ajouter un abonnement"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:654
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:653
 msgid "Add a subscription (Serial Holdings Record)"
 msgstr "Ajout d'un abonnement "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:69
 msgid "Add a system preference"
 msgstr "Ajouter une préférence système"
 
@@ -3374,8 +3379,8 @@
 msgid "Add authority"
 msgstr "Ajouter autorité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:137
 msgid "Add authority type"
 msgstr "Ajout d'un type d'autorité"
 
@@ -3406,7 +3411,7 @@
 #. %1$s: TMPL_VAR name=step
 #. %2$s: TMPL_VAR name=surname
 #. %3$s: TMPL_VAR name=firstname
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:12
 #, c-format
 msgid "Add child borrower (step %s) %s %s"
 msgstr "Inscription d'un enfant (étape %s) %s %s"
@@ -3421,8 +3426,8 @@
 msgstr "Ajouter une devise"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:2
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:121
 msgid "Add framework"
 msgstr "Ajouter une grille"
 
@@ -3442,15 +3447,15 @@
 msgid "Add items for %s"
 msgstr "Ajouter des exemplaires à %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:139
 msgid "Add letter"
 msgstr "Ajouter une lettre"
 
 #. INPUT type=button name=step4
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:468
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:608
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:659
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:655
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:612
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:661
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:659
 msgid "Add member"
 msgstr "Valider l'inscription"
 
@@ -3505,8 +3510,8 @@
 msgid "Add road type"
 msgstr "Ajouter un type de voie"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:120
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:1015
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:1014
 msgid "Add subscription"
 msgstr "Ajouter un abonnement"
 
@@ -3515,8 +3520,8 @@
 msgid "Add supplier"
 msgstr "Ajout d'un fournisseur"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:67
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:69
 msgid "Add tag"
 msgstr "Ajouter un champ"
 
@@ -3573,21 +3578,21 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:237
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:291
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:329
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:368
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:295
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:333
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:372
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:385
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:387
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:329
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:458
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:333
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:462
 msgid "Address"
 msgstr "Adresse"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:246
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:338
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:394
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:338
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:342
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:396
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:342
 msgid "Address 2"
 msgstr "Adresse 2"
 
@@ -3613,7 +3618,7 @@
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:57
 msgid "Advanced constraint"
 msgstr "Restrictions MARC"
 
@@ -3677,7 +3682,7 @@
 msgid "Alt title:"
 msgstr "Autre titre : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:361
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:365
 msgid "Alternate address"
 msgstr "Autre adresse"
 
@@ -3806,7 +3811,7 @@
 msgid "Any Word"
 msgstr "Tout mot"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:691
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:690
 msgid "Any branch"
 msgstr "Tout site"
 
@@ -3858,7 +3863,7 @@
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl:165
 msgid "April"
 msgstr "Avril"
@@ -3872,19 +3877,24 @@
 "adhérents ?"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl:239
+msgid "Are you sure you want to delete this biblio? "
+msgstr "Êtes vous sûr de vouloir supprimer cette nogice?"
+
+#. SCRIPT
+#: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl:130
 msgid "Are you sure you want to delete this item?"
 msgstr "Êtes vous sûr de vouloir supprimer cet exemplaire ?"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:395
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:396
 msgid "Are you sure you want to delete this subscription?"
 msgstr "Êtes vous sur de vouloir supprimer cet abonnement ?"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:382
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:532
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:583
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:579
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:536
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:585
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:583
 msgid "Arrival date"
 msgstr "Date d'arrivée"
 
@@ -3900,7 +3910,7 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl:178
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl:180
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl:87
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:351
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:353
 msgid "Arrived"
 msgstr "Arrivé"
 
@@ -3945,7 +3955,7 @@
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl:169
 msgid "August"
 msgstr "Août"
@@ -3965,11 +3975,11 @@
 msgid "Auth"
 msgstr "Autor."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:110
 msgid "Auth type Admin"
 msgstr "Administration des types d'autorité"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:150
 msgid "Auth value"
 msgstr "Valeur autorisée"
 
@@ -4016,13 +4026,13 @@
 msgid "Author:"
 msgstr "Auteur : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:164
 msgid "Authorised"
 msgstr "Autorisé"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl:67
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:91
 msgid "Authorised value"
 msgstr "Valeur autorisée"
 
@@ -4097,13 +4107,13 @@
 
 #. %1$s: TMPL_VAR name=authtypetext
 #. %2$s: TMPL_VAR name=authtypecode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:89
 #, c-format
 msgid "Authority structure definition for %s (%s)"
 msgstr "Définition de la structure d'autorité pour %s (%s)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl:106
@@ -4111,7 +4121,7 @@
 msgstr "Type d'autorité"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:61
 msgid "Authority type : code missing"
 msgstr "Type d'autorité : code absent"
 
@@ -4123,7 +4133,7 @@
 msgid "Authority:"
 msgstr "Autorité : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:66
 msgid "Authorized Value"
 msgstr "Valeur autorisée"
 
@@ -4133,7 +4143,7 @@
 msgid "Authorized Value %s"
 msgstr "Valeur autorisée : %s"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:75
 msgid "Authorized value"
 msgstr "Valeur autorisée"
 
@@ -4161,7 +4171,7 @@
 #
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 msgid "Autumn"
 msgstr "Automne"
 
@@ -4208,7 +4218,7 @@
 msgstr "Retour à la mise à jour du catalogue"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:142
 msgid "Back to System Preferences"
 msgstr "Retour aux préférences système"
 
@@ -4287,7 +4297,7 @@
 msgstr "Type de code à barres : %s"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 msgid ""
 "Based on the information<br \\/>entered the Numbering Pattern<br \\/>will "
 "look like this<br \\/>\\n"
@@ -4295,7 +4305,7 @@
 "Sur la base du <br \\/> modèle de numérotation saisi<br \\/> cela "
 "ressemblera à ceci <br \\/>\\n"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:43
 msgid "Basic constaints"
 msgstr "Éditeur des restrictions"
 
@@ -4393,19 +4403,19 @@
 "une catégorie C (Centrale) et une catégorie A (Annexe), avec comme "
 "définition Bibliothèque Centrale et Bibliothèque Annexe."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:173
 msgid "Beginnning date:"
 msgstr "Date de début :  "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:872
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:871
 msgid "Begins On: (*)"
 msgstr "Commence le : (*)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:270
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:272
 msgid "Begins on:"
 msgstr "Commence le : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:969
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:968
 msgid "Begins with"
 msgstr "Commence au"
 
@@ -4413,7 +4423,7 @@
 msgid "Benedykt P. Barszcz (Polish for 2.0)"
 msgstr "Benedykt P. Barszcz (Polonais pour version 2.0)"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:675
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:674
 msgid "Biblio"
 msgstr "Notice bibliographique"
 
@@ -4430,7 +4440,7 @@
 msgstr "Détail de la notice"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/help/admin/biblio_framework.tmpl:5
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:91
 msgid "Biblio framework"
 msgstr "Grille de catalogage"
 
@@ -4438,7 +4448,7 @@
 msgid "Biblio informations"
 msgstr "Informations notice"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:163
 msgid "Biblio:"
 msgstr "Notice biblio : "
 
@@ -4552,7 +4562,7 @@
 "Mémoires et thèses"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:486
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:488
 #: ../../koha-tmpl/intranet-tmpl/prog/en/circ/transferstodo.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl:118
@@ -4608,7 +4618,7 @@
 msgstr "Cet adhérent a %s document(s) en prêt."
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:107
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:109
 msgid "Borrower identity"
 msgstr "Identité de l'adhérent"
@@ -4623,7 +4633,7 @@
 msgstr "L'adhérent est suspendu"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:47
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:44
 msgid "Borrower is too young or too old for this category"
 msgstr "Adhérent trop jeune ou trop vieux pour cette catégorie"
 
@@ -4660,9 +4670,9 @@
 msgid "Borrower status"
 msgstr "Statut adhérent"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:191
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:203
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:185
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:205
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:189
 msgid "Borrower type"
 msgstr "Type d'adhérent"
 
@@ -4734,11 +4744,11 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/itemslost.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/inventory.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:688
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:687
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl:235
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl:74
@@ -4748,16 +4758,16 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl:233
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:272
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:298
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:356
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:365
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:302
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:358
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:369
 #: ../../koha-tmpl/intranet-tmpl/prog/en/circ/stats.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/prog/en/circ/bookcount.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl:173
 msgid "Branch"
 msgstr "Site"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:164
 msgid "Branch :"
 msgstr "Site : "
 
@@ -4913,10 +4923,10 @@
 msgid "CD audio"
 msgstr "CD Audio"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl:236
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:275
 msgid "CONFIRM DELETION"
 msgstr "CONFIRMEZ SUPPRESSION"
 
@@ -4952,12 +4962,12 @@
 
 #
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-collection.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:684
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:683
 msgid "Call Number"
 msgstr "Cote"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:163
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:165
 msgid "Call Number:"
 msgstr "Cote : "
 
@@ -5003,7 +5013,7 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/printers.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/currency.tmpl:101
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl:16
@@ -5036,7 +5046,7 @@
 msgstr "Annuler et retourner à valeurs autorisées"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:78
 msgid "Cancel and Return to MARC Tag Structure"
 msgstr "Annuler et retourner à la structure des champs MARC"
 
@@ -5096,11 +5106,11 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:206
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:122
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:313
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:572
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:298
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:568
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:315
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:574
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:302
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:572
 msgid "Card number"
 msgstr "Numéro de carte"
 
@@ -5160,10 +5170,10 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl:298
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:150
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:152
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:191
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:193
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:149
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:192
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:40
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl:21
@@ -5206,9 +5216,9 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl:197
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:194
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:206
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:188
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:198
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:208
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:192
 msgid "Category"
 msgstr "Catégorie"
 
@@ -5408,7 +5418,7 @@
 msgstr "Choisir le fichier à parcourir."
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 msgid "Choose Hemisphere:"
 msgstr "Choisir hémisphère : "
 
@@ -5438,10 +5448,10 @@
 msgstr "Choisir cet adhérent"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/viewlog.tmpl:130
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:170
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:172
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:211
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:213
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:169
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:212
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:11
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl:22
@@ -5498,11 +5508,11 @@
 msgstr "Gestion des communes"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:264
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:356
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:386
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:412
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:356
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:475
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:360
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:390
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:414
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:360
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:479
 msgid "City"
 msgstr "Commune"
 
@@ -5518,7 +5528,7 @@
 msgstr "Nom de commune"
 
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/cities.tmpl:176
 msgid "City name & zipcode missing"
 msgstr "Nom de commune et code postal absents"
 
@@ -5532,17 +5542,17 @@
 msgid "City:"
 msgstr "Commune : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:160
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:162
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:201
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:203
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:200
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:202
 msgid "Claim Acquisition"
 msgstr "Réclamation d'une commande"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:165
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:167
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:206
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:208
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:205
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:207
 msgid "Claim Issues"
 msgstr "Réclamation numéros manquants"
 
@@ -5626,11 +5636,11 @@
 msgid "Closed On:"
 msgstr "Fermé le : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:204
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl:90
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl:155
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl:170
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:17
@@ -5647,8 +5657,8 @@
 msgid "Code39"
 msgstr "Code39"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:182
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:223
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:181
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:222
 msgid "Code:"
 msgstr "Code : "
 
@@ -5755,7 +5765,7 @@
 msgstr "Confirmer la suppression"
 
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:127
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:126
 #, c-format
 msgid "Confirm Deletion of %s?"
 msgstr "Confirmer la suppression de %s ?"
@@ -5815,7 +5825,7 @@
 msgstr "Confirmer la suppression du sous-champ"
 
 #. %1$s: TMPL_VAR name=tagsubfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:81
 #, c-format
 msgid "Confirm Deletion of Subfield %s?"
 msgstr "Confirmer la suppression du sous-champ %s ?"
@@ -5827,7 +5837,7 @@
 msgstr "Confirmer la suppression du champ '%s'"
 
 #. %1$s: TMPL_VAR name=searchfield
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:87
 #, c-format
 msgid "Confirm Deletion of Tag <em>%s</em>?"
 msgstr "Confirmer la suppression du champ <em>%s</em> ?"
@@ -5906,14 +5916,14 @@
 msgid "Considered lost"
 msgstr "Considéré comme perdu"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl:81
 msgid "Constraints"
 msgstr "Restricteurs"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:392
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:430
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:396
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:432
 msgid "Contact"
 msgstr "Contact "
 
@@ -5930,7 +5940,7 @@
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:234
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:233
 msgid "Content (mail content):"
 msgstr "Contenu (contenu de l'email) : "
 
@@ -5996,7 +6006,7 @@
 msgid "Country Name:"
 msgstr "Nom de pays : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:680
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:679
 msgid "Create Biblio"
 msgstr "Créer une notice"
 
@@ -6019,7 +6029,7 @@
 msgstr "Créer un nouveau modèle d'étiquette"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl:20
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:149
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl:155
 msgid "Create Routing List"
 msgstr "Créer une liste de circulation"
 
@@ -6044,14 +6054,14 @@
 msgstr "Créer et gérer les grilles de catalogage (champ et sous champs)"
 
 #. %1$s: TMPL_VAR name=authtypecode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:129
 #, c-format
 msgid "Create authority framework for %s using"
 msgstr "Créer une grille d'autorité pour %s en utilisant"
 
 #. %1$s: TMPL_VAR name=frameworkcode
 #. %2$s: TMPL_VAR name=frameworktext
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:106
 #, c-format
 msgid "Create framework for %s (%s) using"
 msgstr "Créer une grille d'autorité pour %s (%s) en utilisant"
@@ -6149,11 +6159,11 @@
 "Informations sur la version actuelle de Koha pour le rapport de bogues (ou "
 "d'intérêt général)."
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:98
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:117
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl:65
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:141
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:293
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:292
 msgid "Data deleted"
 msgstr "Donnée supprimée"
 
@@ -6164,8 +6174,8 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl:163
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl:120
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:117
-#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl:250
 msgid "Data recorded"
 msgstr "Donnée enregistrée"
 
@@ -6226,11 +6236,11 @@
 msgid "Date last seen"
 msgstr "Vu pour la dernière fois"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:161
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/borrowers_details.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:156
 msgid "Date of birth"
 msgstr "Date de naissance"
 
@@ -6339,17 +6349,17 @@
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:645
 #: ../../koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl:173
 msgid "December"
 msgstr "Décembre"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl:32
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:132
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:147
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:110
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl:58
@@ -6358,7 +6368,7 @@
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:104
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:103
 msgid "Default framework"
 msgstr "Grille par défaut"
 
@@ -6368,7 +6378,7 @@
 msgstr "Valeurs par défaut"
 
 #
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:111
 msgid ""
 "Define authority types, then authority MARC structure in the same way you "
 "define itemtypes and biblio MARC tag structure. Authority values are managed "
@@ -6530,29 +6540,29 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/label-manager.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/label-manager.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl:45
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:115
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:142
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/z3950servers.tmpl:254
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:121
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categoryitem.tmpl:295
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/printers.tmpl:176
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl:139
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl:175
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:168
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:178
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:100
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/currency.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:155
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:167
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:192
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl:200
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:176
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl:138
@@ -6594,7 +6604,7 @@
 msgstr "Supprimer la grille pour %s (%s)?"
 
 #. INPUT type=button name=guarantordelete
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:192
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:194
 msgid "Delete Guarantor"
 msgstr "Supprimer le garant"
 
@@ -6624,7 +6634,7 @@
 
 #. %1$s: TMPL_VAR name=frameworktext
 #. %2$s: TMPL_VAR name=frameworkcode
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:79
 #, c-format
 msgid "Delete ramework for %s (%s)?"
 msgstr "Supprimer la grille pour %s (%s)?"
@@ -6701,8 +6711,8 @@
 "l'impression."
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/barcodes/label-templates.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:79
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:78
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:185
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:205
@@ -6714,8 +6724,8 @@
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl:156
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl:214
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl:13
@@ -6727,9 +6737,9 @@
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:62
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:307
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl:306
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl:60
 msgid "Description missing"
 msgstr "Description manquante"
 
@@ -6743,14 +6753,14 @@
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=liblibrarian
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl:54
 #, c-format
 msgid "Description%s"
 msgstr "Description %s"
 
 #. %1$s: TMPL_VAR name=liblibrarian
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:89
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
@@ -6767,7 +6777,7 @@
 msgid "Destination branch:"
 msgstr "Site de destination : "
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl:145
 msgid "Detail"
 msgstr "Détail"
 
@@ -6861,8 +6871,8 @@
 msgid "Display member details."
 msgstr "Afficher les coordonnées de l'adhérent."
 
+#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:136
 #: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl:140
 msgid "Display only used Tags/Subfields"
 msgstr "Afficher seulement les champs/sous-champs utilisés"
 
@@ -7002,7 +7012,7 @@
 "Non, n'en est pas un"
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl:24
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:24
 #, c-format
 msgid ""
 "Duplicate suspected <a1>Details</a> Duplicate ? <a2>Yes</a> &nbsp;&nbsp;"
@@ -7023,17 +7033,17 @@
 msgid "E-mail"
 msgstr "Email"
 
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:426
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:465
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl:493
-#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl:405
+#: ../../koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl:430
+#: ../../koha-tmpl/intranet-tmpl/prog/en/m