From srdjan at catalyst.net.nz  Tue Oct  1 01:15:09 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue,  1 Oct 2013 12:15:09 +1300
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10843: the DateTime->add
	method takes a scalar, not undef
Message-ID: <1380582909-3988-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

Test plan:
1) set an empty string for the ReservesMaxPickUpDelay pref
2) place a hold on an item
3) check in the item
4) click on "Print and confirm"
5) an error occurs
> The 'days' parameter (undef) to DateTime::Duration::new was an 'undef'
6) apply the patch
7) repeat steps 1 to 4
8) the error does not occur anymore.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Letters.pm |  2 +-
 t/Letters.t   | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 93bc34d..24b8a43 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -613,7 +613,7 @@ sub _parseletter {
         my @waitingdate = split /-/, $values->{'waitingdate'};
 
         my $dt = dt_from_string();
-        $dt->add( days => C4::Context->preference('ReservesMaxPickUpDelay') );
+        $dt->add( days => C4::Context->preference('ReservesMaxPickUpDelay') || 0);
         $values->{'expirationdate'} = output_pref( $dt, undef, 1 );
 
         $values->{'waitingdate'} = output_pref( dt_from_string( $values->{'waitingdate'} ), undef, 1 );
diff --git a/t/Letters.t b/t/Letters.t
index 2d5f557..4d21bc2 100755
--- a/t/Letters.t
+++ b/t/Letters.t
@@ -3,11 +3,11 @@
 # This Koha test module is a stub!
 # Add more tests here!!!
 
-use strict;
-use warnings;
+use Modern::Perl;
+use DBI;
 use Test::MockModule;
-use Test::More tests => 2;
-
+use Test::More tests => 4;
+use t::lib::Mocks;
 my $module = new Test::MockModule('C4::Context');
 $module->mock(
     '_new_dbh',
@@ -32,3 +32,14 @@ $dbh->{mock_add_resultset} = $mock_letters;
 my $letters = C4::Letters::GetLetters();
 
 is( $letters->{ISBN}, 'book', 'HASH ref of ISBN is book' );
+
+# Regression test for bug 10843
+# $dt->add takes a scalar, not undef
+my $letter;
+t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', undef);
+$letter = C4::Letters::_parseletter( undef, 'reserves', {waitingdate => "2013-01-01"} );
+is( ref($letter), 'HASH');
+t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 1);
+$letter = C4::Letters::_parseletter( undef, 'reserves', {waitingdate => "2013-01-01"} );
+is( ref($letter), 'HASH');
+
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Tue Oct  1 01:39:58 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue,  1 Oct 2013 12:39:58 +1300
Subject: [Koha-patches] [PATCH] bug_10781: Removed ILSDI::Utility
Message-ID: <1380584398-7306-1-git-send-email-srdjan@catalyst.net.nz>

Test:
This should be a noop. Regression testing required:
/cgi-bin/koha/ilsdi.pl functioanality, in particuler:
GetAvailability - ?service=Describe&verb=GetAvailability
AuthenticatePatron - ?service=Describe&verb=AuthenticatePatron

ILS-DI syspref must be turned on
---
 C4/ILSDI/Services.pm |  37 +++++++++++++++++-
 C4/ILSDI/Utility.pm  | 107 ---------------------------------------------------
 t/ILSDI_Utility.t    |  14 -------
 3 files changed, 35 insertions(+), 123 deletions(-)
 delete mode 100644 C4/ILSDI/Utility.pm
 delete mode 100755 t/ILSDI_Utility.t

diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index 7941a70..1a189e6 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -29,7 +29,6 @@ use C4::Biblio;
 use C4::Reserves qw(AddReserve CancelReserve GetReservesFromBiblionumber GetReservesFromBorrowernumber CanBookBeReserved CanItemBeReserved);
 use C4::Context;
 use C4::AuthoritiesMarc;
-use C4::ILSDI::Utility;
 use XML::Simple;
 use HTML::Entities;
 use CGI;
@@ -115,7 +114,7 @@ sub GetAvailability {
 
     foreach my $id ( split( / /, $cgi->param('id') ) ) {
         if ( $cgi->param('id_type') eq "item" ) {
-            my ( $biblionumber, $status, $msg, $location ) = Availability($id);
+            my ( $biblionumber, $status, $msg, $location ) = _availability($id);
 
             $out .= "  <dlf:record>\n";
             $out .= "    <dlf:bibliographic id=\"" . ( $biblionumber || $id ) . "\" />\n";
@@ -764,4 +763,38 @@ sub CancelHold {
     return { code => 'Canceled' };
 }
 
+=head2 _availability
+
+Returns, for an itemnumber, an array containing availability information.
+
+	my ($biblionumber, $status, $msg, $location) = _availability($id);
+
+=cut
+
+sub _availability {
+    my ($itemnumber) = @_;
+    my $item = GetItem( $itemnumber, undef, undef );
+
+    if ( not $item->{'itemnumber'} ) {
+        return ( undef, 'unknown', 'Error: could not retrieve availability for this ID', undef );
+    }
+
+    my $biblionumber = $item->{'biblioitemnumber'};
+    my $location     = GetBranchName( $item->{'holdingbranch'} );
+
+    if ( $item->{'notforloan'} ) {
+        return ( $biblionumber, 'not available', 'Not for loan', $location );
+    } elsif ( $item->{'onloan'} ) {
+        return ( $biblionumber, 'not available', 'Checked out', $location );
+    } elsif ( $item->{'itemlost'} ) {
+        return ( $biblionumber, 'not available', 'Item lost', $location );
+    } elsif ( $item->{'wthdrawn'} ) {
+        return ( $biblionumber, 'not available', 'Item withdrawn', $location );
+    } elsif ( $item->{'damaged'} ) {
+        return ( $biblionumber, 'not available', 'Item damaged', $location );
+    } else {
+        return ( $biblionumber, 'available', undef, $location );
+    }
+}
+
 1;
diff --git a/C4/ILSDI/Utility.pm b/C4/ILSDI/Utility.pm
deleted file mode 100644
index b56e1fa..0000000
--- a/C4/ILSDI/Utility.pm
+++ /dev/null
@@ -1,107 +0,0 @@
-package C4::ILSDI::Utility;
-
-# Copyright 2009 SARL Biblibre
-# Copyright 2011 software.coop and MJ Ray
-#
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-use warnings;
-
-use C4::Members;
-use C4::Items;
-use C4::Circulation;
-use C4::Biblio;
-use C4::Reserves qw(GetReservesFromBorrowernumber CanBookBeReserved);
-use C4::Context;
-use C4::Branch qw/GetBranchName/;
-use Digest::MD5 qw(md5_base64);
-
-use vars qw($VERSION @ISA @EXPORT);
-
-BEGIN {
-
-    # set the version for version checking
-    $VERSION = 3.07.00.049;
-    require Exporter;
-    @ISA    = qw(Exporter);
-    @EXPORT = qw(
-      &BorrowerExists &Availability
-    );
-}
-
-=head1 NAME
-
-C4::ILS-DI::Utility - ILS-DI Utilities
-
-=cut
-
-=head2 BorrowerExists
-
-Checks, for a given userid and password, if the borrower exists.
-
-	if ( BorrowerExists($userid, $password) ) {
-		# Do stuff
-	}
-
-=cut
-
-sub BorrowerExists {
-    my ( $userid, $password ) = @_;
-    $password = md5_base64($password);
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("SELECT COUNT(*) FROM borrowers WHERE userid =? and password=? ");
-    $sth->execute( $userid, $password );
-    return $sth->fetchrow;
-}
-
-=head2 Availability
-
-Returns, for an itemnumber, an array containing availability information.
-
-	my ($biblionumber, $status, $msg, $location) = Availability($id);
-
-=cut
-
-sub Availability {
-    my ($itemnumber) = @_;
-    my $item = GetItem( $itemnumber, undef, undef );
-
-    if ( not $item->{'itemnumber'} ) {
-        return ( undef, 'unknown', 'Error: could not retrieve availability for this ID', undef );
-    }
-
-    my $biblionumber = $item->{'biblioitemnumber'};
-    my $location     = GetBranchName( $item->{'holdingbranch'} );
-
-    if ( $item->{'notforloan'} ) {
-        return ( $biblionumber, 'not available', 'Not for loan', $location );
-    } elsif ( $item->{'onloan'} ) {
-        return ( $biblionumber, 'not available', 'Checked out', $location );
-    } elsif ( $item->{'itemlost'} ) {
-        return ( $biblionumber, 'not available', 'Item lost', $location );
-    } elsif ( $item->{'withdrawn'} ) {
-        return ( $biblionumber, 'not available', 'Item withdrawn', $location );
-    } elsif ( $item->{'damaged'} ) {
-        return ( $biblionumber, 'not available', 'Item damaged', $location );
-    } else {
-        return ( $biblionumber, 'available', undef, $location );
-    }
-
-    die Data::Dumper::Dumper($item);
-}
-
-1;
diff --git a/t/ILSDI_Utility.t b/t/ILSDI_Utility.t
deleted file mode 100755
index c06209b..0000000
--- a/t/ILSDI_Utility.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!  
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
-        use_ok('C4::ILSDI::Utility');
-}
-
-- 
1.8.1.2

From colin.campbell at ptfs-europe.com  Wed Oct  2 11:09:13 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed,  2 Oct 2013 10:09:13 +0100
Subject: [Koha-patches] [PATCH] Bug 10983: Remove unused private subroutines
	from C4::Budgets
Message-ID: <1380704953-5984-1-git-send-email-colin.campbell@ptfs-europe.com>

The subroutine _filter_fields is not used by the module
and the sub _columns is only used by it

Remove the dead code, and any associated bugs
---
 C4/Budgets.pm | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index a648773..f3b82d4 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -956,37 +956,6 @@ sub ConvertCurrency {
     return ( $price / $cur );
 }
 
-=head2 _columns
-
-returns an array containing fieldname followed by PRI as value if PRIMARY Key
-
-=cut
-
-sub _columns(;$) {
-	my $tablename=shift||"aqbudgets";
-    return @{C4::Context->dbh->selectcol_arrayref("SHOW columns from $tablename",{Columns=>[1,4]})};
-}
-
-sub _filter_fields{
-	my $budget=shift;
-	my $tablename=shift;
-    my @keys; 
-	my @values;
-	my %columns= _columns($tablename);
-	#Filter Primary Keys of table
-    my $elements=join "|",grep {$columns{$_} ne "PRI"} keys %columns;
-	foreach my $field (grep {/\b($elements)\b/} keys %$budget){
-		$$budget{$field}=format_date_in_iso($$budget{$field}) if ($field=~/date/ && $$budget{$field} !~C4::Dates->regexp("iso"));
-		my $strkeys= " $field = ? ";
-		if ($field=~/branch/){
-			$strkeys="( $strkeys OR $field='' OR $field IS NULL) ";
-		}
-		push @values, $$budget{$field};
-		push @keys, $strkeys;
-	}
-	return (\@keys,\@values);
-}
-
 END { }    # module clean-up code here (global destructor)
 
 1;
-- 
1.8.3.1


From tomascohen at gmail.com  Wed Oct  2 17:52:52 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Wed,  2 Oct 2013 12:52:52 -0300
Subject: [Koha-patches] [PATCH 1/3] Bug 10691: 5xx not properly linked by
	authid in authority search result list
Message-ID: <1380729174-17825-1-git-send-email-tomascohen@gmail.com>

This patch changes the URL and data used to show the 'see also' links
on the OPAC's authority search results page.

Bonus points: makes some strings translatable.

To test:
- On your dev setup (master) create some authority records (i created personal name authorities).
- Pick one of them and link 400$a to another one, do the same with 500$a
- Add some other 400$a and 500$a without linking (i.e. plain text)
- Make sure zebra is running and changes got indexed.
- In the OPAC search for the authority that is linked to the others.
- Check the 'see also:' link points to an authority search
- Apply the patch
- Reload/re-do the search
- Check the 'see also:' link points to the authority id in the case of linked authorities,
  and to an authority search in the case of plain text names.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 .../en/includes/authorities-search-results.inc     |   60 ++++++++++++++------
 .../en/modules/opac-authoritiessearchresultlist.tt |   58 +++++++++----------
 2 files changed, 71 insertions(+), 47 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
index b113049..9a2ffde 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
@@ -1,4 +1,6 @@
 [% BLOCK showreference %]
+    [% SET authidurl = '/cgi-bin/koha/opac-authoritiesdetail.pl?authid=' %]
+    [% SET searchurl = '/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&value=' %]
     [% IF marcflavour == 'UNIMARC' %]
         [% SWITCH type %]
         [% CASE 'broader' %]
@@ -11,24 +13,39 @@
             <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        [% IF ( label ) %]<span class="label">[% SWITCH label %]
-        [% CASE 'see also:' %]see also:
-        [% CASE 'used for/see from:' %]used for/see from:
-        [% END %]</span>[% END %]
+        <span class="label">
+        [% IF ( type=='seefrom' ) %]
+            used for/see from:
+        [% ELSIF  ( type=='seealso' ) %]
+            see also:
+        [% END %]
+        </span>
         <span class="heading">
-        [% IF ( linkpath && search ) %]<a href="[% link | url %][% search | url %]">[% heading | html %]</a>
-        [% ELSE %][% heading | html %][% END %]
+        [% IF ( type=='seealso' ) %]
+            [% IF ( authid ) %]
+            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
+            [% ELSE %]
+            <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a>
+            [% END %]
+        [% ELSE %]
+            [% heading | html %]
+        [% END %]
         </span>
-        [% UNLESS ( type=='seefrom' || type=='seealso' ) %]<span class="type">[% SWITCH type %]
-        [% CASE 'earlier' %](Earlier heading)
-        [% CASE 'later' %](Later heading)
-        [% CASE 'acronym' %](Acronym)
-        [% CASE 'musical' %](Musical composition)
-        [% CASE 'broader' %](Broader heading)
-        [% CASE 'narrower' %](Narrower heading)
-        [% CASE 'parent' %](Immediate parent body)
-        [% CASE %][% IF type %]([% type | html %])[% END %]
-        [% END %]</span>[% END %]
+        [% UNLESS ( type=='seefrom' || type=='seealso' ) %]
+        <span class="type">
+            [% SWITCH type %]
+            [% CASE 'earlier' %](Earlier heading)
+            [% CASE 'later' %](Later heading)
+            [% CASE 'acronym' %](Acronym)
+            [% CASE 'musical' %](Musical composition)
+            [% CASE 'broader' %](Broader heading)
+            [% CASE 'narrower' %](Narrower heading)
+            [% CASE 'parent' %](Immediate parent body)
+            [% CASE %][% IF type %]([% type | html %])
+            [% END %]
+        [% END %]
+        </span>
+        [% END %]
     [% END %]
 [% END %]
 [% BLOCK authresult %]
@@ -68,14 +85,21 @@
             [% IF ( summary.seefrom ) %]
                 [% FOREACH seefro IN summary.seefrom %]
                     <div class="seefrom authref">
-                    [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type search='' %]
+                    [% PROCESS showreference
+                        heading=seefro.heading
+                        type=seefro.type
+                    %]
                     </div>
                 [% END %]
             [% END %]
             [% IF ( summary.seealso ) %]
                 [% FOREACH seeals IN summary.seealso %]
                     <div class="seealso authref">
-                    [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type linkpath=link search=seeals.search %]
+                    [% PROCESS showreference
+                        heading=seeals.heading
+                        type=seeals.type
+                        authid=seeals.authid
+                    %]
                     </div>
                 [% END %]
             [% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
index 71ad40e..7f80fe0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt
@@ -44,35 +44,35 @@
 
 			[% IF ( total ) %]
 <div class="searchresults">
-		<table>
-			<tr>
-                <th>Authorized headings</th>
-                <th>Type of heading</th>
-				[% UNLESS ( isEDITORS ) %]
-                    <th>Biblio records</th>
-				[% END %]
-                <th>Full heading</th>
-			</tr>
-			[% FOREACH resul IN result %]
-            [% UNLESS ( loop.odd ) %]
-                <tr class="highlight">
-            [% ELSE %]
-                <tr>
-            [% END %]
-                    <td>[% PROCESS authresult summary=resul.summary link="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&valuec=" %]</td>
-                    <td>[% resul.authtype %]</td>
-					[% UNLESS ( resul.isEDITORS ) %]
-						<td>
-							 <a href="/cgi-bin/koha/opac-search.pl?type=opac&amp;op=do_search&amp;q=an=[% resul.authid %]">[% resul.used %] biblios</a>
-						</td>
-					[% END %]
-						<td>
-                            <a href="opac-authoritiesdetail.pl?authid=[% resul.authid %]">View full heading</a>
-						</td>
-				</tr>
-			[% END %]
-		</table>
-	</div>
+    <table>
+        <tr>
+            <th>Authorized headings</th>
+            <th>Type of heading</th>
+        [% UNLESS ( isEDITORS ) %]
+            <th>Biblio records</th>
+        [% END %]
+            <th>Full heading</th>
+        </tr>
+[% FOREACH resul IN result %]
+    [% UNLESS ( loop.odd ) %]
+        <tr class="highlight">
+    [% ELSE %]
+        <tr>
+    [% END %]
+            <td>[% PROCESS authresult summary=resul.summary %]</td>
+            <td>[% resul.authtype %]</td>
+        [% UNLESS ( resul.isEDITORS ) %]
+            <td>
+                <a href="/cgi-bin/koha/opac-search.pl?type=opac&amp;op=do_search&amp;q=an=[% resul.authid %]">[% resul.used %] biblios</a>
+            </td>
+        [% END %]
+            <td>
+                <a href="opac-authoritiesdetail.pl?authid=[% resul.authid %]">View full heading</a>
+            </td>
+        </tr>
+[% END %]
+    </table>
+</div>
 	<div id="resultnumber">
 			[% IF ( displayprev ) %]
 				<a href="opac-authorities-home.pl?startfrom=[% startfromprev %]&amp;[% FOREACH searchdat IN searchdata %][% searchdat.term %]=[% searchdat.val |url %]&amp;[% END %]resultsperpage=[% resultsperpage %]&amp;type=opac&amp;op=do_search&amp;authtypecode=[% authtypecode %]&amp;orderby=[% orderby %]">&lt;&lt;</a>
-- 
1.7.9.5


From tomascohen at gmail.com  Wed Oct  2 17:52:53 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Wed,  2 Oct 2013 12:52:53 -0300
Subject: [Koha-patches] [PATCH 2/3] Bug 10691: 5xx not properly linked by
	authid in authority search result list [Staff]
In-Reply-To: <1380729174-17825-1-git-send-email-tomascohen@gmail.com>
References: <1380729174-17825-1-git-send-email-tomascohen@gmail.com>
Message-ID: <1380729174-17825-2-git-send-email-tomascohen@gmail.com>

This patch changes the URL and data used to show the 'see also' links
on the Staff's authority search results page.

Bonus points: makes some strings translatable.

To test:
- On your dev setup (master) create some authority records (i created personal name authorities).
- Pick one of them and link 400$a to another one, do the same with 500$a
- Add some other 400$a and 500$a entries with plain text (i.e. no linking)
- Make sure zebra is running and changes got indexed.
- In the staff interface search for the authority that is linked to the others.
- Check the 'see also:' link points to an authority search
- Apply the patch
- Reload/re-do the search
- Check the 'see also:' link points to the authority id for linked authorities,
  and to an authority search result in the case of plain text entries.
- Check that the authority search from the cataloguing interface still works as usual.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 .../en/includes/authorities-search-results.inc     |  111 ++++++++++++--------
 .../en/modules/authorities/searchresultlist.tt     |    2 +-
 2 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
index 366c695..2ee15db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
@@ -1,4 +1,7 @@
 [% BLOCK showreference %]
+    [% SET authidurl = '/cgi-bin/koha/authorities/detail.pl?authid=' %]
+    [% SET searchurl = '/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=' %]
+
     [% IF marcflavour == 'UNIMARC' %]
         [% SWITCH type %]
         [% CASE 'broader' %]
@@ -11,69 +14,94 @@
             <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        [% IF ( label ) %]<span class="label">[% label | html %]</span>[% END %]
+        <span class="label">
+        [% IF ( type=='seefrom' ) %]
+            used for/see from:
+        [% ELSIF  ( type=='seealso' ) %]
+            see also:
+        [% END %]
+        </span>
         <span class="heading">
-        [% IF ( linkpath && search ) %]<a href="[% link | url %][% search | url %]">[% heading | html %]</a>
-        [% ELSE %][% heading | html %][% END %]
+        [% IF ( type=='seealso' ) %]
+            [% IF ( authid ) %]
+            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
+            [% ELSE %]
+            <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a>
+            [% END %]
+        [% ELSIF  ( type=='seealso' ) %]
+            [% heading | html %]
+        [% END %]
         </span>
-        [% UNLESS ( type=='seefrom' || type=='seealso' ) %]<span class="type">[% SWITCH type %]
-        [% CASE 'earlier' %](Earlier heading)
-        [% CASE 'later' %](Later heading)
-        [% CASE 'acronym' %](Acronym)
-        [% CASE 'musical' %](Musical composition)
-        [% CASE 'broader' %](Broader heading)
-        [% CASE 'narrower' %](Narrower heading)
-        [% CASE 'parent' %](Immediate parent body)
-        [% CASE %][% IF type %]([% type | html %])[% END %]
-        [% END %]</span>[% END %]
+        [% UNLESS ( type=='seefrom' || type=='seealso' ) %]
+        <span class="type">
+            [% SWITCH type %]
+            [% CASE 'earlier' %](Earlier heading)
+            [% CASE 'later' %](Later heading)
+            [% CASE 'acronym' %](Acronym)
+            [% CASE 'musical' %](Musical composition)
+            [% CASE 'broader' %](Broader heading)
+            [% CASE 'narrower' %](Narrower heading)
+            [% CASE 'parent' %](Immediate parent body)
+            [% CASE %][% IF type %]([% type | html %])
+            [% END %]
+        [% END %]
+        </span>
+        [% END %]
     [% END %]
 [% END %]
 [% BLOCK authresult %]
     [% IF ( summary.summary ) %][% summary.summary | html %]:[% END %]
     [% UNLESS ( summary.summaryonly ) %]
         <div class="authorizedheading">
-        [% FOREACH authorize IN summary.authorized %]
-          <span class="authorizedheading">[% authorize.heading | html %]</span>
-        [% END %]
+          [% FOREACH authorize IN summary.authorized %]
+            <span class="authorizedheading">[% authorize.heading | html %]</span>
+          [% END %]
         </div>
         [% IF ( marcflavour == 'UNIMARC' ) %]
-          [% IF summary.notes %]
-           <div class="authres_notes">
-           [% FOREACH note IN summary.notes %]
-             [% note.note | html %]</span>
-           [% END %]
-           </div>
-          [% END %]
-          [% IF summary.seealso %]
-            <div class="authres_seealso">
-            [% FOREACH see IN summary.seealso %]
-              [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
-              [% IF ! loop.last %] ; [% END %]
+            [% IF summary.notes %]
+             <div class="authres_notes">
+             [% FOREACH note IN summary.notes %]
+               [% note.note | html %]</span>
+             [% END %]
+             </div>
             [% END %]
-            </div>
-          [% END %]
-          [% IF summary.otherscript %]
-            <div class="authres_otherscript">
-            [% FOREACH other IN summary.otherscript %]
-              [% PROCESS language lang=other.lang | trim %]:
-              [% other.term %]
-              [% IF ! loop.last %] ; [% END %]
+            [% IF summary.seealso %]
+              <div class="authres_seealso">
+              [% FOREACH see IN summary.seealso %]
+                 [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
+                 [% IF ! loop.last %] ; [% END %]
+              [% END %]
+              </div>
+            [% END %]
+            [% IF summary.otherscript %]
+              <div class="authres_otherscript">
+              [% FOREACH other IN summary.otherscript %]
+                [% PROCESS language lang=other.lang | trim %]:
+                [% other.term %]
+                [% IF ! loop.last %] ; [% END %]
+              [% END %]
+              </div>
             [% END %]
-            </div>
-          [% END %]
-
         [% ELSE %]
             [% IF ( summary.seefrom ) %]
                 [% FOREACH seefro IN summary.seefrom %]
                     <div class="seefrom authref">
-                    [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type search='' %]
+                    [% PROCESS showreference
+                        heading=seefro.heading
+                        type=seefro.type
+                        authid=seefro.authid
+                    %]
                     </div>
                 [% END %]
             [% END %]
             [% IF ( summary.seealso ) %]
                 [% FOREACH seeals IN summary.seealso %]
                     <div class="seealso authref">
-                    [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type linkpath=link search=seeals.search %]
+                    [% PROCESS showreference
+                        heading=seeals.heading
+                        type=seeals.type
+                        authid=seeals.authid
+                    %]
                     </div>
                 [% END %]
             [% END %]
@@ -90,3 +118,4 @@
    [% CASE %][% lang %]
   [% END %]
 [% END %]
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
index ea16505..808881a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
@@ -77,7 +77,7 @@ function searchauthority() {
     [% ELSE %]
     <tr>
     [% END %]
-      <td>[% PROCESS authresult summary=resul.summary link="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=" %]</td>
+      <td>[% PROCESS authresult summary=resul.summary %]</td>
       <td><a href="detail.pl?authid=[% resul.authid %]">Details</a></td>
   [% UNLESS ( resul.isEDITORS ) %]
       <td>
-- 
1.7.9.5


From tomascohen at gmail.com  Wed Oct  2 17:52:54 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Wed,  2 Oct 2013 12:52:54 -0300
Subject: [Koha-patches] [PATCH 3/3] Bug 10691: Small glitch fixed
In-Reply-To: <1380729174-17825-1-git-send-email-tomascohen@gmail.com>
References: <1380729174-17825-1-git-send-email-tomascohen@gmail.com>
Message-ID: <1380729174-17825-3-git-send-email-tomascohen@gmail.com>

A small glitch prevented 'see from' headings to show.

Sponsored-by: Universidad Nacional de C?rdoba
---
 .../en/includes/authorities-search-results.inc     |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
index 2ee15db..10559d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
@@ -28,7 +28,7 @@
             [% ELSE %]
             <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a>
             [% END %]
-        [% ELSIF  ( type=='seealso' ) %]
+        [% ELSE %]
             [% heading | html %]
         [% END %]
         </span>
-- 
1.7.9.5


From tomascohen at gmail.com  Wed Oct  2 20:57:53 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Wed,  2 Oct 2013 15:57:53 -0300
Subject: [Koha-patches] [PATCH] Bug 10987: Too many 'see also' and 'see
	from' labels occurences
Message-ID: <1380740273-18683-1-git-send-email-tomascohen@gmail.com>

If an authority record has more than one 4xx$a (or 5xx$a) entries the
corresponding labels 'see also' and 'used for/see from' are repeated.

To test:
- Have authority records with more than one entry on the 4xx (or 5xx) fields.
- Do a search, check "see also:" (or 'used for/see from') appear more than once.
- Apply the patch
- Reload and check it looks nicer :-D
- Repeat for: staff auth search, opac using ccsr, opac using prog
- Signoff

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    8 +++++---
 .../en/includes/authorities-search-results.inc     |   21 ++++++++++----------
 koha-tmpl/opac-tmpl/ccsr/en/css/opac.css           |    6 ++++--
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    6 ++++--
 .../en/includes/authorities-search-results.inc     |   21 ++++++++++----------
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 308e3a0..64d2f97 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2258,11 +2258,13 @@ ul.ui-tabs-nav li {
 }
 
 .authref {
-    text-indent: 2em;
+    font-style: normal;
+    text-indent: 4em;
 }
 
-.authref .label {
-    font-style: italic;
+.seefrom, .seealso {
+    font-style: italic; 
+    text-indent: 2em;
 }
 
 #authfinderops {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
index 10559d6..5d8819b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
@@ -14,13 +14,6 @@
             <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        <span class="label">
-        [% IF ( type=='seefrom' ) %]
-            used for/see from:
-        [% ELSIF  ( type=='seealso' ) %]
-            see also:
-        [% END %]
-        </span>
         <span class="heading">
         [% IF ( type=='seealso' ) %]
             [% IF ( authid ) %]
@@ -83,9 +76,11 @@
               </div>
             [% END %]
         [% ELSE %]
-            [% IF ( summary.seefrom ) %]
+            [% IF ( summary.seefrom.size > 1 ) %]
+            <div class="seefrom">
+                <span class="seefrom">used for/see from:</span>
                 [% FOREACH seefro IN summary.seefrom %]
-                    <div class="seefrom authref">
+                    <div class="authref">
                     [% PROCESS showreference
                         heading=seefro.heading
                         type=seefro.type
@@ -93,10 +88,13 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
-            [% IF ( summary.seealso ) %]
+            [% IF ( summary.seealso.size > 1 ) %]
+            <div class="seealso">
+                <span class="seealso">see also:</span>
                 [% FOREACH seeals IN summary.seealso %]
-                    <div class="seealso authref">
+                    <div class="authref">
                     [% PROCESS showreference
                         heading=seeals.heading
                         type=seeals.type
@@ -104,6 +102,7 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
         [% END %]
     [% END %]
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
index 0901d6b..f0b8744 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/ccsr/en/css/opac.css
@@ -2640,11 +2640,13 @@ ul.ui-tabs-nav li {
 }
 
 .authref {
-    text-indent: 2em;
+    font-style: normal;
+    text-indent: 4em;
 }
 
-.authref .label {
+.seefrom, .seealso {
     font-style: italic;
+    text-indent: 2em;
 }
 
 .authstanza {
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index c2902c1..c977b62 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -2779,11 +2779,13 @@ ul.ui-tabs-nav li {
 }
 
 .authref {
-    text-indent: 2em;
+    font-style: normal;
+    text-indent: 4em;
 }
 
-.authref .label {
+.seefrom, .seealso {
     font-style: italic;
+    text-indent: 2em;
 }
 
 .authstanza {
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
index 9a2ffde..5406de3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc
@@ -13,13 +13,6 @@
             <span class="RT">RT: [% heading | html %]</span>
         [% END %]
     [% ELSE %]
-        <span class="label">
-        [% IF ( type=='seefrom' ) %]
-            used for/see from:
-        [% ELSIF  ( type=='seealso' ) %]
-            see also:
-        [% END %]
-        </span>
         <span class="heading">
         [% IF ( type=='seealso' ) %]
             [% IF ( authid ) %]
@@ -82,19 +75,24 @@
               </div>
             [% END %]
         [% ELSE %]
-            [% IF ( summary.seefrom ) %]
+            [% IF ( summary.seefrom.size > 1 ) %]
+            <div class="seefrom">
+                <span class="seefrom">used for/see from:</span>
                 [% FOREACH seefro IN summary.seefrom %]
-                    <div class="seefrom authref">
+                    <div class="authref">
                     [% PROCESS showreference
                         heading=seefro.heading
                         type=seefro.type
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
-            [% IF ( summary.seealso ) %]
+            [% IF ( summary.seealso.size > 1 ) %]
+            <div class="seealso">
+                <span class="seealso">see also:</span>
                 [% FOREACH seeals IN summary.seealso %]
-                    <div class="seealso authref">
+                    <div class="authref">
                     [% PROCESS showreference
                         heading=seeals.heading
                         type=seeals.type
@@ -102,6 +100,7 @@
                     %]
                     </div>
                 [% END %]
+            </div>
             [% END %]
         [% END %]
     [% END %]
-- 
1.7.9.5


From srdjan at catalyst.net.nz  Thu Oct  3 02:56:17 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu,  3 Oct 2013 13:56:17 +1300
Subject: [Koha-patches] [PATCH] Bug 10890 - Autobarcode "<branch>yymm00001"
	Fails in Acquisitions When Receiving Item
Message-ID: <1380761777-24123-1-git-send-email-srdjan@catalyst.net.nz>

From: David Cook <dcook at prosentient.com.au>

This patch adds the name "f" to the form that adds items when placing or receiving
an order in Acquisitions.

This is needed so that the autobarcode code (which uses document.f.field_name) will
work properly when the system preference is set to "<branch>yymm00001".

AcqCreateItem
"placing an order"
"receiving an order"

TEST PLAN

1) Set the autobarcode system preference to "<branch>yymm00001"
2) Set the AcqCreateItem system preference to "placing an order"
3) Plan an order
4) Try to add a barcode to the item in the AJAX form
5) Note that no barcode appears. Depending on your browser, you might
receive a Javascript error popup message or a error icon at the bottom
of your screen. You might receive no error message at all and it will
fail seemingly silently.

6) Set the AcqCreateItem system preference to "receiving an order"
7) Receive the order
8) Try to add a barcode to the item in the AJAX form
9) See step 5. No barcode will appear and you might get an error message.

10) Apply the patch
11) Repeat steps 2, 3, 4, 6, 7, and 8 again. That is, try to add
barcodes when placing an order and receiving an order.
12) Note that a barcode now appears with the pattern of <branch>yymm00001

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index c261530..519e8e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -207,7 +207,7 @@ $(document).ready(function()
     </div>
 [% END %]
 
-<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform" onsubmit="return Check(this);">
+<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform" name="f" onsubmit="return Check(this);">
 
 <fieldset class="rows">
         <legend>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index 67999e4..9cae32c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -130,7 +130,7 @@
 <h1>Receive items from : [% name %] [% IF ( invoice ) %][[% invoice %]] [% END %] (order #[% ordernumber %])</h1>
 
 [% IF ( count ) %]
-    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" onsubmit="return Check(this);">
+    <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post" name="f" onsubmit="return Check(this);">
 <div class="yui-g">
 <div class="yui-u first">
     <div class="error" style="display:none"></div>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Thu Oct  3 03:53:37 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu,  3 Oct 2013 14:53:37 +1300
Subject: [Koha-patches] [PATCH] Bug 10794 - Sorting on billing date column
	in invoices table doesn't work
Message-ID: <1380765217-30593-1-git-send-email-srdjan@catalyst.net.nz>

From: Owen Leonard <oleonard at myacpl.org>

This patch adds the sorting by title string option to the table of
invoices. This allows column data to be sorted based on the
ISO-formatted date rather than the formatted-for-display date. A "blank"
(0000-00-00) date is added to cells which contain no date data.

To test, view the Acquisitions Invoices page (acqui/invoices.pl) and
confirm that the "Billing date" column is sorted correctly regardless of
the dateformat system preference.

http://bugs.koha-community.org/show_bug.cgi?id=10749

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
index 40114ad..965fec5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -9,14 +9,11 @@
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
-    [% IF (dateformat == 'metric') %]
-        dt_add_type_uk_date();
-    [% END %]
     $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
-        bInfo: false,
-        bPaginate: false,
-        bFilter: false,
         sDom: "t",
+        "aoColumns": [
+            null,null,{ "sType": "title-string" },null,null,null,null
+        ],
         aoColumnDefs: [
             { "bSortable": false, "aTargets": [6] }
         ]
@@ -59,7 +56,9 @@ $(document).ready(function() {
                   <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid %]">[% invoice.suppliername %]</a></td>
                   <td>
                     [% IF invoice.billingdate %]
-                      [% invoice.billingdate | $KohaDates %]
+                      <span title="[% invoice.billingdate %]">[% invoice.billingdate | $KohaDates %]</span>
+                    [% ELSE %]
+                      <span title="0000-00-00"></span>
                     [% END %]
                   </td>
                   <td>[% invoice.receivedbiblios %]</td>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Thu Oct  3 04:09:26 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu,  3 Oct 2013 15:09:26 +1300
Subject: [Koha-patches] [PATCH] Bug 10798 - OPAC_SEARCH_LIMIT behaves badly
	with search groups
Message-ID: <1380766166-32708-1-git-send-email-srdjan@catalyst.net.nz>

From: Martin Renvoize <martin.renvoize at ptfs-europe.com>

Since the addition of search groups to koha, the branch limiting
parameter in multiple PAC by URL support should also support
limiting by these search groups.  This patch adds this ability.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Auth.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 1e17e59..46d7477 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -371,7 +371,11 @@ sub get_template_and_user {
         my $opac_search_limit = $ENV{'OPAC_SEARCH_LIMIT'};
         my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'};
         my $opac_name = '';
-        if (($opac_search_limit && $opac_search_limit =~ /branch:(\w+)/ && $opac_limit_override) || ($in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:(\w+)/)){
+        if (
+	    ($opac_limit_override && $opac_search_limit && $opac_search_limit =~ /branch:(\w+)/) ||
+	    ($in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:(\w+)/) ||
+	    ($in->{'query'}->param('multibranchlimit') && $in->{'query'}->param('multibranchlimit') =~ /multibranchlimit-(\w+)/)
+        ) { 
             $opac_name = $1;   # opac_search_limit is a branch, so we use it.
         } elsif ( $in->{'query'}->param('multibranchlimit') ) {
             $opac_name = $in->{'query'}->param('multibranchlimit');
-- 
1.8.1.2

From colin.campbell at ptfs-europe.com  Fri Oct  4 12:49:03 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri,  4 Oct 2013 11:49:03 +0100
Subject: [Koha-patches] [PATCH] Bug 10996 Allow numeric subfields to be
	stripped on export
Message-ID: <1380883743-9188-1-git-send-email-colin.campbell@ptfs-europe.com>

Regex assumed all numeric characters were part of the tag number
This is obviously false as $9 would be a likely candidate
to be removed on export. Constrain the tag by length

The code can be any printing ascii character other than space
according to LoC's website

Also changed regexp to no longer allow a zero length tag number
which is nonsensical.
The old regex would accept shorter than 3 digit tags but these were
not stripped so I've removed that option considering it a bug
not a feature

NB assumption that the code makes that a tag is always numeric is
incorrect but works in practice. Handling non-numeric tags is
a 'To be done'

Made code dependent on the regex succeeding. Picking up results
from a previous regex on failure can lead to weird hard to
identify bugs
---
 tools/export.pl | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/export.pl b/tools/export.pl
index 40c3b9b..a9e54ec 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -360,17 +360,19 @@ if ( $op eq "export" ) {
                 if ($export_remove_fields) {
                     my @fields = split " ", $export_remove_fields;
                     foreach (@fields) {
-                        /^(\d*)(\w)?$/;
-                        my $field    = $1;
-                        my $subfield = $2;
-
-                        # skip if this record doesn't have this field
-                        next if not defined $record->field($field);
-                        if ($subfield) {
-                            $record->field($field)->delete_subfields($subfield);
-                        }
-                        else {
-                            $record->delete_field( $record->field($field) );
+                        if (/^(\d{3})(.)?$/) {
+                            my $field    = $1;
+                            my $subfield = $2;
+
+                            # skip if this record doesn't have this field
+                            next if not defined $record->field($field);
+                            if ($subfield) {
+                                $record->field($field)
+                                  ->delete_subfields($subfield);
+                            }
+                            else {
+                                $record->delete_field( $record->field($field) );
+                            }
                         }
                     }
                 }
-- 
1.8.3.1


From mathieu.saby at univ-rennes2.fr  Wed Oct  9 21:41:54 2013
From: mathieu.saby at univ-rennes2.fr (Mathieu Saby)
Date: Wed, 09 Oct 2013 21:41:54 +0200
Subject: [Koha-patches] [PATCH 1] Suppress unneeded fields in
	unimarc_complet default Framework
Message-ID: <5255B182.6010608@univ-rennes2.fr>

First patch, for "complete" framework, used by academic libray
900, 901, 910, 918, 920,950,960,970,980,987 fields were useless. I removed them.
I kept only the fields mentionned in Sudoc documentation http://documentation.abes.fr/sudoc/formats/loc/index.htm
916 field is not cited in that page, but it belongs to Sudoc format.

I kept also 2 fields specific to Electre in 2013 :
902 niveau de lecture (Electre)
903  indexation (Electre)

I also added to the name of the 9XX fields I kept the mention (Sudoc) / (Electre) / (Koha), so it could be easier for librarians to know what is the purpose and the origin of each field

I don't make an updatedatabase, because some libraries could still be using these fields for good or bad reasons.

To test :
1) take a fresh Koha with unimarc marcflavor
2) in web installer, select french language, unimarc marflavor and "Grilles de catalogage compl?tes".
3) check default framework in Administration > MARC Frameworks : it should be without 900,901,910,918,920,950,970,980,987

---
  .../Obligatoire/framework_DEFAULT.sql              |  151 +++-----------------
  1 file changed, 20 insertions(+), 131 deletions(-)

diff --git a/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql b/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
index a143758..ff077f8 100644
--- a/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
+++ b/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
@@ -212,36 +212,24 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
  ('852', 'Localisation et cote', '', 1, 0, '', ''),
  ('856', 'adresse ?lectronique et mode d''acc?s', 'acc?s', 1, 0, '', ''),
  ('886', 'donn?es non converties du format source', '', 1, 0, '', ''),
-('900', 'forme rejet?e des zones 70X et 72X', '', 0, 0, NULL, ''),
-('901', 'num?ro de r?f?rence Electre', '', 0, 0, NULL, ''),
-('902', 'niveau de lecture', '', 0, 0, NULL, ''),
-('903', 'indexation', 'cote', 0, 0, NULL, ''),
-('910', 'forme rejet?e des zones 71X', '', 0, 0, NULL, ''),
-('915', 'num?ro de gestion', '', 0, 0, NULL, ''),
-('916', 'donn?es cod?es sur la conservation', '', 0, 0, NULL, ''),
-('917', 'donn?es cod?es sur le pr?t, le d?p?t, la communication et la reproduction', '', 0, 0, NULL, ''),
-('918', 'num?ro de notice archiv?', '', 0, 0, NULL, ''),
-('919', 'r?f?rence dans le syst?me local', '', 0, 0, NULL, ''),
-('920', 'acc?s auteur-titre', '', 0, 0, NULL, ''),
-('930', 'localisation et cote', 'localisation', 0, 0, NULL, ''),
-('931', 'ancienne cote', '', 0, 0, '', ''),
-('932', 'future cote', '', 0, 0, NULL, ''),
-('936', 'num?ro d''inventaire', '', 0, 0, NULL, ''),
-('942', 'total des pr?ts', '', 0, 0, NULL, ''),
-('950', 'forme rejet?e des zones 5XX', '', 0, 0, NULL, ''),
-('955', '?tat de collection des publications en s?rie', '?tat de collection', 0, 0, NULL, ''),
-('956', '?tat de collection des publications en s?rie : suppl?ment et mat?riel d''accompagnement', 'suppl?ments', 0, 0, NULL, ''),
-('957', '?tat de collection des publications en s?rie : tables et index', 'tables et index', 0, 0, NULL, ''),
-('958', 'nom et importance d''une partie', '', 0, 0, NULL, ''),
-('960', 'forme rejet?e des zones 6XX', '', 0, 0, NULL, ''),
-('966', 'champ de localisation', 'localisation', 0, 0, NULL, ''),
-('970', 'vedettes commerciales', 'sujets', 0, 0, NULL, ''),
-('980', 'forme rejet?e des zones 970', 'sujets', 0, 0, NULL, ''),
-('987', 'num?ro de notice archiv?', '', 0, 0, NULL, ''),
-('990', 'cote ou note de contenu', '', 0, 0, NULL, ''),
-('991', 'indexation locale', 'sujets', 0, 0, NULL, ''),
-('992', 'classification locale', 'cote', 0, 0, NULL, ''),
-('995', 'Exemplaires', '', 0, 0, '', '');
+('902', 'Niveau de lecture (Electre)', '', 0, 0, '', ''),
+('903', 'Indexation (Electre)', '', 0, 0, '', ''),
+('915', 'Num?ro de gestion (Sudoc)', '', 0, 0, NULL, ''),
+('916', 'Donn?es cod?es sur la conservation Publications en s?rie (Sudoc)', '', 0, 0, NULL, ''),
+('917', 'Donn?es cod?es sur le pr?t, le d?p?t, la communication et la reproduction (Sudoc)', '', 0, 0, NULL, ''),
+('919', 'R?f?rence dans le syst?me local (Sudoc)', '', 0, 0, NULL, ''),
+('930', 'Localisation et cote (Sudoc)', 'localisation', 0, 0, NULL, ''),
+('931', 'Ancienne cote (Sudoc)', '', 0, 0, '', ''),
+('932', 'Future cote (Sudoc)', '', 0, 0, NULL, ''),
+('942', 'Total des pr?ts (Koha)', '', 0, 0, NULL, ''),
+('955', 'Etat de collection des publications en s?rie (Sudoc)', '?tat de collection', 0, 0, NULL, ''),
+('956', 'Etat de collection des publications en s?rie : suppl?ment et mat?riel d''accompagnement (Sudoc)', 'suppl?ments', 0, 0, NULL, ''),
+('957', 'Etat de collection des publications en s?rie : tables et index (Sudoc)', 'tables et index', 0, 0, NULL, ''),
+('958', 'Nom et importance d''une partie (Sudoc)', '', 0, 0, NULL, ''),
+('990', 'Cote ou note de contenu (Sudoc)', '', 0, 0, NULL, ''),
+('991', 'Indexation locale (Sudoc)', 'sujets', 0, 0, NULL, ''),
+('992', 'Classification locale (Sudoc)', 'cote', 0, 0, NULL, ''),
+('995', 'Exemplaires (Koha)', '', 0, 0, '', '');
  
  INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `kohafield`, `tab`, `authorised_value`, `authtypecode`, `value_builder`, `isurl`, `hidden`, `frameworkcode`, `seealso`, `link`, `defaultvalue`) VALUES
  ('000', '@', 'leader', '', 0, 0, '', 0, '', '', 'unimarc_leader.pl', NULL, 0, '', '', NULL, ''),
@@ -1799,33 +1787,8 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
  ('886', '2', 'code du syst?me', '', 0, 0, '', 8, '', '', '', 0, 0, '', NULL, '', ''),
  ('886', 'a', '?tiquette de la zone du format source', '', 0, 0, '', 8, '', '', '', 0, 0, '', NULL, '', ''),
  ('886', 'b', 'indicateurs et sous-zones de la zone du format source', '', 0, 0, '', 8, '', '', '', 0, 0, '', NULL, '', ''),
-('900', '3', 'num?ro de la notice d''autorit?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', '4', 'code de fonction', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', '9', 'num?ro d''occurrence de l''?tiquette', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', 'a', '?l?ment d''entr?e', 'auteur', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', 'b', 'partie du nom autre que l''?l?ment d''entr?e', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', 'c', 'qualificatifs autres que les dates', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', 'd', 'chiffres romains', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', 'f', 'dates', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', 'g', 'forme d?velopp?e des initiales du pr?nom', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', 'p', 'affiliation ou adresse', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('900', 'v', 'num?ro de la sous-notice', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('901', '3', 'num?ro de r?f?rence Electre', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('902', 'a', 'code de niveau de lecture', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('903', 'a', 'code d''indexation', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', '3', 'num?ro de la notice d''autorit?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', '4', 'code de fonction', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', '9', 'num?ro d''occurrence de l''?tiquette', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'a', '?l?ment d''entr?e', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'b', 'subdivision', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'c', '?l?ment ajout? au nom ou qualificatif', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'd', 'num?ro de Congr?s et/ou de session', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'e', 'lieu du Congr?s', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'f', 'date du Congr?s', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'g', '?l?ment rejet?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'h', 'partie du nom autre que l''?l?ment d''entr?e et que l''?l?ment rejet?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'p', 'affiliation ou adresse', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('910', 'v', 'num?ro de la sous-notice', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
+('902', 'a', 'niveau de lecture','', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
+('903', 'a', 'indexation Electre', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('915', '5', 'indentifiant de l''exemplaire', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('915', 'a', 'num?ro d''inventaire', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('915', 'b', 'num?ro de code ? barres', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
@@ -1838,18 +1801,12 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
  ('916', 'n', 'date de restitution pr?vue', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('917', '5', 'identifiant de l''exemplaire', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('917', 'a', 'donn?es de communication', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('918', 'a', 'num?ro de notice bnf', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('919', '5', 'identifiant de l''exemplaire', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('919', 'a', 'num?ro d''exemplaire dans le syst?me local', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('919', 'b', 'num?ro de la notice bibliographique dans le syst?me local', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('919', 'c', 'code de statut de l''enregistrement relatif ? l''exemplaire', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('919', 'd', 'date de cr?ation de l''enregistrement', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('919', 'e', 'date de derni?re modification de l''enregistrement', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('920', 'a', '?l?ment d''entr?e', 'sujet', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('920', 'b', '?l?ment rejet?', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('920', 'c', 'num?rotation', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('920', 'd', 'qualificatifs', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('920', 't', 'titre', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('930', '2', 'code du syst?me de classification', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('930', '5', 'identifiant de l''exemplaire', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('930', 'a', 'cote', 'cote', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
@@ -1864,35 +1821,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
  ('930', 'l', 'localisation de niveau 4', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('930', 't', 'num?ro de regroupement', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('930', 'v', 'volumaison ou qualificatif', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('936', 'a', 'num?ro', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('936', 'b', 'qualificatif', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('936', 'c', 'type de la Biblioth?que', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('936', 'd', 'signle de la Biblioth?que', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('942', '0', 'Total des pr?ts', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', '2', 'code syst?me', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', '3', 'num?ro de la notice d''autorit?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', '9', 'num?ro d''occurrence de l''?tiquette', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'a', 'titre', 'titre', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'b', 'indication g?n?rale du type de document', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'd', 'mois et jour', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'e', 'subdivision', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'f', '?l?ment du nom rejet?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'h', 'num?ro de section ou de partie', 'num?ro', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'i', 'titre de section ou de partie', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'j', 'ann?e', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'k', 'date de publication', 'publi? en', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'l', 'sous-vedette de forme', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'm', 'langue', 'langue', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'n', 'autres informations', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'q', 'version', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'r', 'mode d''interpr?tation', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 's', 'indication du num?ro (pour la musique)', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'u', 'cl?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'v', 'num?ro de sous-notice', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'w', 'mention d''arrangement (pour la musique)', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'x', 'subdivision de sujet', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'y', 'subdivision g?ographique', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('950', 'z', 'subdivision chronologique', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('955', '5', 'identifiant de l''exemplaire', '', 0, 0, '', -1, '', '', '', NULL, 0, '', '', NULL, ''),
  ('955', 'a', 'Etat de la collection', '', 0, 0, '', 9, '', '', '', NULL, 0, '', '', NULL, ''),
  ('955', 'b', '?tat de collection des publications en s?rie - 2e niveau de num?rotation', '', 0, 0, '', -1, '', '', '', NULL, 0, '', '', NULL, ''),
@@ -1949,46 +1878,6 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
  ('958', 'a', 'titre d''une partie', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('958', 'c', 'collation de la partie', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('958', 'v', 'num?ro de volume', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', '2', 'code du syst?me d''indexation', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', '3', 'num?ro de la notice d''autorit?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', '9', 'num?ro d''occurrence de l''?tiquette', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'a', '?l?ment d''entr?e', 'sujet', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'b', 'partie autre que l''?l?ment d''entr?e', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'c', 'qualificatifs autre que les dates', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'd', 'chiffres romains', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'e', 'lieu', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'f', 'dates', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'g', 'forme d?velopp?e des initiales du pr?nom', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'h', 'partie du nom autre que l''?l?ment d''entr?e ou l''?l?ment rejet?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'i', 'nom de partie', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'k', 'date de publication', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'l', 'sous-vedettes de forme', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'm', 'langue', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'n', 'autres informations', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'q', 'version', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'v', 'num?ro de sous-notice', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'x', 'subdivision du sujet', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'y', 'subdivision g?ographique', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('960', 'z', 'subdivision chronologique', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('966', 'a', 'pays de conservation', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('966', 'b', 'Biblioth?que', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('966', 'n', 'cote', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('966', 'o', 'indication de fonds propre ? l''?tablissement', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('970', '3', 'num?ro de la notice d''autorit?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('970', '4', 'nature de l''autorit? commerciale', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('970', '9', 'num?ro d''occurrence de l''?tiquette', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('970', 'a', 'vedette commerciale - ?l?ment d''entr?e', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('970', 'b', 'sous-vedette', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('970', 'p', '?l?ment rejet?', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('970', 'v', 'num?ro de la sous-notice', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('980', '3', 'num?ro de la notice d''autorit?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('980', '4', 'nature de l''autorit? commerciale', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('980', '9', 'num?ro d''occurrence de l''?tiquette', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('980', 'a', '?l?ment d''entr?e', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('980', 'b', 'sous-vedette', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('980', 'p', '?l?ment rejet?', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('980', 'v', 'num?ro de la sous-notice', '', 0, 0, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-('987', 'a', 'num?ro de notice archiv?', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('990', '5', 'identifiant de l''exemplaire', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('990', 'a', 'note de contenu propre ? l''?tablissement', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('990', 'b', 'qualificatif', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-- 
1.7.9.5

-- 
Mathieu Saby
Service d'Informatique Documentaire
Service Commun de Documentation
Universit? Rennes 2
T?l?phone : 02 99 14 12 65
Courriel : mathieu.saby at univ-rennes2.fr


From mathieu.saby at univ-rennes2.fr  Wed Oct  9 22:26:56 2013
From: mathieu.saby at univ-rennes2.fr (Mathieu Saby)
Date: Wed, 09 Oct 2013 22:26:56 +0200
Subject: [Koha-patches] [PATCH] Bug 11030 : add fields 947, 969,
 359 in unimarc_complete french framework
Message-ID: <5255BC10.7020502@univ-rennes2.fr>

This patch must be tested on top of bug 11021

This patch adds 3 fields to unimarc_complete french framework
- 359 (2-a-b-c-d-e-f-g-h-i-p-u-v) used by Sudoc network, to be displayed in tab 3
- 947 (c) used by Electre
- 969 (a-h) used by Electre
I don't know the difference between 969a and 969h so I gave them quite the same name

To test :
1) take a fresh Koha with unimarc marcflavor
2) in web installer, select french language, unimarc marflavor and "Grilles de catalogage compl?tes".
3) check default framework in Administration > MARC Frameworks : it should contains 359/947/969 fields

---
  .../Obligatoire/framework_DEFAULT.sql              |   19 +++++++++++++++++++
  1 file changed, 19 insertions(+)

diff --git a/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql b/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
index ff077f8..ae6fe51 100644
--- a/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
+++ b/installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/framework_DEFAULT.sql
@@ -116,6 +116,7 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
  ('336', 'note sur le type de ressource ?lectronique', 'type de fichier', 1, 0, '', ''),
  ('337', 'note sur la configuration requise (ressources ?lectroniques)', 'configuration requise', 1, 0, '', ''),
  ('345', 'renseignements sur l''acquisition', 'note', 0, 0, NULL, ''),
+('359', 'Table des mati?res', 'Table des mati?res', 0, 0, NULL, ''),
  ('410', 'Collection', 'collection', 1, 0, '', ''),
  ('411', 'sous-collection', 'sous-collection', 1, 0, '', ''),
  ('412', 'Est un extrait ou un tir? ? part de', '', 0, 0, '', ''),
@@ -222,10 +223,12 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
  ('931', 'Ancienne cote (Sudoc)', '', 0, 0, '', ''),
  ('932', 'Future cote (Sudoc)', '', 0, 0, NULL, ''),
  ('942', 'Total des pr?ts (Koha)', '', 0, 0, NULL, ''),
+('947', 'Prix (Electre)', '', 0, 0, NULL, ''),
  ('955', 'Etat de collection des publications en s?rie (Sudoc)', '?tat de collection', 0, 0, NULL, ''),
  ('956', 'Etat de collection des publications en s?rie : suppl?ment et mat?riel d''accompagnement (Sudoc)', 'suppl?ments', 0, 0, NULL, ''),
  ('957', 'Etat de collection des publications en s?rie : tables et index (Sudoc)', 'tables et index', 0, 0, NULL, ''),
  ('958', 'Nom et importance d''une partie (Sudoc)', '', 0, 0, NULL, ''),
+('969', 'Nombre d''exemplaires (Electre)', '', 0, 0, NULL, ''),
  ('990', 'Cote ou note de contenu (Sudoc)', '', 0, 0, NULL, ''),
  ('991', 'Indexation locale (Sudoc)', 'sujets', 0, 0, NULL, ''),
  ('992', 'Classification locale (Sudoc)', 'cote', 0, 0, NULL, ''),
@@ -531,6 +534,19 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
  ('345', 'b', 'num?ro d''?diteur', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
  ('345', 'c', 'support', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
  ('345', 'd', 'disponibilit?', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', '2', 'Texte de lien hypertexte', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'a', 'Contenu de la totalit? de la table des mati?res non structur?e', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'b', 'Entr?e de table des mati?res de niveau 1', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'c', 'Entr?e de table des mati?res de niveau 2', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'd', 'Entr?e de table des mati?res de niveau 3', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'e', 'Entr?e de table des mati?res de niveau 4', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'f', 'Entr?e de table des mati?res de niveau 5', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'g', 'Entr?e de table des mati?res de niveau 6', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'h', 'Entr?e de table des mati?res de niveau 7', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'i', 'Entr?e de table des mati?res de niveau 8', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'p', 'Num?ro de page ou de plage', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'u', 'URI', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
+('359', 'v', 'Tomaison / Num?rotation de l''unit? physique', '', 1, 0, '', 3, '', '', '', 0, 0, '', NULL, '', ''),
  ('410', '0', 'num?ro d''identification de la notice', '', 0, 0, '', 4, '', '', '', 0, 0, '', NULL, '', ''),
  ('410', '3', 'num?ro de la notice d''autorit?', '', 1, 0, '', 4, '', '', '', 0, 0, '', NULL, '', ''),
  ('410', '5', 'institution ?  laquelle s''applique cette zone', '', 0, 0, '', 4, '', '', '', 0, 0, '', NULL, '', ''),
@@ -1822,6 +1838,7 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
  ('930', 't', 'num?ro de regroupement', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('930', 'v', 'volumaison ou qualificatif', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('942', '0', 'Total des pr?ts', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
+('947', 'c', 'Prix', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('955', '5', 'identifiant de l''exemplaire', '', 0, 0, '', -1, '', '', '', NULL, 0, '', '', NULL, ''),
  ('955', 'a', 'Etat de la collection', '', 0, 0, '', 9, '', '', '', NULL, 0, '', '', NULL, ''),
  ('955', 'b', '?tat de collection des publications en s?rie - 2e niveau de num?rotation', '', 0, 0, '', -1, '', '', '', NULL, 0, '', '', NULL, ''),
@@ -1874,6 +1891,8 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
  ('957', 'r', 'tables et index - ?tat de collection ?crit sous forme textuelle', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('957', 'w', 'tables et index - mention des lacunes', 'lacunes', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('957', 'z', 'tables et index - note sur l''?tat de collection', 'note', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
+('969', 'a', 'Quantit?', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
+('969', 'h', 'Quantit? (bis)', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('958', '5', 'identifiant de l''exemplaire', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('958', 'a', 'titre d''une partie', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
  ('958', 'c', 'collation de la partie', '', 0, 1, NULL, -1, NULL, NULL, '', NULL, NULL, '', NULL, NULL, ''),
-- 
1.7.9.5

-- 
Mathieu Saby
Service d'Informatique Documentaire
Service Commun de Documentation
Universit? Rennes 2
T?l?phone : 02 99 14 12 65
Courriel : mathieu.saby at univ-rennes2.fr


From srdjan at catalyst.net.nz  Thu Oct 10 06:00:28 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu, 10 Oct 2013 17:00:28 +1300
Subject: [Koha-patches] [PATCH] Bug 10636 - patronimage should have
	borrowernumber as PK, not cardnumber
Message-ID: <1381377628-9933-1-git-send-email-srdjan@catalyst.net.nz>

From: Kyle M Hall <kyle at bywatersolutions.com>

Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Enable patronimages
4) Verify patron images are still displaying correctly
5) Test deleting a patron image
6) Test adding a patron image from moremember.pl
7) Test adding a patron image from tools/picture-upload.pl

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Members.pm                                      | 26 ++++++------
 circ/circulation.pl                                |  2 +-
 installer/data/mysql/kohastructure.sql             |  6 +--
 installer/data/mysql/updatedatabase.pl             | 46 ++++++++++++++++++++++
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |  2 +-
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |  2 +-
 members/boraccount.pl                              |  2 +-
 members/deletemem.pl                               |  2 +-
 members/files.pl                                   |  2 +-
 members/mancredit.pl                               |  2 +-
 members/maninvoice.pl                              |  2 +-
 members/member-flags.pl                            |  2 +-
 members/member-password.pl                         |  2 +-
 members/moremember.pl                              |  2 +-
 members/notices.pl                                 |  2 +-
 members/patronimage.pl                             | 18 ++++-----
 members/pay.pl                                     |  2 +-
 members/paycollect.pl                              |  2 +-
 members/printfeercpt.pl                            |  2 +-
 members/printinvoice.pl                            |  2 +-
 members/readingrec.pl                              |  2 +-
 members/routing-lists.pl                           |  2 +-
 members/statistics.pl                              |  2 +-
 opac/opac-memberentry.pl                           |  2 +-
 opac/opac-patron-image.pl                          |  3 +-
 opac/sco/sco-main.pl                               |  2 +-
 opac/sco/sco-patron-image.pl                       |  4 +-
 patroncards/create-pdf.pl                          |  2 +-
 tools/picture-upload.pl                            |  2 +-
 tools/viewlog.pl                                   |  2 +-
 30 files changed, 98 insertions(+), 53 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index 1d966b3..62a07dd 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1921,19 +1921,19 @@ sub GetTitles {
 
 =head2 GetPatronImage
 
-    my ($imagedata, $dberror) = GetPatronImage($cardnumber);
+    my ($imagedata, $dberror) = GetPatronImage($borrowernumber);
 
-Returns the mimetype and binary image data of the image for the patron with the supplied cardnumber.
+Returns the mimetype and binary image data of the image for the patron with the supplied borrowernumber.
 
 =cut
 
 sub GetPatronImage {
-    my ($cardnumber) = @_;
-    warn "Cardnumber passed to GetPatronImage is $cardnumber" if $debug;
+    my ($borrowernumber) = @_;
+    warn "Borrowernumber passed to GetPatronImage is $borrowernumber" if $debug;
     my $dbh = C4::Context->dbh;
-    my $query = 'SELECT mimetype, imagefile FROM patronimage WHERE cardnumber = ?';
+    my $query = 'SELECT mimetype, imagefile FROM patronimage WHERE borrowernumber = ?';
     my $sth = $dbh->prepare($query);
-    $sth->execute($cardnumber);
+    $sth->execute($borrowernumber);
     my $imagedata = $sth->fetchrow_hashref;
     warn "Database error!" if $sth->errstr;
     return $imagedata, $sth->errstr;
@@ -1952,7 +1952,7 @@ sub PutPatronImage {
     my ($cardnumber, $mimetype, $imgfile) = @_;
     warn "Parameters passed in: Cardnumber=$cardnumber, Mimetype=$mimetype, " . ($imgfile ? "Imagefile" : "No Imagefile") if $debug;
     my $dbh = C4::Context->dbh;
-    my $query = "INSERT INTO patronimage (cardnumber, mimetype, imagefile) VALUES (?,?,?) ON DUPLICATE KEY UPDATE imagefile = ?;";
+    my $query = "INSERT INTO patronimage (borrowernumber, mimetype, imagefile) VALUES ( ( SELECT borrowernumber from borrowers WHERE cardnumber = ? ),?,?) ON DUPLICATE KEY UPDATE imagefile = ?;";
     my $sth = $dbh->prepare($query);
     $sth->execute($cardnumber,$mimetype,$imgfile,$imgfile);
     warn "Error returned inserting $cardnumber.$mimetype." if $sth->errstr;
@@ -1961,19 +1961,19 @@ sub PutPatronImage {
 
 =head2 RmPatronImage
 
-    my ($dberror) = RmPatronImage($cardnumber);
+    my ($dberror) = RmPatronImage($borrowernumber);
 
-Removes the image for the patron with the supplied cardnumber.
+Removes the image for the patron with the supplied borrowernumber.
 
 =cut
 
 sub RmPatronImage {
-    my ($cardnumber) = @_;
-    warn "Cardnumber passed to GetPatronImage is $cardnumber" if $debug;
+    my ($borrowernumber) = @_;
+    warn "Borrowernumber passed to GetPatronImage is $borrowernumber" if $debug;
     my $dbh = C4::Context->dbh;
-    my $query = "DELETE FROM patronimage WHERE cardnumber = ?;";
+    my $query = "DELETE FROM patronimage WHERE borrowernumber = ?;";
     my $sth = $dbh->prepare($query);
-    $sth->execute($cardnumber);
+    $sth->execute($borrowernumber);
     my $dberror = $sth->errstr;
     warn "Database error!" if $sth->errstr;
     return $dberror;
diff --git a/circ/circulation.pl b/circ/circulation.pl
index efd533e5..cd997b3 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -765,7 +765,7 @@ if ($stickyduedate) {
     $session->param( 'stickyduedate', $duedatespec );
 }
 
-my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 # get authorised values with type of BOR_NOTES
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index e2ee43b..e94cc6e 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1662,11 +1662,11 @@ CREATE TABLE `patroncards` (
 
 DROP TABLE IF EXISTS `patronimage`;
 CREATE TABLE `patronimage` ( -- information related to patron images
-  `cardnumber` varchar(16) NOT NULL, -- the cardnumber of the patron this image is attached to (borrowers.cardnumber)
+  `borrowernumber` int(11) NOT NULL, -- the borrowernumber of the patron this image is attached to (borrowers.borrowernumber)
   `mimetype` varchar(15) NOT NULL, -- the format of the image (png, jpg, etc)
   `imagefile` mediumblob NOT NULL, -- the image
-  PRIMARY KEY  (`cardnumber`),
-  CONSTRAINT `patronimage_fk1` FOREIGN KEY (`cardnumber`) REFERENCES `borrowers` (`cardnumber`) ON DELETE CASCADE ON UPDATE CASCADE
+  PRIMARY KEY  (`borrowernumber`),
+  CONSTRAINT `patronimage_fk1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- Table structure for table `pending_offline_operations`
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9871cfd..0451927 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -7169,6 +7169,52 @@ if ( CheckVersion($DBversion) ) {
     SetVersion ($DBversion);
 }
 
+$DBversion = "3.13.00.XXX";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(qq{
+        DELETE FROM patronimage WHERE NOT EXISTS (SELECT * FROM borrowers WHERE borrowers.cardnumber = patronimage.cardnumber)
+    });
+
+    $dbh->do(qq{
+        ALTER TABLE patronimage ADD borrowernumber INT( 11 ) NULL FIRST
+    });
+
+    $dbh->{AutoCommit} = 0;
+    $dbh->{RaiseError} = 1;
+
+    eval {
+        $dbh->do(qq{
+            UPDATE patronimage LEFT JOIN borrowers USING ( cardnumber ) SET patronimage.borrowernumber = borrowers.borrowernumber
+        });
+        $dbh->commit();
+    };
+
+    if ($@) {
+        print "Upgrade to $DBversion done (Bug 10636 - patronimage should have borrowernumber as PK, not cardnumber) failed! Transaction aborted because $@\n";
+        eval { $dbh->rollback };
+    }
+    else {
+        $dbh->do(qq{
+            ALTER TABLE patronimage DROP FOREIGN KEY patronimage_fk1
+        });
+        $dbh->do(qq{
+            ALTER TABLE patronimage DROP PRIMARY KEY, ADD PRIMARY KEY( borrowernumber )
+        });
+        $dbh->do(qq{
+            ALTER TABLE patronimage DROP cardnumber
+        });
+        $dbh->do(qq{
+            ALTER TABLE patronimage ADD FOREIGN KEY ( borrowernumber ) REFERENCES borrowers ( borrowernumber ) ON DELETE CASCADE ON UPDATE CASCADE
+        });
+
+        print "Upgrade to $DBversion done (Bug 10636 - patronimage should have borrowernumber as PK, not cardnumber)\n";
+        SetVersion($DBversion);
+    }
+
+    $dbh->{AutoCommit} = 1;
+    $dbh->{RaiseError} = 0;
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 4632467..62db1c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -7,7 +7,7 @@
 <ul class="patronbriefinfo">
 [% IF ( patronimages ) %]
 [% IF ( picture ) %]
-<li><img src="/cgi-bin/koha/members/patronimage.pl?crdnum=[% cardnumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
+<li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
 [% ELSE %]
 <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
index 8d52b90..7f8cb48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -9,7 +9,7 @@ in the global namespace %]
 <ul class="patronbriefinfo">
 [% IF ( patronimages ) %]
 [% IF borrower.has_picture %]
-<li><img src="/cgi-bin/koha/members/patronimage.pl?crdnum=[% borrower.cardnumber %]" id="patronimage" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
+<li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrower.borrowernumber %]" id="patronimage" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
 [% ELSE %]
 <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
 [% END %]
diff --git a/members/boraccount.pl b/members/boraccount.pl
index 48e2620..255b1ff 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -92,7 +92,7 @@ foreach my $accountline ( @{$accts}) {
 
 $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
 
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
diff --git a/members/deletemem.pl b/members/deletemem.pl
index ef6ba01..6b99cb3 100755
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -83,7 +83,7 @@ my $data=$sth->fetchrow_hashref;
 if ($countissues > 0 or $flags->{'CHARGES'}  or $data->{'borrowernumber'}){
     #   print $input->header;
 
-    my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($bor->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
 
     $template->param(borrowernumber => $member,
diff --git a/members/files.pl b/members/files.pl
index 77d7be5..dc08751 100755
--- a/members/files.pl
+++ b/members/files.pl
@@ -115,7 +115,7 @@ else {
         );
     }
 
-    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
 
     $template->param(
diff --git a/members/mancredit.pl b/members/mancredit.pl
index b011d1a..a2c2258 100755
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -77,7 +77,7 @@ if ($add){
     }
 
     $template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' );
-    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 6331535..c4a9294 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -105,7 +105,7 @@ if ($add){
     }
 
     $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
-    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
diff --git a/members/member-flags.pl b/members/member-flags.pl
index d1c165c..7b08108 100755
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -160,7 +160,7 @@ if ($input->param('newflags')) {
     }
 	
 $template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
-    my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($bor->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
diff --git a/members/member-password.pl b/members/member-password.pl
index 9495e0e..ac25da5 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -89,7 +89,7 @@ if ( $newpassword  && !scalar(@errors) ) {
     }
 	
 $template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
-my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($bor->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
diff --git a/members/moremember.pl b/members/moremember.pl
index 7ed96d3..e7542a2 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -356,7 +356,7 @@ if($userenv->{flags} % 2 == 1){
 # check to see if patron's image exists in the database
 # basically this gives us a template var to condition the display of
 # patronimage related interface on
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 my $branch=C4::Context->userenv->{'branch'};
diff --git a/members/notices.pl b/members/notices.pl
index 16935d9..aca4514 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -47,7 +47,7 @@ my ($template, $loggedinuser, $cookie)
 				});
 
 $template->param( $borrower );
-my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 # Getting the messages
diff --git a/members/patronimage.pl b/members/patronimage.pl
index e76d117..4f663d6 100755
--- a/members/patronimage.pl
+++ b/members/patronimage.pl
@@ -31,7 +31,7 @@ $|=1;
 
 my $DEBUG = 0;
 my $data = new CGI;
-my $cardnumber;
+my $borrowernumber;
 
 =head1 NAME
 
@@ -39,24 +39,24 @@ patronimage.pl - Script for retrieving and formatting Koha patron images for dis
 
 =head1 SYNOPSIS
 
-<img src="patronimage.pl?crdnum= />
+<img src="patronimage.pl?borrowernumber= />
 
 =head1 DESCRIPTION
 
-This script, when called from within HTML and passed a valid patron cardnumber, will retrieve the image data associated with that cardnumber if one exists, format it in proper HTML format and pass it back to be displayed.
+This script, when called from within HTML and passed a valid patron borrowernumber, will retrieve the image data associated with that borrowernumber if one exists, format it in proper HTML format and pass it back to be displayed.
 
 =cut
 
-if ($data->param('crdnum')) {
-    $cardnumber = $data->param('crdnum');
+if ($data->param('borrowernumber')) {
+    $borrowernumber = $data->param('borrowernumber');
 } else {
-    $cardnumber = shift;
+    $borrowernumber = shift;
 }
 
 
-warn "Cardnumber passed in: $cardnumber" if $DEBUG;
+warn "Borrowernumber passed in: $borrowernumber" if $DEBUG;
 
-my ($imagedata, $dberror) = GetPatronImage($cardnumber);
+my ($imagedata, $dberror) = GetPatronImage($borrowernumber);
 
 if ($dberror) {
     warn "Database Error!";
@@ -70,7 +70,7 @@ if ($imagedata) {
     print $data->header (-type => $imagedata->{'mimetype'}, -'Cache-Control' => 'no-store', -Content_Length => length ($imagedata->{'imagefile'})), $imagedata->{'imagefile'};
     exit;
 } else {
-    warn "No image exists for $cardnumber";
+    warn "No image exists for $borrowernumber";
     exit;
 }
 
diff --git a/members/pay.pl b/members/pay.pl
index 4efffc3..8a8e902 100755
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -220,7 +220,7 @@ sub borrower_add_additional_fields {
     } elsif ( $b_ref->{category_type} eq 'A' ) {
         $b_ref->{adultborrower} = 1;
     }
-    my ( $picture, $dberror ) = GetPatronImage( $b_ref->{cardnumber} );
+    my ( $picture, $dberror ) = GetPatronImage( $b_ref->{borrowernumber} );
     if ($picture) {
         $b_ref->{has_picture} = 1;
     }
diff --git a/members/paycollect.pl b/members/paycollect.pl
index 5edb644..96ca0fb 100755
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -169,7 +169,7 @@ sub borrower_add_additional_fields {
     } elsif ( $b_ref->{category_type} eq 'A' ) {
         $b_ref->{adultborrower} = 1;
     }
-    my ( $picture, $dberror ) = GetPatronImage( $b_ref->{cardnumber} );
+    my ( $picture, $dberror ) = GetPatronImage( $b_ref->{borrowernumber} );
     if ($picture) {
         $b_ref->{has_picture} = 1;
     }
diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index 59d5cb3..efd03c1 100755
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -113,7 +113,7 @@ for (my $i=0;$i<$numaccts;$i++){
 
 $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
 
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 $template->param(
diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index fe8e7bd..10ae114 100755
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -112,7 +112,7 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
 
 $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
 
-my ( $picture, $dberror ) = GetPatronImage( $data->{'cardnumber'} );
+my ( $picture, $dberror ) = GetPatronImage( $data->{'borrowernumber'} );
 $template->param( picture => 1 ) if $picture;
 
 $template->param(
diff --git a/members/readingrec.pl b/members/readingrec.pl
index d41e3f9..0f0c3df 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -103,7 +103,7 @@ if (! $limit){
 }
 
 
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index d70c1bc..70165f7 100755
--- a/members/routing-lists.pl
+++ b/members/routing-lists.pl
@@ -128,7 +128,7 @@ $template->param(
     RoutingSerials => C4::Context->preference('RoutingSerials'),
 );
 
-my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/members/statistics.pl b/members/statistics.pl
index 0667ee7..0914364 100755
--- a/members/statistics.pl
+++ b/members/statistics.pl
@@ -91,7 +91,7 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     );
 }
 
-my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 $template->param(
diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl
index 112d405..9106fb4 100755
--- a/opac/opac-memberentry.pl
+++ b/opac/opac-memberentry.pl
@@ -200,7 +200,7 @@ elsif ( $action eq 'edit' ) {    #Display logged in borrower's data
         borrower => $borrower, );
 
     if (C4::Context->preference('OPACpatronimages')) {
-        my ($image, $dberror) = GetPatronImage($borrower->{cardnumber});
+        my ($image, $dberror) = GetPatronImage($borrower->{borrowernumber});
         if ($image) {
             $template->param(
                 display_patron_image => 1
diff --git a/opac/opac-patron-image.pl b/opac/opac-patron-image.pl
index d1f4489..eab6abc 100755
--- a/opac/opac-patron-image.pl
+++ b/opac/opac-patron-image.pl
@@ -37,9 +37,8 @@ my %cookies = fetch CGI::Cookie;
 my $sessid = $cookies{'CGISESSID'}->value;
 my ($auth_status, $auth_sessid) = check_cookie_auth($sessid, $needed_flags);
 my $borrowernumber = C4::Context->userenv->{'number'};
-my $cardnumber = C4::Context->userenv->{'cardnumber'};
 
-my ($imagedata, $dberror) = GetPatronImage($cardnumber);
+my ($imagedata, $dberror) = GetPatronImage($borrowernumber);
 
 if ($dberror) {
     print $query->header(status => '500 internal error');
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index 0f16c8c..62884ee 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -248,7 +248,7 @@ if ($borrower->{cardnumber}) {
 
     );
     if (C4::Context->preference('ShowPatronImageInWebBasedSelfCheck')) {
-        my ($image, $dberror) = GetPatronImage($borrower->{cardnumber});
+        my ($image, $dberror) = GetPatronImage($borrower->{borrowernumber});
         if ($image) {
             $template->param(
                 display_patron_image => 1,
diff --git a/opac/sco/sco-patron-image.pl b/opac/sco/sco-patron-image.pl
index b2ddcf3..de8d8d6 100755
--- a/opac/sco/sco-patron-image.pl
+++ b/opac/sco/sco-patron-image.pl
@@ -33,9 +33,9 @@ unless (C4::Context->preference('ShowPatronImageInWebBasedSelfCheck')) {
     exit;
 }
 
-my ($cardnumber) = C4::Service->require_params('cardnumber');
+my ($borrowernumber) = C4::Service->require_params('borrowernumber');
 
-my ($imagedata, $dberror) = GetPatronImage($cardnumber);
+my ($imagedata, $dberror) = GetPatronImage($borrowernumber);
 
 if ($dberror) {
     print $query->header(status => '500 internal error');
diff --git a/patroncards/create-pdf.pl b/patroncards/create-pdf.pl
index 6a1b67a..56a32e6 100755
--- a/patroncards/create-pdf.pl
+++ b/patroncards/create-pdf.pl
@@ -145,7 +145,7 @@ foreach my $item (@{$items}) {
                     next PROCESS_IMAGES;
                 }
                 elsif ($images->{$_}->{'data_source'}->[0]->{'image_source'} eq 'patronimages') {
-                    ($image_data, $error) = GetPatronImage($card_number);
+                    ($image_data, $error) = GetPatronImage($borrower_number);
                     warn sprintf('No image exists for borrower number %s.', $borrower_number) if !$image_data;
                     next PROCESS_IMAGES if !$image_data;
                 }
diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index 54b6606..b2aa18a 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -146,7 +146,7 @@ if ( ($op eq 'Upload') && $uploadfile ) {       # Case is important in these ope
     $template->param(cardnumber => $cardnumber);
     $template->param(filetype => $filetype);
 } elsif ( $op eq 'Delete' ) {
-    my $dberror = RmPatronImage($cardnumber);
+    my $dberror = RmPatronImage($borrowernumber);
 	$debug and warn "Patron image deleted for $cardnumber";
     warn "Database returned $dberror" if $dberror;
 }
diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index e48aaef..67ce7dd 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -72,7 +72,7 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
     use C4::Members;
     my $borrowernumber = $object;
     my $data = GetMember('borrowernumber'=>$borrowernumber);
-    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
     $template->param( picture => 1 ) if $picture;
     
     $template->param(   menu            => 1,
-- 
1.8.1.2

From vanoudt at gmail.com  Thu Oct 10 10:38:12 2013
From: vanoudt at gmail.com (Nicholas van Oudtshoorn)
Date: Thu, 10 Oct 2013 16:38:12 +0800
Subject: [Koha-patches] [PATCH] Bug 10988 [ENH] Allow login via Google
	OAuth2 Adds googleoauth2 login to koha. Adds applicable
	system preferences Modifies templates to support oauth2 login
	failures changes the login links to use googleoauth2 when
	oauth2 is enabled.
Message-ID: <1381394292-24810-1-git-send-email-vanoudt@gmail.com>

---
 C4/Auth.pm                                         |  10 +-
 .../atomicupdate/bug_10988_add_GoogleOAuth.sql     |   3 +
 installer/data/mysql/sysprefs.sql                  |   3 +
 .../prog/en/modules/admin/preferences/admin.pref   |  15 +++
 koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc   |   6 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |   6 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |   9 ++
 opac/svc/googleoauth2                              | 127 +++++++++++++++++++++
 8 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/bug_10988_add_GoogleOAuth.sql
 create mode 100755 opac/svc/googleoauth2

diff --git a/C4/Auth.pm b/C4/Auth.pm
index d73edaf..1dc0bf1 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -34,7 +34,7 @@ use POSIX qw/strftime/;
 use List::MoreUtils qw/ any /;
 
 # use utf8;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout);
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $googleoauth2 $ldap $cas $caslogout);
 
 BEGIN {
     sub psgi_env { any { /^psgi\./ } keys %ENV }
@@ -52,6 +52,7 @@ BEGIN {
                       ParseSearchHistoryCookie
                    );
     %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
+    $googleoauth2= C4::Context->preference('GoogleOAuth2');
     $ldap        = C4::Context->config('useldapserver') || 0;
     $cas         = C4::Context->preference('casAuthentication');
     $caslogout   = C4::Context->preference('casLogout');
@@ -394,6 +395,7 @@ sub get_template_and_user {
             BranchesLoop              => GetBranchesLoop($opac_name),
             BranchCategoriesLoop      => GetBranchCategories( 'searchdomain', 1, $opac_name ),
             CalendarFirstDayOfWeek    => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday")?0:1,
+            GoogleOAuth2              => (C4::Context->preference("GoogleOAuth2")),
             LibraryName               => "" . C4::Context->preference("LibraryName"),
             LibraryNameTitle          => "" . $LibraryNameTitle,
             LoginBranchname           => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
@@ -1078,6 +1080,12 @@ sub checkauth {
             invalidCasLogin => $info{'invalidCasLogin'}
         );
     }
+    if ($googleoauth2) {
+        if ($query->param("OAuth2Failed")) {
+            my $reason = $query->param('OAuth2Failed');
+            $template->param(invalidOAuth2Login => $reason);
+        }
+    }
 
     my $self_url = $query->url( -absolute => 1 );
     $template->param(
diff --git a/installer/data/mysql/atomicupdate/bug_10988_add_GoogleOAuth.sql b/installer/data/mysql/atomicupdate/bug_10988_add_GoogleOAuth.sql
new file mode 100644
index 0000000..d02d9b3
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_10988_add_GoogleOAuth.sql
@@ -0,0 +1,3 @@
+-- Adding GoogleOAuth2 support
+INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('GoogleOAuth2', '0', NULL, 'if ON, allows the use of Google OAuth2 for login', 'YesNo'), ('GoogleOAuth2ClientID', '', NULL, 'Client ID for the web app registered with google', 'Free'), ('GoogleOAuth2ClientSecret', '', NULL, 'Client Secret for the web app registered with google', 'Free');
+ 
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 4b0f364..3445025 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -115,6 +115,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('FRBRizeEditions','0','','If ON, Koha will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages','YesNo'),
 ('gist','0','','Default Goods and Services tax rate NOT in %, but in numeric form (0.12 for 12%), set to 0 to disable GST','Integer'),
 ('GoogleJackets','0',NULL,'if ON, displays jacket covers from Google Books API','YesNo'),
+('GoogleOAuth2', '0', NULL, 'if ON, allows the use of Google OAuth2 for login', 'YesNo'),
+('GoogleOAuth2ClientID', '', NULL, 'Client ID for the web app registered with google', 'Free'),
+('GoogleOAuth2ClientSecret', '', NULL, 'Client Secret for the web app registered with google', 'Free'),
 ('hidelostitems','0','','If ON, disables display of\"lost\" items in OPAC.','YesNo'),
 ('HidePatronName','0','','If this is switched on, patron\'s cardnumber will be shown instead of their name on the holds and catalog screens','YesNo'),
 ('hide_marc','0',NULL,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)','YesNo'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index 1215ac1..14b53e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -113,3 +113,18 @@ Administration:
                 Solr: Solr
                 Zebra: Zebra
             - is the search engine used.
+    Google OAuth2:
+        -
+            - pref: GoogleOAuth2
+              choices:
+                yes: Use
+                no: "Don't Use"
+            - Google OAuth2 login.
+            - You will need to select OAuth2 when creating an app in the google cloud console, and set the web origin to your_opac_url and the redirect url to your_opac_url/cgi-bin/koha/svc/oauthlogin .
+
+        -
+            - Google OAuth2 Client ID
+            - pref: GoogleOAuth2ClientID
+        -
+            - Google OAuth2 Client Secret
+            - pref: GoogleOAuth2ClientSecret
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
index 42d9576..f832cc4 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
@@ -55,7 +55,11 @@
       [% IF ( opacuserlogin ) %]
         <ul>
     [% UNLESS ( loggedinusername ) %]
-                   <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>[% END %]
+        [% IF ( GoogleOAuth2 ) %]
+               <li><a href="/cgi-bin/koha/svc/googleoauth2">Log in to your account</a></li>
+        [% ELSE %]
+               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
+        [% END %][% END %]
                 [% IF ( loggedinusername ) %]
                     <li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></span></li>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 79eb1a1..48c78bb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -2,7 +2,11 @@
   [% IF ( opacuserlogin ) %]
 	<ul>
 [% UNLESS ( loggedinusername ) %]
-               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>[% END %]
+        [% IF ( GoogleOAuth2 ) %]
+               <li><a href="/cgi-bin/koha/svc/googleoauth2">Log in to your account</a></li>
+        [% ELSE %]
+               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
+        [% END %][% END %]
             [% IF ( loggedinusername ) %]
                 <li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></span></li>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
index 7b8b8f9..af7153c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
@@ -73,6 +73,15 @@ please choose against which one you would like to authenticate: </p>
 
 [% END %]
 
+[% IF ( invalidOAuth2Login ) %]
+<h4>Automatic Login</h4>
+<p>Sorry, your automatic login failed. <span class="error">[% invalidOAuth2Login %]</span></p>
+<p>Please note that automatic login will only work if you are using the email address registered with this library.</p>
+<p>If you want to, you can try to <a href="/cgi-bin/koha/svc/googleoauth2?reauthenticate=select_account">login using a differen account</a>
+<h4>Local login</h4>
+<p>If you can't login automatically, you can still login in manually: </p>
+
+[% END %]
 <form action="[% url %]" name="auth" id="auth" method="post">
   <input type="hidden" name="koha_login_context" value="opac" />
 <fieldset class="brief">[% FOREACH INPUT IN INPUTS %]
diff --git a/opac/svc/googleoauth2 b/opac/svc/googleoauth2
new file mode 100755
index 0000000..f94636e
--- /dev/null
+++ b/opac/svc/googleoauth2
@@ -0,0 +1,127 @@
+#!/bin/perl -w
+# Copyright chris at bigballofwax.co.nz 2013
+# 
+# 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 3 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.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#
+# Basic OAuth2 authentication for google goes like this
+# First: get your clientid, clientsecret from google. At this stage, tell google that
+# your redirect url is /cgi-bin/koha/svc/oauthlogin
+#
+# The first thing that happens when this script is called is that one gets redirected
+# to an authentication url from google
+#
+# If successful, that then redirects back to this script, setting a CODE parameter
+# which we use to look up a json authentication token. This token includes an encrypted 
+# json id_token, which we round-trip back to google to decrypt. Finally, we can extract
+# the email address from this.
+#
+# There is LOTS of room for improvement here.
+# 1. move the clientid, clientsecret to systempreferences
+# 2. use the OPACBaseURL preference to compute the redirecturl
+# 4. Google recommends verifying and decrypting the id_token locally, which means caching
+# some information and updating it daily. But that would make things a lot faster
+
+use strict;
+use warnings;
+use CGI qw/escape/;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+
+use LWP::UserAgent; 
+use HTTP::Request::Common qw{ POST };
+use JSON;
+
+my $scope="openid email";
+my $host = C4::Context->preference('OPACBaseURL');
+my $redirecturl = 'http://' . $host . '/cgi-bin/koha/svc/oauthlogin';
+my $issuer = 'accounts.google.com';
+my $clientid = C4::Context->preference('GoogleOAuth2ClientID');
+my $clientsecret = C4::Context->preference('GoogleOAuth2ClientSecret');
+
+my $query = new CGI;
+
+sub loginfailed {
+  my $query = shift;
+  my $reason = shift;
+  $query->delete('code');
+  $query->param('OAuth2Failed'=>$reason);
+  my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => 'opac-user.tmpl',
+        query           => $query,
+        type            => 'opac',
+        authnotrequired => 0,
+        flagsrequired   => { borrow => 1 },
+    }
+  );
+  $template->param( 'invalidOAuth2Login' => $reason );
+  $template->param( 'loginprompt' => 1);
+  output_html_with_http_headers $query, $cookie, $template->output;
+}
+#die $query->param('code');
+if (defined $query->param('error')) {
+	loginfailed($query, 'An authentication error occurred. (Error:' . $query->param('error') . ')');
+} elsif (defined $query->param('code')) {
+	my $code=$query->param('code');
+	my $ua = LWP::UserAgent->new();
+	my $request = POST('https://accounts.google.com/o/oauth2/token', [
+                        code => $code,
+                        client_id => $clientid,
+                        client_secret => $clientsecret,
+    	            	redirect_uri => $redirecturl,
+                		grant_type => 'authorization_code',
+                        $scope => $scope
+    ]);
+	my $response =  $ua->request($request)->decoded_content ;
+	my $json = decode_json ( $response);
+	if ( exists($json->{'id_token'}) ) {
+		$request = POST('https://www.googleapis.com/oauth2/v1/tokeninfo', [
+			id_token => $json->{'id_token'}
+		]);
+		$response = $ua->request($request)->decoded_content;
+		$json = decode_json ( $response);
+		# Confirm (as google suggests) that the issuer and audience are what we expect them to be
+		if (($json->{'issuer'} eq $issuer) && ($json->{'audience'} eq $clientid) && exists($json->{'email'})) {
+			my $email = $json->{'email'};
+			my ( $userid, $cookie, $sessionID ) =
+                            checkauth( $query, 1,  { borrow => 1 }, 'opac', $email );
+			if ($userid) { # A valid user has logged in
+				print $query->redirect( -uri => '/cgi-bin/koha/opac-user.pl', -cookie => $cookie );
+			} else {
+				loginfailed($query, 'The email address you are trying to use is not associated with a borrower in this library.');
+			}
+		} else { # something went wrong with getting appropriate credentials
+			loginfailed($query, 'Failed to get proper credentials from google.');
+		}
+	} else { # Failed to get ID Token
+		loginfailed($query, 'An authentication error occurred. (Error: No ID Token was supplied)');
+	}	
+
+} else {
+    my  $prompt = '';
+    $prompt = $query->param('reauthenticate') unless not (defined $query->param('reauthenticate'));
+
+    my $authorisationurl =  'https://accounts.google.com/o/oauth2/auth?' .
+                            'response_type=code&' .
+                            'redirect_uri=' . escape ( $redirecturl ) . '&' .
+                            'client_id=' . escape ( $clientid ) . '&' .
+                            'scope=' . escape ( $scope ) . '&';
+    $authorisationurl .=    'prompt=' . escape ( $query->param('reauthenticate') );
+	print $query->redirect($authorisationurl);
+}
+
-- 
1.8.1.4


From vanoudt at gmail.com  Thu Oct 10 11:07:38 2013
From: vanoudt at gmail.com (Nicholas van Oudtshoorn)
Date: Thu, 10 Oct 2013 17:07:38 +0800
Subject: [Koha-patches] [PATCH] Bug 10988 [ENH] Allow login via Google OAuth2
Message-ID: <1381396058-26092-1-git-send-email-vanoudt@gmail.com>

This patch fixes a minor typo in the previous one regarding the oauth2 redirect uri
Adds googleoauth2 login to koha. Adds applicable system preferences Modifies templates to support oauth2 login failures changes the login links to use googleoauth2 when oauth2 is enabled.

Test Plan:
1) Apply this patch
2) Update the database (this is the bit I'm not sure about - I've added the SQL into the atomicupdates directory - is this right?)
3) Create a web app in the google cloud console:
     - Go to https://cloud.google.com/console
     - Create a project, and give it some details
     - Open the Project by clicking on it
     - Under APIs & auth menu, open "Registered Apps" and click "Register App"
     - Give it a name and make sure you select "Web app", click ok
     - Under OAuth 2.0 Client ID,
         - under web origin, type <your_opac_address>
         - in the redirect uri enter <your_opac_address>/cgi-bin/koha/svc/googleoauth2
         - click Generate
4) Set the GoogleOAuth2ClientID and GoogleOAuth2ClientSecret according to the values generated above
5) Test that clicking login intiates an oauth2 login
6) Try logging in with an email that is not registered to a library user. It should fail and offer either to retry or to login manually.
7) Try logging in with an email that is registered to a library user. You should be logged in.
---
 C4/Auth.pm                                         |  10 +-
 .../atomicupdate/bug_10988_add_GoogleOAuth.sql     |   2 +
 installer/data/mysql/sysprefs.sql                  |   3 +
 .../prog/en/modules/admin/preferences/admin.pref   |  15 +++
 koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc   |   6 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |   6 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |   9 ++
 opac/svc/googleoauth2                              | 126 +++++++++++++++++++++
 8 files changed, 174 insertions(+), 3 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/bug_10988_add_GoogleOAuth.sql
 create mode 100755 opac/svc/googleoauth2

diff --git a/C4/Auth.pm b/C4/Auth.pm
index d73edaf..1dc0bf1 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -34,7 +34,7 @@ use POSIX qw/strftime/;
 use List::MoreUtils qw/ any /;
 
 # use utf8;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout);
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $googleoauth2 $ldap $cas $caslogout);
 
 BEGIN {
     sub psgi_env { any { /^psgi\./ } keys %ENV }
@@ -52,6 +52,7 @@ BEGIN {
                       ParseSearchHistoryCookie
                    );
     %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
+    $googleoauth2= C4::Context->preference('GoogleOAuth2');
     $ldap        = C4::Context->config('useldapserver') || 0;
     $cas         = C4::Context->preference('casAuthentication');
     $caslogout   = C4::Context->preference('casLogout');
@@ -394,6 +395,7 @@ sub get_template_and_user {
             BranchesLoop              => GetBranchesLoop($opac_name),
             BranchCategoriesLoop      => GetBranchCategories( 'searchdomain', 1, $opac_name ),
             CalendarFirstDayOfWeek    => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday")?0:1,
+            GoogleOAuth2              => (C4::Context->preference("GoogleOAuth2")),
             LibraryName               => "" . C4::Context->preference("LibraryName"),
             LibraryNameTitle          => "" . $LibraryNameTitle,
             LoginBranchname           => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
@@ -1078,6 +1080,12 @@ sub checkauth {
             invalidCasLogin => $info{'invalidCasLogin'}
         );
     }
+    if ($googleoauth2) {
+        if ($query->param("OAuth2Failed")) {
+            my $reason = $query->param('OAuth2Failed');
+            $template->param(invalidOAuth2Login => $reason);
+        }
+    }
 
     my $self_url = $query->url( -absolute => 1 );
     $template->param(
diff --git a/installer/data/mysql/atomicupdate/bug_10988_add_GoogleOAuth.sql b/installer/data/mysql/atomicupdate/bug_10988_add_GoogleOAuth.sql
new file mode 100644
index 0000000..219d472
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_10988_add_GoogleOAuth.sql
@@ -0,0 +1,2 @@
+-- Adding GoogleOAuth2 support
+INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('GoogleOAuth2', '0', NULL, 'if ON, allows the use of Google OAuth2 for login', 'YesNo'), ('GoogleOAuth2ClientID', '', NULL, 'Client ID for the web app registered with google', 'Free'), ('GoogleOAuth2ClientSecret', '', NULL, 'Client Secret for the web app registered with google', 'Free');
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 4b0f364..3445025 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -115,6 +115,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('FRBRizeEditions','0','','If ON, Koha will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages','YesNo'),
 ('gist','0','','Default Goods and Services tax rate NOT in %, but in numeric form (0.12 for 12%), set to 0 to disable GST','Integer'),
 ('GoogleJackets','0',NULL,'if ON, displays jacket covers from Google Books API','YesNo'),
+('GoogleOAuth2', '0', NULL, 'if ON, allows the use of Google OAuth2 for login', 'YesNo'),
+('GoogleOAuth2ClientID', '', NULL, 'Client ID for the web app registered with google', 'Free'),
+('GoogleOAuth2ClientSecret', '', NULL, 'Client Secret for the web app registered with google', 'Free'),
 ('hidelostitems','0','','If ON, disables display of\"lost\" items in OPAC.','YesNo'),
 ('HidePatronName','0','','If this is switched on, patron\'s cardnumber will be shown instead of their name on the holds and catalog screens','YesNo'),
 ('hide_marc','0',NULL,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)','YesNo'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index 1215ac1..14b53e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -113,3 +113,18 @@ Administration:
                 Solr: Solr
                 Zebra: Zebra
             - is the search engine used.
+    Google OAuth2:
+        -
+            - pref: GoogleOAuth2
+              choices:
+                yes: Use
+                no: "Don't Use"
+            - Google OAuth2 login.
+            - You will need to select OAuth2 when creating an app in the google cloud console, and set the web origin to your_opac_url and the redirect url to your_opac_url/cgi-bin/koha/svc/oauthlogin .
+
+        -
+            - Google OAuth2 Client ID
+            - pref: GoogleOAuth2ClientID
+        -
+            - Google OAuth2 Client Secret
+            - pref: GoogleOAuth2ClientSecret
diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
index 42d9576..f832cc4 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
+++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/top-bar.inc
@@ -55,7 +55,11 @@
       [% IF ( opacuserlogin ) %]
         <ul>
     [% UNLESS ( loggedinusername ) %]
-                   <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>[% END %]
+        [% IF ( GoogleOAuth2 ) %]
+               <li><a href="/cgi-bin/koha/svc/googleoauth2">Log in to your account</a></li>
+        [% ELSE %]
+               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
+        [% END %][% END %]
                 [% IF ( loggedinusername ) %]
                     <li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></span></li>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 79eb1a1..48c78bb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -2,7 +2,11 @@
   [% IF ( opacuserlogin ) %]
 	<ul>
 [% UNLESS ( loggedinusername ) %]
-               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>[% END %]
+        [% IF ( GoogleOAuth2 ) %]
+               <li><a href="/cgi-bin/koha/svc/googleoauth2">Log in to your account</a></li>
+        [% ELSE %]
+               <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
+        [% END %][% END %]
             [% IF ( loggedinusername ) %]
                 <li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></span></li>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
index 7b8b8f9..af7153c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
@@ -73,6 +73,15 @@ please choose against which one you would like to authenticate: </p>
 
 [% END %]
 
+[% IF ( invalidOAuth2Login ) %]
+<h4>Automatic Login</h4>
+<p>Sorry, your automatic login failed. <span class="error">[% invalidOAuth2Login %]</span></p>
+<p>Please note that automatic login will only work if you are using the email address registered with this library.</p>
+<p>If you want to, you can try to <a href="/cgi-bin/koha/svc/googleoauth2?reauthenticate=select_account">login using a differen account</a>
+<h4>Local login</h4>
+<p>If you can't login automatically, you can still login in manually: </p>
+
+[% END %]
 <form action="[% url %]" name="auth" id="auth" method="post">
   <input type="hidden" name="koha_login_context" value="opac" />
 <fieldset class="brief">[% FOREACH INPUT IN INPUTS %]
diff --git a/opac/svc/googleoauth2 b/opac/svc/googleoauth2
new file mode 100755
index 0000000..9df5f01
--- /dev/null
+++ b/opac/svc/googleoauth2
@@ -0,0 +1,126 @@
+#!/bin/perl -w
+# Copyright chris at bigballofwax.co.nz 2013
+#
+# 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 3 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.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#
+# Basic OAuth2 authentication for google goes like this
+# First: get your clientid, clientsecret from google. At this stage, tell google that
+# your redirect url is /cgi-bin/koha/svc/oauthlogin
+#
+# The first thing that happens when this script is called is that one gets redirected
+# to an authentication url from google
+#
+# If successful, that then redirects back to this script, setting a CODE parameter
+# which we use to look up a json authentication token. This token includes an encrypted
+# json id_token, which we round-trip back to google to decrypt. Finally, we can extract
+# the email address from this.
+#
+# There is LOTS of room for improvement here.
+# 1. move the clientid, clientsecret to systempreferences
+# 2. use the OPACBaseURL preference to compute the redirecturl
+# 4. Google recommends verifying and decrypting the id_token locally, which means caching
+# some information and updating it daily. But that would make things a lot faster
+
+use strict;
+use warnings;
+use CGI qw/escape/;
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+
+use LWP::UserAgent;
+use HTTP::Request::Common qw{ POST };
+use JSON;
+
+my $scope="openid email";
+my $host = C4::Context->preference('OPACBaseURL');
+my $redirecturl = 'http://' . $host . '/cgi-bin/koha/svc/googleoauth2';
+my $issuer = 'accounts.google.com';
+my $clientid = C4::Context->preference('GoogleOAuth2ClientID');
+my $clientsecret = C4::Context->preference('GoogleOAuth2ClientSecret');
+
+my $query = new CGI;
+
+sub loginfailed {
+  my $query = shift;
+  my $reason = shift;
+  $query->delete('code');
+  $query->param('OAuth2Failed'=>$reason);
+  my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => 'opac-user.tmpl',
+        query           => $query,
+        type            => 'opac',
+        authnotrequired => 0,
+        flagsrequired   => { borrow => 1 },
+    }
+  );
+  $template->param( 'invalidOAuth2Login' => $reason );
+  $template->param( 'loginprompt' => 1);
+  output_html_with_http_headers $query, $cookie, $template->output;
+}
+#die $query->param('code');
+if (defined $query->param('error')) {
+	loginfailed($query, 'An authentication error occurred. (Error:' . $query->param('error') . ')');
+} elsif (defined $query->param('code')) {
+	my $code=$query->param('code');
+	my $ua = LWP::UserAgent->new();
+	my $request = POST('https://accounts.google.com/o/oauth2/token', [
+                        code => $code,
+                        client_id => $clientid,
+                        client_secret => $clientsecret,
+			redirect_uri => $redirecturl,
+				grant_type => 'authorization_code',
+                        $scope => $scope
+    ]);
+	my $response =  $ua->request($request)->decoded_content ;
+	my $json = decode_json ( $response);
+	if ( exists($json->{'id_token'}) ) {
+		$request = POST('https://www.googleapis.com/oauth2/v1/tokeninfo', [
+			id_token => $json->{'id_token'}
+		]);
+		$response = $ua->request($request)->decoded_content;
+		$json = decode_json ( $response);
+		# Confirm (as google suggests) that the issuer and audience are what we expect them to be
+		if (($json->{'issuer'} eq $issuer) && ($json->{'audience'} eq $clientid) && exists($json->{'email'})) {
+			my $email = $json->{'email'};
+			my ( $userid, $cookie, $sessionID ) =
+                            checkauth( $query, 1,  { borrow => 1 }, 'opac', $email );
+			if ($userid) { # A valid user has logged in
+				print $query->redirect( -uri => '/cgi-bin/koha/opac-user.pl', -cookie => $cookie );
+			} else {
+				loginfailed($query, 'The email address you are trying to use is not associated with a borrower in this library.');
+			}
+		} else { # something went wrong with getting appropriate credentials
+			loginfailed($query, 'Failed to get proper credentials from google.');
+		}
+	} else { # Failed to get ID Token
+		loginfailed($query, 'An authentication error occurred. (Error: No ID Token was supplied)');
+	}
+
+} else {
+    my  $prompt = '';
+    $prompt = $query->param('reauthenticate') unless not (defined $query->param('reauthenticate'));
+
+    my $authorisationurl =  'https://accounts.google.com/o/oauth2/auth?' .
+                            'response_type=code&' .
+                            'redirect_uri=' . escape ( $redirecturl ) . '&' .
+                            'client_id=' . escape ( $clientid ) . '&' .
+                            'scope=' . escape ( $scope ) . '&';
+    $authorisationurl .=    'prompt=' . escape ( $query->param('reauthenticate') );
+	print $query->redirect($authorisationurl);
+}
-- 
1.8.1.4


From vanoudt at gmail.com  Thu Oct 10 11:13:02 2013
From: vanoudt at gmail.com (Nicholas van Oudtshoorn)
Date: Thu, 10 Oct 2013 17:13:02 +0800
Subject: [Koha-patches] [PATCH 2/2] Bug 10988 Fix some minor typos
Message-ID: <1381396382-26390-1-git-send-email-vanoudt@gmail.com>

---
 .../intranet-tmpl/prog/en/modules/admin/preferences/admin.pref |  2 +-
 opac/svc/googleoauth2                                          | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index 14b53e9..8d7803d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -120,7 +120,7 @@ Administration:
                 yes: Use
                 no: "Don't Use"
             - Google OAuth2 login.
-            - You will need to select OAuth2 when creating an app in the google cloud console, and set the web origin to your_opac_url and the redirect url to your_opac_url/cgi-bin/koha/svc/oauthlogin .
+            - You will need to select OAuth2 when creating an app in the google cloud console, and set the web origin to your_opac_url and the redirect url to your_opac_url/cgi-bin/koha/svc/googleoauth2 .
 
         -
             - Google OAuth2 Client ID
diff --git a/opac/svc/googleoauth2 b/opac/svc/googleoauth2
index 9df5f01..8ffef15 100755
--- a/opac/svc/googleoauth2
+++ b/opac/svc/googleoauth2
@@ -1,5 +1,5 @@
 #!/bin/perl -w
-# Copyright chris at bigballofwax.co.nz 2013
+# Copyright vanoudt at gmail.com 2013
 #
 # This file is part of Koha.
 #
@@ -19,7 +19,7 @@
 #
 # Basic OAuth2 authentication for google goes like this
 # First: get your clientid, clientsecret from google. At this stage, tell google that
-# your redirect url is /cgi-bin/koha/svc/oauthlogin
+# your redirect url is /cgi-bin/koha/svc/googleoauth2
 #
 # The first thing that happens when this script is called is that one gets redirected
 # to an authentication url from google
@@ -29,10 +29,8 @@
 # json id_token, which we round-trip back to google to decrypt. Finally, we can extract
 # the email address from this.
 #
-# There is LOTS of room for improvement here.
-# 1. move the clientid, clientsecret to systempreferences
-# 2. use the OPACBaseURL preference to compute the redirecturl
-# 4. Google recommends verifying and decrypting the id_token locally, which means caching
+# There is some room for improvement here.
+# 1. Google recommends verifying and decrypting the id_token locally, which means caching
 # some information and updating it daily. But that would make things a lot faster
 
 use strict;
-- 
1.8.1.4


From colin.campbell at ptfs-europe.com  Thu Oct 10 15:18:30 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu, 10 Oct 2013 14:18:30 +0100
Subject: [Koha-patches] [PATCH] Bug 11034 Remove incorrect return for
	BiblioAutoLink
Message-ID: <1381411110-11716-1-git-send-email-colin.campbell@ptfs-europe.com>

BiblioAutoLink was being called expecting an array to
be returned. The subroutine in fact returns a scalar

As the variables that the return was stored in, went
out of scope immediately. It is probably better to be
explicit that we are throwing the return away by not
going through the motions of storing it in a variable
---
 cataloguing/addbiblio.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index cb40396..bfb62f0 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -865,7 +865,7 @@ if ( $op eq "addbiblio" ) {
         my $oldbibnum;
         my $oldbibitemnum;
         if (C4::Context->preference("BiblioAddsAuthorities")){
-          my ($countlinked,$countcreated)=BiblioAutoLink($record,$frameworkcode);
+            BiblioAutoLink( $record, $frameworkcode );
         } 
         if ( $is_a_modif ) {
             ModBiblioframework( $biblionumber, $frameworkcode ); 
-- 
1.8.3.1


From colin.campbell at ptfs-europe.com  Fri Oct 11 11:30:54 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 11 Oct 2013 10:30:54 +0100
Subject: [Koha-patches] [PATCH] Bug 11032: Check a valid MARC::Record passed
	to Biblio
Message-ID: <1381483854-6243-1-git-send-email-colin.campbell@ptfs-europe.com>

Intermittently problems in the calling environment
cause a C4::Biblio to be called with and undefined
MARC::Record object. This results in the process
dieing and returning to the enduser a low level
message such as 'cannot call method x on an undefined
object'
For exported subroutines taking a MARC::Record object
check that object is defined otherwise return a logical
return value and log a stack trace to the error log.
A couple of cases were checking but dieing, this may have
unwelcome results in a persistent environment so croak has
been downgraded to carp
---
 C4/Biblio.pm | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 t/Biblio.t   |  82 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 187 insertions(+), 5 deletions(-)
 create mode 100755 t/Biblio.t

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index cf83ae6..508e3bf 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -252,6 +252,10 @@ sub AddBiblio {
     my $frameworkcode   = shift;
     my $options         = @_ ? shift : undef;
     my $defer_marc_save = 0;
+    if (!$record) {
+        carp('AddBiblio called with undefined record');
+        return;
+    }
     if ( defined $options and exists $options->{'defer_marc_save'} and $options->{'defer_marc_save'} ) {
         $defer_marc_save = 1;
     }
@@ -301,11 +305,16 @@ in the C<biblio> and C<biblioitems> tables, as well as
 which fields are used to store embedded item, biblioitem,
 and biblionumber data for indexing.
 
+Returns 1 on success 0 on failure
+
 =cut
 
 sub ModBiblio {
     my ( $record, $biblionumber, $frameworkcode ) = @_;
-    croak "No record" unless $record;
+    if (!$record) {
+        carp 'No record passed to ModBiblio';
+        return 0;
+    }
 
     if ( C4::Context->preference("CataloguingLog") ) {
         my $newrecord = GetMarcBiblio($biblionumber);
@@ -475,11 +484,17 @@ sub DelBiblio {
 
 Automatically links headings in a bib record to authorities.
 
+Returns the number of headings changed
+
 =cut
 
 sub BiblioAutoLink {
     my $record        = shift;
     my $frameworkcode = shift;
+    if (!$record) {
+        carp('Undefined record passed to BiblioAutoLink');
+        return 0;
+    }
     my ( $num_headings_changed, %results );
 
     my $linker_module =
@@ -487,7 +502,7 @@ sub BiblioAutoLink {
     unless ( can_load( modules => { $linker_module => undef } ) ) {
         $linker_module = 'C4::Linker::Default';
         unless ( can_load( modules => { $linker_module => undef } ) ) {
-            return 0, 0;
+            return 0;
         }
     }
 
@@ -524,6 +539,10 @@ sub LinkBibHeadingsToAuthorities {
     my $frameworkcode = shift;
     my $allowrelink = shift;
     my %results;
+    if (!$bib) {
+        carp 'LinkBibHeadingsToAuthorities called on undefined bib record';
+        return ( 0, {});
+    }
     require C4::Heading;
     require C4::AuthoritiesMarc;
 
@@ -673,6 +692,11 @@ Get MARC fields from a keyword defined in fieldmapping table.
 
 sub GetRecordValue {
     my ( $field, $record, $frameworkcode ) = @_;
+
+    if (!$record) {
+        carp 'GetRecordValue called with undefined record';
+        return;
+    }
     my $dbh = C4::Context->dbh;
 
     my $sth = $dbh->prepare('SELECT fieldcode, subfieldcode FROM fieldmapping WHERE frameworkcode = ? AND field = ?');
@@ -1304,7 +1328,8 @@ sub GetCOinSBiblio {
 
     # get the coin format
     if ( ! $record ) {
-	return;
+        carp 'GetCOinSBiblio called with undefined record';
+        return;
     }
     my $pos7 = substr $record->leader(), 7, 1;
     my $pos6 = substr $record->leader(), 6, 1;
@@ -1445,10 +1470,20 @@ sub GetCOinSBiblio {
 =head2 GetMarcPrice
 
 return the prices in accordance with the Marc format.
+
+returns 0 if no price found
+returns undef if called without a marc record or with
+an unrecognized marc format
+
 =cut
 
 sub GetMarcPrice {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcPrice called on undefined record';
+        return;
+    }
+
     my @listtags;
     my $subfield;
     
@@ -1520,10 +1555,19 @@ sub MungeMarcPrice {
 return the quantity of a book. Used in acquisition only, when importing a file an iso2709 from a bookseller
 Warning : this is not really in the marc standard. In Unimarc, Electre (the most widely used bookseller) use the 969$a
 
+returns 0 if no quantity found
+returns undef if called without a marc record or with
+an unrecognized marc format
+
 =cut
 
 sub GetMarcQuantity {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcQuantity called on undefined record';
+        return;
+    }
+
     my @listtags;
     my $subfield;
     
@@ -1610,6 +1654,10 @@ Get the control number / record Identifier from the MARC record and return it.
 
 sub GetMarcControlnumber {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcControlnumber called on undefined record';
+        return;
+    }
     my $controlnumber = "";
     # Control number or Record identifier are the same field in MARC21, UNIMARC and NORMARC
     # Keep $marcflavour for possible later use
@@ -1633,6 +1681,10 @@ ISBNs stored in different fields depending on MARC flavour
 
 sub GetMarcISBN {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcISBN called on undefined record';
+        return;
+    }
     my $scope;
     if ( $marcflavour eq "UNIMARC" ) {
         $scope = '010';
@@ -1674,6 +1726,10 @@ ISSNs are stored in different fields depending on MARC flavour
 
 sub GetMarcISSN {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcISSN called on undefined record';
+        return;
+    }
     my $scope;
     if ( $marcflavour eq "UNIMARC" ) {
         $scope = '011';
@@ -1699,6 +1755,10 @@ The note are stored in different fields depending on MARC flavour
 
 sub GetMarcNotes {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcNotes called on undefined record';
+        return;
+    }
     my $scope;
     if ( $marcflavour eq "UNIMARC" ) {
         $scope = '3..';
@@ -1743,6 +1803,10 @@ The subjects are stored in different fields depending on MARC flavour
 
 sub GetMarcSubjects {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcSubjects called on undefined record';
+        return;
+    }
     my ( $mintag, $maxtag, $fields_filter );
     if ( $marcflavour eq "UNIMARC" ) {
         $mintag = "600";
@@ -1828,6 +1892,10 @@ The authors are stored in different fields depending on MARC flavour
 
 sub GetMarcAuthors {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcAuthors called on undefined record';
+        return;
+    }
     my ( $mintag, $maxtag, $fields_filter );
 
     # tagslib useful for UNIMARC author reponsabilities
@@ -1916,6 +1984,10 @@ Assumes web resources (not uncommon in MARC21 to omit resource type ind)
 
 sub GetMarcUrls {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcUrls called on undefined record';
+        return;
+    }
 
     my @marcurls;
     for my $field ( $record->field('856') ) {
@@ -1971,6 +2043,11 @@ The series are stored in different fields depending on MARC flavour
 
 sub GetMarcSeries {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcSeries called on undefined record';
+        return;
+    }
+
     my ( $mintag, $maxtag, $fields_filter );
     if ( $marcflavour eq "UNIMARC" ) {
         $mintag = "225";
@@ -2040,6 +2117,11 @@ Get all host records (773s MARC21, 461 UNIMARC) from the MARC record and returns
 
 sub GetMarcHosts {
     my ( $record, $marcflavour ) = @_;
+    if (!$record) {
+        carp 'GetMarcHosts called on undefined record';
+        return;
+    }
+
     my ( $tag,$title_subf,$bibnumber_subf,$itemnumber_subf);
     $marcflavour ||="MARC21";
     if ( $marcflavour eq "MARC21" || $marcflavour eq "NORMARC" ) {
@@ -2483,12 +2565,19 @@ our $inverted_field_map;
 Extract data from a MARC bib record into a hashref representing
 Koha biblio, biblioitems, and items fields. 
 
+If passed an undefined record will log the error and return an empty
+hash_ref
+
 =cut
 
 sub TransformMarcToKoha {
     my ( $dbh, $record, $frameworkcode, $limit_table ) = @_;
 
-    my $result;
+    my $result = {};
+    if (!defined $record) {
+        carp('TransformMarcToKoha called with undefined record');
+        return $result;
+    }
     $limit_table = $limit_table || 0;
     $frameworkcode = '' unless defined $frameworkcode;
 
@@ -2801,7 +2890,10 @@ if $itemnumbers is defined, only specified itemnumbers are embedded
 
 sub EmbedItemsInMarcBiblio {
     my ($marc, $biblionumber, $itemnumbers) = @_;
-    croak "No MARC record" unless $marc;
+    if ( !$marc ) {
+        carp 'EmbedItemsInMarcBiblio: No MARC record passed';
+        return;
+    }
 
     $itemnumbers = [] unless defined $itemnumbers;
 
@@ -3264,6 +3356,10 @@ sub ModBiblioMarc {
     # pass the MARC::Record to this function, and it will create the records in
     # the marc field
     my ( $record, $biblionumber, $frameworkcode ) = @_;
+    if ( !$record ) {
+        carp 'ModBiblioMarc passed an undefined record';
+        return;
+    }
 
     # Clone record as it gets modified
     $record = $record->clone();
@@ -3625,6 +3721,10 @@ Removes all nsb/nse chars from a record
 
 sub RemoveAllNsb {
     my $record = shift;
+    if (!$record) {
+        carp 'RemoveAllNsb called with undefined record';
+        return;
+    }
 
     SetUTF8Flag($record);
 
diff --git a/t/Biblio.t b/t/Biblio.t
new file mode 100755
index 0000000..9a1b8f4
--- /dev/null
+++ b/t/Biblio.t
@@ -0,0 +1,82 @@
+#!/usr/bin/perl
+#
+use strict;
+use warnings;
+
+use Test::More tests => 22;
+
+BEGIN {
+        use_ok('C4::Biblio');
+}
+
+# test returns if undef record passed
+# carp messages appear on stdout
+
+my @arr = AddBiblio(undef, q{});
+my $elements = @arr;
+
+is($elements, 0, 'Add Biblio returns empty array for undef record');
+
+my $ret = ModBiblio(undef, 0, '');
+
+is( $ret, 0, 'ModBiblio returns zero if not passed rec');
+
+$ret = BiblioAutoLink(undef, q{});
+
+is( $ret, 0, 'BiblioAutoLink returns zero if not passed rec');
+
+$ret = GetRecordValue('100', undef, q{});
+ok( !defined $ret, 'GetRecordValue returns undef if not passed rec');
+
+ at arr = LinkBibHeadingsToAuthorities(q{}, q{});
+is($arr[0], 0, 'LinkBibHeadingsToAuthorities correct error return');
+
+$ret = GetCOinSBiblio();
+ok( !defined $ret, 'GetCOinSBiblio returns undef if not passed rec');
+
+$ret = GetMarcPrice(undef, 'MARC21');
+ok( !defined $ret, 'GetMarcPrice returns undef if not passed rec');
+
+$ret = GetMarcQuantity(undef, 'MARC21');
+ok( !defined $ret, 'GetMarcQuantity returns undef if not passed rec');
+
+$ret = GetMarcControlnumber();
+ok( !defined $ret, 'GetMarcControlnumber returns undef if not passed rec');
+
+$ret = GetMarcISBN();
+ok( !defined $ret, 'GetMarcISBN returns undef if not passed rec');
+
+$ret = GetMarcISSN();
+ok( !defined $ret, 'GetMarcISSN returns undef if not passed rec');
+
+$ret = GetMarcNotes();
+ok( !defined $ret, 'GetMarcNotes returns undef if not passed rec');
+
+$ret = GetMarcSubjects();
+ok( !defined $ret, 'GetMarcSubjects returns undef if not passed rec');
+
+$ret = GetMarcAuthors();
+ok( !defined $ret, 'GetMarcAuthors returns undef if not passed rec');
+
+$ret = GetMarcUrls();
+ok( !defined $ret, 'GetMarcUrls returns undef if not passed rec');
+
+$ret = GetMarcSeries();
+ok( !defined $ret, 'GetMarcSeries returns undef if not passed rec');
+
+$ret = GetMarcHosts();
+ok( !defined $ret, 'GetMarcHosts returns undef if not passed rec');
+
+my $hash_ref = TransformMarcToKoha(undef, undef);
+
+isa_ok( $hash_ref, 'HASH');
+
+$elements = keys %{$hash_ref};
+
+is($elements, 0, 'Empty hashref returned for undefined record in TransformMarcToKoha');
+
+$ret = ModBiblioMarc();
+ok( !defined $ret, 'ModBiblioMarc returns undef if not passed rec');
+
+$ret = RemoveAllNsb();
+ok( !defined $ret, 'RemoveAllNsb returns undef if not passed rec');
-- 
1.8.3.1


From colin.campbell at ptfs-europe.com  Fri Oct 11 12:05:16 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 11 Oct 2013 11:05:16 +0100
Subject: [Koha-patches] [PATCH] Bug 11037 Remove non-existent subs from
	Biblio's @EXPORT
Message-ID: <1381485916-6610-1-git-send-email-colin.campbell@ptfs-europe.com>

No code implements the subs Get and TransformHtmlToMarc2
so dont export them into users' namespace
---
 C4/Biblio.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index cf83ae6..add0f74 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -54,7 +54,6 @@ BEGIN {
 
     # to get something
     push @EXPORT, qw(
-      &Get
       &GetBiblio
       &GetBiblioData
       &GetBiblioItemData
@@ -133,7 +132,6 @@ BEGIN {
     # Others functions
     push @EXPORT, qw(
       &TransformMarcToKoha
-      &TransformHtmlToMarc2
       &TransformHtmlToMarc
       &TransformHtmlToXml
       prepare_host_field
-- 
1.8.3.1


From mathieu.saby at univ-rennes2.fr  Mon Oct 14 23:58:01 2013
From: mathieu.saby at univ-rennes2.fr (Mathieu Saby)
Date: Mon, 14 Oct 2013 23:58:01 +0200
Subject: [Koha-patches] [PATCH 1/3] Bug 8962: Changes to CCL and templates
Message-ID: <525C68E9.4020007@univ-rennes2.fr>

[PATCH 1/3] Bug 8962: Changes to CCL and templates

Content-Type: text/plain; charset="utf-8"

This patch adds a new index Anywhere in ccl.properties and add "any word" option in intranet search for using this index.
Default OPAC and intranet search in still using CCL "Any" index.

Testing plan :
In a Marc21 GRS-1 Koha :
1/ make some biblio searches without selecting any index (Koha will use "any" index) and note the results. Ex : search "fre", "eng", "book", "history", "history book"
2/ apply the 3 patches
3/ copy the 4 new record.abs files (Marc21 auth, Marc21 bib, Unimarc auth, Unimarc bib) from your sources to the directory used by Zebra configuration in your Koha instance
4/ launch rebuild_zebra.pl -b -r -x -v
5/ check that a new choice "Any word (all indexes)" is visible in advanced search.
6/ make the same searches as 1/ : you should see less results (detailed test plan in patchs 2 and 3)
7/ in Staff interface adavanced search, select "Any word (all indexes)" and make the same searches as 1/ : you should see the same results (maybe with a slight differences, because more notes fields are indexed in Marc21)

In a UNIMARC GRS-1 Koha :
same test

---
  etc/zebradb/ccl.properties                         |    2 +-
  .../prog/en/includes/search_indexes.inc            |    1 +
  .../prog/en/modules/catalogue/results.tt           |    4 ++++
  3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index 14aa7b2..0ec0ed2 100644
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -84,7 +84,7 @@ kw Any
  #            support both 'any' and 'anywhere', if the origin uses 'Any'
  #            (rather than 'Anywhere') it is asking the target to locate
  #            the term only if it can do so relatively inexpensively.
-#Anywhere 1=1035
+Anywhere 1=1035
  
  #Author-name          1003  A personal or corporate author, 100, 110, 111, 400
  #                           or a conference or meeting      410, 411, 700, 710,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
index 67725c6..7cec1bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
@@ -42,4 +42,5 @@
      <option value="pl">Publisher location</option>
      <option value="yr">Publication date (yyyy)</option>
      <option value="acqdate">Acquisition date (yyyy-mm-dd)</option>
+    <option value="anywhere">Any word (all indexes)</option>
  </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 520e6d2..962803b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -389,6 +389,10 @@ var holdForPatron = function () {
                              [% ELSE %]<option value="sn">ISBN</option>[% END %]
                              [% IF ( ms_ss ) %]<option selected="selected" value="ss">ISSN</option>
                              [% ELSE %]<option value="ss">ISSN</option>[% END %]
+                            [% IF ( ms_anywhere ) %]<option selected="selected" value="anywhere">Any world (all indexes)</option>
+                            [% ELSE %]<option value="anywhere">Any word (all indexes)</option>[% END %]
+                            [% IF ( ms_anywherecommaphr ) %]<option selected="selected" value="anywhere,phr">Any phrase (all indexes)</option>
+                            [% ELSE %]<option value="anywhere,phr">Any phrase (all indexes)</option>[% END %]
                          </select>
                          <input type="hidden" name="scan" value="1" />
                      </td>
-- 
1.7.9.5

-- 
Mathieu Saby
Service d'Informatique Documentaire
Service Commun de Documentation
Universit? Rennes 2
T?l?phone : 02 99 14 12 65
Courriel : mathieu.saby at univ-rennes2.fr


From mathieu.saby at univ-rennes2.fr  Mon Oct 14 23:58:41 2013
From: mathieu.saby at univ-rennes2.fr (Mathieu Saby)
Date: Mon, 14 Oct 2013 23:58:41 +0200
Subject: [Koha-patches] [PATCH 2/3] Bug 8962: Marc21 biblios and
	authorithies (GRS1)
Message-ID: <525C6911.20900@univ-rennes2.fr>

This patch makes some changes MARC21 GRS1 indexing, for indexing only some specific fields in "any" index.
The patch is fully testable, and can be signed off if it works.
But the list of fields I kept in "any" is rather subjective, and based as my experience as a library user:
It can be discussed in followups.

1. Defines a new index "anywhere" for indexing all biblio and authorities subfields.
2. Make "any" index more selective than before :
- for authorities : all fields indexed in any except 001
- for biblios : fields indexed in any :
* biblio fields indexed in "any" :
** the more "user friendly" control numbers : 020->030
** main entries (authors and uniform title) : 1XX
**  title and Title-Related Fields : 20X-24X
** publisher : 260$b
** series : 4XX
** some notes : 502 (dissertation), 520 (abstract), 505 (formated content), 511 (participant)
** subjects : 6XX
** added Entry Fields : 70X-75X
** linking Entries-General Information : 76X-78X
** series Added Entry Fields : 80X-83X
* item fields indexed in "any" :
** callnumber : 952$o
** barcode : 952$p
3. Also index all the Marc21 notes (5XX) in "Notes" index (same logic as current 3XX fields indexing in UNIMARC)
- new fields not indexed before : 504,506,507,508,511,513,514,515,516,518,521,522,524,525,530,533,534,535, 536,538,540,541,542,544,545,547,550,552,555,556,561,562,563,567,580,581,583,584,585,586,588
- fields indexed in "Notes" in addition to a more specific index : 502,505,521,520,510,526
4. Also index all the Marc21 notes (5XX) in "Notes" index (same logic as current 3XX fields indexing in UNIMARC)
5. Adds a lot of comments to make easier further changes and error checking

Test plan :
In a Marc21 GRS-1 Koha :
1/ apply patch 1 and this one
2/ in Staff interface, make some searches on authorities (choose "Keyword search" tab)
3/ copy the 2 new record.abs files (Marc21 auth, Marc21 bib) from your sources to the directory used by Zebra configuration in your Koha instance
4/ launch rebuild_zebra.pl -b -r -x -v
5/ make the same authorities searches as 2/ : you should get the same results
5/ edit a record to put the value "xxxx" in newly indexed "5XX" field (for example in 530)
6/ search "note:xxxx" : you should find the record
7/ edit a record to put the value "xxxx" in a "5XX" field index in note in addition to a more specifi index (for example in 520)
8/ search "note:xxxx" : you should find the record
9/ in default search (without selecting any index), search for some record by
- its isbn
- its issn
- its title
- its author(s)
- its series name
- its publisher
- its summary (520 field)
- several subjects
- the barcode of one of its items
- the callnumber of one of its items
=> you should find the record each time
10/ in default search (without selecting any index), search for some record by
- the content of any 5XX fields (except 502,505,511,520)
- the number of pages (ex : "510p")
- its language code ("eng", "fre"...)
- its publication year
- its town of publication
- the content of a 05X-08X field
- the content of a 010-018 field
- the content of a 942 subfield
- the content of a 952 subfield (except barcode and callnumber)
=> you should not find the record each time
11/ regression test : check that specific indexes are working as usual (title, subject, callnum, barcode, pubdate etc)

---
  .../marc_defs/marc21/authorities/record.abs        |   78 +--
  etc/zebradb/marc_defs/marc21/biblios/record.abs    |  537 ++++++++++++++++----
  2 files changed, 467 insertions(+), 148 deletions(-)

diff --git a/etc/zebradb/marc_defs/marc21/authorities/record.abs b/etc/zebradb/marc_defs/marc21/authorities/record.abs
index 0e0d451..4e1bd8d 100644
--- a/etc/zebradb/marc_defs/marc21/authorities/record.abs
+++ b/etc/zebradb/marc_defs/marc21/authorities/record.abs
@@ -18,65 +18,67 @@ marc marc21.mar
  systag sysno rank
  xpath enable
  
-all any
+# authority fields indexed in any : all except 001
+
+all anywhere
  melm 001 Local-Number,Local-Number:n,Local-Number:s
-melm 942$a authtype:w,authtype:p
+melm 942$a authtype:w,authtype:p,any:w,any:p
  
  # Personal Name
-melm 100$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 100 Personal-name:w,Personal-name:p,Personal-name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 400 Personal-name-see-from:w,Personal-name-see-from:p,Personal-name-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p
-melm 500 Personal-name-see-also-from:w,Personal-name-see-also-from:p,Personal-name-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p
+melm 100$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 100 Personal-name:w,Personal-name:p,Personal-name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 400 Personal-name-see-from:w,Personal-name-see-from:p,Personal-name-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p,any:w,any:p
+melm 500 Personal-name-see-also-from:w,Personal-name-see-also-from:p,Personal-name-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p,any:w,any:p
  
  # Corporate Name
-melm 110$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 110 Corporate-name:w,Corporate-name:p,Corporate-name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 410 Corporate-name-see-from:w,Corporate-name-see-from:p,Corporate-name-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p
-melm 510 Corporate-name-see-also-from:w,Corporate-name-see-also-from:p,Corporate-name-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p
+melm 110$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 110 Corporate-name:w,Corporate-name:p,Corporate-name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 410 Corporate-name-see-from:w,Corporate-name-see-from:p,Corporate-name-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p,any:w,any:p
+melm 510 Corporate-name-see-also-from:w,Corporate-name-see-also-from:p,Corporate-name-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p,any:w,any:p
  
  # Meeting Name
-melm 111$a Meeting-name-heading:w,Meeting-name-heading:p,Meeting-name-heading:s,Meeting-name:w,Meeting-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 111 Meeting-name:w,Meeting-name:p,Meeting-name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 411 Meeting-name-see-from:w,Meeting-name-see-from:p,Meeting-name-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p
-melm 511 Meeting-name-see-also-from:w,Meeting-name-see-also-from:p,Meeting-name-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p
+melm 111$a Meeting-name-heading:w,Meeting-name-heading:p,Meeting-name-heading:s,Meeting-name:w,Meeting-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 111 Meeting-name:w,Meeting-name:p,Meeting-name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 411 Meeting-name-see-from:w,Meeting-name-see-from:p,Meeting-name-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p,any:w,any:p
+melm 511 Meeting-name-see-also-from:w,Meeting-name-see-also-from:p,Meeting-name-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p,any:w,any:p
  
  # Uniform Title
-melm 130$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 130 Title-uniform:w,Title-uniform:p,Title-uniform:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 431 Title-uniform-see-from:w,Title-uniform-see-from:p,Title-uniform-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p
-melm 531 Title-uniform-see-also-from:w,Title-uniform-see-also-from:p,Title-uniform-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p
+melm 130$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 130 Title-uniform:w,Title-uniform:p,Title-uniform:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 431 Title-uniform-see-from:w,Title-uniform-see-from:p,Title-uniform-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p,any:w,any:p
+melm 531 Title-uniform-see-also-from:w,Title-uniform-see-also-from:p,Title-uniform-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p,any:w,any:p
  
  # Chronological Term
-melm 148$a Chronological-term-heading:w,Chronological-term-heading:p,Chronological-term-heading:s,Chronological-term:w,Chronological-term:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
-melm 148 Chronological-term:w,Chronological-term:p,Chronological-term:s,Heading:w,Heading:p,Heading:s
-melm 448 Chronological-term-see-from:w,Chronological-term-see-from:p,Chronological-term-see-from:s,See-from:w,See-from:p,See-from:s
-melm 548 Chronological-term-see-also-from:w,Chronological-term-see-also-from:p,Chronological-term-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s
+melm 148$a Chronological-term-heading:w,Chronological-term-heading:p,Chronological-term-heading:s,Chronological-term:w,Chronological-term:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,any:w,any:p
+melm 148 Chronological-term:w,Chronological-term:p,Chronological-term:s,Heading:w,Heading:p,Heading:s,any:w,any:p
+melm 448 Chronological-term-see-from:w,Chronological-term-see-from:p,Chronological-term-see-from:s,See-from:w,See-from:p,See-from:s,any:w,any:p
+melm 548 Chronological-term-see-also-from:w,Chronological-term-see-also-from:p,Chronological-term-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,any:w,any:p
  
  # Topical Term
-melm 150$a Subject-topical-heading:w,Subject-topical-heading:p,Subject-topical-heading:s,Subject-topical:w,Subject-topical:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 150 Subject-topical:w,Subject-topical:p,Subject-topical:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 450 Subject-topical-see-from:w,Subject-topical-see-from:p,Subject-topical-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p
-melm 550 Subject-topical-see-also-from:w,Subject-topical-see-also-from:p,Subject-topical-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p
+melm 150$a Subject-topical-heading:w,Subject-topical-heading:p,Subject-topical-heading:s,Subject-topical:w,Subject-topical:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 150 Subject-topical:w,Subject-topical:p,Subject-topical:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 450 Subject-topical-see-from:w,Subject-topical-see-from:p,Subject-topical-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p,any:w,any:p
+melm 550 Subject-topical-see-also-from:w,Subject-topical-see-also-from:p,Subject-topical-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p,any:w,any:p
  
  # Geographic Name
-melm 151$a Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 151 Name-geographic:w,Name-geographic:p,Name-geographic:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 451 Name-geographic-see-from:w,Name-geographic-see-from:p,Name-geographic-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p
-melm 551 Name-geographic-see-also-from:w,Name-geographic-see-also-from:p,Name-geographic-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p
+melm 151$a Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 151 Name-geographic:w,Name-geographic:p,Name-geographic:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 451 Name-geographic-see-from:w,Name-geographic-see-from:p,Name-geographic-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p,any:w,any:p
+melm 551 Name-geographic-see-also-from:w,Name-geographic-see-also-from:p,Name-geographic-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p,any:w,any:p
  
  # Genre/Form Term
-melm 155$a Term-genre-form-heading:w,Term-genre-form-heading:p,Term-genre-form-heading:s,Term-genre-form:w,Term-genre-form:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 155 Term-genre-form:w,Term-genre-form:p,Term-genre-form:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 455 Term-genre-form-see-from:w,Term-genre-form-see-from:p,Term-genre-form-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p
-melm 555 Term-genre-form-see-also-from:w,Term-genre-form-see-also-from:p,Term-genre-form-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p
+melm 155$a Term-genre-form-heading:w,Term-genre-form-heading:p,Term-genre-form-heading:s,Term-genre-form:w,Term-genre-form:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 155 Term-genre-form:w,Term-genre-form:p,Term-genre-form:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 455 Term-genre-form-see-from:w,Term-genre-form-see-from:p,Term-genre-form-see-from:s,See-from:w,See-from:p,See-from:s,Match:w,Match:p,any:w,any:p
+melm 555 Term-genre-form-see-also-from:w,Term-genre-form-see-also-from:p,Term-genre-form-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s,Match:w,Match:p,any:w,any:p
  
  # NOTE: subdivisions management missing from Koha
  # General Subdivision
-melm 180 General-subdivision,Heading:w,Heading:p,Heading:s
+melm 180 General-subdivision,Heading:w,Heading:p,Heading:s,any:w,any:p
  # Geographic Subdivision
-melm 181 Geographic-subdivision,Heading:w,Heading:p,Heading:s
+melm 181 Geographic-subdivision,Heading:w,Heading:p,Heading:s,any:w,any:p
  # Chronological Subdivision
-melm 182 Chronological-subdivision,Heading:w,Heading:p,Heading:s
+melm 182 Chronological-subdivision,Heading:w,Heading:p,Heading:s,any:w,any:p
  # Form Subdivision
-melm 185 Form-subdivision,Heading:w,Heading:p,Heading:s
+melm 185 Form-subdivision,Heading:w,Heading:p,Heading:s,any:w,any:p
  
diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
index e17adb0..805bcd8 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -24,7 +24,22 @@ esetname B @
  marc marc21.mar
  systag sysno rank
  xpath enable
-# Some notes:
+# fields indexed in "any" index :
+# biblio fields indexed in "any" :
+# - the more "user friendly" control numbers : 020->030
+# - main entries (authors and uniform title) : 1XX
+# - title and Title-Related Fields : 20X-24X
+# - publisher : 260$b
+# - series : 4XX
+# - some notes : 502 (dissertation), 520 (abstract), 505 (formated content), 511 (participant)
+# - subjects : 6XX
+# - added Entry Fields : 70X-75X
+# - linking Entries-General Information : 76X-78X
+# - series Added Entry Fields : 80X-83X
+# item fields indexed in "any" :
+# - callnumber : 952$o
+# - barcode : 952$p
+
  # pl = Published Place
  # ta = Target Audience 002/22
  # ff8-23
@@ -43,233 +58,535 @@ xpath enable
  # acqdate                 [yyyy-mm-dd]    (952$d, indexed in date,word,sort indexes)
  # pubdate                 [yyyy]          (008/7-10, indexed in year,word,num,sort indexes)
  
-all any
+all anywhere
  # melm 000      rtype:n:range(data,06,1),Bib-level:w:range(data,07,01)
  xelm /record/leader llength:w:range(data,0,5),rtype:w:range(data,6,1),Bib-level:w:range(data,7,1)
  # example: xelm /record/leader l1:w:range(data,0,5),l2:w:range(data,10,2)
  
+#
+# Control Fields 001-008
+#
  melm 001        Control-number
  melm 005        Date/time-last-modified
  melm 007        Microform-generation:n:range(data,11,1),Material-type,ff7-00:w:range(data,0,1),ff7-01:w:range(data,1,1),ff7-02:w:range(data,2,1),ff7-01-02:w:range(data,0,2)
  
  melm 008        date-entered-on-file:n:range(data,0,5),date-entered-on-file:s:range(data,0,5),pubdate:w:range(data,7,4),pubdate:n:range(data,7,4),pubdate:y:range(data,7,4),pubdate:s:range(data,7,4),pl:w:range(data,15,3),ta:w:range(data,22,1),ff8-23:w:range(data,23,1),ff8-29:w:range(data,29,1),lf:w:range(data,33,1),bio:w:range(data,34,1),ln:w:range(data,35,3),ctype:w:range(data,24,4),Record-source:w:range(data,39,0)
  
+#
+# Number and Code Fields (01X-04X)
+#
+# 010 - Library of Congress Control Number
  melm 010        LC-card-number,Identifier-standard
+# 011 - Linking Library of Congress Control Number (BK, MP, MU, VM, SE, USMARC only) [OBSOLETE, 1993]
  melm 011        LC-card-number,Identifier-standard
+# 013 - Patent Control Information
+# 015 - National Bibliography Number
  melm 015        BNB-card-number,BGF-number,Number-db,Number-natl-biblio,Identifier-standard
+# 016 - National Bibliographic Agency Control Number
+# 017 - Copyright or Legal Deposit Number
  melm 017        Number-legal-deposit,Identifier-standard
+# 018 - Copyright Article-Fee Code
  melm 018        Identifier-standard
-melm 020$a      ISBN:w,Identifier-standard:w
-melm 020        Identifier-standard
-melm 022$a      ISSN:w,Identifier-standard:w
-melm 022        Identifier-standard
-melm 023        Identifier-standard
-melm 024$a      Identifier-other
-melm 024        Identifier-standard
-melm 025        Identifier-standard
-melm 027        Report-number,Identifier-standard
-melm 028        Identifier-publisher-for-music,Identifier-standard
-melm 030        CODEN,Identifier-standard
+# 020 - ISBN
+melm 020$a      ISBN:w,Identifier-standard:w,any:w
+melm 020        Identifier-standard,any:w
+# 022 - ISSN
+melm 022$a      ISSN:w,Identifier-standard:w,any:w
+melm 022        Identifier-standard,any:w
+# 023 - Never defined in Marc21
+melm 023        Identifier-standard,any:w
+# 024 - Other Standard Identifier
+melm 024$a      Identifier-other,any:w
+melm 024        Identifier-standard,any:w
+# 025 - Overseas Acquisition Number
+melm 025        Identifier-standard,any:w
+# 027 - Standard Technical Report Number
+melm 027        Report-number,Identifier-standard,any:w
+# 028 - Publisher Number
+melm 028        Number-music-publisher,Identifier-standard,any:w
+# 030 - CODEN Designation
+melm 030        CODEN,Identifier-standard,any:w
+# 031 - Musical Incipits Information
+# 032 - Postal Registration Number
+# 033 - Date/Time and Place of an Event
  #melm 033       Date
+# 034 - Coded Cartographic Mathematical Data
  melm 034        Map-scale
+# 035 - System Control Number
  #melm 035       Local-number,Identifier-standard
+# 036 - Original Study Number for Computer Data files
+# 037 - Source of Acquisition
  melm 037        Identifier-standard,Stock-number
+038 - Record Content Licensor
+# 040 - Cataloging Source
  melm 040        Code-institution,Record-source
+# 041 - Language Code
+# Language code of text/sound track or separate title
  melm 041$a      ln
+# Language code of sung or spoken text
  melm 041$d      ln
+# Language code of librettos
  melm 041$e      ln
+# Language code of subtitles or captions
  melm 041$j      ln
+# 042 - Authentication Code
+# 043 - Geographic Area Code
  melm 043        Code-geographic
+# 044 - Country of Publishing/Producing Entity Code
+# 045 - Time Period of Content
+# 046 - Special Coded Dates
  #melm 046       pubdate
+# 047 - Form of Musical Composition Code
+# 048 - Number of Musical Instruments or Voices Codes
+
+#
+# Classification and Call Number Fields (05X-08X)
+#
+# 050 - Library of Congress Call Number
  melm 050$b      LC-call-number:w,LC-call-number:p,LC-call-number:s
  melm 050        LC-call-number:w,LC-call-number:p,LC-call-number:s
+# 051 - Library of Congress Copy, Issue, Offprint Statement
+# 052 - Geographic Classification
  melm 052        Geographic-class
+# 055 - Classification Numbers Assigned in Canada
+# 060 - National Library of Medicine Call Number
  melm 060        NLM-call-number
+# 061 - National Library of Medicine Copy Statement
+# 066 - Character Sets Present
+# 070 - National Agricultural Library Call Number
  melm 070        NAL-call-number
+# 071 - National Agricultural Library Copy Statement
+# 072 - Subject Category Code
+# 074 - GPO Item Number
+# 080 - Universal Decimal Classification Number
  melm 080        UDC-classification
+# 082 - Dewey Decimal Classification Number
  melm 082        Dewey-classification:w,Dewey-classification:s
+# 083 - Additional Dewey Decimal Classification Number
+# 084 - Other Classification Number
+# 085 - Synthesized Classification Number Components
+# 086 - Government Document Classification Number
  melm 086        Number-govt-pub
-#melm 942$k     LC-card-number:s
+# 088 - Report Number
  
-## KOHA SPECIFIC
-#melm 090$c     Local-number:w
-#Identifier-standard:w
+#melm 942$k     LC-card-number:s
  
+#
+# Main Entry Fields (1XX)
+#
+# 100 - Author : Person name
  melm 100$9      Cross-Reference:w,Koha-Auth-Number
-melm 100$a      Author,Author:p,Author:s,Editor,Author-personal-bibliography,Author-personal-bibliography:p,Author-personal-bibliography:s
-melm 100        Author,Author:p,Author:s,Author-title,Author-name-personal,Name,Name-and-title,Personal-name
+melm 100$a      Author,Author:p,Author:s,Editor,Author-personal-bibliography,Author-personal-bibliography:p,Author-personal-bibliography:s,any:w,any:p
+melm 100        Author,Author:p,Author:s,Author-title,Author-name-personal,Name,Name-and-title,Personal-name,any:w,any:p
+# 110 - Author : Person name
  melm 110$9      Koha-Auth-Number
-melm 110        Author,Author:p,Author:s,Author-title,Author-name-corporate,Name,Name-and-title,Corporate-name
+melm 110        Author,Author:p,Author:s,Author-title,Author-name-corporate,Name,Name-and-title,Corporate-name,any:w,any:p
+# 111 - Author : Person name
  melm 111$9      Koha-Auth-Number
-melm 111        Author,Author:p,Author:s,Author-title,Author-name-corporate,Name,Name-and-title,Conference-name
+melm 111        Author,Author:p,Author:s,Author-title,Author-name-corporate,Name,Name-and-title,Conference-name,any:w,any:p
+# 130 - Uniform Title
  melm 130$n      Thematic-number
  melm 130$r      Music-key
  melm 130$9      Koha-Auth-Number
-melm 130        Title,Title:p,Title-uniform
+melm 130        Title,Title:p,Title-uniform,any:w,any:p
  
-melm 210        Title,Title:p,Title-abbreviated
-melm 211        Title,Title:p,Title-abbreviated
-melm 212        Title,Title:p,Title-other-variant
-melm 214        Title,Title:p,Title-expanded
-melm 222        Title,Title:p,Title-key
+#
+# Title and Title-Related Fields (20X-24X)
+#
+# 210 - Abbreviated Title
+melm 210        Title,Title:p,Title-abbreviated,any:w,any:p
+# 211 - Acronym or Shortened Title (CF) [OBSOLETE, 1993]
+melm 211        Title,Title:p,Title-abbreviated,any:w,any:p
+# 212 - Variant Access Title (SE) [OBSOLETE, 1993]
+melm 212        Title,Title:p,Title-other-variant,any:w,any:p
+# 214 - Augmented Title (BK, CF) [OBSOLETE, 1993]
+melm 214        Title,Title:p,Title-expanded,any:w,any:p
+# 222- Key Title
+melm 222        Title,Title:p,Title-key,any:w,any:p
+# 240 - Uniform Title
  melm 240$r      Music-key
  melm 240$n      Thematic-number
-melm 240        Title:w,Title:p,Title-uniform
+melm 240        Title:w,Title:p,Title-uniform,any:w,any:p
+# 242 - Translation of Title by Cataloging Agency
+# melm 242      Title:w,Title:p,any:w,any:p
+# 243 - Collective Uniform Title
  melm 243$n      Thematic-number
  melm 243$r      Music-key
-melm 243        Title:w,Title:p,Title-collective
-melm 245$a      Title-cover:w,Title-cover:p,Title-cover:s,Title:w,Title:p,Title:s
-melm 245$c      Author,Author-in-order:w,Author-in-order:p,Author-in-order:s
+melm 243        Title:w,Title:p,Title-collective,any:w,any:p
+# 245 - Title Statement
+melm 245$a      Title-cover:w,Title-cover:p,Title-cover:s,Title:w,Title:p,Title:s,any:w,any:p
+melm 245$c      Author,Author-in-order:w,Author-in-order:p,Author-in-order:s,any:w,any:p
  melm 245$9      Cross-Reference:w,Koha-Auth-Number
-melm 245        Title:w,Title:p
-melm 246        Title,Title:p,Title-abbreviated,Title-expanded,Title-former
-melm 247        Title,Title:p,Title-former,Title-other-variant,Related-periodical
+melm 245        Title:w,Title:p,any:w,any:p
+# 246 - Varying Form of Title
+melm 246        Title,Title:p,Title-abbreviated,Title-expanded,Title-former,any:w,any:p
+# 247 - Former Title
+melm 247        Title,Title:p,Title-former,Title-other-variant,Related-periodical,any:w,any:p
+
+#
+# Edition, Imprint, Etc.Fields (250-260)
+#
+# 250 - Edition Statement
+# 254 - Musical Presentation Statement
+# 255 - Cartographic Mathematical Data
+# 256 - Computer File Characteristics
+# 257 - Country of Producing Entity
+# 258 - Philatelic Issue Data
+# 260 - Publication, Distribution, etc. (Imprint)
  melm 260$a      pl:w,pl:p
-melm 260$b      Publisher:w,Publisher:p
+melm 260$b      Publisher:w,Publisher:p,any:w,any:p
  melm 260$c      copydate,copydate:s
  melm 260        pl
+# 263 - Projected Publication Date
+# 264 - Production, Publication, Distribution, Manufacture, and Copyright Notice
+# 270 - Address
+
+#
+# Physical Description, Etc. Fields (3XX)
+#
+# 300 - Physical Description
  melm 300        Extent:w,Extent:p
-melm 400$a      Name-and-title
-melm 400$t      Author-title,Name-and-title,Title,Title-series
+# 306 - Playing Time
+# 307 - Hours, etc.
+# 310 - Current Publication Frequency
+# 321 - Former Publication Frequency
+# 336 - Content Type
+# 337 - Media Type
+# 338 - Carrier Type
+# 340 - Physical Medium
+# 342 - Geospatial Reference Data
+# 343 - Planar Coordinate Data
+# 344 - Sound Characteristics
+# 345 - Projection Characteristics of Moving Image
+# 346 - Video Characteristics
+# 347 - Digital File Characteristics
+# 351 - Organization and Arrangement of Materials
+# 352 - Digital Graphic Representation
+# 355 - Security Classification Control
+# 357 - Originator Dissemination Control
+# 362 - Dates of Publication and/or Sequential Designation
+# 363 - Normalized Date and Sequential Designation
+# 365 - Trade Price
+# 366 - Trade Availability Information
+# 377 - Associated Language
+# 380 - Form of Work
+# 381 - Other Distinguishing Characteristics of Work or Expression
+# 382 - Medium of Performance
+# 383 - Numeric Designation of Musical Work
+# 384 - Key
+# 385 - Audience Characteristics
+# 386 - Creator/Contributor Characteristics
+
+#
+# Series Statement Fields (4XX)
+#
+# 400 - Series Statement/Added Entry-Personal Name (local field for USA since 1999)
+melm 400$a      Name-and-title,any:w,any:p
+melm 400$t      Author-title,Name-and-title,Title,Title-series,any:w,any:p
  melm 400$9      Koha-Auth-Number
-melm 400        Author,Author-name-personal,Name,Personal-name
-melm 410$a      Name-and-title
-melm 410$t      Author-title,Title,Title-series
+melm 400        Author,Author-name-personal,Name,Personal-name,any:w,any:p
+# 410 - Series Statement/Added Entry-Corporate Name (local field for USA since 1999)
+melm 410$a      Name-and-title,any:w,any:p
+melm 410$t      Author-title,Title,Title-series,any:w,any:p
  melm 410$9      Koha-Auth-Number
-melm 410        Author,Corporate-name
+melm 410        Author,Corporate-name,any:w,any:p
  #melm 410        Author-name-corporate,Name
-melm 411$a      Name-and-title
+# 411 - Series Statement/Added Entry?Meeting Name (local field for USA since 1999)
+melm 411$a      Name-and-title,any:w,any:p
  #melm 411$t     title,author,Author-title,Title-series
-melm 411$t      Author-title,Title-series
-melm 411        Author,Conference-name
+melm 411$t      Author-title,Title-series,any:w,any:p
+melm 411        Author,Conference-name,any:w,any:p
  #melm 411       author,Author-name-corporate,Name
  #melm 411        Author-name-corporate,Name
-melm 440$a      Title-series:w,Title-series:p
+# 440 - Series Statement/Added Entry-Title [OBSOLETE, 2008]
+melm 440$a      Title-series:w,Title-series:p,any:w,any:p
  melm 440$9      Koha-Auth-Number
-melm 440        Title-series:w,Title-series:p,Title,Title-series
-melm 490$a      Title-series:w,Title-series:p
+melm 440        Title-series:w,Title-series:p,Title,Title-series,any:w,any:p
+# 490 - Series Statement
+melm 490$a      Title-series:w,Title-series:p,any:w,any:p
  melm 490$9      Koha-Auth-Number
-melm 490        Title,Title-series
+melm 490        Title,Title-series,any:w,any:p
  
+#
+# Note Fields: Part 1 (50X-53X)
+#
+# 500 - General Note
+melm 500        Note:w,Note:p
+# 501 - With Note
  melm 500        Note:w,Note:p
-melm 502        Material-type
-melm 505$r      Author
-melm 505$t      Title
+# 502 - Dissertation Note
+melm 502        Note:w,Note:p,Material-type:w,Material-type:p,any:w,any:p
+# 504 - Bibliography, etc. Note
+# 505 - Formatted Contents Note
+melm 505$r      Author,any:w,any:p
+melm 505$t      Title,any:w,any:p
  melm 505        Note:w,Note:p
-melm 510        Indexed-by
-melm 520        Abstract:w,Abstract:p
-melm 521$a      lex:n
+# 506 - Restrictions on Access Note
+melm 506        Note:w,Note:p
+# 507 - Scale Note for Graphic Material
+melm 507        Note:w,Note:p
+# 508 - Creation/Production Credits Note
+melm 508        Note:w,Note:p
+# 510 - Citation/References Note
+melm 510        Note:w,Note:p, Indexed-by:w,Indexed-by:p
+# 511 - Participant or Performer Note
+melm 511        Note:w,Note:p,Author:w,Author:p,any:w,any:p
+# 513 - Type of Report and Period Covered Note
+melm 513        Note:w,Note:p
+# 514 - Data Quality Note
+melm 514        Note:w,Note:p
+# 515 - Numbering Peculiarities Note
+melm 515        Note:w,Note:p
+# 516 - Type of Computer File or Data Note
+melm 516        Note:w,Note:p
+# 518 - Date/Time and Place of an Event Note
+melm 518        Note:w,Note:p
+# 520 - Summary, etc.
+melm 520        Abstract:w,Abstract:p,any:w,any:p
+# 521 - Target Audience Note
+melm 521$a      Note:n,lex:n
+# 522 - Geographic Coverage Note
+melm 522        Note:w,Note:p
+# 524 - Preferred Citation of Described Materials Note
+melm 524        Note:w,Note:p
+# 525 - Supplement Note
+melm 525        Note:w,Note:p
+# 526 - Study Program Information Note
  melm 526$c      arl,arl:n
  melm 526$d      arp,arp:n
+melm 526        Note:w,Note:p
+# 530 - Additional Physical Form available Note
+melm 530        Note:w,Note:p
+# 533 - Reproduction Note
+melm 533        Note:w,Note:p
  #melm 533$d     pubdate,pubdate:s
+# 534 - Original Version Note
+melm 534        Note:w,Note:p
+# 535 - Location of Originals/Duplicates Note
+melm 535        Note:w,Note:p
+# 536 - Funding Information Note
+melm 536        Note:w,Note:p
+# 538 - System Details Note
+melm 538        Note:w,Note:p
+# 540 - Terms Governing Use and Reproduction Note
+melm 540        Note:w,Note:p
+# 541 - Immediate Source of Acquisition Note
+melm 541        Note:w,Note:p
  #melm 541$d     Date-of-acquisition,Date-of-acquisition:s
+# 542 - Information Relating to Copyright Status
+melm 542        Note:w,Note:p
+# 544 - Location of Other Archival Materials Note
+melm 544        Note:w,Note:p
+# 545 - Biographical or Historical Data
+melm 545        Note:w,Note:p
+# 546 - Language Note
+melm 546        Note:w,Note:p
+# 547 - Former Title Complexity Note
+melm 547        Note:w,Note:p
+# 550 - Issuing Body Note
+melm 550        Note:w,Note:p
+# 552 - Entity and Attribute Information Note
+melm 552        Note:w,Note:p
+# 555 - Cumulative Index/Finding Aids Note
+melm 555        Note:w,Note:p
+# 556 - Information About Documentation Note
+melm 556        Note:w,Note:p
+# 561 - Ownership and Custodial History
+melm 561        Note:w,Note:p
+# 562 - Copy and Version Identification Note
+melm 562        Note:w,Note:p
+# 563 - Binding Information
+melm 563        Note:w,Note:p
+# 565 - Case File Characteristics Note
+melm 565        Note:w,Note:p
+# 567 - Methodology Note
+melm 567        Note:w,Note:p
+# 580 - Linking Entry Complexity Note
+melm 580        Note:w,Note:p
+# 581 - Publications About Described Materials Note
+melm 581        Note:w,Note:p
+# 583 - Action Note
+melm 583        Note:w,Note:p
+# 584 - Accumulation and Frequency of Use Note
+melm 584        Note:w,Note:p
+# 585 - Exhibitions Note
+melm 585        Note:w,Note:p
+# 586 - Awards Note
+melm 586        Note:w,Note:p
+# 588 - Source of Description Note
+melm 588        Note:w,Note:p
+# 59X - Local Notes
  melm 590        Note:w,Note:p
  
-melm 600$a      Name-and-title,Name,Personal-name,Subject-name-personal,Subject,Subject:p
-melm 600$t      Name-and-title,Title,Subject,Subject:p
+#
+# Subject Access Fields (6XX)
+#
+# 600 - Subject Added Entry - Personal Name (R) Full | Concise
+melm 600$a      Name-and-title,Name,Personal-name,Subject-name-personal,Subject,Subject:p,any:w,any:p
+melm 600$t      Name-and-title,Title,Subject,Subject:p,any:w,any:p
  melm 600$9      Koha-Auth-Number
  #melm 600       Name,Personal-name,Subject-heading,Subject-name-personal
-melm 600        Name,Personal-name,Subject-name-personal,Subject,Subject:p
-melm 610$a      Name-and-title,Subject,Subject:p
-melm 610$t      Name-and-title,Title,Subject,Subject:p
+melm 600        Name,Personal-name,Subject-name-personal,Subject,Subject:p,any:w,any:p
+# 610 - Subject Added Entry - Corporate Name (R) Full | Concise
+melm 610$a      Name-and-title,Subject,Subject:p,any:w,any:p,any:w,any:p
+melm 610$t      Name-and-title,Title,Subject,Subject:p,any:w,any:p
  melm 610$9      Koha-Auth-Number
-melm 610        Name,Subject,Subject:p,Corporate-name
-melm 611$a      Name-and-title,Subject,Subject:p
-melm 611$t      Name-and-title,Title,Subject,Subject:p
+melm 610        Name,Subject,Subject:p,Corporate-name,any:w,any:p
+# 611 - Subject Added Entry - Meeting Name (R) Full | Concise
+melm 611$a      Name-and-title,Subject,Subject:p,any:w,any:p
+melm 611$t      Name-and-title,Title,Subject,Subject:p,any:w,any:p
  melm 611$9      Koha-Auth-Number
-melm 611        Conference-name,Name,Subject,Subject:p
-melm 630$n      Thematic-number,Subject,Subject:p
-melm 630$r      Music-key,Subject,Subject:p
+melm 611        Conference-name,Name,Subject,Subject:p,any:w,any:p
+# 630 - Subject Added Entry - Uniform Title (R) Full | Concise
+melm 630$n      Thematic-number,Subject,Subject:p,any:w,any:p
+melm 630$r      Music-key,Subject,Subject:p,any:w,any:p
  melm 630$9      Koha-Auth-Number
-melm 630        Subject,Subject:p
+melm 630        Subject,Subject:p,any:w,any:p
+# 648 - Subject Added Entry - Chronological Term (R) Full | Concise
+melm 648$9      Koha-Auth-Number
+melm 648        Subject,Subject:p,any:w,any:p
+# 650 - Subject Added Entry - Topical Term (R) Full | Concise
  melm 650$9      Koha-Auth-Number
-melm 650        Subject,Subject:p
+melm 650        Subject,Subject:p,any:w,any:p
+# 651 - Subject Added Entry - Geographic Name (R) Full | Concise
  melm 651$9      Koha-Auth-Number
-melm 651        Name-geographic,Subject,Subject:p
+melm 651        Name-geographic,Subject,Subject:p,any:w,any:p
+# 652 - Subject Added Entry-Reversed Geographic [OBSOLETE, 1980]
  melm 652$9      Koha-Auth-Number
  #melm 652       subject-heading,subject-heading:p
+# 653 - Index Term - Uncontrolled (R) Full | Concise
  melm 653$9      Koha-Auth-Number
-melm 653        Subject,Subject:p
+melm 653        Subject,Subject:p,any:w,any:p
+# 654 - Subject Added Entry - Faceted Topical Terms (R) Full | Concise
  melm 654$9      Koha-Auth-Number
-melm 654        Subject,Subject:p
+melm 654        Subject,Subject:p,any:w,any:p
+# 655 - Index Term - Genre/Form (R) Full | Concise
  melm 655$9      Koha-Auth-Number
-melm 655        Subject,Subject:p
+melm 655        Subject,Subject:p,any:w,any:p
+# 656 - Index Term - Occupation (R) Full | Concise
  melm 656$9      Koha-Auth-Number
-melm 656        Subject,Subject:p
+melm 656        Subject,Subject:p,any:w,any:p
+# 657 - Index Term - Function (R) Full | Concise
  melm 657$9      Koha-Auth-Number
-melm 657        Subject,Subject:p
-melm 658$a      curriculum:w,curriculum:p,Subject,Subject:p
-melm 658$b      curriculum:w,curriculum:p,Subject,Subject:p
-melm 658$c      curriculum:w,curriculum:p,Subject,Subject:p
-melm 658        Subject,Subject:p
+melm 657        Subject,Subject:p,any:w,any:p
+# 658 - Index Term - Curriculum Objective (R) Full | Concise
+melm 658$a      curriculum:w,curriculum:p,Subject,Subject:p,any:w,any:p
+melm 658$b      curriculum:w,curriculum:p,Subject,Subject:p,any:w,any:p
+melm 658$c      curriculum:w,curriculum:p,Subject,Subject:p,any:w,any:p
+melm 658        Subject,Subject:p,any:w,any:p
+# 662 - Subject Added Entry - Hierarchical Place Name (R) Full | Concise
+# 69X - Local Subject Access Fields (R) Full | Concise
  melm 690$9      Koha-Auth-Number
-melm 690        Subject,Subject:p
+melm 690        Subject,Subject:p,any:w,any:p
  
+#
+# Added Entry Fields (70X-75X)
+#
+# 700 - Added Entry - Personal Name (R) Full | Concise
  melm 700$9      Cross-Reference,Koha-Auth-Number
-melm 700$a      Author,Author:p
+melm 700$a      Author,Author:p,any:w,any:p
  melm 700$n      Thematic-number
  melm 700$r      Music-key
  #melm 700$t     author,Author-title,Name-and-title,Title,Title-uniform
-melm 700$t      Author-title,Name-and-title,Title,Title-uniform
-melm 700        Author,Author:p,Author-name-personal,Name,Editor,Personal-name
+melm 700$t      Author-title,Name-and-title,Title,Title-uniform,any:w,any:p
+melm 700        Author,Author:p,Author-name-personal,Name,Editor,Personal-name,any:w,any:p
+# 710 - Added Entry - Corporate Name (R) Full | Concise
  #melm 710$t     author,Author-title,Name-and-title,Title,Title-uniform
-melm 710$t      Author-title,Name-and-title,Title,Title-uniform
+melm 710$t      Author-title,Name-and-title,Title,Title-uniform,any:w,any:p
  #melm 710$a     author,author:p,Name-and-title
-melm 710$a      Name-and-title
+melm 710$a      Name-and-title,any:w,any:p
  melm 710$9      Koha-Auth-Number
-melm 710        Author,Author:p,Corporate-name,Name
-melm 711$a      Name-and-title
+melm 710        Author,Author:p,Corporate-name,Name,any:w,any:p
+# 711 - Added Entry - Meeting Name (R) Full | Concise
+melm 711$a      Name-and-title,any:w,any:p
  #melm 711$t     author,Author-title,Title,Title-uniform
-melm 711$t      Author-title,Title,Title-uniform
+melm 711$t      Author-title,Title,Title-uniform,any:w,any:p
  melm 711$9      Koha-Auth-Number
  #melm 711       author,Author-name-corporate,Name,Conference-name
-melm 711        Author,Author:p,Author-name-corporate,Name,Conference-name
+melm 711        Author,Author:p,Author-name-corporate,Name,Conference-name,any:w,any:p
+# 720 - Added Entry - Uncontrolled Name (R) Full | Concise
+# 730 - Added Entry - Uniform Title (R) Full | Concise
  melm 730$n      Thematic-number
  melm 730$r      Music-key
  melm 730$9      Koha-Auth-Number
-melm 730        Title,Title:p,Title-uniform
-melm 740        Title,Title:p,Title-other-variant
-melm 751$a      Name-geographic
+melm 730        Title,Title:p,Title-uniform,any:w,any:p
+# 740 - Added Entry - Uncontrolled Related/Analytical Title (R) Full | Concise
+melm 740        Title,Title:p,Title-other-variant,any:w,any:p
+# 751 - Added Entry - Geographic Name (R) Full | Concise
+melm 751$a      Name-geographic,any:w,any:p
  melm 751$9      Koha-Auth-Number
-melm 751        Name-geographic
+melm 751        Name-geographic,any:w,any:p
+# 752 - Added Entry - Hierarchical Place Name (R) Full | Concise
+# 753 - System Details Access to Computer Files (R) Full | Concise
+# 754 - Added Entry - Taxonomic Identification (R) Full | Concise
+
+#
+# Linking Entry Fields (76X-78X)
+#
+
+# 760 - Main Series Entry (R) Full | Concise
+# 762 - Subseries Entry (R) Full | Concise
+# 765 - Original Language Entry (R) Full | Concise
+# 767 - Translation Entry (R) Full | Concise
+# 770 - Supplement/Special Issue Entry (R) Full | Concise
  melm 770$w      Record-control-number
+# 772 - Supplement Parent Entry (R) Full | Concise
  melm 772$w      Record-control-number
-melm 773$a      Host-item
-melm 773$9	Host-Item-Number
-melm 773$t      Host-item
+# 773 - Host Item Entry (R) Full | Concise
+melm 773$a      Host-item,any:w,any:p
+melm 773$9      Host-Item-Number
+melm 773$t      Host-item,any:w,any:p
  melm 773$w      Record-control-number
+# 774 - Constituent Unit Entry (R) Full | Concise
  melm 774$w      Record-control-number
+# 775 - Other Edition Entry (R) Full | Concise
  melm 775$w      Record-control-number
+# 776 - Additional Physical Form Entry (R) Full | Concise
  melm 776$w      Record-control-number
+# 777 - Issued With Entry (R) Full | Concise
  melm 777$w      Record-control-number
-melm 780$t      Title
+# 780 - Preceding Entry (R) Full | Concise
+melm 780$t      Title,any:w,any:p
  melm 780$w      Record-control-number
-melm 780        Title,Title:p,Title-former,Related-periodical
+melm 780        Title,Title:p,Title-former,Related-periodical,any:w,any:p
+# 785 - Succeeding Entry (R) Full | Concise
  melm 785$w      Record-control-number
-melm 785        Title,Title:p,Title-later,Related-periodical
+melm 785        Title,Title:p,Title-later,Related-periodical,any:w,any:p
+# 786 - Data Source Entry (R) Full | Concise
+# 787 - Other Relationship Entry (R) Full | Concise
  melm 787$w      Record-control-number
  
-melm 800$a      Name-and-title,Title-series:w,Title-series:p
+#
+# 80X-83X - Series Added Entry Fields
+#
+# 800 - Series Added Entry - Personal Name
+melm 800$a      Name-and-title,Title-series:w,Title-series:p,any:w,any:p
  #melm 800$t     author,Author-title,Name-and-title,Title,Title-series
-melm 800$t      Author-title,Name-and-title,Title,Title-series:w,Title-series:p
+melm 800$t      Author-title,Name-and-title,Title,Title-series:w,Title-series:p,any:w,any:p
  melm 800$9      Koha-Auth-Number
  melm 800$w      Record-control-number
-melm 800        Author,Author-name-personal,Name,Personal-name
-melm 810$a      Name-and-title,Title-series:w,Title-series:p
-melm 810$t      Author-title,Name-and-title,Title,Title-series:w,Title-series:p
+melm 800        Author,Author-name-personal,Name,Personal-name,any:w,any:p
+# 810 - Series Added Entry - Corporate Name
+melm 810$a      Name-and-title,Title-series:w,Title-series:p,any:w,any:p
+melm 810$t      Author-title,Name-and-title,Title,Title-series:w,Title-series:p,any:w,any:p
  melm 810$w      Record-control-number
  melm 810$9      Koha-Auth-Number
-melm 810        Author,Corporate-name,Author-name-corporate,Name
-melm 811$a      Name-and-title,Title-series:w,Title-series:p
+melm 810        Author,Corporate-name,Author-name-corporate,Name,any:w,any:p
+# 811 - Series Added Entry - Meeting Name
+melm 811$a      Name-and-title,Title-series:w,Title-series:p,any:w,any:p
  melm 811$9      Koha-Auth-Number
  #melm 811$t     author,Author-title,Name-and-title,Title,Title-series
-melm 811$t      Author-title,Name-and-title,Title,Title-series:w,Title-series:p
+melm 811$t      Author-title,Name-and-title,Title,Title-series:w,Title-series:p,any:w,any:p
  melm 811$w      Record-control-number
-melm 811        Author,Author-name-corporate,Name,Conference-name
+melm 811        Author,Author-name-corporate,Name,Conference-name,any:w,any:p
+# 830 - Series Added Entry - Uniform Title
  melm 830$w      Record-control-number
  melm 830$9      Koha-Auth-Number
-melm 830        Title,Title-series:w,Title-series:p
-melm 840        Title,Title-series:w,Title-series:p
+melm 830        Title,Title-series:w,Title-series:p,any:w,any:p
+# 840 - Series Added Entry - Title [OBSOLETE, 1980]
+melm 840        Title,Title-series:w,Title-series:p,any:w,any:p
+
+# 841-86X - Holdings, Location, Alternate Graphics Fields : not indexed
  
  ###############################
  # Koha Local-Use Biblio Indexes
@@ -314,8 +631,8 @@ melm 952$j      stack:n,stack:w
  melm 952$l      issues:n,issues:w,issues:s
  melm 952$m      renewals:n,renewals:w
  melm 952$n      reserves:n,reserves:w
-melm 952$o      Local-classification:w,Local-classification:p,Local-classification:s
-melm 952$p      barcode,barcode:n
+melm 952$o      Local-classification:w,Local-classification:p,Local-classification:s,any:w,any:p,any:s
+melm 952$p      barcode,barcode:n,any:w,any:p
  melm 952$q      onloan:n,onloan:w
  melm 952$r      datelastseen
  melm 952$s      datelastborrowed
-- 
1.7.9.5

-- 
Mathieu Saby
Service d'Informatique Documentaire
Service Commun de Documentation
Universit? Rennes 2
T?l?phone : 02 99 14 12 65
Courriel : mathieu.saby at univ-rennes2.fr


From mathieu.saby at univ-rennes2.fr  Mon Oct 14 23:59:32 2013
From: mathieu.saby at univ-rennes2.fr (Mathieu Saby)
Date: Mon, 14 Oct 2013 23:59:32 +0200
Subject: [Koha-patches] [PATCH 3/3] Bug 8962: Unimarc biblios and
	authorithies (GRS1)
Message-ID: <525C6944.5070303@univ-rennes2.fr>

This patch makes some changes UNIMARC GRS1 indexing, for indexing only some specific fields in "any" index.
The patch is fully testable, and can be signed off if it works.
But the list of fields I kept in "any" is rather subjective, and based as my experience as a library user:
It can be discussed in followups.

1. Defines a new index "anywhere" for indexing all biblio and authorities subfields.
2. Make "any" index more selective than before :
- for authorities : all fields indexed in any except 001 and notes (3XX)
- for biblios : fields indexed in any :
* biblio fields indexed in "any" :
** the more "user friendly" control numbers : 01X, 07X
** authors : 7XX except $9, 200$f$g
** titles : 4XX except $9, 5XX except $9, 200$a$d$e$h$i
** edition statement : 205
** series : 225, 410, 411
** subjects : 6XX except $9 and 67X/68X
** notes : only 327, 328, 314, 330
* items fields indexed in "any" :
** barcode : 995f
** callnumber : 995k

Test plan :
In a Marc21 GRS-1 Koha :
1/ apply patch 1 and this one
2/ in Staff interface, make some searches on authorities (choose "Keyword search" tab), including searches of words only present in 3XX fields.
3/ copy the 2 new record.abs files (UNIMARC auth, UNIMARC bib) from your sources to the directory used by Zebra configuration in your Koha instance
4/ launch rebuild_zebra.pl -b -r -x -v
5/ make the same authorities searches as 2/ : you should get the same results, except for searches based on words only present in 3XX fields : in that case, you should not see the auth records.
6/ in default search (without selecting any index), search for some record by
- its isbn
- its issn
- its title
- its author(s)
- its series name
- its publisher
- its summary (330 field)
- several subjects
- the barcode of one of its items
- the callnumber of one of its items
=> you should find the record each time
7/ in default search (without selecting any index), search for some record by
- the content of any 3XX fields (except 327,328,314,330)
- the number of pages or volumes (ex : "510 p." or "1 vol")
- its language code ("eng", "fre"...)
- the value of 200$b (like "Texte imprim?")
- its publication year
- its town of publication
- the content of a 670-680 field
- the content of a 995 subfield (except barcode and callnumber)
- the content of a 099 subfield
=> you should not find the record each time
8/ regression test : check that specific indexes are working as usual (title, subject, callnum, barcode, pubdate etc)

---
  .../marc_defs/unimarc/authorities/record.abs       |  130 +++---
  etc/zebradb/marc_defs/unimarc/biblios/record.abs   |  430 +++++++++++---------
  2 files changed, 297 insertions(+), 263 deletions(-)

diff --git a/etc/zebradb/marc_defs/unimarc/authorities/record.abs b/etc/zebradb/marc_defs/unimarc/authorities/record.abs
index b2a1559..1978a84 100644
--- a/etc/zebradb/marc_defs/unimarc/authorities/record.abs
+++ b/etc/zebradb/marc_defs/unimarc/authorities/record.abs
@@ -18,103 +18,105 @@ marc unimarc.mar
  systag sysno rank
  xpath enable
  
-all any
+# authority fields indexed in "any" : all except 001 and 3XX fields (notes)
+
+all anywhere
  melm 001 Local-Number,Local-Number:n,Local-Number:s
  #FIXME check if 942 is used
-melm 942$a authtype
-melm 152$b authtype:w,authtype:p
+melm 942$a authtype,any:w,any:p
+melm 152$b authtype:w,authtype:p,any:w,any:p
  
  #FIXME index some coded fields and leader positions?
  #FIXME why only $a indexed for some 7XX and not for others (710, 715, 716, 720)?
  #FIXME why 250/260/280 indexed as Subject-heading, Place-heading and Form-heading (not only 250/260/280$a) ?
  
  # Personal Name
-melm 200$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 200 Personal-name:w,Personal-name:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 400 Personal-name-see:w,Personal-name-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 500 Personal-name-see-also:w,Personal-name-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 700$a Personal-name-parallel:w,Personal-name-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 200$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 200 Personal-name:w,Personal-name:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 400 Personal-name-see:w,Personal-name-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 500 Personal-name-see-also:w,Personal-name-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 700$a Personal-name-parallel:w,Personal-name-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Corporate Name and conference Name
  # with GRS-1, no way to make the difference
  # with DOM, possible
-melm 210$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 210 Corporate-name:w,Corporate-name:p,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 410 Corporate-name-see:w,Corporate-name-see:p,Conference-name-see:w,Conference-name-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 510 Corporate-name-see-also:w,Corporate-name-see-also:p,Conference-name-see-also:w,Conference-name-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 710 Corporate-name-parallel:w,Corporate-name-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 210$a Corporate-name-heading:w,Corporate-name-heading:p,Corporate-name-heading:s,Corporate-name:w,Corporate-name:p,Conference-name-heading:w,Conference-name-heading:p,Conference-name-heading:s,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 210 Corporate-name:w,Corporate-name:p,Conference-name:w,Conference-name:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 410 Corporate-name-see:w,Corporate-name-see:p,Conference-name-see:w,Conference-name-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 510 Corporate-name-see-also:w,Corporate-name-see-also:p,Conference-name-see-also:w,Conference-name-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 710 Corporate-name-parallel:w,Corporate-name-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Geographic Name
  # FIXME : what is Term-geographic?
-melm 215$a Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Term-geographic-heading:w,Term-geographic-heading:p,Term-geographic-heading:s,Term-geographic:w,Term-geographic:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 215 Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Term-geographic:w,Term-geographic:p,Term-geographic:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 415 Name-geographic-see:w,Name-geographic-see:p,Term-geographic-see:w,Term-geographic-see:p,Term-geographic-see:s,See:w,See:p,See:s,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 515 Name-geographic-see-also:w,Name-geographic-see-also:p,Term-geographic-see-also:w,Term-geographic-see-also:p,Term-geographic-see-also:s,See-also:w,See-also:p,See-also:s,Match:w,Match:p
-melm 715 Name-geographic-parallel:w,Name-geographic-parallel:p,Term-geographic-parallel:w,Term-geographic-parallel:p,Term-geographic-parallel:s,Parallel:w,Parallel:p,Parallel:s,Match:w,Match:p
+melm 215$a Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Term-geographic-heading:w,Term-geographic-heading:p,Term-geographic-heading:s,Term-geographic:w,Term-geographic:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 215 Name-geographic-heading:w,Name-geographic-heading:w,Name-geographic-heading:s,Name-geographic:w,Name-geographic:p,Term-geographic:w,Term-geographic:p,Term-geographic:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 415 Name-geographic-see:w,Name-geographic-see:p,Term-geographic-see:w,Term-geographic-see:p,Term-geographic-see:s,See:w,See:p,See:s,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 515 Name-geographic-see-also:w,Name-geographic-see-also:p,Term-geographic-see-also:w,Term-geographic-see-also:p,Term-geographic-see-also:s,See-also:w,See-also:p,See-also:s,Match:w,Match:p,any:w,any:p
+melm 715 Name-geographic-parallel:w,Name-geographic-parallel:p,Term-geographic-parallel:w,Term-geographic-parallel:p,Term-geographic-parallel:s,Parallel:w,Parallel:p,Parallel:s,Match:w,Match:p,any:w,any:p
  
  # Trademark
-melm 216$a Trademark-heading:w,Trademark-heading:p,Trademark-heading:s,Trademark:w,Trademark:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 216 Trademark:w,Trademark:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 416 Trademark-see:w,Trademark-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 516 Trademark-see-also:w,Trademark-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 716 Trademark-parallel:w,Trademark-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 216$a Trademark-heading:w,Trademark-heading:p,Trademark-heading:s,Trademark:w,Trademark:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 216 Trademark:w,Trademark:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 416 Trademark-see:w,Trademark-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 516 Trademark-see-also:w,Trademark-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 716 Trademark-parallel:w,Trademark-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Family Name
-melm 220$a Name-heading:w,Name-heading:p,Name-heading:s,Name:w,Name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 220 Name:w,Name:p,Name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 420 Name-see:w,Name-see:p,Name-see:s,See:w,See:p,See:s,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 520 Name-see-also:w,Name-see-also:p,Name-see-also:s,See-also:w,See-also:p,See-also:s,Match:w,Match:p
-melm 720 Name-parallel:w,Name-parallel:p,Name-parallel:s,Parallel:w,Parallel:p,Parallel:s,Match:w,Match:p
+melm 220$a Name-heading:w,Name-heading:p,Name-heading:s,Name:w,Name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 220 Name:w,Name:p,Name:s,Heading:w,Heading:p,Heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 420 Name-see:w,Name-see:p,Name-see:s,See:w,See:p,See:s,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 520 Name-see-also:w,Name-see-also:p,Name-see-also:s,See-also:w,See-also:p,See-also:s,Match:w,Match:p,any:w,any:p
+melm 720 Name-parallel:w,Name-parallel:p,Name-parallel:s,Parallel:w,Parallel:p,Parallel:s,Match:w,Match:p,any:w,any:p
  
  # Uniform Title
-melm 230$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 230 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 430 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 530 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 730$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 230$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 230 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 430 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 530 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 730$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Collective Uniform Title
-melm 235$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 235 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 435 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 535 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 735$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 235$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 235 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 435 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 535 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 735$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Name and Title
-melm 240$a Name-Title-heading:w,Name-Title-heading:p,Name-Title-heading:s,Name-Title:w,Name-Title:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 240 Name-Title:w,Name-Title:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 440 Name-Title-see:w,Name-Title-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 540 Name-Title-see-also:w,Name-Title-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 740$a Name-Title-parallel:w,Name-Title-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 240$a Name-Title-heading:w,Name-Title-heading:p,Name-Title-heading:s,Name-Title:w,Name-Title:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 240 Name-Title:w,Name-Title:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 440 Name-Title-see:w,Name-Title-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 540 Name-Title-see-also:w,Name-Title-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 740$a Name-Title-parallel:w,Name-Title-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Name and Collective Title
  # FIXME maybe use Name-Title index?
-melm 245$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 245 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 445 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 545 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 745$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 245$a Title-uniform-heading:w,Title-uniform-heading:p,Title-uniform-heading:s,Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 245 Title-uniform:w,Title-uniform:p,Heading:w,Heading:p,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 445 Title-uniform-see:w,Title-uniform-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 545 Title-uniform-see-also:w,Title-uniform-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 745$a Title-uniform-parallel:w,Title-uniform-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Topical Term
-melm 250$a Subject-heading:w,Subject-heading:p,Subject-heading:s,Subject:w,Subject:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 250 Subject:w,Subject:p,Heading:w,Heading:p,Subject-heading:w,Subject-heading:p,Subject-heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 450 Subject-see:w,Subject-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 550 Subject-see-also:w,Subject-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 750$a Subject-parallel:w,Subject-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 250$a Subject-heading:w,Subject-heading:p,Subject-heading:s,Subject:w,Subject:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 250 Subject:w,Subject:p,Heading:w,Heading:p,Subject-heading:w,Subject-heading:p,Subject-heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 450 Subject-see:w,Subject-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 550 Subject-see-also:w,Subject-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 750$a Subject-parallel:w,Subject-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Place Access
-melm 260$a Place-heading:w,Place-heading:p,Place-heading:s,Place:w,Place:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p
-melm 260 Place:w,Place:p,Heading:w,Heading:p,Place-heading:w,Place-heading:p,Place-heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 460 Place-see:w,Place-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 560 Place-see-also:w,Place-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 760$a Place-parallel:w,Place-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 260$a Place-heading:w,Place-heading:p,Place-heading:s,Place:w,Place:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,any:w,any:p
+melm 260 Place:w,Place:p,Heading:w,Heading:p,Place-heading:w,Place-heading:p,Place-heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 460 Place-see:w,Place-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 560 Place-see-also:w,Place-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 760$a Place-parallel:w,Place-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  # Form Genre
-melm 280$a Form-heading:w,Form-heading:p,Form-heading:s,Form:w,Form:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 280 Form:w,Form:p,Heading:w,Heading:p,Form-heading:w,Form-heading:p,Form-heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p
-melm 480 Form-see:w,Form-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p
-melm 580 Form-see-also:w,Form-see-also:p,See-also:w,See-also:p,Match:w,Match:p
-melm 780$a Form-parallel:w,Form-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p
+melm 280$a Form-heading:w,Form-heading:p,Form-heading:s,Form:w,Form:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 280 Form:w,Form:p,Heading:w,Heading:p,Form-heading:w,Form-heading:p,Form-heading:s,Match:w,Match:p,Match-heading:w,Match-heading:p,any:w,any:p
+melm 480 Form-see:w,Form-see:p,See:w,See:p,Match:w,Match:p,Match-heading-see-from:w,Match-heading-see-from:p,any:w,any:p
+melm 580 Form-see-also:w,Form-see-also:p,See-also:w,See-also:p,Match:w,Match:p,any:w,any:p
+melm 780$a Form-parallel:w,Form-parallel:p,Parallel:w,Parallel:p,Match:w,Match:p,any:w,any:p
  
  
  # FIXME: manage subdivisions ($j,$x,$y,$z)
@@ -170,4 +172,4 @@ melm 332$a    Note
  melm 333$a    Note
  melm 336$a    Note
  melm 337$a    Note
-melm 345$a    Note
\ No newline at end of file
+melm 345$a    Note
diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
index dfcd8b8..d1fc826 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs
+++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
@@ -20,7 +20,39 @@ marc unimarc.mar
  systag sysno rank
  xpath disable
  
-all any
+# fields indexed in "any" index :
+# biblio fields indexed in "any" :
+# - the more "user friendly" control numbers : 01X, 07X
+# - authors : 7XX except $9, 200$f$g
+# - titles : 4XX except $9, 5XX except $9, 200$a$d$e$h$i
+# - edition statement : 205
+# - series : 225, 410, 411
+# - subjects : 6XX except $9 and 67X/68X
+# - notes : only 327, 328, 314, 330
+# items fields indexed in "any" :
+# - barcode : 995f
+# - callnumber : 995k
+
+# biblio fieds not indexed in "any" (but still in "anywhere"):
+# - 001 : biblionumber
+# - 009 : local identification number
+# - 020 : national bibliography number
+# - 021 : legal deposit number
+# - 090 and 099 : Koha  fields
+# - 1XX : coded fields
+# - 207, 208, 230
+# - 215 : extent
+# - 3XX : notes, except 327, 328, 314, 330
+# - 67X and 68X : subjects based on classification
+# - 942 : Koha field
+
+# biblio subfieds not indexed in "any" (but still in "anywhere"):
+# - XXX$9 : local identification number
+# - 200$b : type of document
+# - 210$a : place of publication
+# - 210$d : date of publication
+
+all anywhere
  ############ IDENTIFICATION NUMBERS ##################
  melm 001        Local-number,Local-number:n
  # Local-number (biblionumber can be either in 090$9 or, on some setup, on 001)
@@ -30,61 +62,59 @@ melm 099$c      date-entered-on-file:s,date-entered-on-file:n,date-entered-on-fi
  melm 099$d      Date/time-last-modified:s,Date/time-last-modified:n,Date/time-last-modified:y
  melm 099$t      ccode:w
  
-# ISBN
-melm 010$a    ISBN:w
+melm 010$a    ISBN:w,Identifier-standard:w,any:w
  # wrong ISBN
-melm 010$z    ISBN:w,Identifier-standard:w
-# ISSN
-melm 011$a    ISSN:w,Identifier-standard:w
+melm 010$z    ISBN:w,Identifier-standard:w,any:w
+melm 011$a    ISSN:w,Identifier-standard:w,any:w
  # cancelled ISSN
-melm 011$y    ISSN:w,Identifier-standard:w
+melm 011$y    ISSN:w,Identifier-standard:w,any:w
  # wrong ISSN
-melm 011$z    ISSN:w,Identifier-standard:w
+melm 011$z    ISSN:w,Identifier-standard:w,any:w
  # L-ISSN
-melm 011$f    Identifier-standard:w
-melm 011$g    Identifier-standard:w
+melm 011$f    Identifier-standard:w,any:w
+melm 011$g    Identifier-standard:w,any:w
  # Fingerprint (ancient books)
-melm 012$a    Identifier-standard:w
+melm 012$a    Identifier-standard:w,any:w
  # ISMN
-melm 013$a    Identifier-standard:w
-melm 013$z    Identifier-standard:w
+melm 013$a    Identifier-standard:w,any:w
+melm 013$z    Identifier-standard:w,any:w
  # Article indentifier
-melm 014$a    Identifier-standard:w
-melm 014$z    Identifier-standard:w
+melm 014$a    Identifier-standard:w,any:w
+melm 014$z    Identifier-standard:w,any:w
  # ISRN
-melm 015$a    Identifier-standard:w
-melm 015$z    Identifier-standard:w
+melm 015$a    Identifier-standard:w,any:w
+melm 015$z    Identifier-standard:w,any:w
  # ISRC
-melm 016$a    Identifier-standard:w
-melm 016$z    Identifier-standard:w
+melm 016$a    Identifier-standard:w,any:w
+melm 016$z    Identifier-standard:w,any:w
  # Other identifiers (DOI...)
-melm 017$a    Identifier-standard:w
-melm 017$z    Identifier-standard:w
+melm 017$a    Identifier-standard:w,any:w
+melm 017$z    Identifier-standard:w,any:w
  # National bibliography
-# uncomment to index
-# melm 020$a    Identifier-standard:w
-# melm 020$z    Identifier-standard:w
+melm 020$a    Identifier-standard:w
+melm 020$z    Identifier-standard:w
  # Legal deposit
-# uncomment to index
-# melm 021$a    Identifier-standard:w
-# melm 021$z    Identifier-standard:w
+melm 021$a    Identifier-standard:w
+melm 021$z    Identifier-standard:w
  # CODEN
-melm 040$a    Identifier-standard:w
-melm 040$z    Identifier-standard:w
+melm 040$a    Identifier-standard:w,any:w
+melm 040$z    Identifier-standard:w,any:w
  # Publisher's number (for music)
-melm 071$a    Identifier-publisher-for-music:w,Identifier-standard:w
-melm 071$z    Identifier-publisher-for-music:w,Identifier-standard:w
-melm 071$b	    Publisher,Publisher:p
+melm 071$a    Identifier-publisher-for-music:w,Identifier-standard:w,any:w
+melm 071$z    Identifier-publisher-for-music:w,Identifier-standard:w,any:w
+melm 071$b    Publisher,Publisher:p,any:w,,any:p
  # UPC
-melm 072$a  	UPC:w,Identifier-standard:w
-melm 072$z  	UPC:w,Identifier-standard:w
+melm 072$a    UPC:w,Identifier-standard:w,any:w
+melm 072$z    UPC:w,Identifier-standard:w,any:w
  # EAN
-melm 073$a	    EAN:w,Identifier-standard:w
-melm 073$z	    EAN:w,Identifier-standard:w
+melm 073$a    EAN:w,Identifier-standard:w,any:w
+melm 073$z    EAN:w,Identifier-standard:w,any:w
  
  ############ ITEM TYPE ##################
+# 200$b : UNIMARC standard plain text item type (biblio level). Ex : "Texte imprim?"
  # FIXME index 200$b only in Material-type ?
  melm 200$b      itemtype:w,itemtype:p,itype:w,itype:p,Material-type:w,Material-type:p
+# 995$r : Koha coded item type (item level)
  melm 995$r      itemtype:w,itemtype:p,itype:w,itype:p
  
  ############ CODED INFORMATIONS ##################
@@ -138,91 +168,93 @@ melm 116$a     Graphics-type:w:range(data,0,1),Graphics-support:w:range(data,1,1
  
  ############ AUTHORS ##################
  # main Author
-melm 200$f		Author:w,Author:p
+melm 200$f    Author:w,Author:p,any:w,any:p
  # other Authors
-melm 200$g		Author:w,Author:p
+melm 200$g    Author:w,Author:p,any:w,any:p
  # physical Author
-melm 700$9      Koha-Auth-Number,Koha-Auth-Number:n
-melm 700$a      Author,Personal-name,Author:p,Personal-name:p,Personal-name,Author:s
-melm 700        Author,Personal-name,Author:p,Personal-name:p,Personal-name:p
-melm 701$9      Koha-Auth-Number,Koha-Auth-Number:n
-melm 701        Author,Personal-name,Author:p,Personal-name:p,Personal-name:p
-melm 702$9      Koha-Auth-Number,Koha-Auth-Number:n
-melm 702        Author,Personal-name,Author:p,Personal-name:p,Personal-name:p
+melm 700$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 700$a    Author,Personal-name,Author:p,Personal-name:p,Personal-name,Author:s,any:w,any:p
+melm 700      Author,Personal-name,Author:p,Personal-name:p,Personal-name:p,any:w,any:p
+melm 701$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 701      Author,Personal-name,Author:p,Personal-name:p,Personal-name:p,any:w,any:p
+melm 702$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 702      Author,Personal-name,Author:p,Personal-name:p,Personal-name:p,any:w,any:p
  
  # collective Author
-melm 710$9        Koha-Auth-Number,Koha-Auth-Number:n
-melm 710    Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p
-melm 711$9        Koha-Auth-Number,Koha-Auth-Number:n
-melm 711    Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p
+melm 710$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 710      Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p,any:w,any:p
+melm 711$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 711      Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p,any:w,any:p
  
-melm 712$9        Koha-Auth-Number,Koha-Auth-Number:n
-melm 712    Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p
+melm 712$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 712      Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p,any:w,any:p
  
  # trademark Author : 716
-melm 716$9        Koha-Auth-Number,Koha-Auth-Number:n
-melm 716    Author:w,Author:p
+melm 716$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 716      Author:w,Author:p,any:w,any:p
  
  # family Author : 72X
-melm 720$9        Koha-Auth-Number,Koha-Auth-Number:n
-melm 720    Author:w,Author:p
-melm 721$9        Koha-Auth-Number,Koha-Auth-Number:n
-melm 721    Author:w,Author:p
-melm 722$9        Koha-Auth-Number,Koha-Auth-Number:n
-melm 722    Author:w,Author:p
+melm 720$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 720      Author:w,Author:p,any:w,any:p
+melm 721$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 721      Author:w,Author:p,any:w,any:p
+melm 722$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 722      Author:w,Author:p,any:w,any:p
  
  # name-responsabily Author
-melm 730$9        Koha-Auth-Number,Koha-Auth-Number:n
-melm 730    Author:w,Author:p
+melm 730$9    Koha-Auth-Number,Koha-Auth-Number:n
+melm 730      Author:w,Author:p,any:w,any:p
  
  # 740-742 = uniform and conventional headings for legal and religious texts. Use not recommended in France (503 used instead, see http://multimedia.bnf.fr/unimarcb_trad/B7XX-6-2011.pdf )
  
  ############## TITLE ##################
  # main Title
  # Keep Title-cover (used for in query weighting algorithm)
-melm 200$a		Title:w,Title:p,Title:s,Title-cover:w,Title-cover:p,Title-cover:s
+melm 200$a    Title:w,Title:p,Title:s,Title-cover:w,Title-cover:p,Title-cover:s,any:w,any:p
  # Title from an other author
-melm 200$c		Title:w,Title:p
+melm 200$c    Title:w,Title:p,any:w,any:p
  # Parallel title
-melm 200$d		Title:w,Title:p
+melm 200$d    Title:w,Title:p,any:w,any:p
  # subtitle
-melm 200$e		Title:w,Title:p,Title-cover:w,Title-cover:p
-# volume : do not index
-# melm 200$h		Title:w,Title:p
+melm 200$e    Title:w,Title:p,Title-cover:w,Title-cover:p,any:w,any:p
+# volume
+melm 200$h    Title:w,Title:p,any:w,any:p
  # part title
-melm 200$i		Title:w,Title:p,Title-cover:w,Title-cover:p
+melm 200$i    Title:w,Title:p,Title-cover:w,Title-cover:p,any:w,any:p
  
  # edition statement
-melm 205        Title,Title:p
+melm 205      Title,Title:p,any:w,any:p
  
  ########## MATERIAL SPECIFIC AREA #################
-# TODO 206
-melm 207    Serials,Serials:p
-melm 208    Printed-music,Printed-music:p
-melm 230$a      Electronic-ressource
+# TODO 206 [ MAPS]
+# melm 206
+melm 207      Serials,Serials:p
+melm 208      Printed-music,Printed-music:p
+# Obsolete
+melm 230$a    Electronic-ressource
  
  ########## PUBLISHER #################
  melm 210$a    pl,pl:p
-melm 210$c    Publisher,Publisher:p
+melm 210$c    Publisher,Publisher:p,any:w,any:p
  melm 210$d    pubdate:n,pubdate:y,pubdate:s
  
  ########## DESCRIPTION #################
  melm 215        Extent
  
  ########## SERIES #################
-melm 225$a      Title-series,Title-series:p
-melm 225$d      Title-series,Title-series:p
+melm 225$a      Title-series,Title-series:p,any:w,any:p
+melm 225$d      Title-series,Title-series:p,any:w,any:p
  #SubTit
-melm 225$e      Title-series,Title-series:p
+melm 225$e      Title-series,Title-series:p,any:w,any:p
  #Authors
-melm 225$f      Author,Author:p,Name-and-title,Name-and-title:p
+melm 225$f      Author,Author:p,Name-and-title,Name-and-title:p,any:w,any:p
  #Part-Title
-melm 225$h      Title-series,Title-series:p
+melm 225$h      Title-series,Title-series:p,any:w,any:p
  #Part Number
-melm 225$i      Title-series,Title-series:p
+melm 225$i      Title-series,Title-series:p,any:w,any:p
  #Volume
-melm 225$v      Title-series,Title-series:p
-melm 225$x      ISSN
+melm 225$v      Title-series,Title-series:p,any:w,any:p
+melm 225$x      ISSN,any:w,any:p
  
  ########## NOTES #################
  # General Note
@@ -252,7 +284,7 @@ melm 312$a    Note,Note:p
  # Notes Pertaining to Subject Access
  melm 313$a    Note,Note:p
  # Notes Pertaining to Intellectual Responsability (in Sudoc catalogue, may contains the 4th, 5th etc. authors)
-melm 314$a    Note,Note:p
+melm 314$a    Note,Note:p,any:w,any:p
  # Notes Pertaining to Material (or Type of Publication) Specific Information
  melm 315$a    Note,Note:p
  # Note Relating to the Copy in Hand (ancient books)
@@ -276,11 +308,11 @@ melm 325$a    Note,Note:p
  # Frequency Statement Note (Serials)
  melm 326$a    Note,Note:p
  # Contents Note
-melm 327$a    Note,Note:p
+melm 327$a    Note,Note:p,any:w,any:p
  # Dissertation note
-melm 328    Note,Note:p
+melm 328    Note,Note:p,any:w,any:p
  # Summary or Abstract
-melm 330$a    Abstract:w,Note:w,Abstract:p,Note:p
+melm 330$a    Abstract:w,Note:w,Abstract:p,Note:p,any:w,any:p
  # Preferred Citation of Described Materials
  melm 332$a    Note,Note:p
  # Users/Intended Audience Note
@@ -296,85 +328,85 @@ melm 345$a    Note,Note:p
  
  ############## 4XX - LINKING ##################
  # All 4XX indexed as Title, except for 410
-melm 410$t    Title-series,Title-series:p
-melm 411$t    Title,Title:p
-melm 412$t    Title,Title:p
-melm 413$t    Title,Title:p
-melm 421$t    Title,Title:p
-melm 422$t    Title,Title:p
-melm 423$t    Title,Title:p
-melm 424$t    Title,Title:p
-melm 425$t    Title,Title:p
-melm 430$t    Title,Title:p
-melm 431$t    Title,Title:p
-melm 432$t    Title,Title:p
-melm 433$t    Title,Title:p
-melm 434$t    Title,Title:p
-melm 435$t    Title,Title:p
-melm 436$t    Title,Title:p
-melm 437$t    Title,Title:p
-melm 440$t    Title,Title:p
-melm 441$t    Title,Title:p
-melm 442$t    Title,Title:p
-melm 443$t    Title,Title:p
-melm 444$t    Title,Title:p
-melm 445$t    Title,Title:p
-melm 446$t    Title,Title:p
-melm 447$t    Title,Title:p
-melm 448$t    Title,Title:p
-melm 451$t    Title,Title:p
-melm 452$t    Title,Title:p
-melm 453$t    Title,Title:p
-melm 454$t    Title,Title:p
-melm 455$t    Title,Title:p
-melm 456$t    Title,Title:p
+melm 410$t    Title-series,Title-series:p,any:w,any:p
+melm 411$t    Title,Title:p,any:w,any:p
+melm 412$t    Title,Title:p,any:w,any:p
+melm 413$t    Title,Title:p,any:w,any:p
+melm 421$t    Title,Title:p,any:w,any:p
+melm 422$t    Title,Title:p,any:w,any:p
+melm 423$t    Title,Title:p,any:w,any:p
+melm 424$t    Title,Title:p,any:w,any:p
+melm 425$t    Title,Title:p,any:w,any:p
+melm 430$t    Title,Title:p,any:w,any:p
+melm 431$t    Title,Title:p,any:w,any:p
+melm 432$t    Title,Title:p,any:w,any:p
+melm 433$t    Title,Title:p,any:w,any:p
+melm 434$t    Title,Title:p,any:w,any:p
+melm 435$t    Title,Title:p,any:w,any:p
+melm 436$t    Title,Title:p,any:w,any:p
+melm 437$t    Title,Title:p,any:w,any:p
+melm 440$t    Title,Title:p,any:w,any:p
+melm 441$t    Title,Title:p,any:w,any:p
+melm 442$t    Title,Title:p,any:w,any:p
+melm 443$t    Title,Title:p,any:w,any:p
+melm 444$t    Title,Title:p,any:w,any:p
+melm 445$t    Title,Title:p,any:w,any:p
+melm 446$t    Title,Title:p,any:w,any:p
+melm 447$t    Title,Title:p,any:w,any:p
+melm 448$t    Title,Title:p,any:w,any:p
+melm 451$t    Title,Title:p,any:w,any:p
+melm 452$t    Title,Title:p,any:w,any:p
+melm 453$t    Title,Title:p,any:w,any:p
+melm 454$t    Title,Title:p,any:w,any:p
+melm 455$t    Title,Title:p,any:w,any:p
+melm 456$t    Title,Title:p,any:w,any:p
  # FIXME Warning : field used by Koha for analytics, but also in Sudoc network
-melm 461$t    Title,Title-host:w,title-host:p
-melm 462$t    Title,Title:p
-melm 463$t    Title,Title:p
+melm 461$t    Title,Title-host:w,title-host:p,any:w,any:p
+melm 462$t    Title,Title:p,any:w,any:p
+melm 463$t    Title,Title:p,any:w,any:p
  # FIXME Warning : field used by Koha for analytics, but also in Sudoc network
-melm 464$t    Title,Title-host:w,title-host:p,Title:p
-melm 470$t    Title,Title:p
-melm 481$t    Title,Title:p
-melm 482$t    Title,Title:p
-melm 488$t    Title,Title:p
+melm 464$t    Title,Title-host:w,title-host:p,Title:p,any:w,any:p
+melm 470$t    Title,Title:p,any:w,any:p
+melm 481$t    Title,Title:p,any:w,any:p
+melm 482$t    Title,Title:p,any:w,any:p
+melm 488$t    Title,Title:p,any:w,any:p
  
  # Linking ids (Koha analytics)
  # FIXME Warning : field used by Koha for analytics, but also in Sudoc network
  melm 461$9    Host-Item-Number
  
  #FIXME Fields 400, 401, 403, 414, 415, 416, 417, 418, 419, 420 are not defined in Unimarc, but may be used by some libraries.
-melm 400$t    Title,Title:p
-melm 401$t    Title,Title:p
-melm 403$t    Title,Title:p,Title-Uniform,Title-Uniform:p
-melm 414$t    Title,Title:p
-melm 415$t    Title,Title:p
-melm 416$t    Title,Title:p
-melm 417$t    Title,Title:p
-melm 418$t    Title,Title:p
-melm 419$t    Title,Title:p
-melm 420$t    Title,Title:p
-
-melm 400$d    pubdate:n
-melm 401$d    pubdate:n
-melm 403$d    pubdate:n
-melm 410$d    pubdate:n
-melm 412$d    pubdate:n
-melm 413$d    pubdate:n
-melm 414$d    pubdate:n
-melm 415$d    pubdate:n
-melm 416$d    pubdate:n
-melm 417$d    pubdate:n
-melm 418$d    pubdate:n
-melm 419$d    pubdate:n
-melm 420$d    pubdate:n
-melm 430$d    pubdate:n
-melm 431$d    pubdate:n
-melm 432$d    pubdate:n
-melm 440$d    pubdate:n
-melm 441$d    pubdate:n
-melm 445$d    pubdate:n
-melm 461$d    pubdate:n
+melm 400$t    Title,Title:p,any:w,any:p
+melm 401$t    Title,Title:p,any:w,any:p
+melm 403$t    Title,Title:p,Title-Uniform,Title-Uniform:p,any:w,any:p
+melm 414$t    Title,Title:p,any:w,any:p
+melm 415$t    Title,Title:p,any:w,any:p
+melm 416$t    Title,Title:p,any:w,any:p
+melm 417$t    Title,Title:p,any:w,any:p
+melm 418$t    Title,Title:p,any:w,any:p
+melm 419$t    Title,Title:p,any:w,any:p
+melm 420$t    Title,Title:p,any:w,any:p
+
+melm 400$d    pubdate:n,any:w,any:p
+melm 401$d    pubdate:n,any:w,any:p
+melm 403$d    pubdate:n,any:w,any:p
+melm 410$d    pubdate:n,any:w,any:p
+melm 412$d    pubdate:n,any:w,any:p
+melm 413$d    pubdate:n,any:w,any:p
+melm 414$d    pubdate:n,any:w,any:p
+melm 415$d    pubdate:n,any:w,any:p
+melm 416$d    pubdate:n,any:w,any:p
+melm 417$d    pubdate:n,any:w,any:p
+melm 418$d    pubdate:n,any:w,any:p
+melm 419$d    pubdate:n,any:w,any:p
+melm 420$d    pubdate:n,any:w,any:p
+melm 430$d    pubdate:n,any:w,any:p
+melm 431$d    pubdate:n,any:w,any:p
+melm 432$d    pubdate:n,any:w,any:p
+melm 440$d    pubdate:n,any:w,any:p
+melm 441$d    pubdate:n,any:w,any:p
+melm 445$d    pubdate:n,any:w,any:p
+melm 461$d    pubdate:n,any:w,any:p
  
  ############## 5XX - TITLES ##################
  melm 500$9    Koha-Auth-Number,Koha-Auth-Number:n
@@ -398,26 +430,26 @@ melm 541$9    Koha-Auth-Number,Koha-Auth-Number:n
  melm 545$9    Koha-Auth-Number,Koha-Auth-Number:n
  melm 560$9    Koha-Auth-Number,Koha-Auth-Number:n
  
-melm 500		Title,Title:p
-melm 501		Title,Title:p
-melm 503		Title,Title:p
-melm 510		Title,Title:p
-melm 512		Title,Title:p
-melm 513		Title,Title:p
-melm 514		Title,Title:p
-melm 515		Title,Title:p
-melm 516		Title,Title:p
-melm 517		Title,Title:p
-melm 518		Title,Title:p
-melm 519		Title,Title:p
-melm 520		Title,Title:p
-melm 530		Title,Title:p
-melm 531		Title,Title:p
-melm 532		Title,Title:p
-melm 540		Title,Title:p
-melm 541		Title,Title:p
-melm 545		Title,Title:p
-melm 560		Title,Title:p
+melm 500		Title,Title:p,any:w,any:p
+melm 501		Title,Title:p,any:w,any:p
+melm 503		Title,Title:p,any:w,any:p
+melm 510		Title,Title:p,any:w,any:p
+melm 512		Title,Title:p,any:w,any:p
+melm 513		Title,Title:p,any:w,any:p
+melm 514		Title,Title:p,any:w,any:p
+melm 515		Title,Title:p,any:w,any:p
+melm 516		Title,Title:p,any:w,any:p
+melm 517		Title,Title:p,any:w,any:p
+melm 518		Title,Title:p,any:w,any:p
+melm 519		Title,Title:p,any:w,any:p
+melm 520		Title,Title:p,any:w,any:p
+melm 530		Title,Title:p,any:w,any:p
+melm 531		Title,Title:p,any:w,any:p
+melm 532		Title,Title:p,any:w,any:p
+melm 540		Title,Title:p,any:w,any:p
+melm 541		Title,Title:p,any:w,any:p
+melm 545		Title,Title:p,any:w,any:p
+melm 560		Title,Title:p,any:w,any:p
  
  ########### SUBJECTS (6xx) ##################
  melm 600$9      Koha-Auth-Number,Koha-Auth-Number:n
@@ -448,29 +480,29 @@ melm 634$9      Koha-Auth-Number,Koha-Auth-Number:n
  melm 635$9      Koha-Auth-Number,Koha-Auth-Number:n
  melm 636$9      Koha-Auth-Number,Koha-Auth-Number:n
  
-melm 600$a              Personal-name,Personal-name:p,Subject,Subject:p
-melm 600                Subject,Subject:p
-melm 601$a              Corporate-name,Conference-name,Corporate-name:p,Conference-name:p
-melm 601                Subject,Subject:p
-melm 602$a    Personal-name,Personal-name:p
-melm 602    Subject,Subject:p
-melm 604                Subject,Subject:p
-melm 605                Subject,Subject:p
-melm 606                Subject,Subject:p
-melm 607        Subject,Subject:p
-melm 608                Subject,Subject:p
-melm 610                Subject,Subject:p
-melm 615                Subject,Subject:p
-melm 616                Subject,Subject:p
-melm 617                Subject,Subject:p
-melm 620                Subject,Subject:p
-melm 621                Subject,Subject:p
+melm 600$a      Personal-name,Personal-name:p,Subject,Subject:p,any:w,any:p
+melm 600        Subject,Subject:p,any:w,any:p
+melm 601$a      Corporate-name,Conference-name,Corporate-name:p,Conference-name:p,any:w,any:p
+melm 601        Subject,Subject:p,any:w,any:p
+melm 602$a      Personal-name,Personal-name:p,any:w,any:p
+melm 602        Subject,Subject:p,any:w,any:p
+melm 604        Subject,Subject:p,any:w,any:p
+melm 605        Subject,Subject:p,any:w,any:p
+melm 606        Subject,Subject:p,any:w,any:p
+melm 607        Subject,Subject:p,any:w,any:p
+melm 608        Subject,Subject:p,any:w,any:p
+melm 610        Subject,Subject:p,any:w,any:p
+melm 615        Subject,Subject:p,any:w,any:p
+melm 616        Subject,Subject:p,any:w,any:p
+melm 617        Subject,Subject:p,any:w,any:p
+melm 620        Subject,Subject:p,any:w,any:p
+melm 621        Subject,Subject:p,any:w,any:p
  # Technical details access // see Marc21 753. Seems deprecated.
-# melm 626                Subject,Subject:p
+# melm 626                Subject,Subject:p,any:w,any:p
  # Geographic area code // see Marc21 043. Probably not useful
-# melm 660                Subject,Subject:p
+# melm 660                Subject,Subject:p,any:w,any:p
  # Chronological coverage code. Probably not useful
-# melm 661                Subject,Subject:p
+# melm 661                Subject,Subject:p,any:w,any:p
  
  #FIXME Fields 603, 630, 631, 632, 633, 634, 635, 636, 646 are not defined in Unimarc, but may be used by some libraries.
  melm 603      Subject,Subject:p
@@ -503,10 +535,10 @@ melm 995$b		homebranch,Host-item,item
  melm 995$c		holdingbranch,Record-Source,item
  melm 995$d		holdingbranch,Record-Source,item
  melm 995$e      location,item
-melm 995$f		barcode,item
+melm 995$f		barcode,item,any:w,any:p
  melm 995$h		ccode,item
  melm 995$j      LC-card-number:s,item
-melm 995$k      Call-Number,Local-classification,lcn,Call-Number:p,Local-classification:p,lcn:p,item,Local-classification:s
+melm 995$k      Call-Number,Local-classification,lcn,Call-Number:p,Local-classification:p,lcn:p,item,Local-classification:s,any:w,any:p
  melm 995$n      onloan:d,onloan:n,onloan:s,onloan:w,item
  melm 995$u      Note,Note:p,item
  melm  995       item   # just to index every subfield
-- 
1.7.9.5

-- 
Mathieu Saby
Service d'Informatique Documentaire
Service Commun de Documentation
Universit? Rennes 2
T?l?phone : 02 99 14 12 65
Courriel : mathieu.saby at univ-rennes2.fr


From colin.campbell at ptfs-europe.com  Tue Oct 15 16:21:06 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 15 Oct 2013 15:21:06 +0100
Subject: [Koha-patches] [PATCH] Bug 11054: Specify utf8 encoding when
	creating a child record
Message-ID: <1381846866-14625-1-git-send-email-colin.campbell@ptfs-europe.com>

When the only non-ascii characters in a new child record
are latin + diacritic in the range covered by Latin-1 they
are not being added to a new child record correctly encoded.
Explicitly setting the record's encodiing ensures that
they are interpreted correctly.

see "Unicode Bug" in perldoc perlunicode for background on
why these characters are special
---
 cataloguing/addbiblio.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index cb40396..841c6c1 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -821,6 +821,7 @@ if ($hostbiblionumber) {
 if ($parentbiblio) {
     my $marcflavour = C4::Context->preference('marcflavour');
     $record = MARC::Record->new();
+    $record->encoding( 'UTF-8' );
     my $hostfield = prepare_host_field($parentbiblio,$marcflavour);
     if ($hostfield) {
         $record->append_fields($hostfield);
-- 
1.8.3.1


From colin.campbell at ptfs-europe.com  Wed Oct 16 11:17:17 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 16 Oct 2013 10:17:17 +0100
Subject: [Koha-patches] [PATCH] Bug 11058: make variable name unique within
	its scope
Message-ID: <1381915037-4717-1-git-send-email-colin.campbell@ptfs-europe.com>

routine declares two lexical variables named $stylesheet
rename the second to keep code clearer and
avoid propagating compile time warnings
---
 C4/Record.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/C4/Record.pm b/C4/Record.pm
index 7277f2c..9d72d5a 100644
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -310,9 +310,9 @@ sub _transformWithStylesheet {
     my $xslt = XML::LibXSLT->new();
     my $source = $parser->parse_string($xmlrecord);
     my $style_doc = $parser->parse_file($xslfile);
-    my $stylesheet = $xslt->parse_stylesheet($style_doc);
-    my $results = $stylesheet->transform($source);
-    my $newxmlrecord = $stylesheet->output_string($results);
+    my $style_sheet = $xslt->parse_stylesheet($style_doc);
+    my $results = $style_sheet->transform($source);
+    my $newxmlrecord = $style_sheet->output_string($results);
     return ($newxmlrecord);
 }
 
-- 
1.8.3.1


From mathieu.saby at univ-rennes2.fr  Thu Oct 17 00:42:41 2013
From: mathieu.saby at univ-rennes2.fr (Mathieu Saby)
Date: Thu, 17 Oct 2013 00:42:41 +0200
Subject: [Koha-patches] [PATCH] Bug 9807 : Make possible to view a
 basketgroup without reopening it
Message-ID: <525F1661.1030608@univ-rennes2.fr>

This patch make possible to view an individual closed basketgroup without reopening it.
- It adds a new "View" button on closed basketgroup list
- It creates a view for closed basketgroups, with 3 buttons (reopen, print, export)
- It adds a "delete" button on standard "edit" view (for open basketgroup)

To test :
1/ regression test :
- create some empty basketgroups
- create some basketgroups by closing baskets
- in the list of basketgroups closed and opened, check you can use the buttons that existed before the patch (close and print, delete, export, print, reopen)
- click on "Edit" to edit a opened basketgroup : check everything is like before :
-- change the billing and delivery places,
-- add a note,
-- put some new baskets  in the bg,
-- remove baskets from it
-- save it without checking "close" box => it must be save but kept open
-- edit it again, and make other some changes (define a free delivery place for example)
-- save it with checking "close" => it must be saved but closed

2/ new feature test
- click on "view" button on top right column of some closed basketgroup
- check all the displayed informations are correct (places, free place, note, list of baskets)
- check you can not change anything
- click on "print" button => check a pdf is created
- click on "export" button => check a csv is created
- click on "reopen" button => you must stay on the same basketgroup, but it is now open and you can make some changes
- go back to the basketgroup list of the vendor. Check the reopened bg is in "open" tab
- click on "edit"
- click on new "delete" button => the bg must be deleted, and you are redirected to the bg list of the vendor.

---
  acqui/basketgroup.pl                               |   96 +++++++---
  .../prog/en/modules/acqui/basketgroup.tt           |  201 +++++++++++++-------
  2 files changed, 198 insertions(+), 99 deletions(-)

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 6fe4db2..aa8d745 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -29,7 +29,7 @@ basketgroup.pl
  =head1 DESCRIPTION
  
   This script lets the user group (closed) baskets into basket groups for easier order management. Note that the grouped baskets have to be from the same bookseller and
- have to be closed.
+ have to be closed to be printed or exported.
  
  =head1 CGI PARAMETERS
  
@@ -294,11 +294,29 @@ sub printbasketgrouppdf{
  }
  
  my $op = $input->param('op') || 'display';
+# possible values of $op :
+# - add : adds a new basketgroup, or edit an open basketgroup, or display a closed basketgroup
+# - mod_basket : modify an individual basket of the basketgroup
+# - validate :  FIXME dead code
+# - closeandprint : close and print an closed basketgroup in pdf. called by clicking on "Close and print" button in closed basketgroups list
+# - print : print a closed basketgroup. called by clicking on "Print" button in closed basketgroups list
+# - export : export in CSV a closed basketgroup. called by clicking on "Export" button in closed basketgroups list
+# - delete : delete an open basketgroup. called by clicking on "Delete" button in open basketgroups list
+# - reopen : reopen a closed basketgroup. called by clicking on "Reopen" button in closed basketgroup list
+# - attachbasket : save a modified basketgroup, or creates a new basketgroup when a basket is closed. called from basket page
+# - display : display the list of all basketgroups for a vendor
  my $booksellerid = $input->param('booksellerid');
  $template->param(booksellerid => $booksellerid);
  
  if ( $op eq "add" ) {
+#
+# if no param('basketgroupid') is not defined, adds a new basketgroup
+# else, edit (if it open) or display (if it is close) the basketgroup basketgroupid
+# the template will know if basketgroup must be displayed or edited, depending on closed value
+#
      if(! $booksellerid){
+# Unknown bookseller
+# FIXME : ungroupedlist does not seem to be used in this file nor in template
          $template->param( ungroupedlist => 1);
          my @booksellers = GetBookSeller('');
         for (my $i=0; $i < scalar @booksellers; $i++) {
@@ -315,6 +333,7 @@ if ( $op eq "add" ) {
              }
          }
      } else {
+# Known bookseller
          my $basketgroupid = $input->param('basketgroupid');
          my $billingplace;
          my $deliveryplace;
@@ -338,8 +357,10 @@ if ( $op eq "add" ) {
              $billingplace  = $basketgroup->{billingplace};
              $deliveryplace = $basketgroup->{deliveryplace};
              $freedeliveryplace = $basketgroup->{freedeliveryplace};
+            $template->param( closedbg => ($basketgroup ->{'closed'}) ? 1 : 0);
+        } else {
+            $template->param( closedbg => 0);
          }
-
          # determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
          my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
          $billingplace  = $billingplace  || $borrower->{'branchcode'};
@@ -349,23 +370,25 @@ if ( $op eq "add" ) {
          $template->param( billingplaceloop => $branches );
          $branches = C4::Branch::GetBranchesLoop( $deliveryplace );
          $template->param( deliveryplaceloop => $branches );
-
          $template->param( booksellerid => $booksellerid );
      }
-    $template->param(grouping => 1);
+    $template->param(grouping => 1); # the template will display a unique basketgroup
      my $basketgroups = &GetBasketgroups($booksellerid);
      my $bookseller = &GetBookSellerFromId($booksellerid);
      my $baskets = &GetBasketsByBookseller($booksellerid);
-
      displaybasketgroups($basketgroups, $bookseller, $baskets);
  } elsif ($op eq 'mod_basket') {
-#we want to modify an individual basket's group
+#
+# edit an individual basket contained in this basketgroup
+#
    my $basketno=$input->param('basketno');
    my $basketgroupid=$input->param('basketgroupid');
-  ModBasket( { basketno => $basketno,
-                         basketgroupid => $basketgroupid } );
+  ModBasket( { basketno => $basketno, basketgroupid => $basketgroupid } );
    print $input->redirect("basket.pl?basketno=" . $basketno);
  } elsif ($op eq 'validate') {
+#
+#  FIXME dead code
+#
      if(! $booksellerid){
          $template->param( booksellererror => 1);
      } else {
@@ -374,7 +397,7 @@ if ( $op eq "add" ) {
      my $baskets = parseinputbaskets($booksellerid);
      my ($basketgroups, $newbasketgroups) = parseinputbasketgroups($booksellerid, $baskets);
      foreach my $nbgid (keys %$newbasketgroups){
-#javascript just picks an ID that's higher than anything else, the ID might not be correct..chenge it and change all the basket's basketgroupid as well
+#javascript just picks an ID that's higher than anything else, the ID might not be correct..change it and change all the basket's basketgroupid as well
          my $bgid = NewBasketgroup($newbasketgroups->{$nbgid});
          ${$newbasketgroups->{$nbgid}}->{'id'} = $bgid;
          ${$newbasketgroups->{$nbgid}}->{'oldid'} = $nbgid;
@@ -400,21 +423,28 @@ if ( $op eq "add" ) {
      $basketgroups = &GetBasketgroups($booksellerid);
      my $bookseller = &GetBookSellerFromId($booksellerid);
      $baskets = &GetBasketsByBookseller($booksellerid);
+    # keep ungroupedbaskets
  
      displaybasketgroups($basketgroups, $bookseller, $baskets);
  } elsif ( $op eq 'closeandprint') {
+#
+# close an open basketgroup and generates a pdf
+#
      my $basketgroupid = $input->param('basketgroupid');
-
      CloseBasketgroup($basketgroupid);
-
      printbasketgrouppdf($basketgroupid);
      exit;
  }elsif ($op eq 'print'){
+#
+# print a closed basketgroup
+#
      my $basketgroupid = $input->param('basketgroupid');
-
      printbasketgrouppdf($basketgroupid);
      exit;
  }elsif ( $op eq "export" ) {
+#
+# export a closed basketgroup in csv
+#
      my $basketgroupid = $input->param('basketgroupid');
      print $input->header(
          -type       => 'text/csv',
@@ -423,20 +453,25 @@ if ( $op eq "add" ) {
      print GetBasketGroupAsCSV( $basketgroupid, $input );
      exit;
  }elsif( $op eq "delete"){
+#
+# delete an closed basketgroup
+#
      my $basketgroupid = $input->param('basketgroupid');
      DelBasketgroup($basketgroupid);
-    print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid);
-
+    print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid.'&amp;listclosed=1');
  }elsif ( $op eq 'reopen'){
+#
+# reopen a closed basketgroup
+#
      my $basketgroupid   = $input->param('basketgroupid');
      my $booksellerid    = $input->param('booksellerid');
-
      ReOpenBasketgroup($basketgroupid);
-
-    print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid . '#closed');
-
+    my $redirectpath = ((defined $input->param('mode'))&& ($input->param('mode') eq 'singlebg')) ?'/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;basketgroupid='.$basketgroupid.'&amp;booksellerid='.$booksellerid : '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' .$booksellerid.'&amp;listclosed=1';
+    print $input->redirect($redirectpath);
  } elsif ( $op eq 'attachbasket') {
-
+#
+# save a modified basketgroup, or creates a new basketgroup when a basket is closed. called from basket page
+#
      # Getting parameters
      my $basketgroup       = {};
      my @baskets           = $input->param('basket');
@@ -447,9 +482,9 @@ if ( $op eq "add" ) {
      my $deliveryplace     = $input->param('deliveryplace');
      my $freedeliveryplace = $input->param('freedeliveryplace');
      my $deliverycomment   = $input->param('deliverycomment');
-    my $close             = $input->param('close') ? 1 : 0;
-    # If we got a basketgroupname, we create a basketgroup
+    my $closedbg          = $input->param('closedbg') ? 1 : 0;
      if ($basketgroupid) {
+    # If we have a basketgroupid we edit the basketgroup
          $basketgroup = {
                name              => $basketgroupname,
                id                => $basketgroupid,
@@ -458,13 +493,14 @@ if ( $op eq "add" ) {
                deliveryplace     => $deliveryplace,
                freedeliveryplace => $freedeliveryplace,
                deliverycomment   => $deliverycomment,
-              closed            => $close,
+              closed            => $closedbg,
          };
          ModBasketgroup($basketgroup);
-        if($close){
-
+        if($closedbg){
+# FIXME
          }
      }else{
+    # we create a new basketgroup (whith a closed basket)
          $basketgroup = {
              name              => $basketgroupname,
              booksellerid      => $booksellerid,
@@ -473,22 +509,22 @@ if ( $op eq "add" ) {
              deliveryplace     => $deliveryplace,
              freedeliveryplace => $freedeliveryplace,
              deliverycomment   => $deliverycomment,
-            closed            => $close,
+            closed            => $closedbg,
          };
          $basketgroupid = NewBasketgroup($basketgroup);
      }
-
-    my $url = '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid;
-    $url .= "&closed=1" if ($input->param("closed"));
-    print $input->redirect($url);
+    my $redirectpath = ((defined $input->param('mode')) && ($input->param('mode') eq 'singlebg')) ?'/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;basketgroupid='.$basketgroupid.'&amp;booksellerid='.$booksellerid : '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid;
+    $redirectpath .=  "&amp;listclosed=1" if $closedbg ;
+    print $input->redirect($redirectpath );
      
  }else{
+# no param : display the list of all basketgroups for a given vendor
      my $basketgroups = &GetBasketgroups($booksellerid);
      my $bookseller = &GetBookSellerFromId($booksellerid);
      my $baskets = &GetBasketsByBookseller($booksellerid);
  
      displaybasketgroups($basketgroups, $bookseller, $baskets);
  }
-$template->param(closed => $input->param("closed"));
+$template->param(listclosed => ((defined $input->param('listclosed')) && ($input->param('listclosed') eq '1'))? 1:0 );
  #prolly won't use all these, maybe just use print, the rest can be done inside validate
  output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index b6cdc52..0619db0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -21,8 +21,8 @@
    we turn them off as a foundation for YUI
    CSS treatments. */
  body {
-	margin:0;
-	padding:0;
+       margin:0;
+       padding:0;
  }
  #basketgroupcolumns {
      width: 58em;
@@ -144,11 +144,26 @@ function submitForm(form) {
      <div class="yui-b">
  
  [% IF ( grouping ) %]
-    <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
-        <div id="basketgroupcolumns" class="yui-g">
-		    <div class="yui-u">
-
-				<form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
+    [% IF (closedbg) %]
+        <div id="toolbar" class="btn-toolbar">
+            <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-small" id="reopenbutton"><i class="icon-download"></i> Reopen this basket group</a></div>
+            <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket group as CSV</a></div>
+            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="icon-download"></i> Print this basket group in PDF</a></div>
+        </div>
+    [% ELSE %]
+    <div class="btn-group"><a href="[% script_name %]?op=delete&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="delbutton"><i class="icon-remove"></i> Delete basket group</a></div>
+    [% END %]
+    [% IF (name && closedgb) %]
+        <h1>Basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+    [% ELSIF (name) %]
+        <h1>Edit basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+    [% ELSE %]
+        <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+    [% END %]
+    <div id="basketgroupcolumns" class="yui-g">
+        [% UNLESS (closedbg) %]
+            <div class="yui-u">
+                <form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
  	            <div id="groups">
  	            <fieldset class="brief">
  	            <div class="workarea_alt" >
@@ -174,65 +189,112 @@ function submitForm(form) {
  	            </fieldset>
  	            </div>
  	            </form>
-
-			</div>
-			
-		    <div class="yui-u first">
-		    	<form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
-					<fieldset id="various" class="brief">
-					<ol>
+                       </div>
+       [% END %]
+                   <div class="yui-u first">
+                       <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
+                                       <fieldset id="various" class="brief">
+                                       <ol>
+                    [% UNLESS (closedbg) %]
                          <li><label for="basketgroupname">Basket group name:</label>
-                                                       <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" class="focus" /></li>
-                        <li><label for="billingplace">Billing place:</label>
-							<select name="billingplace" id="billingplace" style="width:13em;">
-                                <option value="">--</option>
-								[% FOREACH billingplaceloo IN billingplaceloop %]
-	                                [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
-	                                [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
-								[% END %]
-												</select></li>
-                        <li><label for="deliveryplace">Delivery place:</label>
-							<select name="deliveryplace" id="deliveryplace" style="width:13em;">
-								<option value="">--</option>
-								[% FOREACH deliveryplaceloo IN deliveryplaceloop %]
-	                                [% IF ( deliveryplaceloo.selected ) %]<option value="[% deliveryplaceloo.value %]" selected="selected">[% deliveryplaceloo.branchname %]</option>
-	                                [% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END %]
-								[% END %]
-												</select></li>
-                        <li><p>or</p></li>
-                        <li><label for="freedeliveryplace">Delivery place:</label>
-                            <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea></li>
-						<li><label for="deliverycomment">Delivery comment:</label>
-							<textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
-						</li>
-						<li><span class="label">Baskets in this group:</span>
-							<ul class="draglist" id="bg">
-								[% FOREACH selectedbasket IN selectedbaskets %]
-				                    <li class="grouped" id="b-[% selectedbasket.basketno %]" >
-				                        <a href="basket.pl?basketno=[% selectedbasket.basketno %]">
-				                        [% IF ( selectedbasket.basketname ) %]
-				                            [% selectedbasket.basketname %]
-				                        [% ELSE %]
-				                            No name, basketnumber: [% selectedbasket.basketno %]
-				                        [% END %]
-				                        </a>, <br />
-				                        Total: [% selectedbasket.total %]
-				                        <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
-				                    </li>
-			                    [% END %]
-							</ul>
-						</li>
-						<li><label><input type="checkbox" id="close" name="close" /> Close basket group</label></li>
-						</ol>
-					</fieldset>
-
-	                <fieldset class="action"><input type="hidden" name="booksellerid" value="[% booksellerid %]" />
-		                [% IF ( basketgroupid ) %]
-		                	<input type="hidden" name="basketgroupid" value="[% basketgroupid %]" />
-		                [% END %]
-		                <input type="hidden" name="op" value="attachbasket" />
-                        <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]" class="cancel">Cancel</a>
-	                </fieldset>
+                        <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" class="focus" /></li>
+                    [% ELSE %]
+                        <input type="hidden" name="basketgroupname" id="basketgroupname" value="[% name %]" />
+                    [% END %]
+                        <li>
+                            [% UNLESS (closedbg) %]
+                                <label for="billingplace">Billing place:</label>
+                                <select name="billingplace" id="billingplace" style="width:13em;">
+                                    <option value="">--</option>
+                                    [% FOREACH billingplaceloo IN billingplaceloop %]
+                                        [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
+                                        [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
+                                    [% END %]
+                                </select>
+                            [% ELSE %]
+                                <span class="label">Billing place:</span>
+                                [% FOREACH billingplaceloo IN billingplaceloop %]
+                                    [% IF ( billingplaceloo.selected ) %]
+                                        <input name="billingplace" id="billingplace" type ="hidden" value="[% billingplaceloo.value %]" />[% billingplaceloo.branchname %]
+                                    [% END %]
+                                [% END %]
+                            [% END %]
+                        </li>
+                        [% UNLESS (closedbg) %]
+                            <li>
+                                <label for="deliveryplace">Delivery place:</label>
+                                <select name="deliveryplace" id="deliveryplace" style="width:13em;">
+                                    <option value="">--</option>
+                                    [% FOREACH deliveryplaceloo IN deliveryplaceloop %]
+                                        [% IF ( deliveryplaceloo.selected ) %]<option value="[% deliveryplaceloo.value %]" selected="selected">[% deliveryplaceloo.branchname %]</option>
+                                        [% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END%]
+                                    [% END %]
+                                <select>
+                            </li>
+                            <li><p>or</p></li>
+                            <li><label for="freedeliveryplace">Delivery place:</label>
+                                <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea>
+                            </li>
+                        [% ELSE %]
+                            <span class="label">Delivery place:</span>
+                            [% IF (freedeliveryplace) %]
+                                <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="[% freedeliveryplace %]" />[% freedeliveryplace %]
+                                <input name="deliveryplace" id="deliveryplace" type ="hidden" value="" />
+                            [% ELSE %]
+                                [% FOREACH deliveryplaceloo IN deliveryplaceloop %]
+                                    [% IF ( deliveryplaceloo.selected ) %]
+                                        <input name="deliveryplace" id="deliveryplace" type ="hidden" value="[% deliveryplaceloo.value %]" />[% deliveryplaceloo.branchname %]
+                                    [% END %]
+                                [% END %]
+                                <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="" />
+                            [% END %]
+                        [% END %]
+                        <li>
+                            [% UNLESS (closedbg) %]
+                                <label for="deliverycomment">Delivery comment:</label>
+                                <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
+                            [% ELSE %]
+                                <span class="label">Delivery comment:</span>[% deliverycomment %]
+                                <input name="deliverycomment" id="deliverycomment" type="hidden" value = "[% deliverycomment %]" />
+                            [% END %]
+                        </li>
+                        <li><span class="label">Baskets in this group:</span>
+                            [% UNLESS (closedbg) %]
+                                <ul class="draglist" id="bg">
+                            [% ELSE %]
+                                <ul>
+                            [% END %]
+                                [% FOREACH selectedbasket IN selectedbaskets %]
+                                    <li class="grouped" id="b-[% selectedbasket.basketno %]" >
+                                        <a href="basket.pl?basketno=[% selectedbasket.basketno %]">
+                                        [% IF ( selectedbasket.basketname ) %]
+                                            [% selectedbasket.basketname %]
+                                        [% ELSE %]
+                                            No name, basketnumber: [% selectedbasket.basketno %]
+                                        [% END %]
+                                        </a>, <br />
+                                        Total: [% selectedbasket.total %]
+                                        <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
+                                    </li>
+                                [% END %]
+                            </ul>
+                        </li>
+                       [% UNLESS (closedbg) %]
+                        <li><label><input type="checkbox" id="closedbg" name="closedbg" />Close basket group</label></li>
+                       [% ELSE %]
+                           <input type="hidden" id="closedbg" name="closedbg" value ="1"/>
+                       [% END %]
+                        </ol>
+                    </fieldset>
+                    [% UNLESS (closedbg) %]
+                        <fieldset class="action"><input type="hidden" name="booksellerid" value="[% booksellerid %]" />
+                            [% IF ( basketgroupid ) %]
+                                <input type="hidden" name="basketgroupid" value="[% basketgroupid %]" />
+                            [% END %]
+                            <input type="hidden" name="op" value="attachbasket" />
+                            <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]" class="cancel">Cancel</a>
+                        </fieldset>
+                    [% END %]
  				</form>
  			</div>
  		</div> 	
@@ -245,9 +307,9 @@ function submitForm(form) {
  
  	<div id="basket_groups" class="toptabs">
  	<ul class="ui-tabs-nav">
-        [% UNLESS ( closed ) %]<li class="ui-tabs-selected"><a href="#opened">Open</a></li>
+        [% UNLESS ( listclosed) %]<li class="ui-tabs-selected"><a href="#opened">Open</a></li>
          [% ELSE%]<li><a href="#opened">Open</a></li>[% END %]
-        [% IF ( closed ) %]<li class="ui-tabs-selected"><a href="#closed">Closed</a></li>
+        [% IF ( listclosed) %]<li class="ui-tabs-selected"><a href="#closed">Closed</a></li>
          [% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]
      </ul>
      <div id="opened">
@@ -277,7 +339,7 @@ function submitForm(form) {
                                      <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
                                      <td>[% basketgroup.basketsqty %]</td>
  							<td>
-								<input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and print" />
+								<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
  								<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
  								<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
  							</td>
@@ -315,7 +377,8 @@ function submitForm(form) {
                                      <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
                                      <td>[% basketgroup.basketsqty %]</td>
  					<td>
-							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
+                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
+                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
  							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
                                                          <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
                      </td>
-- 
1.7.9.5

-- 
Mathieu Saby
Service d'Informatique Documentaire
Service Commun de Documentation
Universit? Rennes 2
T?l?phone : 02 99 14 12 65
Courriel : mathieu.saby at univ-rennes2.fr


From dpk at randomnotes.org  Thu Oct 17 23:58:05 2013
From: dpk at randomnotes.org (Doug Kingston)
Date: Thu, 17 Oct 2013 14:58:05 -0700
Subject: [Koha-patches] [PATCH 3/3] [ENH] Bug 6345 Add locking to
	rebuild_zebra to prevent races This patch adds flock based
	locking for rebuild_zebra.pl on a per-instance basis. This
	prevents races between full rebuilds and background
	incremental updates from the zebraqueue table in the database.
Message-ID: <1382047085-14748-1-git-send-email-dpk@randomnotes.org>

The race condition exists whether you are doing incremental updates with
a periodic cronjob or with the new daemon mode.  Suppose you start a full rebuild
at time T0 which will take until T20 to extract the records.  Suppose also at T10,
a biblio or auth is updated and processed through the zebraqueue by T15.
In this situation the updated record in zebra will be overwritten when
the full rebuild records are uploaded to zebra after T20.  We prevent this
by only allowing one rebuild_zebra per koha instance to be running at one time.

When running in daemon mode, incremental updates will be skipped while
a full rebuild is running, and resume afterwards.  A full rebuild or other
adhoc request will wait for any previous lock to clear.

Tested by flocking the lock file while invoking rebuild_zebra.pl in
various modes (daemon, adhoc zebraqueue task, and full rebuild) using
flock program I will attach to bug.
---
 misc/migration_tools/rebuild_zebra.pl |   24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index a91c681..7ba199c 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -5,6 +5,7 @@ use strict;
 
 use C4::Context;
 use Getopt::Long;
+use Fcntl qw(:flock);
 use File::Temp qw/ tempdir /;
 use File::Path;
 use C4::Biblio;
@@ -139,12 +140,19 @@ my $dbh = C4::Context->dbh;
 my ($biblionumbertagfield,$biblionumbertagsubfield) = &GetMarcFromKohaField("biblio.biblionumber","");
 my ($biblioitemnumbertagfield,$biblioitemnumbertagsubfield) = &GetMarcFromKohaField("biblioitems.biblioitemnumber","");
 
+# We need to create our own lock directory which incorporates the database instance
+# we are indexing to facilitate multiple instances on the same machine.
+my $lockdir = "/var/lock/koha_rebuild_zebra_" . C4::Context->config("database");
+mkpath($lockdir, 0, 0755) unless (-d $lockdir);
+my $lockfile = $lockdir . "/lock";
+
 if ( $verbose_logging ) {
     print "Zebra configuration information\n";
     print "================================\n";
     print "Zebra biblio directory      = $biblioserverdir\n";
     print "Zebra authorities directory = $authorityserverdir\n";
     print "Koha directory              = $kohadir\n";
+    print "Lockfile                    = $lockfile\n";
     print "BIBLIONUMBER in :     $biblionumbertagfield\$$biblionumbertagsubfield\n";
     print "BIBLIOITEMNUMBER in : $biblioitemnumbertagfield\$$biblioitemnumbertagsubfield\n";
     print "================================\n";
@@ -156,13 +164,27 @@ if ($do_munge) {
 
 my $tester = XML::LibXML->new();
 
+# The main work is done here by calling do_one_pass().  We have added locking
+# avoid race conditions between Full rebuilds and incremental updates either from
+# daemon mode or periodic invocation from cron.  The race can lead to an updated
+# record being overwritten by a rebuild if the update is applied after the export
+# by the rebuild and before the rebuild finishes (more likely to effect large
+# catalogs).
+open(LockFH, ">$lockfile") or die "$lockfile: $!";
 if ($daemon_mode) {
     while (1) {
-        do_one_pass() if ( zebraqueue_not_empty() );
+        # For incremental updates, skip the update if the updates are locked
+	if (flock(LockFH, LOCK_EX|LOCK_NB)) {
+	    do_one_pass() if ( zebraqueue_not_empty() );
+	    flock(LockFH, LOCK_UN);
+	}
         sleep $daemon_sleep;
     }
 } else {
+    # all one-off invocations, wait for the lock to free
+    flock(LockFH, LOCK_EX);
     do_one_pass();
+    flock(LockFH, LOCK_UN);
 }
 
 
-- 
1.7.9.5


From dpk at randomnotes.org  Fri Oct 18 00:40:10 2013
From: dpk at randomnotes.org (Doug Kingston)
Date: Thu, 17 Oct 2013 15:40:10 -0700
Subject: [Koha-patches] [PATCH 4/4] Bug 11065 Increase size of results list
	for manage-marc-import page
Message-ID: <1382049610-15187-1-git-send-email-dpk@randomnotes.org>

Based on feedback from KohaCon13, the default of 25 biblios per page
is woefully too small.  Make it 500.  500 lines of text is very
reasonable for modern browsers.
---
 tools/manage-marc-import.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index c0584c9..9cb3223 100755
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -47,7 +47,7 @@ my $import_batch_id = $input->param('import_batch_id') || '';
 
 # record list displays
 my $offset = $input->param('offset') || 0;
-my $results_per_page = $input->param('results_per_page') || 25; 
+my $results_per_page = $input->param('results_per_page') || 500; 
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "tools/manage-marc-import.tmpl",
-- 
1.7.9.5


From tomascohen at gmail.com  Fri Oct 18 00:54:55 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Thu, 17 Oct 2013 15:54:55 -0700
Subject: [Koha-patches] [PATCH] Bug 11077: Remove useless unititialized
	variable warning.
Message-ID: <1382050495-23631-1-git-send-email-tomascohen@gmail.com>

During login at the Staff interface you get warnings in the logs
regarding an uninitialized value for the $pki_field variable.

To test:
- tail -f /path/to/your-intranet-logs
- Point your browser to your staff login page
- Login
- Three warnings are showed
- Apply the patch
- Log out
- Log in
- No new warnings, and you can still log in.

Thanks
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 C4/Auth.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index d73edaf..4e4a82f 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -682,7 +682,8 @@ sub checkauth {
             $userid   = $session->param('id');
             $sessiontype = $session->param('sessiontype') || '';
         }
-        if ( ( ($query->param('koha_login_context')) && ($query->param('userid') ne $session->param('id')) )
+        if ( ( $query->param('koha_login_context') &&
+             ( $query->param('userid') ne ( $session->param('id') // '' ) ) )
           || ( $cas && $query->param('ticket') ) ) {
             #if a user enters an id ne to the id in the current session, we need to log them in...
             #first we need to clear the anonymous session...
@@ -793,10 +794,11 @@ sub checkauth {
     }
 
     elsif (
+            defined $pki_field && (
                 ( $pki_field eq 'Common Name' && $ENV{'SSL_CLIENT_S_DN_CN'} )
                 || (   $pki_field eq 'emailAddress'
                     && $ENV{'SSL_CLIENT_S_DN_Email'} )
-              )
+              ) )
             {
                 my $value;
                 if ( $pki_field eq 'Common Name' ) {
-- 
1.8.3.2


From oleonard at myacpl.org  Sun Oct 20 20:46:33 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Sun, 20 Oct 2013 11:46:33 -0700
Subject: [Koha-patches] [PATCH] Bug 11057 - Bootstrap theme: Don't hide
	language chooser below the fold
Message-ID: <1382294793-5902-1-git-send-email-oleonard@myacpl.org>

There is a problem with how an active single language is styled, making
the alignment look incorrect. This patch amends the markup and the CSS
to make it look better. This patch does not address the position of the
language menu.

To test you must have at least one additional single translation
installed. Apply the patch, refresh the page, and confirm that the
display of the active language is improved.
---
 koha-tmpl/opac-tmpl/bootstrap/css/opac.css         |    8 +++-----
 .../bootstrap/en/includes/opac-bottom.inc          |    4 ++--
 koha-tmpl/opac-tmpl/bootstrap/less/opac.less       |    4 ++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
index 36b7a1e..a97158f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
@@ -386,6 +386,9 @@ td {
   margin-top: .5em;
   position: static;
 }
+#changelanguage .nav > .active > p {
+  padding: 0 15px;
+}
 .table-striped tbody > tr:nth-child(odd) > td,
 .table-striped tbody > tr:nth-child(odd) > th {
   background-color: #F4F4F4;
@@ -2191,11 +2194,6 @@ td img {
 #shelfbrowser #browser_next {
   background-position: -9px -1057px;
 }
-.shadowed {
-  -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
-  box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
-}
 @media only screen and (min-width: 0px) and (max-width: 304px) {
   /* Screens bewteen 0 and 304 pixels wide */
   #oh:after {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 2164ee4..c3ce588 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -57,9 +57,9 @@
                                     [% ELSE %]
                                         [% IF ( languages_loo.group_enabled ) %]
                                             [% IF ( languages_loo.current ) %]
-                                                <li class="morelang"><p>[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</p></li>
+                                                <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</p></li>
                                             [% ELSE %]
-                                                <li class="morelang"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
+                                                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
                                             [% END %]
                                         [% END # / IF languages_loo.current %]
                                     [% END # / IF ( languages_loo.plural ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
index 106fb3a..c95d82a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
+++ b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
@@ -352,6 +352,10 @@ table, td {
     position: static;
 }
 
+#changelanguage .nav > .active > p {
+    padding : 0 15px;
+}
+
 .table-striped tbody > tr:nth-child(odd) > td,
 .table-striped tbody > tr:nth-child(odd) > th {
   background-color: #F4F4F4;
-- 
1.7.9.5


From oleonard at myacpl.org  Mon Oct 21 19:15:43 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 21 Oct 2013 10:15:43 -0700
Subject: [Koha-patches] [PATCH] Bug 11060 - Bootstrap theme: Incorrect
 rendering for right to left languages
Message-ID: <CAO4qe2Oo3cJiK2QSoRq=oPVhP-0aavK_iN+sxP4JA7m763yWNQ@mail.gmail.com>

This patch has long lines, so could not be sent using git. Please find
it attached.

 -- Owen

-- 
Web Developer
Athens County Public Libraries
http://www.myacpl.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-11060-Bootstrap-theme-Incorrect-rendering-for-ri.patch
Type: application/octet-stream
Size: 325779 bytes
Desc: not available
URL: <http://lists.koha-community.org/pipermail/koha-patches/attachments/20131021/bf7b1dae/attachment-0001.obj>

From oleonard at myacpl.org  Mon Oct 21 23:38:10 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 21 Oct 2013 14:38:10 -0700
Subject: [Koha-patches] [PATCH] Bug 2310 - Delete grayed out w/out
	explanation
Message-ID: <1382391490-21021-1-git-send-email-oleonard@myacpl.org>

With some staff client menus options are displayed as disabled when the
logged in user doesn't have permission to perform that function. This
patch adds Bootstrap tooltips to patron menu items with text explaining
why they are disabled.

To test, log in as a user who lacks permission to modify patrons or set
permissions. Open a patron record in circulation or patrons. Hovering
over renew, delete, and set permissions links (in the patron toolbar
"More" menu) should trigger a tooltip with a brief explanation.

Test the "Update child to adult patron" link by viewing an adult patron.

A separate patch will address catalog menu items.
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    6 ++++++
 .../prog/en/includes/members-toolbar.inc           |   10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index aa7310c..581d59b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2570,6 +2570,12 @@ button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit
     font-size: 13px;
 }
 
+.tooltip-inner {
+    white-space:pre-wrap;
+}
+
+/* End Bootstrap overrides */
+
 .waiting {
     cursor: wait;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index 787b852..60fcdad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -17,7 +17,7 @@ $(document).ready(function(){
             $(".btn-group").removeClass("open");
         });[% END %]
     [% END %]
-
+    $("#updatechild, #patronflags, #renewpatron, #deletepatron").tooltip();
     $("#exportcheckins").click(function(){
         export_barcodes();
         $(".btn-group").removeClass("open");
@@ -133,22 +133,22 @@ function searchToHold(){
                 [% IF ( CAN_user_borrowers ) %]
                     <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=[% destination %]&amp;reregistration=y">Renew patron</a></li>
                 [% ELSE %]
-                    <li class="disabled"><a id="renewpatron" href="#">Renew patron</a></li>
+                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>
                 [% END %]
                 [% IF ( CAN_user_permissions ) %]
                     <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
                 [% ELSE %]
-                    <li class="disabled"><a id="patronflags" href="#">Set permissions</a></li>
+                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>
                 [% END %]
                 [% IF ( CAN_user_borrowers ) %]
                     <li><a id="deletepatron" href="#">Delete</a></li>
                 [% ELSE %]
-                    <li class="disabled"><a id="deletepatron" href="#">Delete</a></li>
+                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to delete patrons" id="deletepatron" href="#">Delete</a></li>
                 [% END %]
                 [% IF ( is_child ) %]
                     <li><a id="updatechild" href="#">Update child to adult patron</a></li>
                 [% ELSE %]
-                    <li class="disabled"><a id="updatechild" href="#">Update child to adult patron</a></li></li>
+                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li></li>
                 [% END %]
                 <li><a id="exportcheckins" href="#">Export today's checked in barcodes</a></li>
             </ul>
-- 
1.7.9.5

From oleonard at myacpl.org  Tue Oct 22 00:36:56 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 21 Oct 2013 15:36:56 -0700
Subject: [Koha-patches] [PATCH] Bug 11097 - Hide duplicate patron button if
	logged in user lacks CAN_user_borrowers permission
Message-ID: <1382395016-22934-1-git-send-email-oleonard@myacpl.org>

The "duplicate" button on the circ/patron toolbar should not appear if
the logged in user lacks permission to edit patron records. This patch
wraps the button in the required logic.

To test, open a patron record in circulation or patrons and view as a
staff client user who both has and doesn't have CAN_user_borrowers
permission. The button should be shown and not shown accordingly.
---
 .../prog/en/includes/members-toolbar.inc           |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index 787b852..258ccc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -115,9 +115,9 @@ function searchToHold(){
         [% IF ( CAN_user_borrowers ) %]
             <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="icon-lock"></i> Change password</a>
         [% END %]
+        <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]"><i class="icon-copy"></i>Duplicate</a>
     [% END %]
 
-    <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]"><i class="icon-copy"></i>Duplicate</a>
     <div class="btn-group">
         <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-print"></i> Print <span class="caret"></span></button>
             <ul class="dropdown-menu">
-- 
1.7.9.5

From nengard at bywatersolutions.com  Tue Oct 15 19:55:51 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 13:55:51 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Add missing patron lists help
Message-ID: <1381859751-20063-1-git-send-email-nengard@bywatersolutions.com>

To test go to Tools > Patron Lists and click 'Help'.
Confirm that the help is there and without typos.
---
 .../prog/en/modules/help/patron_lists/lists.tt     |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/patron_lists/lists.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patron_lists/lists.tt
new file mode 100644
index 0000000..8775a5c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patron_lists/lists.tt
@@ -0,0 +1,19 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Patron lists</h1>
+
+<p>Patron lists are a way to store a group of patrons for easy modification via the batch patron modification tool or reporting.</p>
+
+<p>To create a new list of patrons click the 'New patron list' button</p>
+
+<p>Enter a list name and save the list.</p>
+
+<p>To add patrons to the list click the 'Add patron's button to the right of the list name.</p>
+
+<p>Enter the patron's name or cardnumber in the search box and click on the right result to add the patron.</p>
+
+<p>Once you have all of the patrons you would like to add you can click the 'Update' button to save them to the list.</p>
+
+<p><strong>See the full documentation for Patron Lists in the <a href="http://manual.koha-community.org/3.14/en/tools.html#patronlists">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 20:02:25 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 14:02:25 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Authorities Help
Message-ID: <1381860145-20143-1-git-send-email-nengard@bywatersolutions.com>

To Test go to all authorities pages and click 'Help'.
Confirm that text appears and links work.
---
 .../modules/help/authorities/authorities-home.tt   |    2 +-
 .../en/modules/help/authorities/authorities.tt     |   12 +++++++++---
 .../prog/en/modules/help/authorities/detail.tt     |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
index b0bb67b..2a1b33a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities-home.tt
@@ -14,7 +14,7 @@
 
 <p>If the authority has See Alsos in it you will see those broken out on the search results, clicking the linked headings will run a search for that heading instead.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.12/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.14/en/catauthorities.html">manual</a> (online).</strong></p>
 
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
index 01c465e..ade6d76 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/authorities.tt
@@ -2,9 +2,9 @@
 
 <h2>Adding Authorities</h2>
 
-<p>To add a new authority record, choose the authority type from the 'New Authority' button.</p>
+<p>To add a new authority record you can either choose the authority type from the 'New Authority' button or search another library by clicking the 'New from Z39.50' button.</p>
 
-<p>The form that appears will allow you to enter all of the necessary details regarding your authority record.</p>
+<p>If you choose to enter a new authority from scratch, the form that appears will allow you to enter all of the necessary details regarding your authority record.</p>
 
 <p>To expand collapsed values simply click on the title and the subfields will appear. To duplicate a field or subfield just click the plus sign (+) to the right of the label. To use field helper plugins simply click the ellipsis (...) to the right of the field.</p>
 
@@ -12,6 +12,12 @@
 
 <p>From there you can search your authority file for the authority to link. If you can't find the authority to link, you can click the 'Create new' button and add the necessary authority for the link. This plugin also allows for you to choose the link relationship between the authorities.</p>
 
+<p>If you choose to search another library for the authority record you will be presented with a search box</p>
+
+<p>From the results you can choose the 'Import' link to the right of the record you would like to add to Koha</p>
+
+<p>You will then be presented with the form to edit the authority before saving it to your system</p>
+
 <h2>Editing Authorities</h2>
 
 <p>Authorities can be edited by clicking on the authority summary from the search results and then clicking the 'Edit' button above the record.</p>
@@ -20,6 +26,6 @@
 
 <p>To delete an authority record you first must make sure it's not linked to any bibliographic records. If it is not used by any bibliographic records a 'Delete' link will appear to the right of the record on the search results and as a button that appears after clicking on the summary of the authority record.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.12/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.14/en/catauthorities.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
index 7eeb6bb..93318dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tt
@@ -14,6 +14,6 @@
 
 <p>If the authority has See Alsos in it you will see those broken out on the search results, clicking the linked headings will run a search for that heading instead.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.12/en/catauthorities.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.14/en/catauthorities.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 20:07:35 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 14:07:35 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update links in Catalog help
Message-ID: <1381860455-20222-1-git-send-email-nengard@bywatersolutions.com>

To test search the catalog and click results
Test al of the links to the manual and make sure they
go to the 3.14 manual.
---
 .../prog/en/modules/help/catalogue/detail.tt       |    2 +-
 .../prog/en/modules/help/catalogue/issuehistory.tt |    2 +-
 .../prog/en/modules/help/catalogue/moredetail.tt   |    2 +-
 .../prog/en/modules/help/catalogue/search.tt       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/detail.tt
index ce0c624..52ca04f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/detail.tt
@@ -4,6 +4,6 @@
 
 <p>In Koha the bibliographic record contains the main information related to the material. This includes things like the title, author, ISBN, etc. This information is stored in Koha in Marc (different flavors of Marc are supported in Koha). Once this information is saved, items or holdings can be attached.</p>
 
-<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.12/en/cataloging.html#catbibs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.14/en/cataloging.html#catbibs">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
index 82c352d..f8ce359 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/issuehistory.tt
@@ -6,6 +6,6 @@
 
 <p>Below the 'History' heading is a link to 'View item's checkout history,' clicking that will open up the item's history which will look slightly different from the bibliographic record's history page.</p>
 
-<p><strong>See the full documentation for Item Checkout History in the <a href="http://manual.koha-community.org/3.12/en/catitems.html#itemcirchistory">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Checkout History in the <a href="http://manual.koha-community.org/3.14/en/catitems.html#itemcirchistory">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
index 49d5a65..d29a437 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/moredetail.tt
@@ -18,6 +18,6 @@
 
 <p>Below the 'History' heading is a link to 'View item's checkout history,' clicking that will open up the item's history which will look slightly different from the bibliographic record's history page.</p>
 
-<p><strong>See the full documentation for Item Records in the <a href="http://manual.koha-community.org/3.12/en/catitems.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Records in the <a href="http://manual.koha-community.org/3.14/en/catitems.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
index fad0587..be20110 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search.tt
@@ -72,6 +72,6 @@
 <li>ctype:w Law reports and digests</li>
 <li>ctype:z Treaties</li></ul>
 
-<p><strong>See the full documentation for Searching in the <a href="http://manual.koha-community.org/3.12/en/searching.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Searching in the <a href="http://manual.koha-community.org/3.14/en/searching.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From colin.campbell at ptfs-europe.com  Tue Oct 22 15:54:53 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 22 Oct 2013 14:54:53 +0100
Subject: [Koha-patches] [PATCH] Bug 11114 Correct spelling of shipmentdate
	field
Message-ID: <1382450093-22704-1-git-send-email-colin.campbell@ptfs-europe.com>

Searching invoices using shipmentdate failed as
the attribute name was misspelt
---
 C4/Acquisition.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index e470b24..072b9fb 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -2267,11 +2267,11 @@ sub GetInvoices {
         push @bind_args, "%$args{suppliername}%";
     }
     if($args{shipmentdatefrom}) {
-        push @bind_strs, " aqinvoices.shipementdate >= ? ";
+        push @bind_strs, ' aqinvoices.shipmentdate >= ? ';
         push @bind_args, $args{shipmentdatefrom};
     }
     if($args{shipmentdateto}) {
-        push @bind_strs, " aqinvoices.shipementdate <= ? ";
+        push @bind_strs, ' aqinvoices.shipmentdate <= ? ';
         push @bind_args, $args{shipmentdateto};
     }
     if($args{billingdatefrom}) {
-- 
1.8.3.1


From nengard at bywatersolutions.com  Tue Oct 15 20:25:34 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 14:25:34 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update main help files
Message-ID: <1381861534-20353-1-git-send-email-nengard@bywatersolutions.com>

This patch updates help files that aren't in any other folder.

To test:

* Visit the main staff page and review the help
* Visit the About page and review the help
* Visit a page without help (which there better not be) and
  review the link to the manual
---
 .../intranet-tmpl/prog/en/modules/help/about.tt    |   16 +++++++++++++++-
 .../intranet-tmpl/prog/en/modules/help/mainpage.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/help/nohelp.tt   |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
index 8385320..7138b0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt
@@ -20,6 +20,20 @@
 
 <p>Koha is developed and supported by a large number of developers around the world. Thanks to all the developers and libraries who support Koha</p>
 
-<p><strong>See the full documentation for the About page in the <a href="http://manual.koha-community.org/3.12/en/aboutkoha.html">manual</a> (online).</strong></p>
+<h2>Licenses</h2>
+
+<p>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 3 of the License, or (at your option) any later version.</p>
+
+<p>This tab shows the information related to any and all licenses associated with Koha.</p>
+
+<h2>Translations</h2>
+
+<p>This tab lists all of the languages that Koha has been translated to.</p>
+
+<h2>History</h2>
+
+<p>This tab provides a summary of Koha's release and development history.</p>
+ 
+<p><strong>See the full documentation for the About page in the <a href="http://manual.koha-community.org/3.14/en/aboutkoha.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
index ab99dd2..72f75b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt
@@ -26,7 +26,7 @@
 
 <p>The online help directory is: <pre>[% themelang %]/modules/help</pre></p>
 
-<p><strong>See the full documentation for Koha in the <a href="http://manual.koha-community.org/3.12/en/">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Koha in the <a href="http://manual.koha-community.org/3.14/en/">manual</a> (online).</strong></p>
 
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
index 8cabcec..260a9c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tt
@@ -2,7 +2,7 @@
 	
 <h1>Online help</h1>
 
-<p>Sorry, there is no help available for this topic, please refer to the <a href="http://manual.koha-community.org/3.12/en/">Koha 3.12 manual</a> (online).</p>
+<p>Sorry, there is no help available for this topic, please refer to the <a href="http://manual.koha-community.org/3.14/en/">Koha 3.14 manual</a> (online).</p>
 
 <form action="/cgi-bin/koha/edithelp.pl" method="post">
 	<input type="hidden" name="referer" value="[% referer %]" />
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 20:37:49 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 14:37:49 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Lists Help
Message-ID: <1381862269-20456-1-git-send-email-nengard@bywatersolutions.com>

To test go to Lists in the staff client and click help
Confirm that the link goes to the right manual
---
 .../prog/en/modules/help/virtualshelves/shelves.tt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
index fe91182..932f6d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/virtualshelves/shelves.tt
@@ -67,6 +67,6 @@
 
 <p style="color: rgb(153, 0, 0);">Important: It is important to rebuild your zebra index immediately after merging records. If a search is performed for a record which has been deleted Koha will present the patrons with an error in the OPAC.</p>
 
-<p><strong>See the full documentation for Lists in the <a href="http://manual.koha-community.org/3.12/en/stafflists.html#lists">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Lists in the <a href="http://manual.koha-community.org/3.14/en/stafflists.html#lists">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 20:57:15 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 14:57:15 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Add missing authority merge help
Message-ID: <1381863435-20587-1-git-send-email-nengard@bywatersolutions.com>

Test after 10/23 (when the manual link will work)
Visit authorities
Start a merge
Click help on during the merge process
Be sure that help is there and link works.
---
 .../prog/en/modules/help/authorities/merge.tt      |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/merge.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/merge.tt
new file mode 100644
index 0000000..4436d7d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/merge.tt
@@ -0,0 +1,15 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Merge authorities</h1>
+   
+<p>From this screen you can choose to merge two authority records.</p>
+
+<p>First you will be asked which of the two records you would like to keep as your primary record and which will be deleted after the merge.</p>
+
+<p>You will be presented with the MARC for both of the records (each accessible by tabs labeled with the authority numbers for those records). By default the entire first record will be selected, uncheck the fields you don't want in the final (destination) record and then move on to the second tab to choose which fields should be in the final (destination) record.</p>
+
+<p>Once you have completed your selections click the 'merge' button. The primary record will now contain the data you chose for it and the second record will be deleted.</p>
+
+<p><strong>See the full documentation for Merging authorities in the <a href="http://manual.koha-community.org/3.14/en/catauthorities.html#authoritymerge">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 21:01:03 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 15:01:03 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update links in label help
Message-ID: <1381863663-20661-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the links in the label help
to point to the 3.14 manual.

To test:

Visit all label pages and click the help link
confirm that the manual links goes to the right place
---
 .../en/modules/help/labels/label-edit-batch.tt     |    2 +-
 .../en/modules/help/labels/label-edit-layout.tt    |    2 +-
 .../en/modules/help/labels/label-edit-profile.tt   |    2 +-
 .../en/modules/help/labels/label-edit-template.tt  |    2 +-
 .../prog/en/modules/help/labels/label-home.tt      |    2 +-
 .../prog/en/modules/help/labels/spinelabel-home.tt |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
index 6326021..1832865 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tt
@@ -22,6 +22,6 @@
 
 <p>After saving your file, simply print to the blank labels you have in your library.</p>
 
-<p><strong>See the full documentation for Label Batches in the <a href="http://manual.koha-community.org/3.12/en/labelcreator.html#labelbatches">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Label Batches in the <a href="http://manual.koha-community.org/3.14/en/labelcreator.html#labelbatches">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
index c926ef6..a40ad97 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-layout.tt
@@ -12,6 +12,6 @@
 
 <p>After saving, your layouts will appear on the 'Manage Layouts' page.</p>
 
-<p><strong>See the full documentation for Label Layouts in the <a href="http://manual.koha-community.org/3.12/en/labelcreator.html#labellayouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Label Layouts in the <a href="http://manual.koha-community.org/3.14/en/labelcreator.html#labellayouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
index d26aff6..01c680e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-profile.tt
@@ -28,6 +28,6 @@
 
 <p>Once you have saved your new profile, you can return to the list of templates and choose to edit the template that this profile is for.</p>
 
-<p><strong>See the full documentation for Label Profiles in the <a href="http://manual.koha-community.org/3.12/en/labelcreator.html#labelprofiles">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Label Profiles in the <a href="http://manual.koha-community.org/3.14/en/labelcreator.html#labelprofiles">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
index 2b9a7f9..f77ee65 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tt
@@ -30,6 +30,6 @@
 
 <p>After saving, your templates will appear on the 'Manage Templates' page.</p>
 
-<p><strong>See the full documentation for Label Templates in the <a href="http://manual.koha-community.org/3.12/en/labelcreator.html#labeltemplates">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Label Templates in the <a href="http://manual.koha-community.org/3.14/en/labelcreator.html#labeltemplates">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
index 8a520cc..312b181 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-home.tt
@@ -41,6 +41,6 @@
 
 <p>Batches are made up of the barcodes you would like to print. Once in this tool you can search for the item records you would like to print out labels for.</p>
 
-<p><strong>See the full documentation for the Label Creator in the <a href="http://manual.koha-community.org/3.12/en/labelcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Label Creator in the <a href="http://manual.koha-community.org/3.14/en/labelcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
index 6706a4b..8a79ec8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/spinelabel-home.tt
@@ -11,6 +11,6 @@
 
 <p>To use this tool you simply need the barcode for the book you'd like to print the spine label for.</p>
 
-<p><strong>See the full documentation for Quick Spine Label Creator in the <a href="http://manual.koha-community.org/3.12/en/quicklabelcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Quick Spine Label Creator in the <a href="http://manual.koha-community.org/3.14/en/quicklabelcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 21:07:48 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 15:07:48 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update patron card creator help
Message-ID: <1381864068-20728-1-git-send-email-nengard@bywatersolutions.com>

Update manual links in the patron card help file.

To test:
* visit all patron card creator pages and click 'help'
* confirm that the link to the manual goes to 3.14
---
 .../prog/en/modules/help/patroncards/edit-batch.tt |    2 +-
 .../en/modules/help/patroncards/edit-layout.tt     |    2 +-
 .../en/modules/help/patroncards/edit-profile.tt    |    2 +-
 .../en/modules/help/patroncards/edit-template.tt   |    2 +-
 .../prog/en/modules/help/patroncards/home.tt       |    2 +-
 .../en/modules/help/patroncards/image-manage.tt    |    2 +-
 .../prog/en/modules/help/patroncards/manage.tt     |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tt
index 7f613a6..7657ef4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tt
@@ -8,6 +8,6 @@
 
 <p>To add a new batch, you want to click on the 'Batches' button at the top of your page and choose 'New Batch'</p>
 
-<p><strong>See the full documentation for the Patron Card Batches in the <a href="http://manual.koha-community.org/3.12/en/patroncardcreator.html#patroncardbatches">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Batches in the <a href="http://manual.koha-community.org/3.14/en/patroncardcreator.html#patroncardbatches">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
index d6795112..781e696 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-layout.tt
@@ -31,6 +31,6 @@
 
 <p>After saving, your layouts will appear on the 'Manage Layouts' page.</p>
 
-<p><strong>See the full documentation for the Patron Card Layouts in the <a href="http://manual.koha-community.org/3.12/en/patroncardcreator.html#cardlayouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Layouts in the <a href="http://manual.koha-community.org/3.14/en/patroncardcreator.html#cardlayouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
index 479560d..c900416 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-profile.tt
@@ -28,6 +28,6 @@
 
 <p>Once you have saved your new profile, you can return to the list of templates and choose to edit the template that this profile is for.</p>
 
-<p><strong>See the full documentation for the Patron Card Profiles in the <a href="http://manual.koha-community.org/3.12/en/patroncardcreator.html#patronprofile">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Profiles in the <a href="http://manual.koha-community.org/3.14/en/patroncardcreator.html#patronprofile">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
index 2da1d14..9e65401 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-template.tt
@@ -25,6 +25,6 @@ After saving, your templates will appear on the 'Manage Templates' page.</li>
 </li>
 </ul>
 
-<p><strong>See the full documentation for the Patron Card Templates in the <a href="http://manual.koha-community.org/3.12/en/patroncardcreator.html#patrontemplate">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Templates in the <a href="http://manual.koha-community.org/3.14/en/patroncardcreator.html#patrontemplate">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
index 69fc15a..633bb25 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/home.tt
@@ -17,6 +17,6 @@
 
 <p>The developers of the Patron Card Creator module hope you will find this an extremely useful tool. You are encouraged to submit any enhancement requests as well as any bugs via Koha Project Bugzilla.</p>
 
-<p><strong>See the full documentation for the Patron Card Creator in the <a href="http://manual.koha-community.org/3.12/en/patroncardcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Creator in the <a href="http://manual.koha-community.org/3.14/en/patroncardcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
index 4d74ae1..ea06b7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
@@ -16,6 +16,6 @@
 
 <p>To delete one or multiple of these images, click the checkbox to the right of each image you want to delete and click the 'Delete' button.</p>
 
-<p><strong>See the full documentation for Managing Images in the <a href="http://manual.koha-community.org/3.12/en/patroncardcreator.html#managecardimages">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Managing Images in the <a href="http://manual.koha-community.org/3.14/en/patroncardcreator.html#managecardimages">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
index 16fcee7..2d2edf7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/manage.tt
@@ -16,6 +16,6 @@
 
 <p>A batch is a collection of patrons for whom you want to generate cards.</p>
 
-<p><strong>See the full documentation for the Patron Card Creator in the <a href="http://manual.koha-community.org/3.12/en/patroncardcreator.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Card Creator in the <a href="http://manual.koha-community.org/3.14/en/patroncardcreator.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 21:27:14 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 15:27:14 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update tag tool help
Message-ID: <1381865234-20846-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the links to the manual in the
help files on tags.

To test:

* Visit the tag moderation tool
* Click the help link
* Confirm that the links to the manual are right
---
 .../prog/en/modules/help/tags/list.tt              |    2 +-
 .../prog/en/modules/help/tags/review.tt            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt
index 110a57f..314e7db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt
@@ -6,6 +6,6 @@
 
 <p>To remove a tag from a specific title, simply click the 'Remove tag' button to the right of the title.</p>
 
-<p><strong>See the full documentation for Tag Moderation in the <a href="http://manual.koha-community.org/3.12/en/tagsmoderation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Tag Moderation in the <a href="http://manual.koha-community.org/3.14/en/tagsmoderation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
index fc0c8d8..22a29d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/review.tt
@@ -20,6 +20,6 @@
 
 <p>To check terms against the approved and rejected lists (and possibly against the dictionary you have assigned for tag moderation) simply enter the term into the search box on the bottom right of the screen to see the status of the term.</p>
 
-<p><strong>See the full documentation for Tag Moderation in the <a href="http://manual.koha-community.org/3.12/en/tagsmoderation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Tag Moderation in the <a href="http://manual.koha-community.org/3.14/en/tagsmoderation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 21:56:22 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 15:56:22 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update plugins help
Message-ID: <1381866982-20976-1-git-send-email-nengard@bywatersolutions.com>

To test visit the plugin pages and confirm that the links
to the manual are right.
---
 .../prog/en/modules/help/plugins/plugins-home.tt   |    2 +-
 .../prog/en/modules/help/plugins/plugins-upload.tt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/plugins/plugins-home.tt
index ac8eb6a..1600ff4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/plugins/plugins-home.tt
@@ -6,6 +6,6 @@
 
 <p>The plugin system needs to be turned on by a system administrator and should only managed by those who understand Perl and the way data connects within Koha.</p>
 
-<p><strong>See the full documentation for the Plugin System in the <a href="http://manual.koha-community.org/3.12/en/pluginsystem.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Plugin System in the <a href="http://manual.koha-community.org/3.14/en/pluginsystem.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/plugins/plugins-upload.tt
index ce1450c..75a18b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/plugins/plugins-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/plugins/plugins-upload.tt
@@ -6,6 +6,6 @@
 
 <p style="color: #990000;">Important: Only install plugins from trusted sources.</p>
 
-<p><strong>See the full documentation for the Plugin system in the <a href="http://manual.koha-community.org/3.12/en/pluginsystem.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Plugin system in the <a href="http://manual.koha-community.org/3.14/en/pluginsystem.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Tue Oct 15 21:58:10 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Tue, 15 Oct 2013 15:58:10 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update suggestion help
Message-ID: <1381867090-21034-1-git-send-email-nengard@bywatersolutions.com>

To test visit the suggestion management pages
and confirm that the link in the help file goes
to the right manual.
---
 .../prog/en/modules/help/suggestion/suggestion.tt  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
index 2678621..2aa0bac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/suggestion/suggestion.tt
@@ -38,7 +38,7 @@
 
 <p><strong>Customization:</strong> You can create additional custom suggestion statuses by creating new authorized values of the category SUGGEST_STATUS.</p>
 
-<p><strong>See the full documentation for Purchase Suggestions in the <a href="http://manual.koha-community.org/3.12/en/managesuggest.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Purchase Suggestions in the <a href="http://manual.koha-community.org/3.14/en/managesuggest.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
-- 
1.7.2.3


From oleonard at myacpl.org  Tue Oct 22 18:44:13 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 22 Oct 2013 09:44:13 -0700
Subject: [Koha-patches] [PATCH] Bug 11090 - Bootstrap theme: CSS problem
	with suggestions toolbar links
Message-ID: <1382460253-8595-1-git-send-email-oleonard@myacpl.org>

There is a problem with the style on the toolbar on the suggestions page
which makes it float incorrectly. This patch corrects the problem.

To test, log in to the OPAC as a user who has suggestions. The
selections toolbar (which shows the "select all," etc. controls) should
look correct.
---
 .../bootstrap/en/modules/opac-suggestions.tt       |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index 93115b7..5178b75 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -127,14 +127,14 @@
                                 [% END %]
                                 <form action="/cgi-bin/koha/opac-suggestions.pl" method="post" id="myform">
                                     <input type="hidden" name="op" value="delete_confirm" />
-                                    <div id="toolbar" class="toolbar list-actions">
+                                    <div id="toolbar" class="toolbar clearfix">
                                         [% IF ( loggedinusername || ( Koha.Preference( 'AnonSuggestions' ) == 1 ) ) %]
                                             <a class="new" href="/cgi-bin/koha/opac-suggestions.pl?op=add">New purchase suggestion</a>
                                         [% END %]
                                     </div>
 
                                     [% IF ( loggedinusername ) %]
-                                        <div id="selections-toolbar" class="toolbar list-actions">
+                                        <div id="selections-toolbar" class="toolbar">
                                               <span class="checkall"></span> <span class="clearall"></span> <span class="sep">|</span>
                                               <span class="links"><span id="selections">Select suggestions to: </span>
                                               <span id="removeitems"></span>
-- 
1.7.9.5

From nengard at bywatersolutions.com  Thu Oct 24 05:27:22 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 23 Oct 2013 23:27:22 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Circ Help Files
Message-ID: <1382585242-4008-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the existing help files and
adds the missing offline circ help file.

To test:

* Visit all circ pages and check the manual links
* Visit the new offline circulation page and confirm text
and link are there (link will work after 10/25)
---
 .../prog/en/modules/help/circ/offline.tt           |   37 ++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt
new file mode 100644
index 0000000..bd2556d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt
@@ -0,0 +1,37 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Offline Circulation</h1>
+
+<p>If the AllowOfflineCirculation preference is set to 'Enable' the library staff can continue to perform circulation actions within Koha when the system is offline.
+ 
+<h2>Setup</h2>
+
+<p>Before the first time the system goes offline go to Circulation and choose 'Built-in offline circulation interface'</p>
+
+<p>And synchronize your data on every circulation computer by clicking the 'Synchronize' link on the right of the screen.</p>
+
+<p>This will allow you download a local copy of your patrons and circulation data. Click the 'Download records' link at the top of the page to synchronize your data.</p>
+
+<p>Once your data is downloaded you will see the dates your data was last synced to the right of each data set.</p>
+
+<p>This should be done regularly in preparation for any unexpected connection losses.</p>
+
+<h2>Circulating</h2>
+
+<p>When your system goes offline visit the Offline Circulation page in Koha and click 'Check out' or 'Check in' to perform offline actions.</p>
+
+<p>Checking out is done by searching for the patron by barcode or name at the top of the 'Check out' screen. After selecting a patron you will be presented with the synced patron info, including fines and check outs.</p>
+
+<p>Scan the barcode of the item you would like to check out and enter a due date. If you don't enter a due date Koha will prompt you for one.</p>
+
+<p>Once the item is checked out it will appear below the patron's info.</p>
+
+<p>Once the system is back online visit the Synchronize page on the Offline Circulation module and click 'Upload transactions'</p>
+
+<h2>Upload transactions</h2>
+
+<p>After the files are uploaded you can click 'View pending offline circulation actions' on the right to process the actions.</p>
+
+<p><strong>See the full documentation for Offline Circulation in the <a href="http://manual.koha-community.org/3.14/en/offlinecirc.html#kohaofflinecirc">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Oct 24 05:33:21 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 23 Oct 2013 23:33:21 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Circ Help Files
Message-ID: <1382585601-4082-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the existing help files and
adds the missing offline circ help file.

To test:

* Visit all circ pages and check the manual links
* Visit the new offline circulation page and confirm text
and link are there (link will work after 10/25)
---
 .../prog/en/modules/help/circ/branchoverdues.tt    |    2 +-
 .../prog/en/modules/help/circ/branchtransfers.tt   |    2 +-
 .../prog/en/modules/help/circ/circulation-home.tt  |    2 +-
 .../prog/en/modules/help/circ/circulation.tt       |    2 +-
 .../prog/en/modules/help/circ/offline.tt           |   37 ++++++++++++++++++++
 .../prog/en/modules/help/circ/overdue.tt           |    2 +-
 .../prog/en/modules/help/circ/pendingreserves.tt   |    2 +-
 .../prog/en/modules/help/circ/reserveratios.tt     |    2 +-
 .../prog/en/modules/help/circ/returns.tt           |    2 +-
 .../en/modules/help/circ/selectbranchprinter.tt    |    2 +-
 .../en/modules/help/circ/transferstoreceive.tt     |    2 +-
 .../prog/en/modules/help/circ/view_holdsqueue.tt   |    2 +-
 .../prog/en/modules/help/circ/waitingreserves.tt   |    2 +-
 13 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
index 42298e3..7cec37e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt
@@ -8,6 +8,6 @@
 
 <p style="color: #990000">Important: If you do not charge fines and/or don't have the fines cron job running you will see no data on this report.</p>
 
-<p><strong>See the full documentation for Overdues with Fines in the <a href="http://manual.koha-community.org/3.12/en/circreports.html#overduesfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Overdues with Fines in the <a href="http://manual.koha-community.org/3.14/en/circreports.html#overduesfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
index 5a99a5f..50014a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
@@ -21,6 +21,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Transfers in the <a href="http://manual.koha-community.org/3.12/en/transfers.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Transfers in the <a href="http://manual.koha-community.org/3.14/en/transfers.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
index b402d27..e1bd8a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation-home.tt
@@ -20,6 +20,6 @@
 
 <p style="background-color: #ffe599">Tip: Mac users use the OPTION button in place of ALT</p>
 
-<p><strong>See the full documentation for Circulation in the <a href="http://manual.koha-community.org/3.12/en/circulation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation in the <a href="http://manual.koha-community.org/3.14/en/circulation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
index a70f8e9..452bb6a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/circulation.tt
@@ -149,6 +149,6 @@
 
 <p>Circulation messages meant for the patron will appear when they log into the OPAC.</p>
 
-<p><strong>See the full documentation for Checking Out in the <a href="http://manual.koha-community.org/3.12/en/circulation.html#checkingout">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Checking Out in the <a href="http://manual.koha-community.org/3.14/en/circulation.html#checkingout">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt
new file mode 100644
index 0000000..bd2556d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/offline.tt
@@ -0,0 +1,37 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Offline Circulation</h1>
+
+<p>If the AllowOfflineCirculation preference is set to 'Enable' the library staff can continue to perform circulation actions within Koha when the system is offline.
+ 
+<h2>Setup</h2>
+
+<p>Before the first time the system goes offline go to Circulation and choose 'Built-in offline circulation interface'</p>
+
+<p>And synchronize your data on every circulation computer by clicking the 'Synchronize' link on the right of the screen.</p>
+
+<p>This will allow you download a local copy of your patrons and circulation data. Click the 'Download records' link at the top of the page to synchronize your data.</p>
+
+<p>Once your data is downloaded you will see the dates your data was last synced to the right of each data set.</p>
+
+<p>This should be done regularly in preparation for any unexpected connection losses.</p>
+
+<h2>Circulating</h2>
+
+<p>When your system goes offline visit the Offline Circulation page in Koha and click 'Check out' or 'Check in' to perform offline actions.</p>
+
+<p>Checking out is done by searching for the patron by barcode or name at the top of the 'Check out' screen. After selecting a patron you will be presented with the synced patron info, including fines and check outs.</p>
+
+<p>Scan the barcode of the item you would like to check out and enter a due date. If you don't enter a due date Koha will prompt you for one.</p>
+
+<p>Once the item is checked out it will appear below the patron's info.</p>
+
+<p>Once the system is back online visit the Synchronize page on the Offline Circulation module and click 'Upload transactions'</p>
+
+<h2>Upload transactions</h2>
+
+<p>After the files are uploaded you can click 'View pending offline circulation actions' on the right to process the actions.</p>
+
+<p><strong>See the full documentation for Offline Circulation in the <a href="http://manual.koha-community.org/3.14/en/offlinecirc.html#kohaofflinecirc">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
index e4e9317..13425a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/overdue.tt
@@ -11,6 +11,6 @@
 	<li style="background-color: #ffe599">Tip: Large libraries can choose to filter the report before it runs by setting the FilterBeforeOverdueReport system preference to 'Require'.</li>
 </ul>
 
-<p><strong>See the full documentation for Overdues in the <a href="http://manual.koha-community.org/3.12/en/circreports.html#overduesreport">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Overdues in the <a href="http://manual.koha-community.org/3.14/en/circreports.html#overduesreport">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
index 8f17f3d..9b946d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt
@@ -6,6 +6,6 @@
 
 <p>You can limit the results you see by using the Refine box on the left side of the page</p>
 
-<p><strong>See the full documentation for Holds to Pull in the <a href="http://manual.koha-community.org/3.12/en/circreports.html#holdspull">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Holds to Pull in the <a href="http://manual.koha-community.org/3.14/en/circreports.html#holdspull">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
index 3edcda5..82d9467 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/reserveratios.tt
@@ -4,7 +4,7 @@
 
 <p>Hold ratios help with collection development. Using this report you will be able to see how many of your patrons have holds on items and whether you should buy more. By default it will be set to the library needing 3 items per hold that has been placed. The report will tell you how many additional items need to be purchased to meet this quota.</p>
 
-<p><strong>See the full documentation for Hold Ratios in the <a href="http://manual.koha-community.org/3.12/en/circreports.html#holdratios">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Hold Ratios in the <a href="http://manual.koha-community.org/3.14/en/circreports.html#holdratios">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
index 7c43e55..ec05d14 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
@@ -72,6 +72,6 @@
 
 <p>From here you can check the item out to the patron at the desk and cancel the hold for the patron.</p>
 
-<p><strong>See the full documentation for Checking In in the <a href="http://manual.koha-community.org/3.12/en/checkingin.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Checking In in the <a href="http://manual.koha-community.org/3.14/en/checkingin.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
index b9d22f6..acd74fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/selectbranchprinter.tt
@@ -8,6 +8,6 @@
 
 <p>Once you have saved your changes you new library will appear in the top right.</p>
 
-<p><strong>See the full documentation for Setting your Library in the <a href="http://manual.koha-community.org/3.12/en/setlibrary.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Setting your Library in the <a href="http://manual.koha-community.org/3.14/en/setlibrary.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
index c45d966..66e62d1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/transferstoreceive.tt
@@ -8,6 +8,6 @@
 
 <p style="color: #990000">Important: An item is considered late based on the number of days you have entered in the TransfersMaxDaysWarning system preference.</p>
 
-<p><strong>See the full documentation for Transfers to Receive in the <a href="http://manual.koha-community.org/3.12/en/circreports.html#transferstoreceive">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Transfers to Receive in the <a href="http://manual.koha-community.org/3.14/en/circreports.html#transferstoreceive">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
index 0399938..9d166b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt
@@ -18,6 +18,6 @@
 
 <p>Leaving StaticHoldsQueueWeight empty is contraindicated at this time. Doing so will cause the build_holds_queue script to ignore RandomizeHoldsQueueWeight, causing the script to request hold fulfillment not randomly, but by alphabetical order.</p>
 
-<p><strong>See the full documentation for the Holds Queue in the <a href="http://manual.koha-community.org/3.12/en/circreports.html#holdsqueue">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Holds Queue in the <a href="http://manual.koha-community.org/3.14/en/circreports.html#holdsqueue">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
index be0e509..953806e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/waitingreserves.tt
@@ -6,6 +6,6 @@
 
 <p>Items that have been on the hold shelf longer than you normally allow (based on the ReservesMaxPickUpDelay preference value) will appear on the 'Holds Over' tab, they will not automatically be cancelled unless you have set the cron job to do that for you, but you can cancel all holds using the button at the top of the list.</p>
 
-<p><strong>See the full documentation for Holds Awaiting Pickup in the <a href="http://manual.koha-community.org/3.12/en/circreports.html#holdspickup">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Holds Awaiting Pickup in the <a href="http://manual.koha-community.org/3.14/en/circreports.html#holdspickup">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From colin.campbell at ptfs-europe.com  Thu Oct 24 18:09:55 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu, 24 Oct 2013 17:09:55 +0100
Subject: [Koha-patches] [PATCH] Bug 11135 Check variable exists before
	splitting
Message-ID: <1382630995-14935-1-git-send-email-colin.campbell@ptfs-europe.com>

calling split on an undefined var generates warning to
the log. Lets check it exists before processing it
---
 admin/preferences.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/preferences.pl b/admin/preferences.pl
index 8636afe..9a2c8ca 100755
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -121,7 +121,10 @@ sub TransformPrefsToHTML {
     my $tab = $data->{ $title };
     $tab = { '' => $tab } if ( ref( $tab ) eq 'ARRAY' );
 
-    my @override_syspref_names = split( /,/, $ENV{"OVERRIDE_SYSPREF_NAMES"} );
+    my @override_syspref_names;
+    if ( $ENV{OVERRIDE_SYSPREF_NAMES} ) {
+        @override_syspref_names = split /,/, $ENV{OVERRIDE_SYSPREF_NAMES};
+    }
 
     foreach my $group ( sort keys %$tab ) {
         if ( $group ) {
-- 
1.8.3.1


From nengard at bywatersolutions.com  Thu Oct 24 05:40:18 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 23 Oct 2013 23:40:18 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Offline Circ Help
Message-ID: <1382586018-4157-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the offline circulation help files.

To test:

Visit the KOC file upload and pending transactions page
Review the help and check the links
---
 .../prog/en/modules/help/offline_circ/list.tt      |    6 +++---
 .../en/modules/help/offline_circ/process_koc.tt    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/list.tt
index bf0ee2f..1363b6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/list.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/list.tt
@@ -2,9 +2,9 @@
 
 <h1>Offline circulation</h1>
 
-<p>From this page you can manage offline circulation actions tracked in the Firefox plugin found at: <a class="ulink" href="https://addons.mozilla.org/en/firefox/addon/koct/" target="_top">https://addons.mozilla.org/en/firefox/addon/koct/</a> and the Windows Offline Circulation tool found at <a href="http://kylehall.info/index.php/projects/koha/koha-offline-circulation/" target="_top">http://kylehall.info/index.php/projects/koha/koha-offline-circulation/</a>.</p>
+<p>From this page you can manage offline circulation actions tracked in the Firefox plugin found at: <a class="ulink" href="https://addons.mozilla.org/en/firefox/addon/koct/" target="_top">https://addons.mozilla.org/en/firefox/addon/koct/</a>, the Windows Offline Circulation tool found at <a href="http://kylehall.info/index.php/projects/koha/koha-offline-circulation/" target="_top">http://kylehall.info/index.php/projects/koha/koha-offline-circulation/</a> or the built in Koha Offline Circulation tool.</p>
 
-<p>When you use the 'Commit to Koha' option in the Firefox plugin or the 'View pending offline circulation actions' after uploading your *.koc file you will come to this page to manage the data.</p>
+<p>When you use the 'Commit to Koha' option in the Firefox plugin, the 'View pending offline circulation actions' after uploading your *.koc file or uploading your Koha offline circulation transactions you will come to this page to manage the data.</p>
 
 <p>Once all of the logs from all of the circulation computers are loaded you will be able to check them all or select just those you want to process into Koha.</p>
 
@@ -20,6 +20,6 @@
     <li>Once finished you will have a summary of all of your transactions</li>
 </ul>
 
-<p><strong>See the full documentation for Offline Circulation in the <a href="http://manual.koha-community.org/3.12/en/offlinecirc.html#firefoxofflinecirc">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Offline Circulation in the <a href="http://manual.koha-community.org/3.14/en/offlinecirc.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
index 0959722..5132bfb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
@@ -16,6 +16,6 @@
 
 <p>You can also tend to pending circulation actions by going to Circulation > Pending offline circulation actions.</p>
 
-<p><strong>See the full documentation for Uploading the Offline Circulation File in the <a http://manual.koha-community.org/3.12/en/offlinecirc.html#uploadofflinecirc">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Uploading the Offline Circulation File in the <a http://manual.koha-community.org/3.14/en/offlinecirc.html#uploadofflinecirc">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Oct 24 05:45:22 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 23 Oct 2013 23:45:22 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Remove Unused Help File
Message-ID: <1382586322-4235-1-git-send-email-nengard@bywatersolutions.com>

This patch removes an unused help file in the help/export
folder.

To test:

Just confirm that the file is removed, there were no links
to it anymore.
---
 .../prog/en/modules/help/export/marc.tt            |   39 --------------------
 1 files changed, 0 insertions(+), 39 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt
deleted file mode 100644
index 61948bb..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/export/marc.tt
+++ /dev/null
@@ -1,39 +0,0 @@
-[% INCLUDE 'help-top.inc' %]
-
-<h1>MARC Export</h1>
-
-<p>Koha comes with a tool that will allow you to export your bibliographic and/or holdings data in bulk. This can be used to send your records to fellow libraries, organizations or services; or simply for backup purposes.</p>
-
-<ul>
-	<li>Fill in the form in order to limit your export to a specific range (all fields are optional)
-<ul>
-	<li>Choose to limit your export by any one or more of the following options
-<ul>
-	<li>Limit to a bib number range</li>
-	<li>Limit to a specific item type</li>
-	<li>Limit to a specific library</li>
-	<li>Limit to a call number range</li>
-	<li>Limit to an acquisition date range</li>
-</ul>
-</li>
-	<li>Next choose what to skip when exporting
-<ul>
-	<li>By default items will be exported, if you would like to only export bibliographic data, check the 'Don't export items' box</li>
-	<li>To limit your export only to items from the library you're logged in as (if you leave the 'Library' field set to 'All') or to the library you selected above check the 'Remove non-local items' box</li>
-	<li>You can also choose what fields you don't want to export. This can be handy if you're sharing your data, you can remove all local fields before sending your data to another library</li>
-</ul>
-</li>
-	<li>Finally choose the file type and file name
-<ul>
-    <li>Choose to export your data in marc or marcxml format</li>
-	<li>Choose the name you want your file to save as</li>
-</ul>
-</li>
-	<li>Click 'Export'</li>
-</ul>
-</li>
-</ul>
-
-<p><strong>See the full documentation for Marc Export in the <a href="http://manual.koha-community.org/3.8/en/exportbibs.html">manual</a> (online).</strong></p>
-
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Oct 24 05:47:18 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 23 Oct 2013 23:47:18 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Reviews Help
Message-ID: <1382586438-4291-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the link to the manual in the comments
moderation help.

To test:

* Visit comments moderation
* Click the help link
* Confirm manual link works
---
 .../prog/en/modules/help/reviews/reviewswaiting.tt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
index d3dfb82..700ddb9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reviews/reviewswaiting.tt
@@ -10,6 +10,6 @@
 
 <p>You can also review and unapprove comments you have approved in the past by choosing the 'Approved comments' tab</p>
 
-<p><strong>See the full documentation for Comments in the <a href="http://manual.koha-community.org/3.12/en/comments.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Comments in the <a href="http://manual.koha-community.org/3.14/en/comments.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Oct 24 05:50:08 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 23 Oct 2013 23:50:08 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update holds help
Message-ID: <1382586608-4356-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the manual link in the holds help
file.

To test:

* Place a hold in the staff client
* Click the help link
* Confirm manual link works
---
 .../prog/en/modules/help/reserve/request.tt        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
index 68b75f1..580767f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
@@ -60,6 +60,6 @@
 
 <p>If a patron asks to have their hold suspended you can do so by clicking the Suspend button to far right. If the patron gives you a date for the items to become unsuspended you can enter that in the date box and click the 'Update hold(s)' button to save your changes.</p>
 
-<p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.12/en/holds.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.14/en/holds.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From oleonard at myacpl.org  Fri Oct 25 16:43:33 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 25 Oct 2013 10:43:33 -0400
Subject: [Koha-patches] [PATCH] Bug 11133 - Markup errors in OPAC place hold
	form HTML
Message-ID: <1382712214-5847-1-git-send-email-oleonard@myacpl.org>

There are markup errors in the OPAC place hold form which prevent it
from validating successfully. These errors don't seem to cause any
visual problem but can potentially cause problems when debugging
template logic.

To test, apply the patch and validate the page using your preferred
validator (since it's a page which requires login you'll have to upload
or paste the source). The page should validate successfully. Test when
placing holds on:

- a single item
- multiple items
- items which you cannot place on hold
---
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
index bf334fa..671e1f9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt
@@ -460,8 +460,8 @@
                                 </li>
 
                             [% END %]
-                        [% END %]
                 </ul>
+                        [% END %]
                   [% IF ( OPACItemHolds ) %]
                   [% IF ( bibitemloo.holdable ) %]
 
@@ -540,11 +540,12 @@
                         </table>
                     </div>
 
+                </fieldset>
+                  [% END %]<!-- OPACItemHolds -->
+
                   [% END %]<!-- bib_available -->
 
-                  [% END %]<!-- OPACItemHolds -->
             </div>
-                </fieldset>
                 [% END %]
 
               [% END %] <!-- if message -->
-- 
1.7.9.5

From nengard at bywatersolutions.com  Thu Oct 24 16:52:07 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 24 Oct 2013 10:52:07 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Reports Help
Message-ID: <1382626327-6543-1-git-send-email-nengard@bywatersolutions.com>

Update all of the reports related help files.

To test:

* Visit report pages and confirm that text and links
are right.
---
 .../en/modules/help/reports/acquisitions_stats.tt  |    2 +-
 .../prog/en/modules/help/reports/bor_issues_top.tt |    2 +-
 .../prog/en/modules/help/reports/borrowers_out.tt  |    2 +-
 .../en/modules/help/reports/borrowers_stats.tt     |    2 +-
 .../prog/en/modules/help/reports/cat_issues_top.tt |    2 +-
 .../prog/en/modules/help/reports/catalogue_out.tt  |    2 +-
 .../en/modules/help/reports/catalogue_stats.tt     |    2 +-
 .../prog/en/modules/help/reports/dictionary.tt     |    2 +-
 .../prog/en/modules/help/reports/guided_reports.tt |   14 ++++++++------
 .../en/modules/help/reports/issues_avg_stats.tt    |    2 +-
 .../prog/en/modules/help/reports/issues_stats.tt   |    2 +-
 .../prog/en/modules/help/reports/itemslost.tt      |    2 +-
 .../prog/en/modules/help/reports/manager.tt        |    2 +-
 .../prog/en/modules/help/reports/reports-home.tt   |    2 +-
 .../prog/en/modules/help/reports/reserves_stats.tt |    2 +-
 .../prog/en/modules/help/reports/serials_stats.tt  |    2 +-
 16 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tt
index 499e597..0e0ee56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/acquisitions_stats.tt
@@ -12,6 +12,6 @@
 
 <p>Choosing amount will change your results to appear as the sum of the amounts spent.</p>
 
-<p><strong>See the full documentation for Acquisitions Statistics in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#acqstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions Statistics in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#acqstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/bor_issues_top.tt
index 717c5cb..8d453dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/bor_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/bor_issues_top.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Patrons with the most Checkouts report in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#mostcheckouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patrons with the most Checkouts report in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#mostcheckouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_out.tt
index e9032c8..5c4e374 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_out.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Patrons with no Checkouts report in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#patnocheckouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patrons with no Checkouts report in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#patnocheckouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_stats.tt
index 36309c0..4335bf5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/borrowers_stats.tt
@@ -8,7 +8,7 @@
 
 <p>Based on your selections, you may see some query information above your results table. You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#patstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#patstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/cat_issues_top.tt
index ab569e3..c1f7844 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/cat_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/cat_issues_top.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Most Circulation Items report in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#mostcirculated">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Most Circulation Items report in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#mostcirculated">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_out.tt
index 31f71b8..9176597 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_out.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Items with no Checkouts report in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#itemnocheckouts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Items with no Checkouts report in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#itemnocheckouts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_stats.tt
index 9678d20..a41f7d8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/catalogue_stats.tt
@@ -8,7 +8,7 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for Catalog Statistics in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#catstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Catalog Statistics in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#catstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/dictionary.tt
index cdaf397..6a10caa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/dictionary.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/dictionary.tt
@@ -18,6 +18,6 @@
 
 <p>Then when generating reports on the module you created the value for you will see an option to limit by the definition at the bottom of the usual filters.</p>
 
-<p><strong>See the full documentation for the Reports Dictionary in the <a href="http://manual.koha-community.org/3.12/en/reportdic.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Reports Dictionary in the <a href="http://manual.koha-community.org/3.14/en/reportdic.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt
index 4a38fd9..0844b92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt
@@ -82,9 +82,9 @@
 
 <h3>Duplicate Report</h3>
 
-<p>Reports can also be added by duplicating an existing report. Visit the 'Saved reports' page to see all of the reports listed on your system already.</p>
+<p>Reports can also be added by duplicating an existing report. Visit the 'Saved reports' page to see all of the reports listed on your system</p> already.
 
-<p>To the right of every report there is a 'Duplicate' link in the 'Saved SQL' column. Click that 'Duplicate' link to use an existing report as the basis for your new report. That will populate the new report form with the existing SQL for easy editing and resaving.</p>
+<p>To the right of every report there is an 'Actions' pull down. Clickin that and choose 'Duplicate' to use an existing report as the basis for your new report. That will populate the new report form with the existing SQL for easy editing and resaving.</p>
 
 <h3>Edit Custom Reports</h3>
 
@@ -92,13 +92,15 @@
 
 <p>To find the report you'd like to edit you can sort by any of the columns by clicking the on the column header. You can also filter your results using the filter menu on the left or use the tabs to find reports based on your custom groups.</p>
 
-<p>From this list you can edit any custom report by clicking 'Edit' in the 'Saved SQL' column.</p>
+<p>From this list you can edit any custom report by clicking 'Actions' to the right of the report and choosing 'Edit' from the menu that appears.</p>
+
+<p>The form to edit the report will appear.</p>
 
 <h3>Running Custom Reports</h3>
 
-<p>Once custom reports are saved to Koha, you can run them by going to the Saved Reports page and clicking the 'Run' link to the right of the report.</p>
+<p>Once custom reports are saved to Koha, you can run them by going to the Saved Reports page and clicking the 'Actions' button to the right of the report and choosing 'Run'.</p>
 
-<p>When you report runs you will either be asked for some value or you will see the results right away</p>
+<p>When you report runs you will either be asked for some values or you will see the results right away</p>
 
 <p>From the results you can choose to rerun the report by clicking 'Run report' at the top, edit the report by clicking the 'Edit' button or starting over and creating a new report by using the 'New' button. You can also download your results by choosing a file type at the bottom of the results next to the 'Download the report' label and clicking 'Download.'</p>
 
@@ -193,6 +195,6 @@
 	<li>8 = Stopped</li>
 </ul>
 
-<p><strong>See the full documentation for Custom Reports in the <a href="http://manual.koha-community.org/3.10/en/reports.html#customreports">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Custom Reports in the <a href="http://manual.koha-community.org/3.14/en/reports.html#customreports">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_avg_stats.tt
index 479e9a3..4f3731d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_avg_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_avg_stats.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Average Loan Time report in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#avloantime">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Average Loan Time report in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#avloantime">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt
index 068bff8..03267a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/issues_stats.tt
@@ -19,6 +19,6 @@
 	<li>For a single day, an example would be: 11/15/2009 to 11/16/2009 to find what circulated on the 15th</li>
 </ul>
 
-<p><strong>See the full documentation for Circulation Statistics in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#circstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation Statistics in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#circstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
index 4e33125..821fa2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
@@ -16,6 +16,6 @@
 		</ul>
 	</div>	
 
-<p><strong>See the full documentation for the Lost Items report in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#lostreport">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Lost Items report in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#lostreport">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
index 3dd9ca2..8a131db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for the Catalog by Item Type report in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#catbyitem">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Catalog by Item Type report in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#catbyitem">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt
index c7914cf..3716a03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tt
@@ -19,6 +19,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Reports in the <a href="http://manual.koha-community.org/3.12/en/reports.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Reports in the <a href="http://manual.koha-community.org/3.14/en/reports.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reserves_stats.tt
index 91bda83..77f45b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reserves_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reserves_stats.tt
@@ -10,6 +10,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for Holds Statistics in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#holdstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Holds Statistics in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#holdstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/serials_stats.tt
index 1519f0d..9450d7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/serials_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/serials_stats.tt
@@ -8,6 +8,6 @@
 
 <p>You can also choose to export to a file that you can manipulate to your needs.</p>
 
-<p><strong>See the full documentation for Serials Statistics in the <a href="http://manual.koha-community.org/3.12/en/statsreports.html#serialstats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serials Statistics in the <a href="http://manual.koha-community.org/3.14/en/statsreports.html#serialstats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From dpk at randomnotes.org  Mon Oct 28 03:30:15 2013
From: dpk at randomnotes.org (Doug Kingston)
Date: Sun, 27 Oct 2013 19:30:15 -0700
Subject: [Koha-patches] [PATCH 1/2] [ENH] Bug 6435 Add daemon mode to
	rebuild_zebra.pl
Message-ID: <1382927415-30244-1-git-send-email-dpk@randomnotes.org>

This change adds code to check the zebraqueue table with a cheap SQL query
and a daemon loop that checks for new entries and processes them incremantally
before sleeping for a controllable number of seconds.  The default is 5 seconds
which provides a near realtime search index update.  This is desirable particularly
for libraries that are doing active catalogue updating.  The query is adjusted
based on whether -a, -b, or -a -b are specified.

Help text updated.  Tested against a live 3.12 system.

Note that this fix will benefit from the fix to lack of locking (bug 11078)
---
 misc/migration_tools/rebuild_zebra.pl |   65 ++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index a46526d..6489fc5 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -21,6 +21,8 @@ $|=1; # flushes output
 # If the cron job starts us in an unreadable dir, we will break without
 # this.
 chdir $ENV{HOME} if (!(-r '.'));
+my $daemon_mode;
+my $daemon_sleep = 5;
 my $directory;
 my $nosanitize;
 my $skip_export;
@@ -45,6 +47,8 @@ my $run_user = (getpwuid($<))[0];
 my $verbose_logging = 0;
 my $zebraidx_log_opt = " -v none,fatal,warn ";
 my $result = GetOptions(
+    'daemon'        => \$daemon_mode,
+    'sleep:i'       => \$daemon_sleep,
     'd:s'           => \$directory,
     'r|reset'       => \$reset,
     's'             => \$skip_export,
@@ -152,16 +156,13 @@ if ($do_munge) {
 
 my $tester = XML::LibXML->new();
 
-if ($authorities) {
-    index_records('authority', $directory, $skip_export, $skip_index, $process_zebraqueue, $as_xml, $noxml, $nosanitize, $do_not_clear_zebraqueue, $verbose_logging, $zebraidx_log_opt, $authorityserverdir);
-} else {
-    print "skipping authorities\n" if ( $verbose_logging );
-}
-
-if ($biblios) {
-    index_records('biblio', $directory, $skip_export, $skip_index, $process_zebraqueue, $as_xml, $noxml, $nosanitize, $do_not_clear_zebraqueue, $verbose_logging, $zebraidx_log_opt, $biblioserverdir);
+if ($daemon_mode) {
+    while (1) {
+        do_one_pass() if ( zebraqueue_not_empty() );
+        sleep $daemon_sleep;
+    }
 } else {
-    print "skipping biblios\n" if ( $verbose_logging );
+    do_one_pass();
 }
 
 
@@ -191,6 +192,40 @@ if ($keep_export) {
     }
 }
 
+sub do_one_pass {
+    if ($authorities) {
+        index_records('authority', $directory, $skip_export, $skip_index, $process_zebraqueue, $as_xml, $noxml, $nosanitize, $do_not_clear_zebraqueue, $verbose_logging, $zebraidx_log_opt, $authorityserverdir);
+    } else {
+        print "skipping authorities\n" if ( $verbose_logging );
+    }
+
+    if ($biblios) {
+        index_records('biblio', $directory, $skip_export, $skip_index, $process_zebraqueue, $as_xml, $noxml, $nosanitize, $do_not_clear_zebraqueue, $verbose_logging, $zebraidx_log_opt, $biblioserverdir);
+    } else {
+        print "skipping biblios\n" if ( $verbose_logging );
+    }
+}
+
+# Check the zebra update queue and return true if there are records to process
+sub zebraqueue_not_empty {
+    my $where_str;
+
+    if ($authorities && $biblios) {
+	$where_str = 'done = 0;';
+    } elsif ($biblios) {
+	$where_str = 'server = "biblioserver" AND done = 0;';
+    } else {
+	$where_str = 'server = "authorityserver" AND done = 0;';
+    }
+    my $query = $dbh->prepare('SELECT COUNT(*) FROM zebraqueue WHERE ' .
+	                      $where_str );
+
+    $query->execute;
+    my $count = $query->fetchrow_arrayref->[0];
+    print "queued records: $count\n" if $verbose_logging > 0;
+    return $count > 0;
+}
+
 # This checks to see if the zebra directories exist under the provided path.
 # If they don't, then zebra is likely to spit the dummy. This returns true
 # if the directories had to be created, false otherwise.
@@ -692,6 +727,18 @@ Parameters:
 
     -a                      index authority records
 
+    -daemon                 Run in daemon mode.  The program will loop checking
+                            for entries on the zebraqueue table, processing
+                            them incrementally if present, and then sleep
+                            for a few seconds before repeating the process
+                            Checking the zebraqueue table is done with a cheap
+                            SQL query.  This allows for near realtime update of
+                            the zebra search index with low system overhead.
+                            Use -sleep to control the checking interval.
+
+    -sleep 10               Seconds to sleep between checks of the zebraqueue
+                            table in daemon mode.  The default is 5 seconds.
+
     -z                      select only updated and deleted
                             records marked in the zebraqueue
                             table.  Cannot be used with -r
-- 
1.7.9.5


From dpk at randomnotes.org  Mon Oct 28 03:30:46 2013
From: dpk at randomnotes.org (Doug Kingston)
Date: Sun, 27 Oct 2013 19:30:46 -0700
Subject: [Koha-patches] [PATCH 2/2] Bug 11078 Add locking to rebuild_zebra
	to prevent race conditions.
Message-ID: <1382927446-30286-1-git-send-email-dpk@randomnotes.org>

The race condition exists whether you are doing incremental updates with
a periodic cronjob or with the new daemon mode.  Suppose you start a full rebuild
at time T0 which will take until T20 to extract the records.  Suppose also at T10,
a biblio or auth is updated and processed through the zebraqueue by T15.
In this situation the updated record in zebra will be overwritten when
the full rebuild records are uploaded to zebra after T20.  We prevent this
by only allowing one rebuild_zebra per koha instance to be running at one time.

This patch adds flock based locking for rebuild_zebra.pl on a per-instance basis.
This prevents races between full rebuilds and background incremental updates from
the zebraqueue table in the database.  Add a lockdir to the config file
to allow the proper location to be determined at runtime.

When running in daemon mode (see bug 6435), incremental updates will be skipped
while a full rebuild is running, and resume afterwards.  A full rebuild or other
adhoc request will wait for any previous lock to clear.

Tested by flocking the lock file while invoking rebuild_zebra.pl in
various modes (daemon, adhoc zebraqueue task, and full rebuild) using
flock program I will attach to bug.
---
 etc/koha-conf.xml                     |    1 +
 misc/migration_tools/rebuild_zebra.pl |   25 ++++++++++++++++++++++++-
 rewrite-config.PL                     |    1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index d42f041..3f180bf 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -283,6 +283,7 @@ __PAZPAR2_TOGGLE_XML_POST__
  <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
  <intrahtdocs>__INTRANET_TMPL_DIR__</intrahtdocs>
  <includes>__INTRANET_TMPL_DIR__/prog/en/includes/</includes>
+ <lockdir>__LOCK_DIR__</lockdir>
  <logdir>__LOG_DIR__</logdir>
  <docdir>__DOC_DIR__</docdir>
  <backupdir>__BACKUP_DIR__</backupdir>
diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index 6489fc5..e18725c 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -5,6 +5,7 @@ use strict;
 
 use C4::Context;
 use Getopt::Long;
+use Fcntl qw(:flock);
 use File::Temp qw/ tempdir /;
 use File::Path;
 use C4::Biblio;
@@ -139,12 +140,20 @@ my $dbh = C4::Context->dbh;
 my ($biblionumbertagfield,$biblionumbertagsubfield) = &GetMarcFromKohaField("biblio.biblionumber","");
 my ($biblioitemnumbertagfield,$biblioitemnumbertagsubfield) = &GetMarcFromKohaField("biblioitems.biblioitemnumber","");
 
+# We need to create our own lock directory which incorporates the database instance
+# we are indexing to facilitate multiple instances on the same machine.
+
+my $lockdir = C4::Context->config("lockdir") . "/koha_rebuild_zebra_" . C4::Context->config("database");
+mkpath($lockdir, 0, 0755) unless (-d $lockdir);
+my $lockfile = $lockdir . "/lock";
+
 if ( $verbose_logging ) {
     print "Zebra configuration information\n";
     print "================================\n";
     print "Zebra biblio directory      = $biblioserverdir\n";
     print "Zebra authorities directory = $authorityserverdir\n";
     print "Koha directory              = $kohadir\n";
+    print "Lockfile                    = $lockfile\n";
     print "BIBLIONUMBER in :     $biblionumbertagfield\$$biblionumbertagsubfield\n";
     print "BIBLIOITEMNUMBER in : $biblioitemnumbertagfield\$$biblioitemnumbertagsubfield\n";
     print "================================\n";
@@ -156,13 +165,27 @@ if ($do_munge) {
 
 my $tester = XML::LibXML->new();
 
+# The main work is done here by calling do_one_pass().  We have added locking
+# avoid race conditions between Full rebuilds and incremental updates either from
+# daemon mode or periodic invocation from cron.  The race can lead to an updated
+# record being overwritten by a rebuild if the update is applied after the export
+# by the rebuild and before the rebuild finishes (more likely to effect large
+# catalogs).
+open(LockFH, ">$lockfile") or die "$lockfile: $!";
 if ($daemon_mode) {
     while (1) {
-        do_one_pass() if ( zebraqueue_not_empty() );
+        # For incremental updates, skip the update if the updates are locked
+	if (flock(LockFH, LOCK_EX|LOCK_NB)) {
+	    do_one_pass() if ( zebraqueue_not_empty() );
+	    flock(LockFH, LOCK_UN);
+	}
         sleep $daemon_sleep;
     }
 } else {
+    # all one-off invocations, wait for the lock to free
+    flock(LockFH, LOCK_EX);
     do_one_pass();
+    flock(LockFH, LOCK_UN);
 }
 
 
diff --git a/rewrite-config.PL b/rewrite-config.PL
index e903d49..24dae36 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -102,6 +102,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   "__KOHA_GROUP__" => "koha",
   "__ZEBRA_PASS__" => "zebrastripes",
   "__ZEBRA_USER__" => "kohauser",
+  "__LOCK_DIR__" => "$ENV{'INSTALL_BASE'}/var/lock",
   '__BACKUP_DIR__' => "$prefix/var/spool",
   '__INTRANET_CGI_DIR__' => "$prefix/intranet/cgi-bin",
   '__INTRANET_TMPL_DIR__' => "$prefix/intranet/templates",
-- 
1.7.9.5


From oleonard at myacpl.org  Mon Oct 28 18:09:06 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 28 Oct 2013 13:09:06 -0400
Subject: [Koha-patches] [PATCH] Bug 11142 - Update Bootstrap theme's place
	hold form to match the new version in prog
Message-ID: <1382980147-4081-1-git-send-email-oleonard@myacpl.org>

The update to the prog theme's place hold page (Bug 10836) happened
after the Bootstrap theme's place hold form had already been converted,
so it lags behind. This patch applies the changes made to prog to Bootstrap.

To test, switch to the Bootstrap theme and follow the test plan from Bug
10836:

Place single and multiple holds under various conditions:

- Items which are not available to be place on hold
- With OpacHoldNotes on and off
- With OPACItemHolds on and off
- With OPACAllowHoldDateInFuture on and off
- With IndependentBranches on and off
- With JavaScript disabled

Test setting hold notes, holding specific copies, and setting hold start
dates. When setting a hold start date and hold expiration date, the two
datepickers should work together to prevent invalid date combinations
(dates after today, expiration dates which precede the start date).
---
 koha-tmpl/opac-tmpl/bootstrap/css/opac.css         |   43 ++
 .../bootstrap/en/includes/date-format.inc          |    1 +
 .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt |  547 ++++++++++----------
 koha-tmpl/opac-tmpl/bootstrap/less/opac.less       |   39 ++
 4 files changed, 360 insertions(+), 270 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
index a97158f..d9a22de 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
@@ -755,6 +755,9 @@ fieldset.action {
 fieldset.action p {
   margin-bottom: 1em;
 }
+fieldset table {
+  font-size: 100%;
+}
 div.rows + div.rows {
   margin-top: .6em;
 }
@@ -2194,6 +2197,46 @@ td img {
 #shelfbrowser #browser_next {
   background-position: -9px -1057px;
 }
+#holds {
+  margin: 0 auto;
+  max-width: 800px;
+}
+.holdrow {
+  clear: both;
+  padding: 0 1em 1em 1em;
+  border-bottom: 1px solid #CCC;
+  margin-bottom: .5em;
+}
+.holdrow fieldset {
+  border: 0;
+  margin: 0;
+  float: none;
+}
+.holdrow fieldset .label {
+  font-size: 14px;
+}
+.holdrow label {
+  display: inline;
+}
+.hold-options {
+  clear: both;
+}
+.toggle-hold-options {
+  background-color: #eee;
+  clear: both;
+  display: block;
+  font-weight: bold;
+  margin: 1em 0;
+  padding: .5em;
+}
+.copiesrow {
+  clear: both;
+}
+.shadowed {
+  -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
+  box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.2);
+}
 @media only screen and (min-width: 0px) and (max-width: 304px) {
   /* Screens bewteen 0 and 304 pixels wide */
   #oh:after {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc
new file mode 100644
index 0000000..53dae71
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc
@@ -0,0 +1 @@
+[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 1038595..ecccb6e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -13,9 +13,8 @@
         <li><a href="#">Placing a hold</a></li>
     </ul>
 
-    <div class="container-fluid">
-        <div class="row-fluid">
-            <div class="span12">
+    <div class="container">
+
                 <div id="holds">
                     [% IF ( message ) %]
                         [% IF ( GNA ) %]
@@ -93,6 +92,7 @@
                                 [% END %]
                             </h3>
                         [% END # / UNLESS none_available %]
+
                         [% IF (RESERVE_CHARGE) %]
                             <div class="alert" id="reserve_fee">
                                 There is a charge of [% RESERVE_CHARGE %] for placing this hold
@@ -104,295 +104,265 @@
                             <!-- These values are set dynamically by js -->
                             <input type="hidden" name="biblionumbers" id="biblionumbers"/>
                             <input type="hidden" name="selecteditems" id="selections"/>
-
                             <div id="bigloop">
-                                <table id="bibitemloop" class="table table-bordered table-striped">
-                                    [% UNLESS ( none_available ) %]
-                                        <tr>
-                                            <th>Hold</th>
-                                            <th>Title</th>
-                                            [% UNLESS ( item_level_itypes ) %]
-                                                <th>Item type</th>
-                                            [% END %]
-
-                                            [% IF showholds && showpriority %]
-                                                <th>Holds and priority</th>
-                                            [% ELSIF showholds %]
-                                                <th>Holds</th>
-                                            [% ELSIF showpriority %]
-                                                <th>Priority</th>
-                                            [% END %]
-
-                                            [% IF ( reserve_in_future ) %]
-                                                <th>Hold starts on date</th>
-                                            [% END %]
-
-                                            [% IF ( OpacHoldNotes ) %]
-                                                <th>Notes</th>
-                                            [% END %]
-
-                                            <th>Hold not needed after</th>
-                                            [% IF ( OPACItemHolds ) %]
-                                                <th id="place_on_hdr" style="display:none">Place on</th>
-                                            [% END %]
-
-                                            [% UNLESS ( singleBranchMode ) %]
-                                                [% IF ( choose_branch ) %]
-                                                    <th>Pickup location</th>
-                                                [% END %]
-                                            [% END %]
-                                        </tr>
-                                    [% ELSE %]
-                                        <tr><th colspan="[% itemtable_colspan + 1 %]">Title</th></tr>
-                                    [% END # / UNLESS none_available%]
-
-                                    [% FOREACH bibitemloo IN bibitemloop %]
-                                        <tr>
+
+                                [% FOREACH bibitemloo IN bibitemloop %]
+                                    <div class="holdrow">
+                                        <p>
                                             [% IF ( bibitemloo.holdable ) %]
-                                                <td class="hold">
-                                                    <input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>
-                                                    <input class="single_bib" name="single_bib" type="hidden" value="[% bibitemloo.biblionumber %]"/>
-                                                    <span class="confirmjs_hold" title="[% bibitemloo.biblionumber %]"></span>
-                                                    <span class="confirm_nonjs">
-                                                        <input type="radio" class="confirmbox checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]" checked="checked" id="checkitem_[% bibitemloo.biblionumber %]" value="any" />
-                                                        <label class="confirm_label" for="checkitem_[% bibitemloo.biblionumber %]">Next available copy</label>
-                                                    </span>
-                                                </td>
-                                            [% ELSE %]
-                                                [% UNLESS ( none_available ) %]
-                                                    <td class="hold">&nbsp;</td>
+                                                <input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>
+                                                <input class="single_bib" name="single_bib" type="hidden" value="[% bibitemloo.biblionumber %]"/>
+                                                <span class="confirmjs_hold" title="[% bibitemloo.biblionumber %]" style="padding:.3em"></span>
+                                                <span class="confirm_nonjs">
+                                                    <input type="radio" class="confirmbox checkitem [% bibitemloo.biblionumber %]" name="[% bibitemloo.biblionumber %]" checked="checked" id="single_[% bibitemloo.biblionumber %]" value="any" />
+                                                    <label class="confirm_label" for="single_[% bibitemloo.biblionumber %]">Place a hold on </label>
+                                                </span>
+                                            [% END # / bibitemloo.holdable %]
+
+                                            <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% bibitemloo.biblionumber %]">
+                                                [% bibitemloo.title |html %]
+                                                [% IF ( bibitemloo.subtitle ) %]
+                                                    [% FOREACH subtitl IN bibitemloo.subtitle %]
+                                                        [% subtitl.subfield %]
+                                                    [% END %]
                                                 [% END %]
-                                            [% END # / IF biblioloo.holdable %]
+                                            </a>
+                                            [% IF ( bibitemloo.author ) %],  by [% bibitemloo.author %][% END %]
+                                        </p>
 
-                                            [% IF ( bibitemloo.holdable ) %]
-                                                <td class="title">
+                                        [% UNLESS ( bibitemloo.holdable ) %]
+                                            [% IF ( bibitemloo.already_reserved ) %]
+                                                <div class="alert">You have already requested this title.</div>
                                             [% ELSE %]
-                                                <td class="title" colspan="[% itemtable_colspan + 1 %]">
-                                            [% END %]
-                                                <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% bibitemloo.biblionumber %]">[% bibitemloo.title |html %][% IF ( bibitemloo.subtitle ) %] [% FOREACH subtitl IN bibitemloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
-                                                [% IF ( bibitemloo.author ) %],  by [% bibitemloo.author %][% END %]
-                                                [% UNLESS ( bibitemloo.holdable ) %]
-                                                    [% IF ( bibitemloo.already_reserved ) %]
-                                                        <div class="hold-message">You have already requested this title.</div>
+                                                [% UNLESS ( bibitemloo.bib_available ) %]
+                                                    <div class="alert">No available items.</div>
+                                                [% ELSE %]
+                                                    [% IF ( bibitemloo.already_patron_possession ) %]
+                                                        <div class="alert">This title cannot be requested because it's already in your possession.</div>
                                                     [% ELSE %]
-                                                        [% UNLESS ( bibitemloo.bib_available ) %]
-                                                            <div class="hold-message">No available items.</div>
-                                                        [% ELSE %]
-                                                            [% IF ( bibitemloo.already_patron_possession ) %]
-                                                                <div class="hold-message">This title cannot be requested because it's already in your possession.</div>
-                                                            [% ELSE %]
-                                                                <div class="hold-message">This title cannot be requested.</div>
-                                                            [% END %]
-                                                        [% END # / UNLESS biblioitemloo.bib_available %]
-                                                    [% END # / IF bibitemloo.already_reserved %]
-                                                [% END # / UNLESS bibitemloo.holdable %]
-                                                </td>
-                                                [% IF ( bibitemloo.holdable ) %]
+                                                        <div class="alert">This title cannot be requested.</div>
+                                                    [% END %]
+                                                [% END # / UNLESS bibitemloo.bib_available %]
+                                            [% END # / IF bibitemloo.already_reserved %]
+                                        [% END # / UNLESS bibitemloo.holdable %]
+
+                                        [% IF ( bibitemloo.holdable ) %]
+                                            <fieldset class="rows">
+                                                <ul>
                                                     <!-- HOLDABLE -->
                                                     [% UNLESS ( item_level_itypes ) %]
-                                                        <td class="itype">
+                                                        <li class="itype">
+                                                            <span class="label">Item type: </span>
                                                             [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
                                                             [% bibitemloo.description %]
-                                                        </td>
+                                                        </li>
                                                     [% END %]
+
                                                     [% IF showholds || showpriority %]
-                                                        <td class="priority">
+                                                        <li class="priority">
+                                                            <span class="label">Holds and priority: </span>
                                                             [% IF showpriority %] [% bibitemloo.rank %] [% END %]
                                                             [% IF showholds && showpriority %] out of [% END %]
                                                             [% IF showholds %] [% bibitemloo.reservecount %] [% END %]
-                                                        </td>
-                                                    [% END %]
-                                                    [% IF ( reserve_in_future ) %]
-                                                        <td class="reserve_date">
-                                                            <input name="reserve_date_[% bibitemloo.biblionumber %]" id="from" size="10" class="datepickerfrom"/>
-                                                            <p><a href="#" class="clearfield">Clear date</a></p>
-                                                        </td>
-                                                    [% END # / IF reserve_in_future %]
-
-                                                    [% IF ( OpacHoldNotes && bibitemloo.holdable ) %]
-                                                        <td><input type="button" id="shownotes_[% bibitemloo.biblionumber %]" class="btn shownotes" value="Show notes"/></td>
+                                                        </li>
                                                     [% END %]
 
-                                                    <td class="expiration_date">
-                                                        <input name="expiration_date_[% bibitemloo.biblionumber %]" id="to" size="10" class="datepickerto" />
-                                                        <p><a href="#" class="clearfield">Clear date</a></p>
-                                                    </td>
 
-                                                    [% IF ( OPACItemHolds ) %]
-                                                        <!-- ITEM HOLDS -->
-                                                        <td class="place_on_type" style="display:none">
-                                                            <label for="reqany_[% bibitemloo.biblionumber %]">
-                                                            [% UNLESS ( bibitemloo.holdable ) %]
-                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]" id="reqany_[% bibitemloo.biblionumber %]" class="selectany" value="Any" disabled="disabled" />
-                                                            [% ELSE %]
-                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]" id="reqany_[% bibitemloo.biblionumber %]" class="selectany" value="Any" checked="checked" />
-                                                            [% END %]
-                                                            Next available copy
-                                                            </label>
-                                                            <label for="reqspecific_[% bibitemloo.biblionumber %]">
-                                                            [% UNLESS ( bibitemloo.holdable ) %]
-                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]" id="reqspecific_[% bibitemloo.biblionumber %]" class="selectspecific" disabled="disabled" value="Specific" />
-                                                            [% ELSE %]
-                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]" id="reqspecific_[% bibitemloo.biblionumber %]" class="selectspecific" value="Specific" />
-                                                            [% END %]
-                                                            A specific copy
-                                                            </label>
-                                                        </td>
-                                                    [% END # / IF OPACItemHolds %]
-                                                [% END # / IF bibitemloo.holdable %]
-
-                                                [% UNLESS ( singleBranchMode ) %]
-                                                    [% IF ( bibitemloo.holdable && choose_branch ) %]
-                                                        <td class="branch">
-                                                            [% UNLESS ( bibitemloo.holdable ) %]
-                                                                <select name="branch" id="branch_[% bibitemloo.biblionumber %]" disabled="disabled">
-                                                                [% FOREACH branchloo IN bibitemloo.branchloop %]
-                                                                    [% IF ( branchloo.selected ) %]
-                                                                        <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
-                                                                    [% ELSE %]
-                                                                        <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
-                                                                    [% END %]
+                                                    [% UNLESS ( singleBranchMode ) %]
+                                                        [% IF ( bibitemloo.holdable && choose_branch ) %]
+                                                            <li class="branch">
+                                                                <label for="branch_[% bibitemloo.biblionumber %]">Pick up location:</label>
+                                                                [% UNLESS ( bibitemloo.holdable ) %]
+                                                                    <select name="branch" id="branch_[% bibitemloo.biblionumber %]" disabled="disabled">
+                                                                        [% FOREACH branchloo IN bibitemloo.branchloop %]
+                                                                            [% IF ( branchloo.selected ) %]
+                                                                                <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
+                                                                            [% ELSE %]
+                                                                                <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
+                                                                            [% END %]
+                                                                        [% END %]
+                                                                    </select>
+                                                                [% ELSE %]
+                                                                    <select name="branch" id="branch_[% bibitemloo.biblionumber %]">
+                                                                        [% FOREACH branchloo IN bibitemloo.branchloop %]
+                                                                            [% IF ( branchloo.selected ) %]
+                                                                                <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
+                                                                            [% ELSE %]
+                                                                                <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
+                                                                            [% END %]
+                                                                        [% END %]
+                                                                    </select>
+                                                                [% END # / UNLESS bibitemloo.holdable %]
+                                                            </li>
+                                                        [% END # / IF bibitemloo.holdable && choose_branch %]
+                                                    [% END # / UNLESS singleBranchMode %]
+                                                </ul>
+
+                                                <a class="toggle-hold-options" id="toggle-hold-options-[% bibitemloo.biblionumber %]" style="display:none;" href="#">Show more options</a>
+
+                                                <div id="hold-options-[% bibitemloo.biblionumber %]" class="hold-options">
+
+                                                    <ul>
+                                                        [% IF ( reserve_in_future ) %]
+                                                            <li>
+                                                                <label for="from[% bibitemloo.biblionumber %]">Hold starts on date:</label>
+                                                                <input name="reserve_date_[% bibitemloo.biblionumber %]" id="from[% bibitemloo.biblionumber %]" size="10" class="holddatefrom"/>
+                                                                <span class="date-format from" data-biblionumber="[% bibitemloo.biblionumber %]">[% INCLUDE 'date-format.inc' %]</span>
+                                                            </li>
+                                                        [% END %]
+
+                                                        <li>
+                                                            <label for="to[% bibitemloo.biblionumber %]">Hold not needed after:</label>
+                                                            <input name="expiration_date_[% bibitemloo.biblionumber %]" id="to[% bibitemloo.biblionumber %]" size="10" class="holddateto" />
+                                                            <span class="date-format to" data-biblionumber="[% bibitemloo.biblionumber %]">[% INCLUDE 'date-format.inc' %]</span>
+                                                        </li>
+
+                                                        [% IF ( OpacHoldNotes ) %]
+                                                            <li>
+                                                                <div class="notesrow" id="notesrow_[% bibitemloo.biblionumber %]">
+                                                                    <label for="holdnotes[% bibitemloo.biblionumber %]">Hold notes:</label>
+                                                                    <span id="forcenotesreason_[% bibitemloo.biblionumber %]" class="forcenotesreason"></span>
+                                                                    <textarea id="holdnotes[% bibitemloo.biblionumber %]" rows="2" cols="30" name="notes_[% bibitemloo.biblionumber %]">[% bibitemloo.holdnotes %]</textarea>
+                                                                    <input type="hidden" id="notesmandatory_[% bibitemloo.biblionumber %]" value="[% bibitemloo.mandatorynotes %]"/>
+                                                                </div>
+                                                            </li>
+                                                        [% END # / IF OpacHoldNotes %]
+
+                                                        [% IF ( OPACItemHolds ) %]
+                                                            <!-- ITEM HOLDS -->
+                                                            <li class="lradio">
+                                                                <label class="radio inline" for="reqany_[% bibitemloo.biblionumber %]">Next available copy</label>
+                                                                [% UNLESS ( bibitemloo.holdable ) %]
+                                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]" id="reqany_[% bibitemloo.biblionumber %]" class="selectany" value="Any" disabled="disabled" />
+                                                                [% ELSE %]
+                                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]" id="reqany_[% bibitemloo.biblionumber %]" class="selectany" value="Any" checked="checked" />
                                                                 [% END %]
-                                                                </select>
-                                                            [% ELSE %]
-                                                                <select name="branch" id="branch_[% bibitemloo.biblionumber %]">
-                                                                [% FOREACH branchloo IN bibitemloo.branchloop %]
-                                                                    [% IF ( branchloo.selected ) %]
-                                                                        <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
-                                                                    [% ELSE %]
-                                                                        <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
-                                                                    [% END %]
+
+                                                                <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber %]">A specific copy</label>
+                                                                [% UNLESS ( bibitemloo.holdable ) %]
+                                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]" id="reqspecific_[% bibitemloo.biblionumber %]" class="selectspecific" disabled="disabled" value="Specific" />
+                                                                [% ELSE %]
+                                                                    <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]" id="reqspecific_[% bibitemloo.biblionumber %]" class="selectspecific" value="Specific" />
                                                                 [% END %]
-                                                                </select>
-                                                            [% END # / UNLESS bibitemloo.holdable %]
-                                                        </td>
-                                                    [% END %]
-                                                [% END # / UNLESS singleBranchMode %]
-                                        </tr>
-
-                                        [% IF ( OpacHoldNotes && bibitemloo.holdable ) %]
-                                            <tr class="notesrow" id="notesrow_[% bibitemloo.biblionumber %]">
-                                                <td>&nbsp;</td>
-                                                <td colspan="[% itemtable_colspan - 2 %]">
-                                                    <label for="notes_[% bibitemloo.biblionumber %]">Hold notes:</label>&nbsp;
-                                                    <span id="forcenotesreason_[% bibitemloo.biblionumber %]" class="forcenotesreason"></span>
-                                                    <textarea id="notes_[% bibitemloo.biblionumber %]" name="notes_[% bibitemloo.biblionumber %]">[% bibitemloo.holdnotes %]</textarea>
-                                                    <input type="hidden" id="notesmandatory_[% bibitemloo.biblionumber %]" value="[% bibitemloo.mandatorynotes %]"/>
-                                                </td>
-                                            </tr>
-                                        [% END %]
-
-                                        [% IF ( OPACItemHolds && bibitemloo.holdable ) %]
-                                            <tr class="copiesrow" id="copiesrow_[% bibitemloo.biblionumber %]">
-                                                <td>&nbsp;</td>
-                                                <td colspan="[% itemtable_colspan - 2 %]">
-                                                    <table class="table table-bordered table-striped">
-                                                        <caption>Select a specific copy:</caption>
-                                                        <tr>
-                                                            <th>Copy</th>
-                                                            [% IF ( item_level_itypes ) %]
-                                                              <th>Item type</th>
-                                                            [% END %]
-                                                            <th>Barcode</th>
-                                                            [% UNLESS ( singleBranchMode ) %]
-                                                              <th>Home library</th>
-                                                              <th>Last location</th>
-                                                            [% END %]
-                                                            <th>Call number</th>
-                                                            [% IF ( itemdata_enumchron ) %]
-                                                              <th>Vol info</th>
-                                                            [% END %]
-                                                            <th>Information</th>
-                                                        </tr>
-
-                                                        [% FOREACH itemLoo IN bibitemloo.itemLoop %]
-                                                            <tr class="[% itemLoo.backgroundcolor %]">
-                                                                <td class="copy">
-                                                                    [% IF ( itemLoo.available ) %]
-                                                                        <input type="radio" class="checkitem checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]" value="[% itemLoo.itemnumber %]" />
-                                                                    [% ELSE %]
-                                                                        <input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber %]" />
-                                                                        <img src="/opac-tmpl/lib/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
-                                                                    [% END %]
-                                                                    [% IF ( itemLoo.copynumber ) %]
-                                                                        [% itemLoo.copynumber %]
-                                                                    [% END %]
-                                                                </td>
+                                                            </li>
+                                                        [% END # / IF OPACItemHolds %]
+                                                    </ul>
+
+                                                    [% IF ( OPACItemHolds ) %]
+                                                        <table class="copiesrow table table-bordered table-striped" id="copiesrow_[% bibitemloo.biblionumber %]">
+                                                            <caption>Select a specific copy:</caption>
+                                                            <tr>
+                                                                <th>Copy</th>
                                                                 [% IF ( item_level_itypes ) %]
-                                                                    <td class="itype">
-                                                                        [% UNLESS ( noItemTypeImages ) %]
-                                                                            [% IF ( itemLoo.imageurl ) %]
-                                                                                <img src="[% itemLoo.imageurl %]" alt="" />
-                                                                            [% END %]
-                                                                        [% END %]
-                                                                        [% itemLoo.description %]
-                                                                    </td>
+                                                                    <th>Item type</th>
                                                                 [% END %]
-                                                                <td class="barcode">[% itemLoo.barcode %]</td>
+                                                                <th>Barcode</th>
                                                                 [% UNLESS ( singleBranchMode ) %]
-                                                                    <td class="homebranch">[% itemLoo.homeBranchName %]</td>
-                                                                    <td class="holdingbranch">[% itemLoo.holdingBranchName %]</td>
+                                                                    <th>Home library</th>
+                                                                    <th>Last location</th>
                                                                 [% END %]
-                                                                <td class="call_no">[% itemLoo.callNumber %]</td>
+                                                                <th>Call number</th>
                                                                 [% IF ( itemdata_enumchron ) %]
-                                                                    <td class="vol_info">[% itemLoo.enumchron %]</td>
+                                                                    <th>Vol info</th>
                                                                 [% END %]
-                                                                <td class="information">
-                                                                    [% IF ( itemLoo.dateDue ) %]
-                                                                        <span class="checkedout">Due [% itemLoo.dateDue %]</span>
-                                                                    [% ELSIF ( itemLoo.transfertwhen ) %]
-                                                                        <span class="intransit">In transit from [% itemLoo.transfertfrom %] to [% itemLoo.transfertto %] since [% itemLoo.transfertwhen %]</span>
+                                                                <th>Information</th>
+                                                            </tr>
+
+                                                            [% FOREACH itemLoo IN bibitemloo.itemLoop %]
+                                                                <tr class="[% itemLoo.backgroundcolor %]">
+                                                                    <td class="copy">
+                                                                        [% IF ( itemLoo.available ) %]
+                                                                            <input type="radio" class="checkitem checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]" value="[% itemLoo.itemnumber %]" />
+                                                                        [% ELSE %]
+                                                                            <input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber %]" />
+                                                                            <img src="[% interface %]/lib/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
+                                                                        [% END %]
+
+                                                                        [% IF ( itemLoo.copynumber ) %]
+                                                                            [% itemLoo.copynumber %]
+                                                                        [% END %]
+                                                                    </td>
+
+                                                                    [% IF ( item_level_itypes ) %]
+                                                                        <td class="itype">
+                                                                            [% UNLESS ( noItemTypeImages ) %]
+                                                                                [% IF ( itemLoo.imageurl ) %]
+                                                                                    <img src="[% itemLoo.imageurl %]" alt="" />
+                                                                                [% END %]
+                                                                            [% END %]
+                                                                            [% itemLoo.description %]
+                                                                        </td>
                                                                     [% END %]
-                                                                    [% IF ( itemLoo.message ) %]
-                                                                        <span class="lost">Unavailable (lost or missing)</span>
+
+                                                                    <td class="barcode">[% itemLoo.barcode %]</td>
+                                                                    [% UNLESS ( singleBranchMode ) %]
+                                                                        <td class="homebranch">[% itemLoo.homeBranchName %]</td>
+                                                                        <td class="holdingbranch">[% itemLoo.holdingBranchName %]</td>
                                                                     [% END %]
-                                                                    [% IF ( itemLoo.notforloan ) %]
-                                                                        <span class="notforloan">Not for loan ([% itemLoo.notforloanvalue %])</span>
+                                                                    <td class="call_no">[% itemLoo.callNumber %]</td>
+                                                                    [% IF ( itemdata_enumchron ) %]
+                                                                        <td class="vol_info">[% itemLoo.enumchron %]</td>
                                                                     [% END %]
-                                                                    [% IF ( itemLoo.reservedate ) %]
-                                                                        <span class="waiting">
-                                                                            [% IF ( itemLoo.waitingdate ) %]
-                                                                                Waiting
-                                                                            [% ELSE %]
-                                                                                On hold
-                                                                            [% END %]
-                                                                            for patron
-                                                                            [% IF ( itemLoo.waitingdate ) %]
-                                                                                at
-                                                                            [% ELSE %]
-                                                                                expected at
-                                                                            [% END %]
-                                                                            [% itemLoo.ExpectedAtLibrary %] since
-                                                                            [% IF ( itemLoo.waitingdate ) %]
-                                                                                [% itemLoo.waitingdate %]
-                                                                            [% ELSE %]
-                                                                                [% IF ( itemLoo.reservedate ) %]
-                                                                                    [% itemLoo.reservedate %]
+                                                                    <td class="information">
+                                                                        [% IF ( itemLoo.dateDue ) %]
+                                                                            <span class="checkedout">Due [% itemLoo.dateDue %]</span>
+                                                                        [% ELSIF ( itemLoo.transfertwhen ) %]
+                                                                            <span class="intransit">In transit from [% itemLoo.transfertfrom %] to [% itemLoo.transfertto %] since [% itemLoo.transfertwhen %]</span>
+                                                                        [% END %]
+
+                                                                        [% IF ( itemLoo.message ) %]
+                                                                            <span class="lost">Unavailable (lost or missing)</span>
+                                                                        [% END %]
+
+                                                                        [% IF ( itemLoo.notforloan ) %]
+                                                                            <span class="notforloan">Not for loan ([% itemLoo.notforloanvalue %])</span>
+                                                                        [% END %]
+
+                                                                        [% IF ( itemLoo.reservedate ) %]
+                                                                            <span class="waiting">
+                                                                                [% IF ( itemLoo.waitingdate ) %]
+                                                                                    Waiting
+                                                                                [% ELSE %]
+                                                                                    On hold
                                                                                 [% END %]
-                                                                            [% END %].
-                                                                        </span>
-                                                                    [% ELSE %]
-                                                                        <span class="notonhold">Not on hold</span>
-                                                                    [% END # / IF itemLoo.reservedate %]&nbsp;
-                                                                </td>
-                                                            </tr>
-                                                        [% END # / FOREACH itemLoo %]
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                        [% END # / IF OPACItemHolds && bibitemloo.holdable %]
-                                    [% END # / FOREACH bibitemloo %]
-                                </table> <!-- / #bibitemloop -->
-                            </div><!-- / #bigloop -->
+                                                                                for patron
+                                                                                [% IF ( itemLoo.waitingdate ) %]
+                                                                                    at
+                                                                                [% ELSE %]
+                                                                                    expected at
+                                                                                [% END %]
+                                                                                [% itemLoo.ExpectedAtLibrary %] since
+                                                                                [% IF ( itemLoo.waitingdate ) %]
+                                                                                    [% itemLoo.waitingdate %]
+                                                                                [% ELSE %]
+                                                                                    [% IF ( itemLoo.reservedate ) %]
+                                                                                        [% itemLoo.reservedate %]
+                                                                                    [% END %]
+                                                                                [% END %].
+                                                                            </span>
+                                                                        [% ELSE %]
+                                                                            <span class="notonhold">Not on hold</span>
+                                                                        [% END # / IF ( itemLoo.reservedate )%]
+                                                                    </td>
+                                                                </tr>
+                                                            [% END # / FOREACH itemLoo IN bibitemloo.itemLoop%]
+                                                        </table> <!-- / #copiesrow_[% bibitemloo.biblionumber %] -->
+                                                    [% END # / IF ( OPACItemHolds )%]
+                                                </div> <!-- / #hold-options-[% bibitemloo.biblionumber %] -->
+                                            </fieldset>
+                                        [% END # / IF ( bibitemloo.holdable ) %]
+                                    </div> <!-- / .holdrow -->
+                                [% END # / FOREACH bibitemloo IN bibitemloop %]
+                            </div><!-- #bigloop -->
+
                             [% UNLESS ( none_available ) %]
                                 <input type="submit" value="Place hold" class="btn placehold" />
                             [% END %]
+
                         </form>
                     [% END # / UNLESS message %]
                 </div> <!-- / #holds -->
-            </div> <!-- / .span12 -->
-        </div> <!-- / .row-fluid -->
-    </div> <!-- / .container-fluid -->
+    </div> <!-- / .container -->
 </div> <!-- / .main -->
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
@@ -424,7 +394,6 @@
         });
         // Hides all 'specific copy' table rows on load.
         $(".copiesrow").hide();
-        $(".notesrow").hide();
 
         // Insert reasons for forced hold notes
         $(".forcenotesreason").each(function(){
@@ -437,20 +406,37 @@
 
         $("#place_on_hdr").show();
         $(".place_on_type").show();
+        $("#place_on_hdr,.place_on_type,.toggle-hold-options").show();
+        $(".hold-options").hide();
+        $(".holddatefrom,.holddateto").prop("readOnly", true);
+
+        $(".date-format").each(function(){
+            if($(this).hasClass("to")){ var op = "to"; }
+            if($(this).hasClass("from")){ var op = "from"; }
+            var bibNum = $(this).data("biblionumber");
+            $(this).html("<a href=\"#\" class=\"clear-date\" data-op=\"" + op + "\" id=\"clear" + bibNum + "\">" + _("Clear date") + "</a>");
+        });
+
+        $(".clear-date").on("click",function(e){
+            e.preventDefault();
+            var fieldID = this.id.replace("clear","");
+            var op = $(this).data("op");
+            $("#" + op + fieldID).val("");
+        });
 
         // Replace non-JS single-selection with multi-selection capability.
         $(".reserve_mode").val("multi");
         $(".confirm_nonjs").remove();
         $(".confirmjs_hold").each(function(){
             var bib = $(this).attr("title");
-            var html = "<input type =\"checkbox\" class=\"confirmjs\" checked=\"checked\"";
-            html += "value=\"" + bib + "\"/>";
+            var html = "<label><input type =\"checkbox\" class=\"confirmjs\" checked=\"checked\"";
+            html += "value=\"" + bib + "\"/> " + _("Place a hold on") + " </label> ";
             $(this).html(html);
         });
         $(".confirmjs_nohold").each(function(){
             var bib = $(this).attr("title");
-            var html = "<input type =\"checkbox\" class=\"confirmjs\" disabled=\"disabled\"";
-            html += "value=\"" + bib + "\"/>";
+            var html = "<label><input type =\"checkbox\" class=\"confirmjs\" disabled=\"disabled\"";
+            html += "value=\"" + bib + "\"/>" + _("Place a hold on: ") + "</label>";
             $(this).html(html);
         });
 
@@ -485,7 +471,6 @@
             if (!changeSelection(newCopiesRowId, true)) {
                 return false;
             }
-            $(".copiesrow:not(" + newCopiesRowId + ")").hide();
 
             // Show the specific copy table for this radio button.
             $(newCopiesRowId).show();
@@ -502,16 +487,9 @@
             }
 
             // Hide the copies table row
-            $(".copiesrow").hide();
-        });
-
-        // Show or hide holds notes
-        $(".shownotes").click(function(){
-            biblioNum = suffixOf($(this).attr("id"), "_");
-            $("#notesrow_"+biblioNum).toggle();
+            $(newCopiesRowId).hide();
         });
 
-
         // When 'Place Hold' button is clicked
         $(".placehold").click(function(){
             var biblionumbers = "";
@@ -562,6 +540,35 @@
             return true;
         });
 
+        $(".toggle-hold-options").on("click",function(e){
+            e.preventDefault();
+            toggleLink = $(this);
+            var optionsID = this.id.replace("toggle-hold-options-","");
+            $("#hold-options-"+optionsID).toggle(0, function() {
+                toggleLink.text($(this).is(':visible') ? _("Hide options") : _("Show more options"));
+            });
+        });
+
+        [% FOREACH bibitemloo IN bibitemloop %]
+            [% IF ( bibitemloo.holdable ) %]
+                // http://jqueryui.com/demos/datepicker/#date-range
+                var dates[% bibitemloo.biblionumber %] = $( "#from[% bibitemloo.biblionumber %], #to[% bibitemloo.biblionumber %]" ).datepicker({
+                    minDate: 1,
+                    changeMonth: true,
+                    numberOfMonths: 1,
+                    onSelect: function( selectedDate ) {
+                        var option = this.id == "from[% bibitemloo.biblionumber %]" ? "minDate" : "maxDate",
+                            instance = $( this ).data( "datepicker" );
+                            date = $.datepicker.parseDate(
+                                instance.settings.dateFormat ||
+                                $.datepicker._defaults.dateFormat,
+                                selectedDate, instance.settings );
+                        dates[% bibitemloo.biblionumber %].not( this ).datepicker( "option", option, date );
+                    }
+                });
+            [% END %]
+        [% END %]
+
  });
 // ]]>
 </script>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
index c95d82a..8fb8bf2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
+++ b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
@@ -745,6 +745,9 @@ fieldset {
             margin-bottom : 1em;
         }
     }
+    table {
+        font-size: 100%;
+    }
 }
 
 div.rows+div.rows {
@@ -2226,4 +2229,40 @@ td img {
     }
 }
 
+#holds {
+    margin : 0 auto;
+    max-width: 800px;
+}
+.holdrow {
+    clear : both;
+    padding: 0 1em 1em 1em;
+    border-bottom:1px solid #CCC;
+    margin-bottom:.5em;
+    fieldset {
+        border : 0;
+        margin : 0;
+        float: none;
+        .label {
+            font-size: 14px;
+        }
+    }
+    label {
+        display: inline;
+    }
+}
+.hold-options {
+    clear : both;
+}
+.toggle-hold-options {
+    background-color: #eee;
+    clear : both;
+    display : block;
+    font-weight : bold;
+    margin: 1em 0;
+    padding: .5em;
+}
+.copiesrow {
+    clear : both;
+}
+
 @import "responsive.less";
-- 
1.7.9.5


From dpk at randomnotes.org  Tue Oct 29 03:22:50 2013
From: dpk at randomnotes.org (Doug Kingston)
Date: Mon, 28 Oct 2013 19:22:50 -0700
Subject: [Koha-patches] [PATCH 3/3] Bug 11078 rebuild-zebra can lose updates,
	QA patch 1
Message-ID: <1383013370-8078-1-git-send-email-dpk@randomnotes.org>

Add lockdir to the debian config template.
---
 debian/templates/koha-conf-site.xml.in |    1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 71de9fb..e15e249 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -265,6 +265,7 @@
  <opachtdocs>/usr/share/koha/opac/htdocs/opac-tmpl</opachtdocs>
  <intrahtdocs>/usr/share/koha/intranet/htdocs/intranet-tmpl</intrahtdocs>
  <includes>/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/includes/</includes>
+ <lockdir>/var/lock</lockdir>
  <logdir>/var/log/koha/__KOHASITE__</logdir>
  <docdir>/usr/share/doc/koha-common</docdir>
  <backupdir>/var/spool/koha/__KOHASITE__</backupdir>
-- 
1.7.9.5


From dpk at randomnotes.org  Tue Oct 29 07:33:36 2013
From: dpk at randomnotes.org (Doug Kingston)
Date: Mon, 28 Oct 2013 23:33:36 -0700
Subject: [Koha-patches] [PATCH 4/4] Bug 11078 Add locking to rebuild_zebra
	(QA Patch 2 10/28)
Message-ID: <1383028416-10195-1-git-send-email-dpk@randomnotes.org>

In the event lockdir is not specified in the koha-conf.xml file
which will occur for old installations, default the lockdir to a
sensible default (/var/lock).
---
 misc/migration_tools/rebuild_zebra.pl |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl
index e18725c..8b77686 100755
--- a/misc/migration_tools/rebuild_zebra.pl
+++ b/misc/migration_tools/rebuild_zebra.pl
@@ -143,7 +143,9 @@ my ($biblioitemnumbertagfield,$biblioitemnumbertagsubfield) = &GetMarcFromKohaFi
 # We need to create our own lock directory which incorporates the database instance
 # we are indexing to facilitate multiple instances on the same machine.
 
-my $lockdir = C4::Context->config("lockdir") . "/koha_rebuild_zebra_" . C4::Context->config("database");
+my $lockdir = C4::Context->config("lockdir");
+$lockdir = "/var/lock" if $lockdir == "";
+$lockdir .= ("/koha_rebuild_zebra_" . C4::Context->config("database"));
 mkpath($lockdir, 0, 0755) unless (-d $lockdir);
 my $lockfile = $lockdir . "/lock";
 
-- 
1.7.9.5


From colin.campbell at ptfs-europe.com  Tue Oct 29 14:02:30 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 29 Oct 2013 13:02:30 +0000
Subject: [Koha-patches] [PATCH] Bug 11158 In searching starts with needs to
	apply to heading
Message-ID: <1383051750-9355-1-git-send-email-colin.campbell@ptfs-europe.com>

starts with was being applied to all tokens within the heading
needs to apply to the heading as a whole otherwise results
are indistinguishable to contains. The problem manifests if ICU
is being used for tokenization (although there are a couple of
anomalous cases that have cropped up using the old chr mappings)
---
 C4/AuthoritiesMarc.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 7443f36..2ece257 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -172,8 +172,8 @@ sub SearchAuthorities {
                 $attr .= " \@attr 4=107 ";    #Number Exact match
             }
             elsif ( @$operator[$i] eq "start" ) {
-                $attr .= " \@attr 3=2 \@attr 4=1 \@attr 5=1 "
-                  ;    #Firstinfield Phrase, Right truncated
+                $attr .= ' \@attr 3=1 \@attr 6=3 \@attr 4=1 \@attr 5=1 ';
+                # First_in_field, complete_field phrase Right truncation
             }
             elsif ( @$operator[$i] eq "exact" ) {
                 $attr .= " \@attr 4=1  \@attr 5=100 \@attr 6=3 "
-- 
1.8.3.1


From dpk at randomnotes.org  Wed Oct 30 05:19:12 2013
From: dpk at randomnotes.org (Doug Kingston)
Date: Tue, 29 Oct 2013 21:19:12 -0700
Subject: [Koha-patches] [PATCH 5/5] Bug 11078 Add locking to rebuild_zebra
	(QA Patch 3 10/29)
Message-ID: <1383106752-20094-1-git-send-email-dpk@randomnotes.org>

A final tweak to the debian packages template to ensure the lock
file is under /var/lock/koha/INSTANCENAME.  Its not ideal but
this work for all legacy and new instalations.
---
 debian/templates/koha-conf-site.xml.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index e15e249..bae4bf8 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -265,7 +265,7 @@
  <opachtdocs>/usr/share/koha/opac/htdocs/opac-tmpl</opachtdocs>
  <intrahtdocs>/usr/share/koha/intranet/htdocs/intranet-tmpl</intrahtdocs>
  <includes>/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/includes/</includes>
- <lockdir>/var/lock</lockdir>
+ <lockdir>/var/lock/koha/__KOHASITE__</lockdir>
  <logdir>/var/log/koha/__KOHASITE__</logdir>
  <docdir>/usr/share/doc/koha-common</docdir>
  <backupdir>/var/spool/koha/__KOHASITE__</backupdir>
-- 
1.7.9.5


From nengard at bywatersolutions.com  Sat Oct 26 02:11:18 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 20:11:18 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Cataloging Help
Message-ID: <1382746278-2970-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the links to the manual in
the cataloging help files.

To test:

* Visit cataloging pages and click the help
* confirm links work
---
 .../prog/en/modules/help/cataloguing/addbiblio.tt  |    2 +-
 .../prog/en/modules/help/cataloguing/addbooks.tt   |    2 +-
 .../prog/en/modules/help/cataloguing/additem.tt    |    2 +-
 .../prog/en/modules/help/cataloguing/linkitem.tt   |    2 +-
 .../prog/en/modules/help/cataloguing/merge.tt      |    2 +-
 .../prog/en/modules/help/cataloguing/moveitem.tt   |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
index 0fbb72f..ca65d2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbiblio.tt
@@ -89,6 +89,6 @@
 
 <p>If you would like to merge together multiple records you can do that via the Lists tool.</p>
 
-<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.12/en/cataloging.html#catbibs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.14/en/cataloging.html#catbibs">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt
index 02d1fa1..65d0983 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/addbooks.tt
@@ -30,7 +30,7 @@
 
 <p>Once you've opened a blank framework or imported a record via Z39.50 you will be presented with the form to continue cataloging</p>
 
-<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.12/en/cataloging.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Cataloging in the <a href="http://manual.koha-community.org/3.14/en/cataloging.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
index 85ed076..192a8fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/additem.tt
@@ -74,6 +74,6 @@
 
 <p>Finally you can use the batch delete tool to delete a batch of items.</p>
 
-<p><strong>See the full documentation for Adding/Editing Items in the <a href="http://manual.koha-community.org/3.12/en/catitems.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Adding/Editing Items in the <a href="http://manual.koha-community.org/3.14/en/catitems.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/linkitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/linkitem.tt
index fe9f091..d79b2a8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/linkitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/linkitem.tt
@@ -27,6 +27,6 @@
 
 <p>You can also see the analytics attached to this record by clicking the 'Show Analytic' link towards the top of the record in the normal view.</p>
 
-<p><strong>See the full documentation for Analytics in the <a href="http://manual.koha-community.org/3.12/en/cataloging.html#cataloganalytics">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Analytics in the <a href="http://manual.koha-community.org/3.14/en/cataloging.html#cataloganalytics">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
index 0c7d905..d101e72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tt
@@ -18,6 +18,6 @@
 
 <p style="color: rgb(153, 0, 0);">Important: It is important to rebuild your zebra index immediately after merging records. If a search is performed for a record which has been deleted Koha will present the patrons with an error in the OPAC.</p>
 
-<p><strong>See the full documentation for Merging Items in the <a href="http://manual.koha-community.org/3.12/en/stafflists.html#mergebibrecs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Merging Items in the <a href="http://manual.koha-community.org/3.14/en/stafflists.html#mergebibrecs">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
index 89edfe8..188f6a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
@@ -10,6 +10,6 @@
 
 <p>If you want to move all items to a new record creating only one bibliographic record you can use the 'Merge records' tool instead.</p>
 
-<p><strong>See the full documentation for Moving Items in the <a href="http://manual.koha-community.org/3.12/en/catitems.html#moveitemrec">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Moving Items in the <a href="http://manual.koha-community.org/3.14/en/catitems.html#moveitemrec">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat Oct 26 02:32:09 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 20:32:09 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Serials Help
Message-ID: <1382747529-3089-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the links to the manual in
the serials help files.

To test:

* Visit serials pages and click the help
* confirm links work
---
 .../en/modules/help/serials/checkexpiration.tt     |    2 +-
 .../prog/en/modules/help/serials/claims.tt         |    2 +-
 .../prog/en/modules/help/serials/routing.tt        |    2 +-
 .../en/modules/help/serials/serials-collection.tt  |    2 +-
 .../prog/en/modules/help/serials/serials-edit.tt   |    2 +-
 .../prog/en/modules/help/serials/serials-home.tt   |    2 +-
 .../en/modules/help/serials/subscription-add.tt    |    2 +-
 .../en/modules/help/serials/subscription-detail.tt |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt
index cc30fb1..71aa917 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt
@@ -8,6 +8,6 @@
 
 <p>In your results you will see all subscriptions that will expire before the date you entered. From there you can choose to view the subscription further or renew it in one click.</P>
 
-<p><strong>See the full documentation for Checking Serial Expiration in the <a href="http://manual.koha-community.org/3.12/en/serialexpiration.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Checking Serial Expiration in the <a href="http://manual.koha-community.org/3.14/en/serialexpiration.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt
index 33116a8..1da2bd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt
@@ -12,7 +12,7 @@
 
 <p>From the list of late issues you can choose which ones you want to send a claim email to by clicking the checkbox to the left of late issue, choosing the notice template to use and clicking the 'Send notification' button.</p>
 
-<p><strong>See the full documentation for Serial Claims in the <a href="http://manual.koha-community.org/3.12/en/serialclaims.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serial Claims in the <a href="http://manual.koha-community.org/3.14/en/serialclaims.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt
index 644baae..1f3989f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt
@@ -18,6 +18,6 @@
 
 <p>To see a list of all of the routing lists a specific patron is on visit the Routing Lists tab on their patron record.</p>
 
-<p><strong>See the full documentation for Routing Lists in the <a href="http://manual.koha-community.org/3.12/en/routinglist.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Routing Lists in the <a href="http://manual.koha-community.org/3.14/en/routinglist.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt
index 5854817..1806fa7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt
@@ -10,6 +10,6 @@
 
 <p>If you are adding multiple issues at once or if the latest expected issue is late, you can click the 'Generate Next' button to generate the next issue based on the subscription pattern.</p>
 
-<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.12/en/serials.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.14/en/serials.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt
index 4b0c596..b6fd187 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt
@@ -24,6 +24,6 @@
 
 <p>Clicking this button will generate the next issue for you and mark the previously expected issue as 'Late' automatically. You can then check the 'Edit' box to the right of each issue and edit the status on multiple issues at once.</p>
 
-<p><strong>See the full documentation for Receiving a Serial in the <a href="http://manual.koha-community.org/3.12/en/receiveissues.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving a Serial in the <a href="http://manual.koha-community.org/3.14/en/receiveissues.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt
index 6b56d41..8c2cfa4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt
@@ -6,7 +6,7 @@
 
 <p>You can search for existing subscriptions by using the search box at the top of the page. You can search for any part of the serial title or ISSN.</p>
 
-<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.12/en/serials.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.14/en/serials.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
index a5d99b6..947c4c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
@@ -83,7 +83,7 @@
 
 <p>Click 'Save Subscription' to save the information you have entered.</p>
 
-<p><strong>See the full documentation for Adding a Subscription in the <a href="http://manual.koha-community.org/3.12/en/serials.html#newsubscription">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Adding a Subscription in the <a href="http://manual.koha-community.org/3.14/en/serials.html#newsubscription">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt
index ae0c07b..ce9008a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt
@@ -6,6 +6,6 @@
 
 <p>From here you can edit your subscription, renew it and/or recieve issues.</p>
 
-<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.12/en/serials.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.14/en/serials.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat Oct 26 02:43:26 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 20:43:26 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Tools Help Files
Message-ID: <1382748206-3183-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the links to the manual in
the tool help files.

To test:

* Visit tool pages and click the help
* confirm links work
---
 .../prog/en/modules/help/tools/batchMod.tt         |    2 +-
 .../prog/en/modules/help/tools/cleanborrowers.tt   |    2 +-
 .../prog/en/modules/help/tools/csv-profiles.tt     |    2 +-
 .../prog/en/modules/help/tools/export.tt           |    2 +-
 .../prog/en/modules/help/tools/holidays.tt         |    2 +-
 .../prog/en/modules/help/tools/import_borrowers.tt |    2 +-
 .../prog/en/modules/help/tools/inventory.tt        |    2 +-
 .../prog/en/modules/help/tools/koha-news.tt        |    2 +-
 .../prog/en/modules/help/tools/letter.tt           |    2 +-
 .../en/modules/help/tools/manage-marc-import.tt    |    2 +-
 .../prog/en/modules/help/tools/modborrowers.tt     |    2 +-
 .../prog/en/modules/help/tools/overduerules.tt     |    2 +-
 .../prog/en/modules/help/tools/picture-upload.tt   |    2 +-
 .../prog/en/modules/help/tools/quotes-upload.tt    |    2 +-
 .../prog/en/modules/help/tools/quotes.tt           |    2 +-
 .../prog/en/modules/help/tools/scheduler.tt        |    2 +-
 .../en/modules/help/tools/stage-marc-import.tt     |    2 +-
 .../prog/en/modules/help/tools/tools-home.tt       |    2 +-
 .../en/modules/help/tools/upload-cover-image.tt    |    2 +-
 .../prog/en/modules/help/tools/viewlog.tt          |    2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
index 63c60b6..2139408 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batchMod.tt
@@ -30,6 +30,6 @@
 
 <p>If the items can be deleted they will be and you will be presented with a confirmation of your deletion.</p>
 
-<p><strong>See the full documentation for <a href="http://manual.koha-community.org/3.12/en/batchmodifyitems.html">Batch Item Modifications</a> and <a href="http://manual.koha-community.org/3.12/en/batchdeleteitems.html">Batch Item Deletions</a> in the manual (online).</strong></p>
+<p><strong>See the full documentation for <a href="http://manual.koha-community.org/3.14/en/batchmodifyitems.html">Batch Item Modifications</a> and <a href="http://manual.koha-community.org/3.14/en/batchdeleteitems.html">Batch Item Deletions</a> in the manual (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
index c5e2a40..c6f5895 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/cleanborrowers.tt
@@ -21,6 +21,6 @@
 	<li>Clicking 'Finish' will delete or anonymize your data</li>
 </ul>
 
-<p><strong>See the full documentation for Anonymizing Patrons in the <a href="http://manual.koha-community.org/3.12/en/anonpatrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Anonymizing Patrons in the <a href="http://manual.koha-community.org/3.14/en/anonpatrons.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
index 3dcb37e..dd1543e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/csv-profiles.tt
@@ -52,6 +52,6 @@
 
 <p>Your CSV Profiles will appear on the export list or cart menu under the 'Download' button in both the staff client and the OPAC</p>
 
-<p><strong>See the full documentation for CSV Profiles in the <a href="http://manual.koha-community.org/3.12/en/csvprofiles.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for CSV Profiles in the <a href="http://manual.koha-community.org/3.14/en/csvprofiles.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
index 261164a..bad8822 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/export.tt
@@ -59,6 +59,6 @@
     <li>Click 'Export authority records'</li>
 </ul>
 
-<p><strong>See the full documentation for Exporting MARC Records in the <a href="http://manual.koha-community.org/3.12/en/exportbibs.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Exporting MARC Records in the <a href="http://manual.koha-community.org/3.14/en/exportbibs.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
index 5b3ad48..a86ccc9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
@@ -65,7 +65,7 @@
 
 <p>When adding or editing events you can get additional help by clicking on the question mark next to various different options on the form</p>
 
-<p><strong>See the full documentation for the Calendar in the <a href="http://manual.koha-community.org/3.12/en/calholidays.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Calendar in the <a href="http://manual.koha-community.org/3.14/en/calholidays.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
index 0ef671d..ce4153a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
@@ -55,6 +55,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Import in the <a href="http://manual.koha-community.org/3.12/en/patronimport.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Import in the <a href="http://manual.koha-community.org/3.14/en/patronimport.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
index f6f8d2f..7dc1124 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tt
@@ -16,6 +16,6 @@
 
 <p>Choose the text file and the date you want to mark all times as seen and click 'Submit.'</p>
 
-<p><strong>See the full documentation for Inventory in the <a href="http://manual.koha-community.org/3.12/en/inventory.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Inventory in the <a href="http://manual.koha-community.org/3.14/en/inventory.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
index 4b05dbd..dcf236f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/koha-news.tt
@@ -22,6 +22,6 @@
 	<li>News on the circulation receipts will appear below the items that are checked out</li>
 </ul>
 
-<p><strong>See the full documentation for News in the <a href="http://manual.koha-community.org/3.12/en/tools.html#newstool">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for News in the <a href="http://manual.koha-community.org/3.14/en/tools.html#newstool">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]    
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
index c490504..edb0ee6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
@@ -157,6 +157,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Notices in the <a href="http://manual.koha-community.org/3.12/en/notices.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Notices in the <a href="http://manual.koha-community.org/3.14/en/notices.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
index 0d53d86..09e0b99 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt
@@ -40,7 +40,7 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for the Managing Staged MARC Records in the <a href="http://manual.koha-community.org/3.12/en/managestaged.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Managing Staged MARC Records in the <a href="http://manual.koha-community.org/3.14/en/managestaged.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/modborrowers.tt
index 8debfb4..b18d715 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/modborrowers.tt
@@ -14,6 +14,6 @@
 
 <p>Once you have made the changes you want, you can click 'Save' and Koha will present you with the changed patron records.</p>
 
-<p><strong>See the full documentation for Batch Patron Modification in the <a href="http://manual.koha-community.org/3.12/en/tools.html#batchpatronmod">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Batch Patron Modification in the <a href="http://manual.koha-community.org/3.14/en/tools.html#batchpatronmod">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
index 90f5430..77a00f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt
@@ -41,7 +41,7 @@
 
 <p>Sincerely, Library Staff</p>
 
-<p><strong>See the full documentation for the Overdue Notice/Status Triggers in the <a href="http://manual.koha-community.org/3.12/en/noticetriggers.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Overdue Notice/Status Triggers in the <a href="http://manual.koha-community.org/3.14/en/noticetriggers.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
index 9c5cc07..e001d95 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt
@@ -20,6 +20,6 @@
 
 <p style="color:#990000;">Important: There is a limit of 520K on the size of the picture uploaded and it is recommended that the image be 200x300 pixels, but smaller images will work as well.</p>
 
-<p><strong>See the full documentation for the Patron Image Uploader in the <a href="http://manual.koha-community.org/3.12/en/uploadpatronimages.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Image Uploader in the <a href="http://manual.koha-community.org/3.14/en/uploadpatronimages.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes-upload.tt
index 6f27ca8..90a9fca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes-upload.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes-upload.tt
@@ -40,6 +40,6 @@
     </ol>
 </ol>
 
-<p><strong>See the full documentation for the Quote of the Day Uploader in the <a href="http://manual.koha-community.org/3.12/en/additionaltools.html#importquote">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Quote of the Day Uploader in the <a href="http://manual.koha-community.org/3.14/en/additionaltools.html#importquote">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes.tt
index 6672663..cc11e5d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes.tt
@@ -38,6 +38,6 @@
     </ol>
 </ol>
 
-<p><strong>See the full documentation for the Quote of the Day Editor in the <a href="http://manual.koha-community.org/3.12/en/additionaltools.html#QOTDEditor">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Quote of the Day Editor in the <a href="http://manual.koha-community.org/3.14/en/additionaltools.html#QOTDEditor">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
index 1b06d8a..cb86bf7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt
@@ -23,6 +23,6 @@
 
 <p>Task scheduler will not work if the user the web server runs as doesn't have the permission to use it. To find out if the right user has the permissions necessary, check /etc/at.allow to see what users are in it. If you don't have that file, check etc/at.deny. If at.deny exists but is blank, then every user can use it. Talk to your system admin about adding the user to the right place to make the task scheduler work.</p>
 
-<p><strong>See the full documentation for the Task Scheduler in the <a href="http://manual.koha-community.org/3.12/en/taskscheduler.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Task Scheduler in the <a href="http://manual.koha-community.org/3.14/en/taskscheduler.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
index 77315e7..c5ed964 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt
@@ -27,6 +27,6 @@ records
 	<li>To complete the process continue to the Managed Staged MARC Records Tool</li>
 </ul>
 
-<p><strong>See the full documentation for the MARC Import in the <a href="http://manual.koha-community.org/3.12/en/stagemarc.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the MARC Import in the <a href="http://manual.koha-community.org/3.14/en/stagemarc.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
index eb18b4c..22f39b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/tools-home.tt
@@ -4,6 +4,6 @@
 
 <p>Tools in Koha all perform some sort of action. Often many of the items listed under Tools in Koha are referred to as 'Reports' in other library management systems.</p>
 
-<p><strong>See the full documentation for Tools in the <a href="http://manual.koha-community.org/3.12/en/tools.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Tools in the <a href="http://manual.koha-community.org/3.14/en/tools.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/upload-cover-image.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/upload-cover-image.tt
index 7422c7f..b35954b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/upload-cover-image.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/upload-cover-image.tt
@@ -40,6 +40,6 @@
 
 <p>In the OPAC the cover images will also appear in the images tab, as well as next to the title and on the search results.</p>
 
-<p><strong>See the full documentation for Uploading Cover Images in the <a href="http://manual.koha-community.org/3.12/en/uploadlocalimages.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Uploading Cover Images in the <a href="http://manual.koha-community.org/3.14/en/uploadlocalimages.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
index 73b5c04..ce4de86 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/viewlog.tt
@@ -8,6 +8,6 @@
 
 <p>You will note that real names do not appear on the log, only identifying numbers. You need to use the identifying numbers when searching the logs as well.</p>
 
-<p><strong>See the full documentation for the Log Viewer in the <a href="http://manual.koha-community.org/3.12/en/logviewer.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Log Viewer in the <a href="http://manual.koha-community.org/3.14/en/logviewer.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat Oct 26 03:05:31 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 21:05:31 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_10671=3A_Update_Admin_He?=
	=?utf-8?q?lp_Files?=
Message-ID: <1382749531-3346-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the links to the manual in the
help files. It also updates the text a bit in a few.

To test:

* Visit admin pages
* Check the help files on each
* Make sure links and text appears
---
 .../prog/en/modules/help/admin/admin-home.tt       |    2 +-
 .../prog/en/modules/help/admin/aqbudgetperiods.tt  |    2 +-
 .../prog/en/modules/help/admin/aqbudgets.tt        |    2 +-
 .../prog/en/modules/help/admin/aqplan.tt           |    2 +-
 .../modules/help/admin/auth_subfields_structure.tt |    2 +-
 .../en/modules/help/admin/auth_tag_structure.tt    |   14 +++---
 .../en/modules/help/admin/authorised_values.tt     |    2 +-
 .../prog/en/modules/help/admin/authtypes.tt        |    2 +-
 .../prog/en/modules/help/admin/biblio_framework.tt |    2 +-
 .../modules/help/admin/branch_transfer_limits.tt   |    2 +-
 .../prog/en/modules/help/admin/branches.tt         |    2 +-
 .../prog/en/modules/help/admin/categorie.tt        |    2 +-
 .../prog/en/modules/help/admin/checkmarc.tt        |    2 +-
 .../prog/en/modules/help/admin/cities.tt           |    2 +-
 .../prog/en/modules/help/admin/classsources.tt     |    2 +-
 .../prog/en/modules/help/admin/currency.tt         |    2 +-
 .../prog/en/modules/help/admin/didyoumean.tt       |    2 +-
 .../prog/en/modules/help/admin/fieldmapping.tt     |    2 +-
 .../modules/help/admin/item_circulation_alerts.tt  |    2 +-
 .../prog/en/modules/help/admin/itemtypes.tt        |    2 +-
 .../prog/en/modules/help/admin/koha2marclinks.tt   |    2 +-
 .../modules/help/admin/marc_subfields_structure.tt |    2 +-
 .../prog/en/modules/help/admin/marctagstructure.tt |    2 +-
 .../prog/en/modules/help/admin/matching-rules.tt   |    2 +-
 .../prog/en/modules/help/admin/oai_set_mappings.tt |    2 +-
 .../prog/en/modules/help/admin/oai_sets.tt         |    2 +-
 .../en/modules/help/admin/patron-attr-types.tt     |    2 +-
 .../prog/en/modules/help/admin/preferences.tt      |    2 +-
 .../prog/en/modules/help/admin/printers.tt         |   11 -----
 .../prog/en/modules/help/admin/roadtype.tt         |    2 +-
 .../prog/en/modules/help/admin/smart-rules.tt      |    2 +-
 .../prog/en/modules/help/admin/stopwords.tt        |   15 -------
 .../en/modules/help/admin/systempreferences.tt     |    2 +-
 .../en/modules/help/admin/transport-cost-matrix.tt |    2 +-
 .../prog/en/modules/help/admin/z3950servers.tt     |   40 +++++++++++++++----
 35 files changed, 69 insertions(+), 73 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
index b34f20d..90cc810 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
@@ -30,6 +30,6 @@
 
 <p>This list of parameters includes functionalities that didn't fit in any other category.  These items are optional and may not need to be altered, depending on your library's needs.</p>
 
-<p><strong>See the full documentation for system Administration in the <a href="http://manual.koha-community.org/3.12/en/administration.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for system Administration in the <a href="http://manual.koha-community.org/3.14/en/administration.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
index 462dfc5..2b89722 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
@@ -34,6 +34,6 @@
 
 <p>Once you have made your edits, click the 'Save Changes' button. You will be brought to a list of your existing budgets.</p>
 
-<p><strong>See the full documentation for Budgets in the <a href="http://manual.koha-community.org/3.12/en/acqadmin.html#budgetplanning">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Budgets in the <a href="http://manual.koha-community.org/3.14/en/acqadmin.html#budgetplanning">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
index 0feeff4..296d997 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
@@ -31,6 +31,6 @@
 
 <p>To the right of each fund you will find the 'Edit,' 'Delete,' and 'Add Child Fund' options. A Child Fund a sub-fund of the parent fund. For example, one might have a parent fund for 'Fiction,' and Child Funds for 'New Releases' and 'Science Fiction.' It is an optional way to further organize your finances.</p>
 
-<p><strong>See the full documentation for Funds in the <a href="http://manual.koha-community.org/3.12/en/acqadmin.html#funds">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Funds in the <a href="http://manual.koha-community.org/3.14/en/acqadmin.html#funds">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
index 4c2ba3a..158c26e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
@@ -12,6 +12,6 @@
 
 <p>Once your changes are made, click the 'Save' button. If you would like to export your data as a CSV file you can do so by entering a file name in the 'Output to a file named' field and clicking the 'Output' button.</p>
 
-<p><strong>See the full documentation for Budget Planning in the <a href="http://manual.koha-community.org/3.12/en/acqadmin.html#fundsplanning">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Budget Planning in the <a href="http://manual.koha-community.org/3.14/en/acqadmin.html#fundsplanning">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
index 1fd0d85..54479b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
@@ -63,6 +63,6 @@
     <li>To save your changes, click the 'Save Changes' button at the top of the screen.</li>
 </ul>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
index fb44a26..6833b6d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
@@ -7,18 +7,18 @@
 <p>Enter the information about your new tag:</p>
 
 <ul>
-      <li>The 'Tag' is the MARC field number.</li>
-   <li>The 'Label for lib' is the text that will appear in the staff client when in the cataloging module.</li>
-   <li>The 'Label for OPAC' is the text that will appear in the OPAC when viewing the MARC version of the record.</li>
-    <li>If this field can be repeated, check the 'Repeatable' box.</li>
-    <li>If this field is mandatory, check the 'Mandatory' box.</li>
-        <li>If you want this field to be a drop-down menu with limited possible answers, choose which 'Authorized value' list you want to use.</li>
+  <li>The 'Tag' is the MARC field number.</li>
+  <li>The 'Label for lib' is the text that will appear in the staff client when in the cataloging module.</li>
+  <li>The 'Label for OPAC' is the text that will appear in the OPAC when viewing the MARC version of the record.</li>
+  <li>If this field can be repeated, check the 'Repeatable' box.</li>
+  <li>If this field is mandatory, check the 'Mandatory' box.</li>
+  <li>If you want this field to be a drop-down menu with limited possible answers, choose which 'Authorized value' list you want to use.</li>
 </ul>
 
 <p>When you're finished, click 'Save Changes' and you will be presented with your new field.</p>
 
 <p>To the right of the new field is a link to 'Subfields.' You will need to add subfields before this tag will appear in your MARC editor.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
index ce50907..1a6ee51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
@@ -90,6 +90,6 @@ to show images for authorized values you can choose the image under 'Choose an i
 </ul>
 </ul>
 
-<p><strong>See the full documentation for Authorized Values in the <a href="http://manual.koha-community.org/3.12/en/basicparams.html#authorizedvalues">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorized Values in the <a href="http://manual.koha-community.org/3.14/en/basicparams.html#authorizedvalues">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
index a75dcdc..3282912 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
@@ -6,6 +6,6 @@
 
 <p>Koha comes with many of the necessary Authority frameworks already installed.</p>
 
-<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Authorities in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#authoritiesadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
index 190b774..7000d85 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
@@ -34,6 +34,6 @@
 
 <p>To make edits to the fields associated with the Framework you must first click 'MARC Structure' and then follow the instructions for editing subfields</p>
 
-<p><strong>See the full documentation for Frameworks in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Frameworks in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
index 6f74312..bdadbac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
@@ -16,6 +16,6 @@
 
 <p>In the above example, Centerville library will allow patrons to return items from all libraries except Liberty and Franklin to their library.</p>
 
-<p><strong>See the full documentation for Library Transfer Limits in the <a href="http://manual.koha-community.org/3.12/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Library Transfer Limits in the <a href="http://manual.koha-community.org/3.14/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
index 021c403..f568904 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
@@ -47,6 +47,6 @@
 
 <p>Properties are then applied to libraries via the add or edit library form.</p>
 
-<p><strong>See the full documentation for Libraries &amp; Groups in the <a href="http://manual.koha-community.org/3.12/en/basicparams.html#libsgroups">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Libraries &amp; Groups in the <a href="http://manual.koha-community.org/3.14/en/basicparams.html#libsgroups">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
index efffab7..15156f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
@@ -86,6 +86,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Categories in the <a href="http://manual.koha-community.org/3.12/en/patscirc.html#patcats">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Categories in the <a href="http://manual.koha-community.org/3.14/en/patscirc.html#patcats">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
index bc83cc5..bfdcce4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
@@ -6,6 +6,6 @@
 
 <p>If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</p>
 
-<p><strong>See the full documentation for the MARC Bibliographic Framework Test in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#marcbibframeworkstest">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the MARC Bibliographic Framework Test in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#marcbibframeworkstest">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
index 42c77cb..a969984 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
@@ -18,6 +18,6 @@
 
 <p>This will allow for easy entry of local cities into the patron record without risking the potential for typos or mistaken zip/postal codes.</p>
 
-<p><strong>See the full documentation for Cities and Towns in the <a href="http://manual.koha-community.org/3.12/en/patscirc.html#citytowns">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Cities and Towns in the <a href="http://manual.koha-community.org/3.14/en/patscirc.html#citytowns">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
index bf5c9c6..0f7db0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
@@ -53,6 +53,6 @@
 	<li>Choose an appropriate filing routine - dewey, generic or lcc</li>
 </ul>
 
-<p><strong>See the full documentation for Classification Sources in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#classificationsources">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Classification Sources in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#classificationsources">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
index 679570b..95cf8df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
@@ -8,6 +8,6 @@
 
 <p>The active currency is the main currency you use in your library. Your active currency will have a check mark in the 'Active' column. If you don't have an active currency you will see an error message telling you to choose an active currency.</p>
 
-<p><strong>See the full documentation for Currencies and Exchange Rates in the <a href="http://manual.koha-community.org/3.12/en/acqadmin.html#currexchangeadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Currencies and Exchange Rates in the <a href="http://manual.koha-community.org/3.14/en/acqadmin.html#currexchangeadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/didyoumean.tt
index 4304b91..4979b7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/didyoumean.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/didyoumean.tt
@@ -17,6 +17,6 @@
 
 <p>If you want one plugin to take priority over another you simply drag it above the other.</p>
 
-<p><strong>See the full documentation for the Did you mean? feature in the <a href="http://manual.koha-community.org/3.12/en/additionaladmin.html#didyoumean">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Did you mean? feature in the <a href="http://manual.koha-community.org/3.14/en/additionaladmin.html#didyoumean">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
index 308f158..82728f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
@@ -20,6 +20,6 @@
 
 <p>Future developments will include additional keyword assigned fields.</p>
 
-<p><strong>See the full documentation for Keyword to MARC Mapping in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#keywordmapping">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Keyword to MARC Mapping in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#keywordmapping">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
index 5534661..25bb266 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
@@ -19,6 +19,6 @@
 	<li>By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item/patron type combo that you would like to stop notices for.</li>
 </ul>
 
-<p><strong>See the full documentation for Item Circulation Alerts in the <a href="http://manual.koha-community.org/3.12/en/patscirc.html#itemcircalerts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Circulation Alerts in the <a href="http://manual.koha-community.org/3.14/en/patscirc.html#itemcircalerts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
index 081cae9..0046ab8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
@@ -57,6 +57,6 @@
 
 <p>You will not be able to delete item types that are being used by items within your system.</p>
 
-<p><strong>See the full documentation for Item Types in the <a href="http://manual.koha-community.org/3.12/en/basicparams.html#itemtypeadmin">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Item Types in the <a href="http://manual.koha-community.org/3.14/en/basicparams.html#itemtypeadmin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
index a7c2abc..ecc1c8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
@@ -12,6 +12,6 @@
 
 <p style="color: #990000;">Important: At this time you can map only 1 MARC field to 1 Koha field. This means that you won't be able to map both the 100a and the 700a to the author field, you need to choose one or the other.</p>
 
-<p><strong>See the full documentation for Koha to MARC Mapping in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#kohamarcmapping">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Koha to MARC Mapping in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#kohamarcmapping">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
index 3307318..c9fc6d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
@@ -127,6 +127,6 @@ To edit the subfields associated with the tag, click 'Subfields' to the right of
       <li>To save your changes simply click the 'Save Changes' button at the top of the screen</li>
 </ul>
 
-<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
index c126094..59db5e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
@@ -21,6 +21,6 @@
 
 <p>To the right of the new field is a link to 'Subfields,' you will need to add subfields before this tag will appear in your MARC editor.</p>
 
-<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for MARC Frameworks in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#marcbibframeworks">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
index 46dae8d..c760bf1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
@@ -46,6 +46,6 @@
    <li>Required Match checks: none (remove the blank one)</li>
 </ul>
 
-<p><strong>See the full documentation for Record Matching Rules in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#recordmatchingrules">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Record Matching Rules in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#recordmatchingrules">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
index 1566523..6a08e6e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
@@ -18,6 +18,6 @@
 
 <p>And it is case sensitive : a record having 999$9 = 'xxx' will not belong to a set where condition is 999$9 = 'XXX'.</p>
 
-<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
index 9bb7736..2804ba9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
@@ -29,6 +29,6 @@
 
 <p>Once you have configured all your sets, you have to build the sets. This is done by calling the script misc/migration_tools/build_oai_sets.pl.</p>
 
-<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.12/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for OAI Sets in the <a href="http://manual.koha-community.org/3.14/en/catadmin.html#oaisetsconfig">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
index 18d1733..6e62db0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
@@ -70,6 +70,6 @@
 
 <p>You will be unable to delete an attribute if it's in use.</p>
 
-<p><strong>See the full documentation for Patron Attribute Types in the <a href="http://manual.koha-community.org/3.12/en/patscirc.html#patronattributetypes">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Attribute Types in the <a href="http://manual.koha-community.org/3.14/en/patscirc.html#patronattributetypes">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
index de954e9..d1e39e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
@@ -33,6 +33,6 @@
     <li><strong>Web Services:</strong> includes preferences related to services like OAI-PMH.</li>
 </ul>
 	
-<p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/3.12/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/3.14/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
deleted file mode 100644
index 5874a98..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
+++ /dev/null
@@ -1,11 +0,0 @@
-[% INCLUDE 'help-top.inc' %]
-
-<h1>Printer Administration</h1>
-
-<p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>
-
-<p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>
-
-<p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
-
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
index e07eaef..2626479 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
@@ -10,6 +10,6 @@
 
 <p>When adding or editing a patron, if you have road types defined, there will be a pull down to choose the road type from.</p>
 
-<p><strong>See the full documentation for Road Types in the <a href="http://manual.koha-community.org/3.12/en/patscirc.html#roadtypes">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Road Types in the <a href="http://manual.koha-community.org/3.14/en/patscirc.html#roadtypes">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
index c5cd892..fc67d63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
@@ -133,6 +133,6 @@
     <li>Item floats: The item will not be transferred from the library it was checked in at, instead it will remain there until transferred manually or checked in at another library</li>
 </ul>
 
-<p><strong>See the full documentation for Circulation and Fine Rules in the <a href="http://manual.koha-community.org/3.12/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation and Fine Rules in the <a href="http://manual.koha-community.org/3.14/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
deleted file mode 100644
index b6e0782..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
+++ /dev/null
@@ -1,15 +0,0 @@
-[% INCLUDE 'help-top.inc' %]
-
-<h1>Stop Words</h1>
-
-<p>Stop words are words that you want the search system to ignore.</p>
-
-<p>Koha comes with a standard list of stop words that can be edited by visiting the Stop Word administration area.</p>
-
-<p>To add a new stop word to the list, click the 'New Stop Word' button and add the word you'd like ignored</p>
-
-<p style="color: #990000">Important: If you change something in this table, ask your administrator to run misc/batchRebuildBiblioTables.pl script.</p>
-
-<p><strong>See the full documentation for Stop Words in the <a href="http://manual.koha-community.org/3.12/en/additionaladmin.html#stopwordsadmin">manual</a> (online).</strong></p>
-
-[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tt
index a21594e..f9af56b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tt
@@ -8,6 +8,6 @@
 
 <p>Always contains <i>Version</i> preference, <strong>please do not change it manually.</strong>
 
-<p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/3.12/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for System Preferences in the <a href="http://manual.koha-community.org/3.14/en/administration.html#globalsysprefs">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/transport-cost-matrix.tt
index ab24e92..5573ce9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/transport-cost-matrix.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/transport-cost-matrix.tt
@@ -10,6 +10,6 @@
 
 <p>After entering in your cost, hit 'Enter' on your keyboard or click the 'Save' button at the bottom of the matrix to save your changes.</p>
 
-<p><strong>See the full documentation for the Transport Cost Matrix in the <a href="http://manual.koha-community.org/3.12/en/patscirc.html#transportcostmatrix">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Transport Cost Matrix in the <a href="http://manual.koha-community.org/3.14/en/patscirc.html#transportcostmatrix">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
index 189a24d..2683a44 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
@@ -2,31 +2,44 @@
 
 <h1>Z39.50 Servers</h1>
 
-<p>Koha has a powerful copy cataloging tool. Using Koha you can connect to any Z39.50 target that is publicly available or that you have the log in information to.</p>
+<p>Z39.50 is a client?server protocol for searching and retrieving information from remote computer databases, in short it's a tool used for copy cataloging. Using Koha you can connect to any Z39.50 target that is publicly available or that you have the log in information to and copy both bibliographic and/or authority records from that source.</p>
 
-<p>Koha comes with a default list of Z39.50 targets set up that you can add to, edit or delete.</p>
+<p>Koha comes with a default list of Z39.50 targets set up that you can add to, edit or delete</p>
 
-<p>To find additional targets you use IndexData's IRSpy: <a href="http://irspy.indexdata.com">http://irspy.indexdata.com</a></p>
+<p>To find additional targets you use IndexData's IRSpy: <a href="http://irspy.indexdata.com/" target="_top">http://irspy.indexdata.com</a></p>
 
 <h2>Add a Z39.50 Target</h2>
+
+<ul>
+	<li>From the main Z39.50 page, click 'New Z39.50 Server'
 <ul>
-   <li>From the main Z39.50 page, click 'New Z39.50 Server'
+	<li>'Z39.50 server' should be populated with a name that will help you identify the source (such as the library name).</li>
+	<li>'Hostname' will be the address to the Z39.50 target.</li>
+	<li>'Port' tells Koha what port to listen on to get results from this target.</li>
+	<li>'Userid' and 'Password' are only required for servers that are password protected.</li>
+	<li>Check the 'Checked' box if you want this target to always be selected by default.</li>
+	<li>'Rank' lets you enter where in the list you'd like this target to appear.
 <ul>
-	<li>Userid and Password are only required for servers that are password protected</li>
+	<li>If this is left blank the targets will be in alphabetical order.</li>
+</ul>
+</li>
+	<li>'Syntax' is the MARC flavor you use.</li>
+	<li>'Encoding' tells the system how to read special characters.</li>
+	<li>'Timeout' is helpful for targets that take a long while. You can set the timeout so that it doesn't keep trying the target if results aren't found in a reasonable amount of time.</li>
+	<li>'Record type' lets you define if this is a bibliographic or an authority target.</li>
 </ul>
 </li>
 </ul>
 
-<h2>Suggested Z39.50 Targets</h2>
+<h2>Suggested Bibliographic Z39.50 Targets</h2>
 
 <p>The following targets have been used successfully by other Koha libraries (in the Americas):</p>
-
 <ul>
 	<li>CUYAHOGA COUNTY PUBLIC webcat.cuyahoga.lib.oh.us:210 INNOPAC</li>
 	<li>GREATER SUDBURY PUBLIC 216.223.90.51:210 INNOPAC</li>
 	<li>HALIFAX PUBLIC catalogue.halifaxpubliclibraries.ca:210 horizon</li>
 	<li>HALTON HILLS PUBLIC cat.hhpl.on.ca:210 halton_hills</li>
-	<li>LIBRARY OF CONGRESS lx2.loc.gov:210 LCDB</li>
+	<li>LIBRARY OF CONGRESS lx2.loc.gov: 210 LCDB</li>
 	<li>LONDON PUBLIC LIBRARY catalogue.londonpubliclibrary.ca:210 INNOPAC</li>
 	<li>MANITOBA PUBLIC library.gov.mb.ca:210 horizon</li>
 	<li>MILTON PL cat.mpl.on.ca:210 horizon</li>
@@ -36,6 +49,15 @@
 	<li>VANCOUVER PUBLIC LIBRARY z3950.vpl.ca:210 Horizon</li>
 </ul>
 
-<p><strong>See the full documentation for Z39.50 Servers in the <a href="http://manual.koha-community.org/3.12/en/additionaladmin.html#z3950admin">manual</a> (online).</strong></p>
+<h2>Suggested Authority Z39.50 Targets</h2>
+
+<p>The following targets have been used successfully by other Koha libraries:</p>
+
+<ul>
+	<li>LIBRARIESAUSTRALIA AUTHORITIES z3950-test.librariesaustralia.nla.gov.au:210 AuthTraining Userid: ANLEZ / Password: z39.50</li>
+	<li>LIBRARY OF CONGRESS NAME AUTHORITIES lx2.loc.gov:210 NAF</li>
+	<li>LIBRARY OF CONGRESS SUBJECT AUTHORITIES lx2.loc.gov:210 SAF</li>
+</ul>
+<p><strong>See the full documentation for Z39.50 Servers in the <a href="http://manual.koha-community.org/3.14/en/additionaladmin.html#z3950admin">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat Oct 26 03:28:29 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 21:28:29 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update patron help files
Message-ID: <1382750909-3506-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the text and links in the
patron related help files.

To test:

* visit all patron pages
* Click help
* confirm test and links
---
 .../prog/en/modules/help/members/boraccount.tt     |    2 +-
 .../prog/en/modules/help/members/files.tt          |    2 +-
 .../prog/en/modules/help/members/mancredit.tt      |    2 +-
 .../prog/en/modules/help/members/maninvoice.tt     |    2 +-
 .../prog/en/modules/help/members/member-flags.tt   |    4 +-
 .../en/modules/help/members/member-password.tt     |    2 +-
 .../prog/en/modules/help/members/member.tt         |   37 ++++++++++++--------
 .../prog/en/modules/help/members/memberentry.tt    |    2 +-
 .../prog/en/modules/help/members/members-home.tt   |   37 ++++++++++++--------
 .../prog/en/modules/help/members/members-update.tt |    2 +-
 .../prog/en/modules/help/members/moremember.tt     |    2 +-
 .../prog/en/modules/help/members/notices.tt        |    2 +-
 .../prog/en/modules/help/members/pay.tt            |    2 +-
 .../prog/en/modules/help/members/paycollect.tt     |    2 +-
 .../prog/en/modules/help/members/readingrec.tt     |    2 +-
 .../prog/en/modules/help/members/routing-lists.tt  |    2 +-
 .../prog/en/modules/help/members/statistics.tt     |    2 +-
 17 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
index ce326dd..1d6ebb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
@@ -19,6 +19,6 @@
 
 <p>To the right of each account line there is a print link. Clicking that link will print an invoice for the line item that includes the date and description of the line item along with the total outstanding on the account.</p>
 
-<p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
index 375ebfc..9f76fb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
@@ -8,6 +8,6 @@
 
 <p>All files that are uploaded will appear above a form where additional files can be uploaded from.</p>
 
-<p><strong>See the full documentation for Patron Files in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronfiles">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Files in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronfiles">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
index ebe6ad0..564b7e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
@@ -11,6 +11,6 @@
 	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
 </ul>
 
-<p><strong>See the full documentation for Creating Manual Credits in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#manualcredit">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Creating Manual Credits in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#manualcredit">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
index 6be07b1..71fca1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
@@ -14,6 +14,6 @@
 	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
 </ul>
 
-<p><strong>See the full documentation for Creating Manual Invoices in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#manualinvoice">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Creating Manual Invoices in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#manualinvoice">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
index afdbdcf..975ac07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
@@ -333,7 +333,7 @@
 <ul>
 	<li>batch_upload_patron_images
 <ul>
-	<li>Upload patron images in a batch or one at a time</li>
+	<li>Upload patron images in batch or one at a time</li>
 	<li>Access to the Image Upload Tool</li>
 </ul>
 </li>
@@ -472,6 +472,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Permissions in the <a href="http://manual.koha-community.org/3.12/en/patronpermissions.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Permissions in the <a href="http://manual.koha-community.org/3.14/en/patronpermissions.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
index 762b6ec..54c011e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
@@ -11,7 +11,7 @@
 
 <p>The default minimum password length is 3 characters long.  To change this value, update your system preferences.</p>
 
-<p><strong>See the full documentation for Editing Patrons in the <a href="http://manual.koha-community.org/3.12/en/editpatrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Editing Patrons in the <a href="http://manual.koha-community.org/3.14/en/editpatrons.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
index b05ff82..828c81e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
@@ -2,45 +2,52 @@
 
 <h1>Patron search</h1>
 
-<p>From here you can search for a patron by using the search boxes at the top of the page.</p>
+<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron by any part of their name or their card number.</p>
 
-<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron.</p>
+<p>Clicking the small plus sign [+] to the right of the search box will open up an advanced patron search with more filters including the ability to limit to a specific category and/or library.</p>
 
 <p>Depending on what you have chosen for the 'Search fields' you can search for patrons in various different ways.</p>
 
 <ul>
-    <li>Standard:
+	<li>Standard:
 <ul>
-    <li>Enter any part of their name, username, email address or barcode</li>
+	<li>Enter any part of their name, username, email address or barcode</li>
 </ul>
 </li>
-    <li>Email:
+	<li>Email:
 <ul>
-    <li>Enter any part of their email address.</li>
+	<li>Enter any part of their email address and choose 'Contains' instead of 'Starts with'</li>
 </ul>
 </li>
-    <li>Borrower number:
+	<li>Borrower number:
 <ul>
-    <li>Enter the Koha borrower number</li>
+	<li>Enter the Koha borrower number</li>
 </ul>
 </li>
-    <li>Phone number:
+	<li>Phone number:
 <ul>
-    <li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
-    <li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
+	<li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
+	<li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
 </ul>
 </li>
-<li>Street address:
+	<li>Street address:
 <ul>
-    <li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+	<li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+</ul>
+</li>
+	<li>Date of birth
+<ul>
+	<li>A tooltip will appear telling you how to enter the date of birth, most libraries will be entering MM/DD/YYYY for the birthday search</li>
 </ul>
 </li>
 </ul>
 
-<p>If you want to filter your results to a specific library or category, you can click the plus sign [+] to the right of the search box.</p>
+<p>You can also choose to either search for fields that start with the string you entered or contain the string. Choosing 'Contains' will work like a wildcard search.</p>
+
+<p>You can also choose how your results will be sorted by using the 'Order by' pull down menu at the end of the form.</p>
 
 <p>You can also browse through the patron records by clicking on the linked letters across the top.</p>
 
-<p><strong>See the full documentation for Patron Search in the <a href="http://manual.koha-community.org/3.12/en/patronsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Search in the <a href="http://manual.koha-community.org/3.14/en/patronsearch.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
index 2a8595c..bef4768 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
@@ -86,6 +86,6 @@
 
 <p style="color: #990000">Remember to assign your staff secure usernames and passwords since these will be used to log into the staff client.</p>
 
-<p><strong>See the full documentation for Adding Patrons in the <a href="http://manual.koha-community.org/3.12/en/patrons.html#addnewpatron">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Adding Patrons in the <a href="http://manual.koha-community.org/3.14/en/patrons.html#addnewpatron">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
index 93b1f7d..2f16a66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
@@ -4,45 +4,52 @@
 
 <p>The Patrons module stores the information you add about your patrons.</p>
 
-<p>From here you can search for a patron by using the search boxes at the top of the page.</p>
+<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron by any part of their name or their card number.</p>
 
-<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron.</p>
+<p>Clicking the small plus sign [+] to the right of the search box will open up an advanced patron search with more filters including the ability to limit to a specific category and/or library.</p>
 
 <p>Depending on what you have chosen for the 'Search fields' you can search for patrons in various different ways.</p>
 
 <ul>
-    <li>Standard:
+	<li>Standard:
 <ul>
-    <li>Enter any part of their name, username, email address or barcode</li>
+	<li>Enter any part of their name, username, email address or barcode</li>
 </ul>
 </li>
-    <li>Email:
+	<li>Email:
 <ul>
-    <li>Enter any part of their email address.</li>
+	<li>Enter any part of their email address and choose 'Contains' instead of 'Starts with'</li>
 </ul>
 </li>
-    <li>Borrower number:
+	<li>Borrower number:
 <ul>
-    <li>Enter the Koha borrower number</li>
+	<li>Enter the Koha borrower number</li>
 </ul>
 </li>
-    <li>Phone number:
+	<li>Phone number:
 <ul>
-    <li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
-    <li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
+	<li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
+	<li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
 </ul>
 </li>
-<li>Street address:
+	<li>Street address:
 <ul>
-    <li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+	<li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+</ul>
+</li>
+	<li>Date of birth
+<ul>
+	<li>A tooltip will appear telling you how to enter the date of birth, most libraries will be entering MM/DD/YYYY for the birthday search</li>
 </ul>
 </li>
 </ul>
 
-<p>If you want to filter your results to a specific library or category, you can click the plus sign [+] to the right of the search box.</p>
+<p>You can also choose to either search for fields that start with the string you entered or contain the string. Choosing 'Contains' will work like a wildcard search.</p>
+
+<p>You can also choose how your results will be sorted by using the 'Order by' pull down menu at the end of the form.</p>
 
 <p>You can also browse through the patron records by clicking on the linked letters across the top.</p>
 
-<p><strong>See the full documentation for the Patrons module in the <a href="http://manual.koha-community.org/3.12/en/patrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patrons module in the <a href="http://manual.koha-community.org/3.14/en/patrons.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
index 525d308..ec3512a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
@@ -8,6 +8,6 @@
 
 <p>From here you can 'Approve' and apply the changes to the patron record, 'Delete' and remove the changes or 'Ignore' and keep the changes pending to review later.</p>
 
-<p><strong>See the full documentation for Updating patron records in the <a href="http://manual.koha-community.org/3.12/en/mangepatronedits.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Updating patron records in the <a href="http://manual.koha-community.org/3.14/en/mangepatronedits.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
index 79d941e..2c547b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
@@ -109,6 +109,6 @@
 	<li>You will be brought to your new patron</li>
 </ul>
 
-<p><strong>See the full documentation for the Patron Details in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Details in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
index cd0d3bd..25caae2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
@@ -6,6 +6,6 @@
 
 <p>Clicking on the message title will expand the view to show you the full text of the message that was sent.</p>
 
-<p><strong>See the full documentation for Patron Notices in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patnotices">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Notices in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patnotices">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
index f0bdd94..a0be70a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
@@ -57,6 +57,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
index f0bdd94..a0be70a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
@@ -57,6 +57,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
index a66ad3e..11f32c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
@@ -8,6 +8,6 @@
 
 <p>This will generate a text file with one barcode per line.</p>
 
-<p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
index aa79334..6981b3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
@@ -6,6 +6,6 @@
 
 <p>On this tab you will be able to see and edit all of the routing lists that this patron is on.</p>
 
-<p><strong>See the full documentation for Patron routing lists in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronroutingtab">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron routing lists in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronroutingtab">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
index 0f0e087..ce65fcf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
@@ -4,6 +4,6 @@
 
 <p>Depending on what you set for the values of your StatisticsFields system preference, you can see statistics for one patron's circulation actions.</p>
 
-<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronstatstab">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronstatstab">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat Oct 26 03:36:14 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 21:36:14 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Update Acq Help Files
Message-ID: <1382751374-3587-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the Acq help file links
to the manual.

To test:

* visit acq pages
* confirm manual links are right
---
 .../prog/en/modules/help/acqui/acqcontract.tt      |    2 +-
 .../prog/en/modules/help/acqui/acqui-home.tt       |    2 +-
 .../prog/en/modules/help/acqui/addorderiso2709.tt  |    2 +-
 .../prog/en/modules/help/acqui/basket.tt           |    2 +-
 .../prog/en/modules/help/acqui/basketgroup.tt      |    2 +-
 .../prog/en/modules/help/acqui/basketheader.tt     |    2 +-
 .../prog/en/modules/help/acqui/booksellers.tt      |    2 +-
 .../prog/en/modules/help/acqui/histsearch.tt       |    2 +-
 .../prog/en/modules/help/acqui/invoice.tt          |    2 +-
 .../prog/en/modules/help/acqui/invoices.tt         |    2 +-
 .../prog/en/modules/help/acqui/lateorders.tt       |    2 +-
 .../prog/en/modules/help/acqui/neworderbiblio.tt   |    2 +-
 .../prog/en/modules/help/acqui/neworderempty.tt    |    2 +-
 .../en/modules/help/acqui/newordersuggestion.tt    |    2 +-
 .../prog/en/modules/help/acqui/orderreceive.tt     |    2 +-
 .../prog/en/modules/help/acqui/parcel.tt           |    2 +-
 .../prog/en/modules/help/acqui/parcels.tt          |    2 +-
 .../prog/en/modules/help/acqui/supplier.tt         |    2 +-
 .../prog/en/modules/help/acqui/uncertainprice.tt   |    2 +-
 .../prog/en/modules/help/acqui/z3950_search.tt     |    2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
index 803af36..07264f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
@@ -16,6 +16,6 @@
 
 <p>It will also be an option when creating a basket.</p>
 
-<p><strong>See the full documentation for Vendor Contracts in the <a href="http://manual.koha-community.org/3.12/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Vendor Contracts in the <a href="http://manual.koha-community.org/3.14/en/acqvendors.html#vendorcontracts">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
index 7376641..dc1473b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
@@ -10,6 +10,6 @@
 
 <p>First, set your Acquisitions System Preferences and Acquisitions Administration to match your library's workflow.</p>
 
-<p><strong>See the full documentation for Acquisitions in the <a href="http://manual.koha-community.org/3.12/en/acqmodule.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions in the <a href="http://manual.koha-community.org/3.14/en/acqmodule.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/addorderiso2709.tt
index c716c38..74aa249 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/addorderiso2709.tt
@@ -19,6 +19,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
index 1e5e4cd..5497442 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
@@ -111,6 +111,6 @@
 
 <p>Clicking 'Print' below your order will generate a PDF for printing, which will have all of your library information followed by the items in your order.</p>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
index 52488bf..1779490 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
@@ -8,7 +8,7 @@
 
 <p>A basket group is simply a group of baskets. In some libraries, you have several staff members who create baskets, and, at the end of a period of time, someone then groups them together to send to the vendor in bulk. That said, it is possible to have one basket in a basket group if that's the workflow used in your library.</p>
 
-<p><strong>See the full documentation for Basket Groups in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#acqbasketgroup">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Basket Groups in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#acqbasketgroup">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
index e01d650..894923e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
@@ -18,7 +18,7 @@
 
 <p>After creating your basket, you can edit the name of the basket, the billing place, delivery place, the notes and the contract you're ordering against.</p>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
index 50c0fcf..fbe0939 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
@@ -14,6 +14,6 @@
 
 <p>Clicking Advanced Search to the right of the search button will give you all of the order search options available.</p>
 
-<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.12/en/acqsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.14/en/acqsearch.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
index 50c0fcf..fbe0939 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
@@ -14,6 +14,6 @@
 
 <p>Clicking Advanced Search to the right of the search button will give you all of the order search options available.</p>
 
-<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.12/en/acqsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Acquisitions Searching in the <a href="http://manual.koha-community.org/3.14/en/acqsearch.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt
index bfce1b0..3d12198 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoice.tt
@@ -8,6 +8,6 @@
 
 <p>From the results you can click the 'Details' link to see the full invoice or 'Close' to note that the invoice is closed/paid for.</p>
 
-<p><strong>See the full documentation for Invoices in the <a href="http://manual.koha-community.org/3.12/en/acqinvoices.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Invoices in the <a href="http://manual.koha-community.org/3.14/en/acqinvoices.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt
index bfce1b0..3d12198 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/invoices.tt
@@ -8,6 +8,6 @@
 
 <p>From the results you can click the 'Details' link to see the full invoice or 'Close' to note that the invoice is closed/paid for.</p>
 
-<p><strong>See the full documentation for Invoices in the <a href="http://manual.koha-community.org/3.12/en/acqinvoices.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Invoices in the <a href="http://manual.koha-community.org/3.14/en/acqinvoices.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
index f24922e..4a3e0dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
@@ -16,6 +16,6 @@
 
 <p>There is a default acquisitions cliam letter. If you would rather use a different one, you can create that in the notices module and choose it from the menu above the list of late items.</p>
 
-<p><strong>See the full documentation for Claims and Late Orders in the <a href="http://manual.koha-community.org/3.12/en/acqclaims.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Claims and Late Orders in the <a href="http://manual.koha-community.org/3.14/en/acqclaims.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
index 00d6add..7d52605 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
@@ -9,6 +9,6 @@
 	<li>All of the details associated with the item will already be listed under 'Catalog details'</li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
index fd70bc0..df148b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
@@ -8,6 +8,6 @@
     <li>You will be presented with an empty form to fill in all of the necessary details about the item.</li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
index 11ff29a..d0a350f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
@@ -14,6 +14,6 @@
     <li>Orders added to the basket in this way will notify the patron via email that their suggestion has been ordered and will update the patron's 'My purchase suggestions' page in the OPAC.</li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
index 7b418cf..340a59a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
@@ -18,6 +18,6 @@
 
 <p>You will also see that the item is received and/or cancelled if you view the basket.</p>
 
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.12/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.14/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
index 7b418cf..340a59a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
@@ -18,6 +18,6 @@
 
 <p>You will also see that the item is received and/or cancelled if you view the basket.</p>
 
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.12/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.14/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
index 7b418cf..340a59a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
@@ -18,6 +18,6 @@
 
 <p>You will also see that the item is received and/or cancelled if you view the basket.</p>
 
-<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.12/en/receiveacqorder.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Receiving Orders in the <a href="http://manual.koha-community.org/3.14/en/receiveacqorder.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
index b41b25e..5acee92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
@@ -51,6 +51,6 @@
 
 <p>If the vendor has no baskets attached to it, a 'Delete' button will also be visible, allowing the vendor to be deleted.</p>
 
-<p><strong>See the full documentation for managing Vendors in the <a href="http://manual.koha-community.org/3.12/en/acqvendors.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for managing Vendors in the <a href="http://manual.koha-community.org/3.14/en/acqvendors.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt
index 51dd481..34e0430 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/uncertainprice.tt
@@ -4,6 +4,6 @@
 
 <p>The Uncertain Prices page is independent of the basket. It is linked to the vendor so you will see all items on order with uncertain prices for that vendor.</p>
 
-<p><strong>See the full documentation for Uncertain prices in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Uncertain prices in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
index d3d9b98..11ead87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
@@ -14,6 +14,6 @@
     <li>In the order form that pops up, you will not be able to edit the catalog details</li>
 </ul>
 
-<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.12/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Ordering in the <a href="http://manual.koha-community.org/3.14/en/placingacqorder.html#createacqbasket">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat Oct 26 05:47:35 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 23:47:35 -0400
Subject: [Koha-patches] [PATCH 1/2] Bug 10671: Update patron help files
Message-ID: <1382759256-4148-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the text and links in the
patron related help files.

To test:

* visit all patron pages
* Click help
* confirm test and links
---
 .../prog/en/modules/help/members/boraccount.tt     |    2 +-
 .../prog/en/modules/help/members/files.tt          |    2 +-
 .../prog/en/modules/help/members/mancredit.tt      |    2 +-
 .../prog/en/modules/help/members/maninvoice.tt     |    2 +-
 .../prog/en/modules/help/members/member-flags.tt   |    4 +-
 .../en/modules/help/members/member-password.tt     |    2 +-
 .../prog/en/modules/help/members/member.tt         |   37 ++++++++++++--------
 .../prog/en/modules/help/members/memberentry.tt    |    2 +-
 .../prog/en/modules/help/members/members-home.tt   |   37 ++++++++++++--------
 .../prog/en/modules/help/members/members-update.tt |    2 +-
 .../prog/en/modules/help/members/moremember.tt     |    2 +-
 .../prog/en/modules/help/members/notices.tt        |    2 +-
 .../prog/en/modules/help/members/pay.tt            |    2 +-
 .../prog/en/modules/help/members/paycollect.tt     |    2 +-
 .../prog/en/modules/help/members/readingrec.tt     |    2 +-
 .../prog/en/modules/help/members/routing-lists.tt  |    2 +-
 .../prog/en/modules/help/members/statistics.tt     |    2 +-
 17 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
index ce326dd..1d6ebb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
@@ -19,6 +19,6 @@
 
 <p>To the right of each account line there is a print link. Clicking that link will print an invoice for the line item that includes the date and description of the line item along with the total outstanding on the account.</p>
 
-<p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
index 375ebfc..9f76fb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
@@ -8,6 +8,6 @@
 
 <p>All files that are uploaded will appear above a form where additional files can be uploaded from.</p>
 
-<p><strong>See the full documentation for Patron Files in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronfiles">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Files in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronfiles">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
index ebe6ad0..564b7e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
@@ -11,6 +11,6 @@
 	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
 </ul>
 
-<p><strong>See the full documentation for Creating Manual Credits in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#manualcredit">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Creating Manual Credits in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#manualcredit">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
index 6be07b1..71fca1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
@@ -14,6 +14,6 @@
 	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
 </ul>
 
-<p><strong>See the full documentation for Creating Manual Invoices in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#manualinvoice">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Creating Manual Invoices in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#manualinvoice">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
index afdbdcf..975ac07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
@@ -333,7 +333,7 @@
 <ul>
 	<li>batch_upload_patron_images
 <ul>
-	<li>Upload patron images in a batch or one at a time</li>
+	<li>Upload patron images in batch or one at a time</li>
 	<li>Access to the Image Upload Tool</li>
 </ul>
 </li>
@@ -472,6 +472,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Permissions in the <a href="http://manual.koha-community.org/3.12/en/patronpermissions.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Permissions in the <a href="http://manual.koha-community.org/3.14/en/patronpermissions.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
index 762b6ec..54c011e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
@@ -11,7 +11,7 @@
 
 <p>The default minimum password length is 3 characters long.  To change this value, update your system preferences.</p>
 
-<p><strong>See the full documentation for Editing Patrons in the <a href="http://manual.koha-community.org/3.12/en/editpatrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Editing Patrons in the <a href="http://manual.koha-community.org/3.14/en/editpatrons.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
index b05ff82..828c81e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
@@ -2,45 +2,52 @@
 
 <h1>Patron search</h1>
 
-<p>From here you can search for a patron by using the search boxes at the top of the page.</p>
+<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron by any part of their name or their card number.</p>
 
-<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron.</p>
+<p>Clicking the small plus sign [+] to the right of the search box will open up an advanced patron search with more filters including the ability to limit to a specific category and/or library.</p>
 
 <p>Depending on what you have chosen for the 'Search fields' you can search for patrons in various different ways.</p>
 
 <ul>
-    <li>Standard:
+	<li>Standard:
 <ul>
-    <li>Enter any part of their name, username, email address or barcode</li>
+	<li>Enter any part of their name, username, email address or barcode</li>
 </ul>
 </li>
-    <li>Email:
+	<li>Email:
 <ul>
-    <li>Enter any part of their email address.</li>
+	<li>Enter any part of their email address and choose 'Contains' instead of 'Starts with'</li>
 </ul>
 </li>
-    <li>Borrower number:
+	<li>Borrower number:
 <ul>
-    <li>Enter the Koha borrower number</li>
+	<li>Enter the Koha borrower number</li>
 </ul>
 </li>
-    <li>Phone number:
+	<li>Phone number:
 <ul>
-    <li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
-    <li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
+	<li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
+	<li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
 </ul>
 </li>
-<li>Street address:
+	<li>Street address:
 <ul>
-    <li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+	<li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+</ul>
+</li>
+	<li>Date of birth
+<ul>
+	<li>A tooltip will appear telling you how to enter the date of birth, most libraries will be entering MM/DD/YYYY for the birthday search</li>
 </ul>
 </li>
 </ul>
 
-<p>If you want to filter your results to a specific library or category, you can click the plus sign [+] to the right of the search box.</p>
+<p>You can also choose to either search for fields that start with the string you entered or contain the string. Choosing 'Contains' will work like a wildcard search.</p>
+
+<p>You can also choose how your results will be sorted by using the 'Order by' pull down menu at the end of the form.</p>
 
 <p>You can also browse through the patron records by clicking on the linked letters across the top.</p>
 
-<p><strong>See the full documentation for Patron Search in the <a href="http://manual.koha-community.org/3.12/en/patronsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Search in the <a href="http://manual.koha-community.org/3.14/en/patronsearch.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
index 2a8595c..bef4768 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
@@ -86,6 +86,6 @@
 
 <p style="color: #990000">Remember to assign your staff secure usernames and passwords since these will be used to log into the staff client.</p>
 
-<p><strong>See the full documentation for Adding Patrons in the <a href="http://manual.koha-community.org/3.12/en/patrons.html#addnewpatron">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Adding Patrons in the <a href="http://manual.koha-community.org/3.14/en/patrons.html#addnewpatron">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
index 93b1f7d..2f16a66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
@@ -4,45 +4,52 @@
 
 <p>The Patrons module stores the information you add about your patrons.</p>
 
-<p>From here you can search for a patron by using the search boxes at the top of the page.</p>
+<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron by any part of their name or their card number.</p>
 
-<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron.</p>
+<p>Clicking the small plus sign [+] to the right of the search box will open up an advanced patron search with more filters including the ability to limit to a specific category and/or library.</p>
 
 <p>Depending on what you have chosen for the 'Search fields' you can search for patrons in various different ways.</p>
 
 <ul>
-    <li>Standard:
+	<li>Standard:
 <ul>
-    <li>Enter any part of their name, username, email address or barcode</li>
+	<li>Enter any part of their name, username, email address or barcode</li>
 </ul>
 </li>
-    <li>Email:
+	<li>Email:
 <ul>
-    <li>Enter any part of their email address.</li>
+	<li>Enter any part of their email address and choose 'Contains' instead of 'Starts with'</li>
 </ul>
 </li>
-    <li>Borrower number:
+	<li>Borrower number:
 <ul>
-    <li>Enter the Koha borrower number</li>
+	<li>Enter the Koha borrower number</li>
 </ul>
 </li>
-    <li>Phone number:
+	<li>Phone number:
 <ul>
-    <li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
-    <li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
+	<li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
+	<li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
 </ul>
 </li>
-<li>Street address:
+	<li>Street address:
 <ul>
-    <li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+	<li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+</ul>
+</li>
+	<li>Date of birth
+<ul>
+	<li>A tooltip will appear telling you how to enter the date of birth, most libraries will be entering MM/DD/YYYY for the birthday search</li>
 </ul>
 </li>
 </ul>
 
-<p>If you want to filter your results to a specific library or category, you can click the plus sign [+] to the right of the search box.</p>
+<p>You can also choose to either search for fields that start with the string you entered or contain the string. Choosing 'Contains' will work like a wildcard search.</p>
+
+<p>You can also choose how your results will be sorted by using the 'Order by' pull down menu at the end of the form.</p>
 
 <p>You can also browse through the patron records by clicking on the linked letters across the top.</p>
 
-<p><strong>See the full documentation for the Patrons module in the <a href="http://manual.koha-community.org/3.12/en/patrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patrons module in the <a href="http://manual.koha-community.org/3.14/en/patrons.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
index 525d308..ec3512a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
@@ -8,6 +8,6 @@
 
 <p>From here you can 'Approve' and apply the changes to the patron record, 'Delete' and remove the changes or 'Ignore' and keep the changes pending to review later.</p>
 
-<p><strong>See the full documentation for Updating patron records in the <a href="http://manual.koha-community.org/3.12/en/mangepatronedits.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Updating patron records in the <a href="http://manual.koha-community.org/3.14/en/mangepatronedits.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
index 79d941e..2c547b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
@@ -109,6 +109,6 @@
 	<li>You will be brought to your new patron</li>
 </ul>
 
-<p><strong>See the full documentation for the Patron Details in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Details in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
index cd0d3bd..25caae2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
@@ -6,6 +6,6 @@
 
 <p>Clicking on the message title will expand the view to show you the full text of the message that was sent.</p>
 
-<p><strong>See the full documentation for Patron Notices in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patnotices">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Notices in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patnotices">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
index f0bdd94..a0be70a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
@@ -57,6 +57,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
index f0bdd94..a0be70a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
@@ -57,6 +57,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
index a66ad3e..11f32c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
@@ -8,6 +8,6 @@
 
 <p>This will generate a text file with one barcode per line.</p>
 
-<p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
index aa79334..6981b3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
@@ -6,6 +6,6 @@
 
 <p>On this tab you will be able to see and edit all of the routing lists that this patron is on.</p>
 
-<p><strong>See the full documentation for Patron routing lists in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronroutingtab">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron routing lists in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronroutingtab">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
index 0f0e087..ce65fcf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
@@ -4,6 +4,6 @@
 
 <p>Depending on what you set for the values of your StatisticsFields system preference, you can see statistics for one patron's circulation actions.</p>
 
-<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronstatstab">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronstatstab">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat Oct 26 05:47:53 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 23:47:53 -0400
Subject: [Koha-patches] [PATCH 1/2] Bug 10671: Update patron help files
Message-ID: <1382759274-4182-1-git-send-email-nengard@bywatersolutions.com>

This patch updates the text and links in the
patron related help files.

To test:

* visit all patron pages
* Click help
* confirm test and links
---
 .../prog/en/modules/help/members/boraccount.tt     |    2 +-
 .../prog/en/modules/help/members/files.tt          |    2 +-
 .../prog/en/modules/help/members/mancredit.tt      |    2 +-
 .../prog/en/modules/help/members/maninvoice.tt     |    2 +-
 .../prog/en/modules/help/members/member-flags.tt   |    4 +-
 .../en/modules/help/members/member-password.tt     |    2 +-
 .../prog/en/modules/help/members/member.tt         |   37 ++++++++++++--------
 .../prog/en/modules/help/members/memberentry.tt    |    2 +-
 .../prog/en/modules/help/members/members-home.tt   |   37 ++++++++++++--------
 .../prog/en/modules/help/members/members-update.tt |    2 +-
 .../prog/en/modules/help/members/moremember.tt     |    2 +-
 .../prog/en/modules/help/members/notices.tt        |    2 +-
 .../prog/en/modules/help/members/pay.tt            |    2 +-
 .../prog/en/modules/help/members/paycollect.tt     |    2 +-
 .../prog/en/modules/help/members/readingrec.tt     |    2 +-
 .../prog/en/modules/help/members/routing-lists.tt  |    2 +-
 .../prog/en/modules/help/members/statistics.tt     |    2 +-
 17 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
index ce326dd..1d6ebb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt
@@ -19,6 +19,6 @@
 
 <p>To the right of each account line there is a print link. Clicking that link will print an invoice for the line item that includes the date and description of the line item along with the total outstanding on the account.</p>
 
-<p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
index 375ebfc..9f76fb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/files.tt
@@ -8,6 +8,6 @@
 
 <p>All files that are uploaded will appear above a form where additional files can be uploaded from.</p>
 
-<p><strong>See the full documentation for Patron Files in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronfiles">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Files in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronfiles">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
index ebe6ad0..564b7e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/mancredit.tt
@@ -11,6 +11,6 @@
 	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
 </ul>
 
-<p><strong>See the full documentation for Creating Manual Credits in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#manualcredit">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Creating Manual Credits in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#manualcredit">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
index 6be07b1..71fca1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/maninvoice.tt
@@ -14,6 +14,6 @@
 	<li>In the amount field, do not enter currency symbols, only numbers and decimals</li>
 </ul>
 
-<p><strong>See the full documentation for Creating Manual Invoices in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#manualinvoice">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Creating Manual Invoices in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#manualinvoice">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
index afdbdcf..975ac07 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
@@ -333,7 +333,7 @@
 <ul>
 	<li>batch_upload_patron_images
 <ul>
-	<li>Upload patron images in a batch or one at a time</li>
+	<li>Upload patron images in batch or one at a time</li>
 	<li>Access to the Image Upload Tool</li>
 </ul>
 </li>
@@ -472,6 +472,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Patron Permissions in the <a href="http://manual.koha-community.org/3.12/en/patronpermissions.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Permissions in the <a href="http://manual.koha-community.org/3.14/en/patronpermissions.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
index 762b6ec..54c011e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-password.tt
@@ -11,7 +11,7 @@
 
 <p>The default minimum password length is 3 characters long.  To change this value, update your system preferences.</p>
 
-<p><strong>See the full documentation for Editing Patrons in the <a href="http://manual.koha-community.org/3.12/en/editpatrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Editing Patrons in the <a href="http://manual.koha-community.org/3.14/en/editpatrons.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
index b05ff82..828c81e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt
@@ -2,45 +2,52 @@
 
 <h1>Patron search</h1>
 
-<p>From here you can search for a patron by using the search boxes at the top of the page.</p>
+<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron by any part of their name or their card number.</p>
 
-<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron.</p>
+<p>Clicking the small plus sign [+] to the right of the search box will open up an advanced patron search with more filters including the ability to limit to a specific category and/or library.</p>
 
 <p>Depending on what you have chosen for the 'Search fields' you can search for patrons in various different ways.</p>
 
 <ul>
-    <li>Standard:
+	<li>Standard:
 <ul>
-    <li>Enter any part of their name, username, email address or barcode</li>
+	<li>Enter any part of their name, username, email address or barcode</li>
 </ul>
 </li>
-    <li>Email:
+	<li>Email:
 <ul>
-    <li>Enter any part of their email address.</li>
+	<li>Enter any part of their email address and choose 'Contains' instead of 'Starts with'</li>
 </ul>
 </li>
-    <li>Borrower number:
+	<li>Borrower number:
 <ul>
-    <li>Enter the Koha borrower number</li>
+	<li>Enter the Koha borrower number</li>
 </ul>
 </li>
-    <li>Phone number:
+	<li>Phone number:
 <ul>
-    <li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
-    <li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
+	<li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
+	<li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
 </ul>
 </li>
-<li>Street address:
+	<li>Street address:
 <ul>
-    <li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+	<li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+</ul>
+</li>
+	<li>Date of birth
+<ul>
+	<li>A tooltip will appear telling you how to enter the date of birth, most libraries will be entering MM/DD/YYYY for the birthday search</li>
 </ul>
 </li>
 </ul>
 
-<p>If you want to filter your results to a specific library or category, you can click the plus sign [+] to the right of the search box.</p>
+<p>You can also choose to either search for fields that start with the string you entered or contain the string. Choosing 'Contains' will work like a wildcard search.</p>
+
+<p>You can also choose how your results will be sorted by using the 'Order by' pull down menu at the end of the form.</p>
 
 <p>You can also browse through the patron records by clicking on the linked letters across the top.</p>
 
-<p><strong>See the full documentation for Patron Search in the <a href="http://manual.koha-community.org/3.12/en/patronsearch.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Search in the <a href="http://manual.koha-community.org/3.14/en/patronsearch.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
index 2a8595c..bef4768 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt
@@ -86,6 +86,6 @@
 
 <p style="color: #990000">Remember to assign your staff secure usernames and passwords since these will be used to log into the staff client.</p>
 
-<p><strong>See the full documentation for Adding Patrons in the <a href="http://manual.koha-community.org/3.12/en/patrons.html#addnewpatron">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Adding Patrons in the <a href="http://manual.koha-community.org/3.14/en/patrons.html#addnewpatron">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
index 93b1f7d..2f16a66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt
@@ -4,45 +4,52 @@
 
 <p>The Patrons module stores the information you add about your patrons.</p>
 
-<p>From here you can search for a patron by using the search boxes at the top of the page.</p>
+<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron by any part of their name or their card number.</p>
 
-<p>Clicking on the link to the Patron module will bring you to a search/browse screen for patrons. From here you can search for a patron.</p>
+<p>Clicking the small plus sign [+] to the right of the search box will open up an advanced patron search with more filters including the ability to limit to a specific category and/or library.</p>
 
 <p>Depending on what you have chosen for the 'Search fields' you can search for patrons in various different ways.</p>
 
 <ul>
-    <li>Standard:
+	<li>Standard:
 <ul>
-    <li>Enter any part of their name, username, email address or barcode</li>
+	<li>Enter any part of their name, username, email address or barcode</li>
 </ul>
 </li>
-    <li>Email:
+	<li>Email:
 <ul>
-    <li>Enter any part of their email address.</li>
+	<li>Enter any part of their email address and choose 'Contains' instead of 'Starts with'</li>
 </ul>
 </li>
-    <li>Borrower number:
+	<li>Borrower number:
 <ul>
-    <li>Enter the Koha borrower number</li>
+	<li>Enter the Koha borrower number</li>
 </ul>
 </li>
-    <li>Phone number:
+	<li>Phone number:
 <ul>
-    <li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
-    <li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
+	<li>Enter the phone number exactly as it is in the system or by using spaces between each batch of numbers.</li>
+	<li>Example: To find (212) 555-1212 you can search for it exactly as it was entered or by searching for 212 555 1212</li>
 </ul>
 </li>
-<li>Street address:
+	<li>Street address:
 <ul>
-    <li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+	<li>Enter any part of the patron's address (includes all address fields) and choose 'Contains' instead of 'Starts with' to find the string anywhere in the address</li>
+</ul>
+</li>
+	<li>Date of birth
+<ul>
+	<li>A tooltip will appear telling you how to enter the date of birth, most libraries will be entering MM/DD/YYYY for the birthday search</li>
 </ul>
 </li>
 </ul>
 
-<p>If you want to filter your results to a specific library or category, you can click the plus sign [+] to the right of the search box.</p>
+<p>You can also choose to either search for fields that start with the string you entered or contain the string. Choosing 'Contains' will work like a wildcard search.</p>
+
+<p>You can also choose how your results will be sorted by using the 'Order by' pull down menu at the end of the form.</p>
 
 <p>You can also browse through the patron records by clicking on the linked letters across the top.</p>
 
-<p><strong>See the full documentation for the Patrons module in the <a href="http://manual.koha-community.org/3.12/en/patrons.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patrons module in the <a href="http://manual.koha-community.org/3.14/en/patrons.html">manual</a> (online).</strong></p>
 	
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
index 525d308..ec3512a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
@@ -8,6 +8,6 @@
 
 <p>From here you can 'Approve' and apply the changes to the patron record, 'Delete' and remove the changes or 'Ignore' and keep the changes pending to review later.</p>
 
-<p><strong>See the full documentation for Updating patron records in the <a href="http://manual.koha-community.org/3.12/en/mangepatronedits.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Updating patron records in the <a href="http://manual.koha-community.org/3.14/en/mangepatronedits.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
index 79d941e..2c547b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/moremember.tt
@@ -109,6 +109,6 @@
 	<li>You will be brought to your new patron</li>
 </ul>
 
-<p><strong>See the full documentation for the Patron Details in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for the Patron Details in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
index cd0d3bd..25caae2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tt
@@ -6,6 +6,6 @@
 
 <p>Clicking on the message title will expand the view to show you the full text of the message that was sent.</p>
 
-<p><strong>See the full documentation for Patron Notices in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patnotices">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Notices in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patnotices">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
index f0bdd94..a0be70a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/pay.tt
@@ -57,6 +57,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
index f0bdd94..a0be70a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
@@ -57,6 +57,6 @@
 </li>
 </ul>
 
-<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Paying Fines in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#payfines">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
index a66ad3e..11f32c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/readingrec.tt
@@ -8,6 +8,6 @@
 
 <p>This will generate a text file with one barcode per line.</p>
 
-<p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Circulation History in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#circhistory">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
index aa79334..6981b3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/routing-lists.tt
@@ -6,6 +6,6 @@
 
 <p>On this tab you will be able to see and edit all of the routing lists that this patron is on.</p>
 
-<p><strong>See the full documentation for Patron routing lists in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronroutingtab">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron routing lists in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronroutingtab">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
index 0f0e087..ce65fcf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/statistics.tt
@@ -4,6 +4,6 @@
 
 <p>Depending on what you set for the values of your StatisticsFields system preference, you can see statistics for one patron's circulation actions.</p>
 
-<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.12/en/patroninformation.html#patronstatstab">manual</a> (online).</strong></p>
+<p><strong>See the full documentation for Patron Statistics in the <a href="http://manual.koha-community.org/3.14/en/patroninformation.html#patronstatstab">manual</a> (online).</strong></p>
 
 [% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From nengard at bywatersolutions.com  Sat Oct 26 05:47:54 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Fri, 25 Oct 2013 23:47:54 -0400
Subject: [Koha-patches] [PATCH 2/2] Bug 10671: Update patron help files [
	FOLLOW-UP ]
In-Reply-To: <1382759274-4182-1-git-send-email-nengard@bywatersolutions.com>
References: <1382759274-4182-1-git-send-email-nengard@bywatersolutions.com>
Message-ID: <1382759274-4182-2-git-send-email-nengard@bywatersolutions.com>

This patch adds two new permissions that were just pushed
to the related patron help files. It is a follow up to the
previous patch that updated the patron help file.

To test:

Apply the patron help patch
Apply this patch
Visit the patron permissions page
Confirm that help is there and right
---
 .../prog/en/modules/help/members/member-flags.tt   |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
index 975ac07..8a79b7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt
@@ -254,6 +254,11 @@
 	<li>Manage orders and baskets</li>
 </ul>
 </li>
+	<li>order_manage_all
+<ul>
+	<li>Manage all orders and baskets, regardless of restrictions on them</li>
+</ul>
+</li>
 	<li>order_receive
 <ul>
 	<li>Manage orders and baskets</li>
@@ -324,6 +329,11 @@
 	<li>Manage routing lists</li>
 </ul>
 </li>
+	<li>superserials
+<ul>
+	<li>Manage subscriptions from any branch (only applies when IndependentBranches is used)</li>
+</ul>
+</li>
 </ul>
 
 <h4>Granular Tools Permissions</h4>
-- 
1.7.2.3