From gmcharlt at gmail.com  Mon Nov  1 00:50:16 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sun, 31 Oct 2010 19:50:16 -0400
Subject: [Koha-patches] Pull request -
	git://git.librarypolice.com/git/koha-galen.git bug5332-tested
Message-ID: <1288569016-3083-1-git-send-email-gmcharlt@gmail.com>

Fixes and improvements to the --revert and --progress-interval options
added by Doug Kingston.

The following changes since commit 795ebedecd1bd8dc4759f9911d11341313423f29:
  Galen Charlton (1):
        remove extraneous semicolon

are available in the git repository at:

  git://git.librarypolice.com/git/koha-galen.git bug5332-tested

Doug Kingston (1):
      bug 5332: Add batch revert capability (--revert) to commit_biblios_file.pl.

Galen Charlton (3):
      bug 5332: typo and whitespace fixes
      bug 5332: functionality and doc fixes
      bug 5332: add --progress-interval to stage_biblios_file.pl

 misc/commit_biblios_file.pl |   82 +++++++++++++++++++++++++++++++-----------
 misc/stage_biblios_file.pl  |   19 ++++++----
 2 files changed, 71 insertions(+), 30 deletions(-)

From henridamien.laurent at biblibre.com  Mon Nov  1 02:37:52 2010
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Mon,  1 Nov 2010 14:37:52 +1300
Subject: [Koha-patches] [PATCH] Analytical record : UNIMARC support added
Message-ID: <1288575472-29930-1-git-send-email-henridamien.laurent@biblibre.com>

This is a followup proposition for analytical record support with UNIMARC.
Previous patches only implemented the MARC21 support.
This is a generalize the support.
---
 C4/Biblio.pm |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index a58f03e..bdeb74a 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1558,27 +1558,36 @@ sub GetMarcSeries {
 
   $marchostsarray = GetMarcHosts($record,$marcflavour);
 
-Get all host records (773s) from the MARC record and returns them in an array.
+Get all host records (773s MARC21, 461 UNIMARC) from the MARC record and returns them in an array.
 
 =cut
 
 sub GetMarcHosts {
     my ( $record, $marcflavour ) = @_;
-    my ( $tag );
+    my ( $tag,$title_subf,$bibnumber_subf,$itemnumber_subf);
+    $marcflavour ||="MARC21";
     if ( $marcflavour eq "MARC21" ) {
         $tag = "773";
-
+        $title_subf = "a";
+        $bibnumber_subf ="w";
+        $itemnumber_subf='o';
+    }
+    elsif ($marcflavour eq "UNIMARC") {
+        $tag = "461";
+        $title_subf = "t";
+        $bibnumber_subf ="0";
+        $itemnumber_subf='9';
     }
 
     my @marchosts;
 
-    foreach my $field ( $record->field('773')) {
+    foreach my $field ( $record->field($tag)) {
 
         my @fields_loop;
 
-        my $hostbiblionumber = $field->subfield("w");
-        my $hosttitle = $field->subfield("a");
-        my $hostitemnumber=$field->subfield("o");
+        my $hostbiblionumber = $field->subfield("$title_subf");
+        my $hosttitle = $field->subfield($bibnumber_subf);
+        my $hostitemnumber=$field->subfield($itemnumber_subf);
         push @fields_loop, { hostbiblionumber => $hostbiblionumber, hosttitle => $hosttitle, hostitemnumber => $hostitemnumber};
         push @marchosts, { MARCHOSTS_FIELDS_LOOP => \@fields_loop };
 
-- 
1.7.0.4


From gmcharlt at gmail.com  Mon Nov  1 03:35:12 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sun, 31 Oct 2010 22:35:12 -0400
Subject: [Koha-patches] [PATCH] history updates - recent releases
Message-ID: <1288578912-4326-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 docs/history.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index e119577..2dd63e0 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -492,6 +492,7 @@ May 4 2010	Koustubha Kale becomes the 112th committer to have a patch accepted
 May 4 2010	Community Handover meeting http://wiki.koha-community.org/wiki/Community_Handover_IRC_Meeting,_4_May_2010
 May 5 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_Meeting,_May_5_2010
 May 5 2010	Matthew Hunt becomes the 113th committer to have a patch accepted
+May 17 2010	Koha 3.0.6 released
 May 19 2010	Marcel de Rooy becomes the 114th committer to have a patch accepted
 July 19 2010	Andrew Chilton becomes the 115th committer to have a patch accepted
 June 2 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_2_June_2010
@@ -501,6 +502,7 @@ July 13 2010	License meeting http://wiki.koha-community.org/wiki/License_Upgrade
 August 11 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_11_August_2010
 September 1 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_1_September_2010
 September 29 2010	Eric Olsen becomes the 116th committer to have a patch accepted
+October 22 2010	Koha 3.2.0 released
 October 25-31 2010	Kohacon10 in Wellington
 October 30 2010	Brian Engard becomes the 117th committer to have a patch accepted
 October 30 2010 Daniel Grobani becomes the 118th committer to have a patch accepted
-- 
1.7.0


From M.de.Rooy at rijksmuseum.nl  Mon Nov  1 09:27:17 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 1 Nov 2010 08:27:17 +0000
Subject: [Koha-patches] [PATCH] Enhancement 5320 (Estimate optionally next
 planned date for serials without periodicity)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3119A49A@S-MAIL-1B.rijksmuseum.intra>

For periodicity Irregular, Unknown or "Without periodicity", it would be
helpful if Koha could suggest a next planned date when receiving an issue based
on the time interval between the last two receivals of this serial. 

This option is triggered by new local-use preference SerialEstimatePlannedDate.
If this option exists and contains uppercase W for without periodicity, I for
irregular or U for unknown, or a combination of those characters, the option is
enabled for these particular periodicities. Behavior does not change for other
periodicities.
---
 C4/Serials.pm |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/C4/Serials.pm b/C4/Serials.pm
index 32e46be..3835e2e 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -2178,7 +2178,12 @@ sub GetNextDate(@) {
 
     #       warn "DOW $dayofweek";
     if ( $subscription->{periodicity} % 16 == 0 ) {    # 'without regularity' || 'irregular'
-        return 0;
+      return 0 unless _estimate_option_enabled($subscription->{periodicity});
+      my $estimate_days=_get_estimate_for_no_periodicity($subscription);
+      if(!$estimate_days) { #return today
+        ($year, $month, $day)= (localtime)[5,4,3]; $year+=1900; $month++;
+      }
+      @resultdate = Add_Delta_Days($year,$month,$day,$estimate_days);
     }
 
     #   daily : n / week
@@ -2305,6 +2310,35 @@ sub GetNextDate(@) {
 
     return "$resultdate";
 }
+sub _estimate_option_enabled { #check preference
+  my $periodicity= shift;
+  my $pref=C4::Context->preference('SerialEstimatePlannedDate');
+  my $period_char= substr("WIU",-1+$periodicity/16,1);
+	#16=Without,32=Irreg,48=Unknwn
+  return $pref=~ /$period_char/;
+}
+sub _get_estimate_for_no_periodicity {
+  my ($subscription) = @_;
+
+  my $dbh= C4::Context->dbh;
+  my $sth= $dbh->prepare('SELECT
+        YEAR(COALESCE(publisheddate,planneddate)), 
+	MONTH(COALESCE(publisheddate,planneddate)),
+	DAY(COALESCE(publisheddate,planneddate))
+	FROM serial 
+	WHERE subscriptionid = ? AND 
+	  (planneddate IS NOT NULL OR publisheddate IS NOT NULL)
+	ORDER BY serialid DESC LIMIT 2');
+  $sth->execute($subscription->{subscriptionid});
+  my $dates= $sth->fetchall_arrayref; #last two non-null dates
+  $sth->finish;
+  return if @$dates<2 || 
+	!check_date(@{$dates->[1]}) || !check_date(@{$dates->[0]});
+
+  #pass args in chronological order to Delta_Days, return difference in days
+  #check on positive result
+  my $d; return ($d=Delta_Days(@{$dates->[1]}, @{$dates->[0]}))>0? $d: 1;
+}
 
 =head2 itemdata
 
-- 
1.6.0.6


From gmcharlt at gmail.com  Mon Nov  1 13:25:20 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon,  1 Nov 2010 08:25:20 -0400
Subject: [Koha-patches] Pull request -
	git://git.librarypolice.com/git/koha-galen.git bug5308
Message-ID: <1288614320-5717-1-git-send-email-gmcharlt@gmail.com>

Tested Srdjan Jankovic's patch + a followup to add foreign key constraints.

The following changes since commit 8af6165f537c6324fa9184f3b0788ebf287820f8:
  Chris Cormack (1):
        Merge remote branch 'kc/new/background_jobs_tested' into kcmaster

are available in the git repository at:

  git://git.librarypolice.com/git/koha-galen.git bug5308

Galen Charlton (1):
      bug 5308: add foreign key constraints as well

Srdjan Jankovic (1):
      bug 5308: subscriptionroutinglist more strict

 installer/data/mysql/kohastructure.sql |   11 ++++++++---
 installer/data/mysql/updatedatabase.pl |   27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

From chris at bigballofwax.co.nz  Tue Nov  2 02:54:46 2010
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Tue, 2 Nov 2010 14:54:46 +1300
Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] bug 5149 fix broken
 link to noItemTypeImages preference
In-Reply-To: <1288354848-13325-1-git-send-email-gmcharlt@gmail.com>
References: <1288354848-13325-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <AANLkTi=+WpU8newsu2F6kO44c=+wTqnQ4FSsdUU8u3NJ@mail.gmail.com>

This patch no longer applies


Applying: bug 5149 fix broken link to noItemTypeImages preference
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl

Could you please rebase, and fix the conflict and resend the patch please
The follow up patch of course no longer applies also.

Chris
On 30 October 2010 01:20, Galen Charlton <gmcharlt at gmail.com> wrote:
> From: Nicole Engard <nengard at bywatersolutions.com>
>
> Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
> ---
> ?.../prog/en/modules/admin/itemtypes.tmpl ? ? ? ? ? | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
> index 4c34695..8111182 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
> @@ -162,7 +162,7 @@ Item Types Administration
> ? ? ? <li>
> ? ? ? ? ? <label for="description">Description</label><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" /> ? ? ?</li>
> ? ? ?<!-- TMPL_IF NAME="noItemTypeImages" -->
> - ? ? ? ?<li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=all&searchfield=noItemTypeImages">noItemTypeImages system preference</a></li></ol>
> + ? ? ? ?<li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=+noItemTypeImages">noItemTypeImages system preference</a></li></ol>
> ? ? ? ? <!-- TMPL_ELSE --></ol>
> ? ? ? ? ? ? ? ?<div id="icons" class="toptabs">
> ? ? ? ? ? ? ? ?<h5 style="margin-left:10px;">Choose an Icon:</h5>
> --
> 1.7.0
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>

From gmcharlt at gmail.com  Tue Nov  2 03:09:09 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon,  1 Nov 2010 22:09:09 -0400
Subject: [Koha-patches] [PATCH 1/2] bug 5149 fix broken link to
	noItemTypeImages preference
Message-ID: <1288663750-9142-1-git-send-email-gmcharlt@gmail.com>

From: Nicole Engard <nengard at bywatersolutions.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/admin/itemtypes.tmpl           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index a36c4ee..1703e78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -162,7 +162,7 @@ Item Types Administration
       <li>
           <label for="description">Description</label><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />      </li>
      <!-- TMPL_IF NAME="noItemTypeImages" -->
-	 <li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=all&amp;searchfield=noItemTypeImages">noItemTypeImages system preference</a></li></ol>
+	 <li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=+noItemTypeImages">noItemTypeImages system preference</a></li></ol>
 	 <!-- TMPL_ELSE --></ol>
 		<div id="icons" class="toptabs">
 		<h5 style="margin-left:10px;">Choose an Icon:</h5>
-- 
1.7.0


From gmcharlt at gmail.com  Tue Nov  2 03:09:10 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon,  1 Nov 2010 22:09:10 -0400
Subject: [Koha-patches] [PATCH 2/2] bug 5149: follow-up - remove extraneous
	character in link
In-Reply-To: <1288663750-9142-1-git-send-email-gmcharlt@gmail.com>
References: <1288663750-9142-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1288663750-9142-2-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/admin/itemtypes.tmpl           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index 1703e78..6e77c88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -162,7 +162,7 @@ Item Types Administration
       <li>
           <label for="description">Description</label><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />      </li>
      <!-- TMPL_IF NAME="noItemTypeImages" -->
-	 <li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=+noItemTypeImages">noItemTypeImages system preference</a></li></ol>
+	 <li><span class="label">Image: </span>Item type images are disabled. To enable them, turn off the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=noItemTypeImages">noItemTypeImages system preference</a></li></ol>
 	 <!-- TMPL_ELSE --></ol>
 		<div id="icons" class="toptabs">
 		<h5 style="margin-left:10px;">Choose an Icon:</h5>
-- 
1.7.0


From gmcharlt at gmail.com  Tue Nov  2 03:09:34 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 1 Nov 2010 22:09:34 -0400
Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] bug 5149 fix broken
 link to noItemTypeImages preference
In-Reply-To: <AANLkTi=+WpU8newsu2F6kO44c=+wTqnQ4FSsdUU8u3NJ@mail.gmail.com>
References: <1288354848-13325-1-git-send-email-gmcharlt@gmail.com>
	<AANLkTi=+WpU8newsu2F6kO44c=+wTqnQ4FSsdUU8u3NJ@mail.gmail.com>
Message-ID: <AANLkTik_7mED=zGgzVzgusf2ENQEDmkcvTSxD6TU7OUb@mail.gmail.com>

Hi,

On Mon, Nov 1, 2010 at 9:54 PM, Chris Cormack <chris at bigballofwax.co.nz> wrote:
> Could you please rebase, and fix the conflict and resend the patch please
> The follow up patch of course no longer applies also.

Done.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From jcamins at cpbibliography.com  Tue Nov  2 04:16:52 2010
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Mon,  1 Nov 2010 23:16:52 -0400
Subject: [Koha-patches] [PATCH] Add MARC21 field 545 to to framework fix bug
	5226
Message-ID: <1288667812-4495-1-git-send-email-jcamins@cpbibliography.com>

Adds MARC21 field 545 to the English, French, German, and Polish MARC21
frameworks. The labels for the field still need to be translated into
French and Polish.
---
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    3 ++-
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../Obligatoire/marc21_framework_DEFAULT.sql       |    1 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 installer/data/mysql/updatedatabase.pl             |   13 +++++++++++++
 5 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/de-DE/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/de-DE/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index 35c22a0..015c94e 100644
--- a/installer/data/mysql/de-DE/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/de-DE/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -346,6 +346,7 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
 		('541', 'Fu?note zur Herkunft', 'Fu?note zur Herkunft', 1, 0, NULL, ''),
 		('543', 'SOLICITATION INFORMATION NOTE (AM) [OBSOLETE]', 'SOLICITATION INFORMATION NOTE (AM) [OBSOLETE]', 1, 0, NULL, ''),
 		('544', 'Fu?note zum Standort anderer Archivmaterialien', 'Fu?note zum Standort anderer Archivmaterialien', 1, 0, NULL, ''),
+        ('545', 'Fu?note zu biografischen oder historischen Daten', 'Fu?note zu biografischen oder historischen Daten', 1, 0, NULL, ''),
 		('546', 'Fu?note zur Sprache', 'Fu?note zur Sprache', 1, 0, NULL, ''),
 		('547', 'Fu?note zu fr?heren Titeln', 'Fu?note zu fr?heren Titeln', 1, 0, NULL, ''),
 		('550', 'Fu?note zur herausgebenden K?rperschaft', 'Fu?note zur herausgebenden K?rperschaft', 1, 0, NULL, ''),
@@ -3981,4 +3982,4 @@ INSERT INTO `marc_subfield_structure` (`tagfield`, `tagsubfield`, `liblibrarian`
 		('998', 'p', 'PROC (RLIN)', 'PROC (RLIN)', 0, 0, '', 9, '', '', '', 0, 5, '', '', '', NULL),
 		('998', 's', 'CC (RLIN)', 'CC (RLIN)', 0, 0, '', 9, '', '', '', 0, 5, '', '', '', NULL),
 		('998', 't', 'RTYP (RLIN)', 'RTYP (RLIN)', 0, 0, '', 9, '', '', '', 0, 5, '', '', '', NULL),
-		('998', 'w', 'PLINK (RLIN)', 'PLINK (RLIN)', 0, 0, '', 9, '', '', '', 0, 5, '', '', '', NULL);
\ No newline at end of file
+		('998', 'w', 'PLINK (RLIN)', 'PLINK (RLIN)', 0, 0, '', 9, '', '', '', 0, 5, '', '', '', NULL);
diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index a5e7d77..f770bc2 100644
--- a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -346,6 +346,7 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
 		('541', 'IMMEDIATE SOURCE OF ACQUISITION NOTE', 'IMMEDIATE SOURCE OF ACQUISITION NOTE', 1, 0, NULL, ''),
 		('543', 'SOLICITATION INFORMATION NOTE (AM) [OBSOLETE]', 'SOLICITATION INFORMATION NOTE (AM) [OBSOLETE]', 1, 0, NULL, ''),
 		('544', 'LOCATION OF OTHER ARCHIVAL MATERIALS NOTE', 'LOCATION OF OTHER ARCHIVAL MATERIALS NOTE', 1, 0, NULL, ''),
+        ('545', 'BIOGRAPHICAL OR HISTORICAL DATA', 'BIOGRAPHICAL OR HISTORICAL DATA', 1, 0, NULL, ''),
 		('546', 'LANGUAGE NOTE', 'LANGUAGE NOTE', 1, 0, NULL, ''),
 		('547', 'FORMER TITLE COMPLEXITY NOTE', 'FORMER TITLE COMPLEXITY NOTE', 1, 0, NULL, ''),
 		('550', 'ISSUING BODY NOTE', 'ISSUING BODY NOTE', 1, 0, NULL, ''),
diff --git a/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql b/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
index 5877662..0bd0f33 100644
--- a/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/fr-FR/marcflavour/marc21/Obligatoire/marc21_framework_DEFAULT.sql
@@ -346,6 +346,7 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
 		('541', 'IMMEDIATE SOURCE OF ACQUISITION NOTE', 'IMMEDIATE SOURCE OF ACQUISITION NOTE', 1, 0, NULL, ''),
 		('543', 'SOLICITATION INFORMATION NOTE (AM) [OBSOLETE]', 'SOLICITATION INFORMATION NOTE (AM) [OBSOLETE]', 1, 0, NULL, ''),
 		('544', 'LOCATION OF OTHER ARCHIVAL MATERIALS NOTE', 'LOCATION OF OTHER ARCHIVAL MATERIALS NOTE', 1, 0, NULL, ''),
+        ('545', 'BIOGRAPHICAL OR HISTORICAL DATA', 'BIOGRAPHICAL OR HISTORICAL DATA', 1, 0, NULL, ''),
 		('546', 'LANGUAGE NOTE', 'LANGUAGE NOTE', 1, 0, NULL, ''),
 		('547', 'FORMER TITLE COMPLEXITY NOTE', 'FORMER TITLE COMPLEXITY NOTE', 1, 0, NULL, ''),
 		('550', 'ISSUING BODY NOTE', 'ISSUING BODY NOTE', 1, 0, NULL, ''),
diff --git a/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
index be49737..274caac 100644
--- a/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
+++ b/installer/data/mysql/pl-PL/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
@@ -345,6 +345,7 @@ INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeat
 		('541','ACQUISITION INFO--IMMEDIATE SOURCE OF ACQUISITION NOTE','IMMEDIATE SOURCE OF ACQUISITION NOTE',1,0,NULL,''),
 		('543','SOLICITATION INFORMATION NOTE (AM) [OBSOLETE]','SOLICITATION INFORMATION NOTE (AM) [OBSOLETE]',1,0,NULL,''),
 		('544','LOCATION OF OTHER ARCHIVAL MATERIALS NOTE','LOCATION OF OTHER ARCHIVAL MATERIALS NOTE',1,0,NULL,''),
+        ('545', 'BIOGRAPHICAL OR HISTORICAL DATA', 'BIOGRAPHICAL OR HISTORICAL DATA', 1, 0, NULL, ''),
 		('546','UWAGA O J?ZYKU','LANGUAGE NOTE',1,0,NULL,''),
 		('547','Z?O?ONA UWAGA O POPRZEDNIM TYTULE','FORMER TITLE COMPLEXITY NOTE',1,0,NULL,''),
 		('550','UWAGA DOTYCZ?CA INSTYTUCJI SPRAWCZEJ','ISSUING BODY NOTE',1,0,NULL,''),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 523c533..c412e35 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3799,6 +3799,19 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = '3.03.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    if (C4::Context->preference("marcflavour") eq 'MARC21') {
+        if (C4::Context->preference("opaclanguages") eq "de") {
+            $dbh->do("INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`, `frameworkcode`) VALUES ('545', 'Fu?note zu biografischen oder historischen Daten', 'Fu?note zu biografischen oder historischen Daten', 1, 0, NULL, '');");
+        } else {
+            $dbh->do("INSERT INTO `marc_tag_structure` (`tagfield`, `liblibrarian`, `libopac`, `repeatable`, `mandatory`, `authorised_value`, `frameworkcode`) VALUES ('545', 'BIOGRAPHICAL OR HISTORICAL DATA', 'BIOGRAPHICAL OR HISTORICAL DATA', 1, 0, NULL, '');");
+        }
+    }
+    print "Upgrade to $DBversion done (add MARC21 field 545 to framework)\n";
+    SetVersion ($DBversion);
+}
+
 =item DropAllForeignKeys($table)
 
   Drop all foreign keys of the table $table
-- 
1.7.0.4


From gmcharlt at gmail.com  Tue Nov  2 18:00:22 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue, 2 Nov 2010 13:00:22 -0400
Subject: [Koha-patches] [PATCH] Add MARC21 field 545 to to framework fix
 bug 5226
In-Reply-To: <1288667812-4495-1-git-send-email-jcamins@cpbibliography.com>
References: <1288667812-4495-1-git-send-email-jcamins@cpbibliography.com>
Message-ID: <AANLkTikvzWpT4RBO=TQpKG-TxozyXQtVc0=w0MNdDXc8@mail.gmail.com>

Hi,

On Mon, Nov 1, 2010 at 11:16 PM, Jared Camins-Esakov
<jcamins at cpbibliography.com> wrote:
> Adds MARC21 field 545 to the English, French, German, and Polish MARC21
> frameworks. The labels for the field still need to be translated into
> French and Polish.

This is not complete - it lacks inserts into marc_subfield_structure
for the subfields.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From jcamins at cpbibliography.com  Tue Nov  2 18:02:14 2010
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Tue, 2 Nov 2010 13:02:14 -0400
Subject: [Koha-patches] [PATCH] Add MARC21 field 545 to to framework fix
 bug 5226
In-Reply-To: <AANLkTikvzWpT4RBO=TQpKG-TxozyXQtVc0=w0MNdDXc8@mail.gmail.com>
References: <1288667812-4495-1-git-send-email-jcamins@cpbibliography.com>
	<AANLkTikvzWpT4RBO=TQpKG-TxozyXQtVc0=w0MNdDXc8@mail.gmail.com>
Message-ID: <AANLkTimoEOQ3c9Fhzp-GG_=hgum-vbxj0SQ7zS+Vor8p@mail.gmail.com>

Galen,

As far as I can tell, the subfields are already loaded into the database.
Once you add the field, all the subfields start showing up.

Regards,
Jared

On Tue, Nov 2, 2010 at 1:00 PM, Galen Charlton <gmcharlt at gmail.com> wrote:

> Hi,
>
> On Mon, Nov 1, 2010 at 11:16 PM, Jared Camins-Esakov
> <jcamins at cpbibliography.com> wrote:
> > Adds MARC21 field 545 to the English, French, German, and Polish MARC21
> > frameworks. The labels for the field still need to be translated into
> > French and Polish.
>
> This is not complete - it lacks inserts into marc_subfield_structure
> for the subfields.
>
> Regards,
>
> Galen
> --
> Galen Charlton
> gmcharlt at gmail.com
>



-- 
Jared Camins-Esakov
Freelance bibliographer, C & P Bibliography Services, LLC
(phone) +1 (917) 727-3445
(e-mail) jcamins at cpbibliography.com
(web) http://www.cpbibliography.com/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101102/37008e44/attachment.htm>

From gmcharlt at gmail.com  Tue Nov  2 20:01:36 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue, 2 Nov 2010 15:01:36 -0400
Subject: [Koha-patches] [PATCH] Add MARC21 field 545 to to framework fix
 bug 5226
In-Reply-To: <AANLkTimoEOQ3c9Fhzp-GG_=hgum-vbxj0SQ7zS+Vor8p@mail.gmail.com>
References: <1288667812-4495-1-git-send-email-jcamins@cpbibliography.com>
	<AANLkTikvzWpT4RBO=TQpKG-TxozyXQtVc0=w0MNdDXc8@mail.gmail.com>
	<AANLkTimoEOQ3c9Fhzp-GG_=hgum-vbxj0SQ7zS+Vor8p@mail.gmail.com>
Message-ID: <AANLkTi=PE7hWq4HEE-9Kx_VjYg4FyC-NgjSsLvPDyPdk@mail.gmail.com>

Hi,

On Tue, Nov 2, 2010 at 1:02 PM, Jared Camins-Esakov
<jcamins at cpbibliography.com> wrote:
> As far as I can tell, the subfields are already loaded into the database.
> Once you add the field, all the subfields start showing up.

You're correct - I was imagining a foreign key constraint that does
not currently exist.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From chris.nighswonger at gmail.com  Wed Nov  3 02:39:43 2010
From: chris.nighswonger at gmail.com (Chris Nighswonger)
Date: Tue,  2 Nov 2010 21:39:43 -0400
Subject: [Koha-patches] [PATCH 2/2] bug 4991: follow-up tweaks
In-Reply-To: <1288748383-14277-1-git-send-email-chris.nighswonger@gmail.com>
References: <1288748383-14277-1-git-send-email-chris.nighswonger@gmail.com>
Message-ID: <1288748383-14277-2-git-send-email-chris.nighswonger@gmail.com>

From: Galen Charlton <gmcharlt at gmail.com>

* make some strings translatable
* display library name instead of code in add/edit
  holiday panel
* minor textual fixes to hints

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
---
 .../prog/en/modules/tools/holidays.tmpl            |   22 ++++++++++----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
index 423c7da..38b12dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
@@ -21,7 +21,7 @@
 		$("#showHoliday").slideDown("fast");
 		$('#showDaynameOutput').html(dayName);
 		$('#showDayname').val(dayName);
-		$('#showBranchNameOutput').html($("#branch").val());
+		$('#showBranchNameOutput').html($("#branch :selected").text());
 		$('#showBranchName').val($("#branch").val());
 		$('#showDayOutput').html(day);
 		$('#showDay').val(day);
@@ -35,14 +35,14 @@
 		$('#showHolidayType').val(holidayType);
 
 		if (holidayType == 'exception') {
-			$("#showOperationDelLabel").html('Delete this exception.');
-			$("#holtype").attr("class","key exception").html("Holiday exception");
+			$("#showOperationDelLabel").html(_('Delete this exception.'));
+			$("#holtype").attr("class","key exception").html(_("Holiday exception"));
 		} else if(holidayType == 'weekday') {
-			$("#showOperationDelLabel").html('Delete this holiday.');
-			$("#holtype").attr("class","key repeatableday").html("Repeatable holiday");
+			$("#showOperationDelLabel").html(_('Delete this holiday.'));
+			$("#holtype").attr("class","key repeatableday").html(_("Repeatable holiday"));
 		} else {
-			$("#showOperationDelLabel").html('Delete this holiday.');
-			$("#holtype").attr("class","key holiday").html("Unique holiday");
+			$("#showOperationDelLabel").html(_('Delete this holiday.'));
+			$("#holtype").attr("class","key holiday").html(_("Unique holiday"));
 		}
 		
 		if (exceptionPosibility == 1) {
@@ -58,7 +58,7 @@
 		$("#newHoliday").slideDown("fast");
 		$("#newDaynameOutput").html(dayName);
 		$("#newDayname").val(dayName);
-		$("#newBranchNameOutput").html($('#branch').val());
+		$("#newBranchNameOutput").html($('#branch :selected').text());
 		$("#newBranchName").val($('#branch').val());
 		$("#newDayOutput").html(day);
 		$("#newDay").val(day);
@@ -201,7 +201,7 @@
 			<h3>Add new holiday</h3>
 			<ol>
 			<li>
-				<strong>Library</strong>
+				<strong>Library:</strong>
 				<span id="newBranchNameOutput"></span>
 				<input type="hidden" id="newBranchName" name="newBranchName" />
 			</li>
@@ -224,7 +224,7 @@
 			<li class="radio"><input type="radio" name="newOperation" id="newOperationOnce" value="holiday" checked="checked" />
 			<label for="newOperationOnce">Holiday only on this day</label>.
 			<a href="#" class="helptext">[?]</a>
-			<div class="hint">Make a single holiday. For example, selecting August 1st, 2012 will make it holiday, but will not affect August 1st in other years.</div>
+			<div class="hint">Make a single holiday. For example, selecting August 1st, 2012 will make it a holiday, but will not affect August 1st in other years.</div>
 			</li>
 			<li class="radio"><input type="radio" name="newOperation" id="newOperationDay" value="weekday" />
 							<label for="newOperationDay">Holiday repeated every same day of the week</label>.
@@ -234,7 +234,7 @@
 			<li class="radio"><input type="radio" name="newOperation" id="newOperationYear" value="repeatable" />
 							<label for="newOperationYear">Holiday repeated yearly on the same date</label>.
 							<a href="#" class="helptext">[?]</a>
-							<div class="hint">This will take this day and month as a reference to make it holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1st will make August 1st a holiday every year.</div>
+							<div class="hint">This will take this day and month as a reference to make it a holiday. Through this option, you can repeat this rule for every year. For example, selecting August 1st will make August 1st a holiday every year.</div>
 							</li>
 				<li class="radio">
 				<input type="checkbox" name="allBranches" id="allBranches" />
-- 
1.7.0


From f.demians at tamil.fr  Wed Nov  3 18:38:35 2010
From: f.demians at tamil.fr (=?utf-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Wed,  3 Nov 2010 18:38:35 +0100
Subject: [Koha-patches] [PATCH] Bug 4472 Apply it to MARC21
Message-ID: <1288805915-16093-1-git-send-email-f.demians@tamil.fr>

For French installation of Koha using MARC21, the same issues as UNIMARC
affects handling of &nbsp; by translation scripts.
---
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    1 +
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index e31dbe7..e6a5d01 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:items="http://www.koha.org/items"
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 372d31c..9a58ee3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:items="http://www.koha.org/items"
-- 
1.5.6.5


From gmcharlt at gmail.com  Wed Nov  3 18:49:00 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed,  3 Nov 2010 13:49:00 -0400
Subject: [Koha-patches] [PATCH] bug 4141: fix upgrade of OPAC XSLT
	parameters from 3.0.x
Message-ID: <1288806540-17126-1-git-send-email-gmcharlt@gmail.com>

Note that OPACXSLTResultsDisplay and OPACXSLTDetailsDisplay
are boolean parameters in 3.2.x, not string parameters.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 installer/data/mysql/updatedatabase.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 6490549..a6f6be6 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3448,11 +3448,11 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     my $value = C4::Context->preference("XSLTResultsDisplay");
     $dbh->do(
         "INSERT INTO systempreferences (variable,value,type)
-         VALUES('OPACXSLTResultsDisplay',$value,'YesNo')");
+         VALUES('OPACXSLTResultsDisplay',?,'YesNo')", {}, $value ? 1 : 0);
     $value = C4::Context->preference("XSLTDetailsDisplay");
     $dbh->do(
         "INSERT INTO systempreferences (variable,value,type)
-         VALUES('OPACXSLTDetailsDisplay',$value,'YesNo')");
+         VALUES('OPACXSLTDetailsDisplay',?,'YesNo')", {}, $value ? 1 : 0);
     print "Upgrade done (added two new syspref: OPACXSLTResultsDisplay and OPACXSLTDetailDisplay). You may have to go in Admin > System preference to tweak XSLT related syspref both in OPAC and Search tabs.\n     ";
     SetVersion ($DBversion);
 }
-- 
1.7.0


From chris.nighswonger at gmail.com  Wed Nov  3 21:31:03 2010
From: chris.nighswonger at gmail.com (Chris Nighswonger)
Date: Wed,  3 Nov 2010 16:31:03 -0400
Subject: [Koha-patches] [PATCH] Bug 5363 - Removing unused module
	(C4::Cache::FastMemcached)
Message-ID: <1288816263-20541-1-git-send-email-chris.nighswonger@gmail.com>

From: Chris Cormack <chrisc at catalyst.net.nz>

Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
---
 C4/Cache.pm               |    1 -
 C4/Cache/FastMemcached.pm |   95 ---------------------------------------------
 t/Cache_FastMemcached.t   |   14 -------
 3 files changed, 0 insertions(+), 110 deletions(-)
 delete mode 100644 C4/Cache/FastMemcached.pm
 delete mode 100755 t/Cache_FastMemcached.t

diff --git a/C4/Cache.pm b/C4/Cache.pm
index ebe881a..151a3fa 100644
--- a/C4/Cache.pm
+++ b/C4/Cache.pm
@@ -50,7 +50,6 @@ use Carp;
 use base qw(Class::Accessor);
 
 use C4::Cache::Memcached;
-use C4::Cache::FastMemcached;
 
 __PACKAGE__->mk_ro_accessors( qw( cache ) );
 
diff --git a/C4/Cache/FastMemcached.pm b/C4/Cache/FastMemcached.pm
deleted file mode 100644
index 96dc08e..0000000
--- a/C4/Cache/FastMemcached.pm
+++ /dev/null
@@ -1,95 +0,0 @@
-package Koha::Cache::FastMemcached;
-
-# Copyright 2009 Chris Cormack and The Koha Dev Team
-#
-# 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 Carp;
-
-use Cache::Memcached::Fast;
-use IO::Compress::Gzip;
-use IO::Uncompress::Gunzip;
-use Storable;
-
-use base qw(C4::Cache);
-
-sub _cache_handle {
-    my $class  = shift;
-    my $params = shift;
-
-    my @servers = split /,/, $params->{'cache_servers'};
-
-    return Cache::Memcached::Fast->new(
-        {
-            servers            => \@servers,
-            namespace          => $params->{'namespace'} || 'KOHA',
-            connect_timeout    => $params->{'connect_timeout'} || 2,
-            io_timeout         => $params->{'io_timeout'} || 2,
-            close_on_error     => 1,
-            compress_threshold => 100_000,
-            compress_ratio     => 0.9,
-            compress_methods =>
-              [ \&IO::Compress::Gzip::gzip, \&IO::Uncompress::Gunzip::gunzip ],
-            max_failures      => 3,
-            failure_timeout   => 2,
-            ketama_points     => 150,
-            nowait            => 1,
-            hash_namespace    => 1,
-            serialize_methods => [ \&Storable::freeze, \&Storable::thaw ],
-            utf8              => 1,
-        }
-    );
-}
-
-sub set_in_cache {
-    my ( $self, $key, $value, $expiry ) = @_;
-    croak "No key" unless $key;
-
-    if ( defined $expiry ) {
-        return $self->cache->set( $key, $value, $expiry );
-    }
-    else {
-        return $self->cache->set( $key, $value );
-    }
-}
-
-sub get_from_cache {
-    my ( $self, $key ) = @_;
-    croak "No key" unless $key;
-    return $self->cache->get($key);
-}
-
-sub clear_from_cache {
-    my ( $self, $key ) = @_;
-    croak "No key" unless $key;
-    return $self->cache->delete($key);
-}
-
-sub flush_all {
-    my $self = shift;
-    return $self->cache->flush_all;
-}
-
-1;
-__END__                                                                         
-                                                                                  
-=head1 NAME                                                                     
-                                                                                
-  C4::Cache::FastMemcached - memcached::fast subclass of C4::Cache                
-                                                                                  
-=cut
diff --git a/t/Cache_FastMemcached.t b/t/Cache_FastMemcached.t
deleted file mode 100755
index 589e9b1..0000000
--- a/t/Cache_FastMemcached.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::Cache::FastMemcached');
-}
-
-- 
1.7.0


From M.de.Rooy at rijksmuseum.nl  Thu Nov  4 10:26:52 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 4 Nov 2010 09:26:52 +0000
Subject: [Koha-patches] [PATCH] Bug 5066 (Incorrect use of localtime
 function when calling _session_log)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3119B52D@S-MAIL-1B.rijksmuseum.intra>

---
 C4/Auth.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 6ba852d..58ce63e 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -717,7 +717,7 @@ sub checkauth {
 		    ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
 		}
 		if ($return) {
-            	_session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},localtime);
+            	_session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},scalar localtime);
             	if ( $flags = haspermission(  $userid, $flagsrequired ) ) {
 					$loggedin = 1;
             	}
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Thu Nov  4 12:32:05 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 4 Nov 2010 11:32:05 +0000
Subject: [Koha-patches] [PATCH] Bug 4515 (Few very small errors in
	opac-search.pl)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3119B5C7@S-MAIL-1B.rijksmuseum.intra>

Loop on results should stop before $i==@servers.  Adding fix for warnings on undefined values in comparison for lines 485, 488 and 510.
---
 opac/opac-search.pl |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 30bc34a..b1be022 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -431,7 +431,7 @@ if ($@ || $error) {
 # At this point, each server has given us a result set
 # now we build that set for template display
 my @sup_results_array;
-for (my $i=0;$i<=@servers;$i++) {
+for (my $i=0;$i<@servers;$i++) {
     my $server = $servers[$i];
     if ($server && $server =~/biblioserver/) { # this is the local bibliographic server
         $hits = $results_hashref->{$server}->{"hits"};
@@ -482,10 +482,10 @@ for (my $i=0;$i<=@servers;$i++) {
  	    }
  
  	    # Adding the new search if needed
- 	    if ($borrowernumber eq '') {
+ 	    if (!$borrowernumber || $borrowernumber eq '') {
  	    # To a cookie (the user is not logged in)
  
-     		if ($params->{'offset'} eq '') {
+     		if (($params->{'offset'}||'') eq '') {
  
      		    push @recentSearches, {
      					    "query_desc" => $query_desc || "unknown", 
@@ -507,7 +507,7 @@ for (my $i=0;$i<=@servers;$i++) {
  	    } 
 		else {
  	    # To the session (the user is logged in)
- 			if ($params->{'offset'} eq '') {
+ 			if (($params->{'offset'}||'') eq '') {
 				AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc, $query_cgi, $total);
      		    $template->param(ShowOpacRecentSearchLink => 1);
      		}
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Thu Nov  4 12:38:45 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 4 Nov 2010 11:38:45 +0000
Subject: [Koha-patches] [PATCH] Bug 4515 (Few very small errors in
 opac-search.pl) RESENT fixing whitespace warning
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3119B5E5@S-MAIL-1B.rijksmuseum.intra>

Loop on results should stop before $i==@servers.  Adding fix for warnings on undefined values in comparison for lines 485, 488 and 510.
---
 opac/opac-search.pl |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 30bc34a..b1be022 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -431,7 +431,7 @@ if ($@ || $error) {
 # At this point, each server has given us a result set
 # now we build that set for template display
 my @sup_results_array;
-for (my $i=0;$i<=@servers;$i++) {
+for (my $i=0;$i<@servers;$i++) {
     my $server = $servers[$i];
     if ($server && $server =~/biblioserver/) { # this is the local bibliographic server
         $hits = $results_hashref->{$server}->{"hits"};
@@ -482,10 +482,10 @@ for (my $i=0;$i<=@servers;$i++) {
  	    }
  
  	    # Adding the new search if needed
- 	    if ($borrowernumber eq '') {
+           if (!$borrowernumber || $borrowernumber eq '') {
  	    # To a cookie (the user is not logged in)
  
-     		if ($params->{'offset'} eq '') {
+               if (($params->{'offset'}||'') eq '') {
  
      		    push @recentSearches, {
      					    "query_desc" => $query_desc || "unknown", 
@@ -507,7 +507,7 @@ for (my $i=0;$i<=@servers;$i++) {
  	    } 
 		else {
  	    # To the session (the user is logged in)
- 			if ($params->{'offset'} eq '') {
+                       if (($params->{'offset'}||'') eq '') {
 				AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc, $query_cgi, $total);
      		    $template->param(ShowOpacRecentSearchLink => 1);
      		}
-- 
1.6.0.6


From cnighswonger at foundations.edu  Thu Nov  4 19:44:21 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 4 Nov 2010 14:44:21 -0400
Subject: [Koha-patches] Pull Request
Message-ID: <AANLkTi=keMPSuqxsC5XvL7rOg20Rt=+QUtXi57q8kfao@mail.gmail.com>

The following changes since commit 414b2ace4fa5804d27e927b9b573dcb973761c87:
  Chris Cormack (1):
        Merge remote branch 'kc/new/signoffs' into kcmaster

are available in the git repository at:

  git://git.koha-community.org/wip/koha-fbc.git trivial_bugs

Chris Nighswonger (1):
      Fixing up a regexp to stop a trivial warn

 misc/migration_tools/bulkmarcimport.pl |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

From cnighswonger at foundations.edu  Thu Nov  4 19:45:17 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 4 Nov 2010 14:45:17 -0400
Subject: [Koha-patches] Pull Request
Message-ID: <AANLkTiktt8w_4pfoTyrgSRrdCmxBTaYz_ZG9MzB9f+ao@mail.gmail.com>

The following changes since commit 414b2ace4fa5804d27e927b9b573dcb973761c87:
  Chris Cormack (1):
        Merge remote branch 'kc/new/signoffs' into kcmaster

are available in the git repository at:

  git://git.koha-community.org/wip/koha-fbc.git k_bug_5366

Chris Nighswonger (1):
      Bug 5366 - Standing enh req for code changes enabling database agnosticism

 C4/Biblio.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

From cnighswonger at foundations.edu  Thu Nov  4 21:28:49 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 4 Nov 2010 16:28:49 -0400
Subject: [Koha-patches] [Bug 5366] Pull Request
Message-ID: <AANLkTikgQKfw63R0UdOaQ=dKpdsFO=qd9pXbX6OX-=cC@mail.gmail.com>

The following changes since commit 414b2ace4fa5804d27e927b9b573dcb973761c87:
  Chris Cormack (1):
        Merge remote branch 'kc/new/signoffs' into kcmaster

are available in the git repository at:

  git://git.koha-community.org/wip/koha-fbc.git k_bug_5366

Chris Nighswonger (2):
      [1/2] Bug 5366 - Standing enh req for code changes enabling
database agnosticism
      [2/2] Bug 5366 - Standing enh req for code changes enabling
database agnosticism

 C4/Biblio.pm               |    7 ++++---
 C4/ImportBatch.pm          |   12 ++++--------
 tools/stage-marc-import.pl |    9 ++++++++-
 3 files changed, 16 insertions(+), 12 deletions(-)

From f.demians at tamil.fr  Fri Nov  5 12:23:08 2010
From: f.demians at tamil.fr (=?utf-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Fri,  5 Nov 2010 12:23:08 +0100
Subject: [Koha-patches] [PATCH] Bug 5368 Browse Shelf link appears when no
	itemcallnumber
Message-ID: <1288956188-7901-1-git-send-email-f.demians@tamil.fr>

Suppress Browse Shelf link on OPAC detail page when there is no item
call number.

[3.2] Should also apply on 3.2
---
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index b1fdf84..1e5e2b7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -398,7 +398,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 	    <tr><!-- TMPL_IF NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR NAME="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_IF -->
 		<td><!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_IF name="branchurl" --><a href="<!-- TMPL_VAR NAME="branchurl" -->"><!-- TMPL_VAR NAME="branchname" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="location_description" --> </td>
 		<!-- TMPL_IF NAME="itemdata_ccode" --><td><!-- TMPL_VAR NAME="ccode" --></td><!-- /TMPL_IF -->
-		<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="OPACShelfBrowser" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --></td>
+		<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- TMPL_IF NAME="OPACShelfBrowser" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
 		<!-- TMPL_IF NAME="itemdata_enumchron" --><td><!-- TMPL_VAR NAME="enumchron" --></td><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="itemdata_uri" --><td><a href="<!-- TMPL_VAR NAME="uri" -->"><!-- TMPL_VAR NAME="uri" --></a></td><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="itemdata_copynumber" --><td><!-- TMPL_VAR NAME="copynumber" --></td><!-- /TMPL_IF -->
-- 
1.5.6.5


From gmcharlt at gmail.com  Fri Nov  5 14:13:21 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  5 Nov 2010 09:13:21 -0400
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] (MT 2985) simplify
	CanBookBeReserved
Message-ID: <1288962801-27121-1-git-send-email-gmcharlt@gmail.com>

From: Nahuel ANGELINETTI <nahuel.angelinetti at biblibre.com>

The function was too complex for so simple stuff, not we check if one of all items of the record can be issued.

[Note by Galen Charlton: not only does this patch simplify the routine,
 it also makes it behave correctly.]

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Reserves.pm |   73 +++----------------------------------------------------
 1 files changed, 4 insertions(+), 69 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 9b7014e..fcf9209 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -380,76 +380,11 @@ sub GetReservesFromBorrowernumber {
 sub CanBookBeReserved{
     my ($borrowernumber, $biblionumber) = @_;
 
-    my $dbh           = C4::Context->dbh;
-    my $biblio        = GetBiblioData($biblionumber);
-    my $borrower      = C4::Members::GetMember(borrowernumber=>$borrowernumber);
-    my $controlbranch = C4::Context->preference('ReservesControlBranch');
-    my $itype         = C4::Context->preference('item-level_itypes');
-    my $reservesrights= 0;
-    my $reservescount = 0;
-    
-    # we retrieve the user rights
-    my @args;
-    my $rightsquery = "SELECT categorycode, itemtype, branchcode, reservesallowed 
-                       FROM issuingrules 
-                       WHERE categorycode IN (?, '*')";
-    push @args,$borrower->{categorycode};
-
-    if($controlbranch eq "ItemHomeLibrary"){
-        $rightsquery .= " AND branchcode = '*'";
-    }elsif($controlbranch eq "PatronLibrary"){
-        $rightsquery .= " AND branchcode IN (?,'*')";
-        push @args, $borrower->{branchcode};
-    }
-    
-    if(not $itype){
-        $rightsquery .= " AND itemtype IN (?,'*')";
-        push @args, $biblio->{itemtype};
-    }else{
-        $rightsquery .= " AND itemtype = '*'";
-    }
-    
-    $rightsquery .= " ORDER BY categorycode DESC, itemtype DESC, branchcode DESC";
-    my $sthrights = $dbh->prepare($rightsquery);
-    $sthrights->execute(@args);
-    
-    if(my $row = $sthrights->fetchrow_hashref()){
-       $reservesrights = $row->{reservesallowed};
-    }
-    
-    @args = ();
-    # we count how many reserves the borrower have
-    my $countquery = "SELECT count(*) as count
-                      FROM reserves
-                      LEFT JOIN items USING (itemnumber)
-                      LEFT JOIN biblioitems ON (reserves.biblionumber=biblioitems.biblionumber)
-                      LEFT JOIN borrowers USING (borrowernumber)
-                      WHERE borrowernumber = ?
-                    ";
-    push @args, $borrowernumber;
-    
-    if(not $itype){
-           $countquery .= "AND itemtype = ?";
-           push @args, $biblio->{itemtype};
+    my @items = GetItemsInfo($biblionumber);
+    foreach my $item (@items){
+        return 1 if CanItemBeReserved($borrowernumber, $item->{itemnumber});
     }
-    
-    if($controlbranch eq "PatronLibrary"){
-        $countquery .= " AND borrowers.branchcode = ? ";
-        push @args, $borrower->{branchcode};
-    }
-    
-    my $sthcount = $dbh->prepare($countquery);
-    $sthcount->execute(@args);
-    
-    if(my $row = $sthcount->fetchrow_hashref()){
-       $reservescount = $row->{count};
-    }
-    if($reservescount < $reservesrights){
-        return 1;
-    }else{
-        return 0;
-    }
-    
+    return 0;
 }
 
 =head2 CanItemBeReserved
-- 
1.7.0


From savitra.sirohi at osslabs.biz  Fri Nov  5 14:25:53 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Fri,  5 Nov 2010 18:55:53 +0530
Subject: [Koha-patches] [PATCH] Analytical records - some code cleanup
Message-ID: <1288963553-30622-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 cataloguing/addbiblio.pl |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index a306dd3..4e56fad 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -346,6 +346,8 @@ sub create_input {
         );
     # always expand all subfields of a mandatory field
     $subfield_data{visibility} = "" if $tagslib->{$tag}->{mandatory};
+    # expand all subfields of 773 if there is a host item provided in the input
+    $subfield_data{visibility} ="" if ($tag eq 773 and $cgi->param('hostitemnumber'));
     # it's an authorised field
     if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
         $subfield_data{marc_value} =
@@ -677,6 +679,14 @@ sub build_tabs ($$$$$) {
             # if breeding is empty
             }
             else {
+               my $hostbiblionumber;
+               my $hostitemnumber;
+               my $hostrecord;
+               if ($tag eq 773){
+			$hostbiblionumber = $input->param('hostbiblionumber');
+			$hostitemnumber = $input->param('hostitemnumber');
+			$hostrecord = &GetMarcBiblio($hostbiblionumber);
+               }
                 my @subfields_data;
                 foreach my $subfield ( sort( keys %{ $tagslib->{$tag} } ) ) {
                     next if ( length $subfield != 1 );
@@ -693,12 +703,7 @@ sub build_tabs ($$$$$) {
                            # always include in the form regardless of the hidden setting - bug 2206
                     next
                       if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
-
-                # populating host record details for analytical records
-                my $hostbiblionumber = $input->param('hostbiblionumber');
-                my $hostitemnumber = $input->param('hostitemnumber');
                     if ( $tag eq 773 and $hostbiblionumber){
-                                my $hostrecord = &GetMarcBiblio($hostbiblionumber);
                                 if ($subfield eq "w"){
                                         push(
                                                 @subfields_data,
@@ -706,34 +711,34 @@ sub build_tabs ($$$$$) {
                                             $tag, $subfield,$hostbiblionumber, $index_tag, $tabloop, $record,
                                             $authorised_values_sth,$input
                                         ));
+					next;
                                 }
-                                elsif ($subfield eq "a"){
+                                if ($subfield eq "a"){
                                         push(
                                         @subfields_data,
                                         &create_input(
                                             $tag, $subfield,$hostrecord->subfield('245',"a"), $index_tag, $tabloop, $record,
                                             $authorised_values_sth,$input
                                         ));
+					next;
                                 }
-                                elsif ($subfield eq "o"){
+                                if ($subfield eq "o"){
                                         push(
                                         @subfields_data,
                                         &create_input(
                                             $tag, $subfield,$hostitemnumber, $index_tag, $tabloop, $record,
                                             $authorised_values_sth,$input
                                         ));
+					next;
                                 }
-
-                        }
-                         else {
-                    push(
+                    }
+			push(
                         @subfields_data,
                         &create_input(
                             $tag, $subfield, '', $index_tag, $tabloop, $record,
                             $authorised_values_sth,$input
                         )
                     );
-		}
                 }
                 if ( $#subfields_data >= 0 ) {
                     my %tag_data = (
-- 
1.5.4.5


From savitra.sirohi at osslabs.biz  Fri Nov  5 14:26:43 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Fri,  5 Nov 2010 18:56:43 +0530
Subject: [Koha-patches] [PATCH] Analytical records - support for holds from
	the OPAC
Message-ID: <1288963603-30665-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

Signed-off-by: Amit Gupta <amit.gupta at osslabs.biz>
---
 .../opac-tmpl/prog/en/modules/opac-reserve.tmpl    |   10 ++++++++++
 opac/opac-reserve.pl                               |   19 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 812c91b..59c9a2f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -457,6 +457,9 @@
                               <th>Vol Info</th>
                             <!-- /TMPL_IF -->
                             <th>Information</th>
+		            <!-- TMPL_IF NAME="hostitemsflag" -->
+			      <th>Host Record</th>
+			    <!-- /TMPL_IF -->
                           </tr>
 
                           <!-- TMPL_LOOP name="itemLoop" -->
@@ -499,15 +502,22 @@
                                   <span class="notforloan">Not for loan (<!-- TMPL_VAR NAME="notforloanvalue" -->)</span>
                                 <!-- /TMPL_IF -->
                                 <!-- TMPL_IF NAME="reservedate"-->
+				<!-- TMPL_IF NAME="already_reserved"-->
+				  <span class="waiting">You have already requested this item. </span>
+				<!-- TMPL_ELSE -->
                                   <span class="waiting"><!-- TMPL_IF NAME="waitingdate" -->Waiting<!-- TMPL_ELSE -->On hold<!-- /TMPL_IF --> for patron
                                     <!-- TMPL_IF NAME="waitingdate" -->at<!-- TMPL_ELSE -->expected at<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="ExpectedAtLibrary" -->
                                     since
                                     <!-- TMPL_IF NAME="waitingdate" --><!-- TMPL_VAR NAME="waitingdate" --><!-- TMPL_ELSE --><!-- TMPL_IF name="reservedate" --><!-- TMPL_VAR NAME="reservedate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->.
                                   </span>
+				<!-- /TMPL_IF -->
                                 <!-- TMPL_ELSE -->
                                   <span class="notonhold">Not on hold</span>
                                 <!-- /TMPL_IF -->&nbsp;
                               </td>
+                <!-- TMPL_IF NAME="hostitemsflag" -->
+                      <td><!-- TMPL_IF NAME="hostbiblionumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="hostbiblionumber" -->" >Host Record</a><!-- /TMPL_IF --></td>
+                <!-- /TMPL_IF -->
                             </tr>
                           <!-- /TMPL_LOOP -->
                         </table>
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index bcd47a7..01cd576 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -195,6 +195,12 @@ if ( $query->param('place_reserve') ) {
             $branch = $borr->{'branchcode'};
         }
 
+	#item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber
+	my $hostbiblioNum = GetBiblionumberFromItemnumber($itemNum);
+	if ($hostbiblioNum ne $biblioNum) {
+		$biblioNum = $hostbiblioNum;
+	}
+
         my $biblioData = $biblioDataHash{$biblioNum};
         my $found;
 
@@ -390,6 +396,11 @@ foreach my $biblioNum (@biblionumbers) {
         my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemNum);
         my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0);
 
+	# the item could be reserved for this borrower vi a host record, flag this
+	if ($reservedfor eq $borrowernumber){
+		$itemLoopIter->{already_reserved} = 1;
+	}
+
         if ( defined $reservedate ) {
             $itemLoopIter->{backgroundcolor} = 'reserved';
             $itemLoopIter->{reservedate}     = format_date($reservedate);
@@ -431,6 +442,12 @@ foreach my $biblioNum (@biblionumbers) {
             $itemLoopIter->{nocancel} = 1;
         }
 
+	# if the items belongs to a host record, show link to host record
+	if ($itemInfo->{biblionumber} ne $biblioNum){
+		$biblioLoopIter{hostitemsflag} = 1;
+		$itemLoopIter->{hostbiblionumber} = $itemInfo->{biblionumber};
+	}
+
         # If there is no loan, return and transfer, we show a checkbox.
         $itemLoopIter->{notforloan} = $itemLoopIter->{notforloan} || 0;
 
@@ -444,7 +461,7 @@ foreach my $biblioNum (@biblionumbers) {
             $policy_holdallowed = 0;
         }
 
-        if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum)) {
+        if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and ($itemLoopIter->{already_reserved} ne 1)) {
             $itemLoopIter->{available} = 1;
             $numCopiesAvailable++;
         }
-- 
1.5.4.5


From savitra.sirohi at osslabs.biz  Fri Nov  5 14:27:08 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Fri,  5 Nov 2010 18:57:08 +0530
Subject: [Koha-patches] [PATCH] Analytical records - minor correction to sub
	GetMarcHosts
Message-ID: <1288963628-30698-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 C4/Biblio.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index bdeb74a..eb0b248 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1585,8 +1585,8 @@ sub GetMarcHosts {
 
         my @fields_loop;
 
-        my $hostbiblionumber = $field->subfield("$title_subf");
-        my $hosttitle = $field->subfield($bibnumber_subf);
+        my $hostbiblionumber = $field->subfield("$bibnumber_subf");
+        my $hosttitle = $field->subfield($title_subf);
         my $hostitemnumber=$field->subfield($itemnumber_subf);
         push @fields_loop, { hostbiblionumber => $hostbiblionumber, hosttitle => $hosttitle, hostitemnumber => $hostitemnumber};
         push @marchosts, { MARCHOSTS_FIELDS_LOOP => \@fields_loop };
-- 
1.5.4.5


From cfouts at ptfs.com  Fri Nov  5 20:51:43 2010
From: cfouts at ptfs.com (cfouts at ptfs.com)
Date: Fri,  5 Nov 2010 19:51:43 +0000
Subject: [Koha-patches] [PATCH] Refactor GetIssuingRule and GetLoanLength
Message-ID: <1288986703-18128-1-git-send-email-cfouts@ptfs.com>

From: Clay Fouts <cfouts at ptfs.com>

This refactors GetIssuingRule and GetLoanLength to make only a single DB query,
caching the result. This dramatically improves XSLT processing of search results
if the search returns bibs with large numbers of items.

---
 C4/Circulation.pm |  141 ++++++++++++++++-------------------------------------
 1 files changed, 43 insertions(+), 98 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 10c3c11..d0b9720 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1071,121 +1071,66 @@ sub AddIssue {
   return ($datedue);	# not necessarily the same as when it came in!
 }
 
-=head2 GetLoanLength
+=head2 GetIssuingRule
 
-  my $loanlength = &GetLoanLength($borrowertype,$itemtype,branchcode)
+Get the issuing rule for an itemtype, a borrower type and a branch
+Returns a hashref from the issuingrules table.
 
-Get loan length for an itemtype, a borrower type and a branch
+my $irule = &GetIssuingRule($categorycode, $itemtype, $branchcode)
 
 =cut
 
-sub GetLoanLength {
-    my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-"select issuelength from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"
-      );
-# warn "in get loan lenght $borrowertype $itemtype $branchcode ";
-# try to find issuelength & return the 1st available.
-# check with borrowertype, itemtype and branchcode, then without one of those parameters
-    $sth->execute( $borrowertype, $itemtype, $branchcode );
-    my $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", "*", $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", "*", "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    # if no rule is set => 21 days (hardcoded)
-    return 21;
-}
-
-=head2 GetIssuingRule
+our $irule_cache = undef;
 
-  my $irule = &GetIssuingRule($borrowertype,$itemtype,branchcode)
+sub _populate_irule_cache() {
+    my ($categorycode, $itemtype, $branchcode) = @_;
 
-FIXME - This is a copy-paste of GetLoanLength
-as a stop-gap.  Do not wish to change API for GetLoanLength 
-this close to release, however, Overdues::GetIssuingRules is broken.
+    $irule_cache = C4::Context->dbh->selectall_hashref(
+        'SELECT * FROM issuingrules WHERE issuelength IS NOT NULL',
+        ['categorycode', 'itemtype', 'branchcode']) or
+        die sprintf "Cannot get issuingrules: %s\n", $!;
 
-Get the issuing rule for an itemtype, a borrower type and a branch
-Returns a hashref from the issuingrules table.
-
-=cut
-
-sub GetIssuingRule {
-    my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =  $dbh->prepare( "select * from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"  );
-    my $irule;
+    return $irule_cache;
+}
 
-	$sth->execute( $borrowertype, $itemtype, $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+sub _clear_irule_cache {
+    return $irule_cache = undef;
+}
 
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+sub GetIssuingRule($$$) {
+    my ($categorycode, $itemtype, $branchcode) = @_;
+    die unless $categorycode and $itemtype and $branchcode;
+
+    $irule_cache //= _populate_irule_cache();
+    my $irule = $irule_cache->{$categorycode}{$itemtype}{$branchcode} //
+        $irule_cache->{$categorycode}{'*'}{$branchcode} //
+        $irule_cache->{'*'}{$itemtype}{$branchcode} //
+        $irule_cache->{'*'}{'*'}{$branchcode} //
+        $irule_cache->{$categorycode}{$itemtype}{'*'} //
+        $irule_cache->{$categorycode}{'*'}{'*'} //
+        $irule_cache->{'*'}{$itemtype}{'*'} //
+        $irule_cache->{'*'}{'*'}{'*'} //
+        undef;
+
+    return $irule;
+}
 
-    $sth->execute( "*", $itemtype, $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+=head2 GetLoanLength
 
-    $sth->execute( "*", "*", $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+Get loan length for an itemtype, a borrower type and a branch
 
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+my $loanlength = &GetLoanLength($categorycode, $itemtype, $branchcode)
 
-    $sth->execute( $borrowertype, "*", "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+=cut
 
-    $sth->execute( "*", $itemtype, "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+sub GetLoanLength($$$) {
+    my ($categorycode, $itemtype, $branchcode) = @_;
+    my $loanlength = 21;
 
-    $sth->execute( "*", "*", "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    my $irule = GetIssuingRule($categorycode, $itemtype, $branchcode);
+    $loanlength = $irule->{issuelength} if defined $irule;
 
-    # if no rule matches,
-    return undef;
+    return $loanlength;
 }
 
 =head2 GetBranchBorrowerCircRule
-- 
1.5.6.5


From chris.nighswonger at gmail.com  Sat Nov  6 05:12:46 2010
From: chris.nighswonger at gmail.com (Chris Nighswonger)
Date: Sat,  6 Nov 2010 00:12:46 -0400
Subject: [Koha-patches] [PATCH] Adding 3.2 Release Maintainer to Release
	Team List
Message-ID: <1289016766-31367-1-git-send-email-chris.nighswonger@gmail.com>

---
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
index 64d5a67..bef9e20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
@@ -106,6 +106,7 @@
 	           <li><strong>Rachel Hamilton-Williams</strong> (Kaitiaki from 2004 to present)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a></strong> (Koha 3.0 Release Maintainer)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a></strong> (Koha 3.x Interface Design)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a></strong> (Koha 3.2 Release Maintainer)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a></strong> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer)</li>
 	           <li><strong><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></strong> (Koha 2.0 Release Maintainer)</li>
                 </ul>
-- 
1.7.0


From lrea at nekls.org  Sat Nov  6 07:56:01 2010
From: lrea at nekls.org (Liz Rea)
Date: Sat,  6 Nov 2010 01:56:01 -0500
Subject: [Koha-patches] [PATCH] [Signed Off] Adding 3.2 Release Maintainer
	to Release Team List
Message-ID: <1289026561-10657-1-git-send-email-lrea@nekls.org>

From: Chris Nighswonger <chris.nighswonger at gmail.com>


Signed-off-by: Liz Rea <lrea at nekls.org>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
index 64d5a67..bef9e20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
@@ -106,6 +106,7 @@
 	           <li><strong>Rachel Hamilton-Williams</strong> (Kaitiaki from 2004 to present)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a></strong> (Koha 3.0 Release Maintainer)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a></strong> (Koha 3.x Interface Design)</li>
+               <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a></strong> (Koha 3.2 Release Maintainer)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a></strong> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer)</li>
 	           <li><strong><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></strong> (Koha 2.0 Release Maintainer)</li>
                 </ul>
-- 
1.5.6.5


From Katrin.Fischer.83 at web.de  Sun Nov  7 07:39:34 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sun, 7 Nov 2010 07:39:34 +0100 (CET)
Subject: [Koha-patches] Pull request for bug 5370
Message-ID: <171020753.7037828.1289111974641.JavaMail.fmail@mwmweb073>

An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101107/4e628faf/attachment.htm>

From Katrin.Fischer.83 at web.de  Sun Nov  7 08:42:49 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sun,  7 Nov 2010 08:42:49 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 5370: Fix all references to koha.org
Message-ID: <1289115769-28261-1-git-send-email-Katrin.Fischer.83@web.de>

---
 C4/XSLT.pm                                         |    2 +-
 .../authorities/authority-koha-indexdefs.xml       |    2 +-
 .../authorities/authority-zebra-indexdefs.xsl      |    2 +-
 .../marc21/authorities/koha-indexdefs-to-zebra.xsl |    2 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    2 +-
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |    2 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    2 +-
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    2 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |    2 +-
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl       |    2 +-
 misc/cronjobs/rss/README                           |    6 +++---
 misc/cronjobs/rss/lastAcquired-1.0.conf            |    6 +++---
 misc/cronjobs/rss/lastAcquired-2.0.conf            |    6 +++---
 misc/cronjobs/rss/lastAcquired.conf                |    6 +++---
 misc/cronjobs/rss/longestUnseen.conf               |    6 +++---
 misc/cronjobs/rss/mostReserved.conf                |    6 +++---
 16 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index ddc9077..7844330 100644
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -218,7 +218,7 @@ sub buildKohaItemsNamespace {
         . "</item>";
 
     }
-    $xml = "<items xmlns=\"http://www.koha.org/items\">".$xml."</items>";
+    $xml = "<items xmlns=\"http://www.koha-community.org/items\">".$xml."</items>";
     return $xml;
 }
 
diff --git a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
index 52bf15d..8b56ad0 100644
--- a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<kohaidx:index_defs xmlns:kohaidx="http://www.koha.org/schemas/index-defs">
+<kohaidx:index_defs xmlns:kohaidx="http://www.koha-community.org/schemas/index-defs">
   <!-- variables -->
   <kohaidx:var name="form_subdivision_subfield">v</kohaidx:var>
   <kohaidx:var name="general_subdivision_subfield">x</kohaidx:var>
diff --git a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
index 4cecf9c..c05b711 100644
--- a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xslo:stylesheet xmlns:xslo="http://www.w3.org/1999/XSL/Transform" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:z="http://indexdata.com/zebra-2.0" xmlns:kohaidx="http://www.koha.org/schemas/index-defs" version="1.0">
+<xslo:stylesheet xmlns:xslo="http://www.w3.org/1999/XSL/Transform" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:z="http://indexdata.com/zebra-2.0" xmlns:kohaidx="http://www.koha-community.org/schemas/index-defs" version="1.0">
   <xslo:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>
   <xslo:template match="text()"/>
   <xslo:template match="text()" mode="index_subfields"/>
diff --git a/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl b/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl
index 198b0c3..57c6321 100644
--- a/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl
+++ b/etc/zebradb/marc_defs/marc21/authorities/koha-indexdefs-to-zebra.xsl
@@ -4,7 +4,7 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xslo="http://www.w3.org/1999/XSL/TransformAlias"
                 xmlns:z="http://indexdata.com/zebra-2.0"
-                xmlns:kohaidx="http://www.koha.org/schemas/index-defs">
+                xmlns:kohaidx="http://www.koha-community.org/schemas/index-defs">
 
     <xsl:namespace-alias stylesheet-prefix="xslo" result-prefix="xsl"/>
     <xsl:output indent="yes" method="xml" version="1.0" encoding="UTF-8"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index f4bc51f..9de39cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -2,7 +2,7 @@
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
-  xmlns:items="http://www.koha.org/items"
+  xmlns:items="http://www.koha-community.org/items"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="marc items">
     <xsl:import href="MARC21slimUtils.xsl"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
index 55cd370..38c6124 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -4,7 +4,7 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
-  xmlns:items="http://www.koha.org/items"
+  xmlns:items="http://www.koha-community.org/items"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="marc items">
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index e31dbe7..0682ae0 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -2,7 +2,7 @@
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
-  xmlns:items="http://www.koha.org/items"
+  xmlns:items="http://www.koha-community.org/items"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="marc items">
     <xsl:import href="MARC21slimUtils.xsl"/>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 372d31c..a8121c1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -2,7 +2,7 @@
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
-  xmlns:items="http://www.koha.org/items"
+  xmlns:items="http://www.koha-community.org/items"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="marc items">
     <xsl:import href="MARC21slimUtils.xsl"/>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 69e5cf6..2ef828f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -4,7 +4,7 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
-  xmlns:items="http://www.koha.org/items"
+  xmlns:items="http://www.koha-community.org/items"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="marc items">
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
index 1290e94..66c41c0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -4,7 +4,7 @@
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
-  xmlns:items="http://www.koha.org/items"
+  xmlns:items="http://www.koha-community.org/items"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="marc items">
 
diff --git a/misc/cronjobs/rss/README b/misc/cronjobs/rss/README
index adeeda3..896a1d9 100644
--- a/misc/cronjobs/rss/README
+++ b/misc/cronjobs/rss/README
@@ -42,14 +42,14 @@ Here's the lastAquired.conf by way of example:
 
 channel
 title=Recent Koha Acquisitions
-link=http://www.koha.org
+link=http://www.koha-community.org
 desc=The 15 most recent acquisitions
 lang=en
 lastBuild=Fri, 09 May 2003 08:00:00
 image
 title=Koha, the worlds best Open Source Library System
-url=http://www.koha.org/images/foo.jpg
-link=http://www.koha.org
+url=http://www.koha-community.org/images/foo.jpg
+link=http://www.koha-community.org
 config
 tmpl=lastAcquired.tmpl
 output=lastAcquired.xml
diff --git a/misc/cronjobs/rss/lastAcquired-1.0.conf b/misc/cronjobs/rss/lastAcquired-1.0.conf
index 44036d8..d70cf71 100644
--- a/misc/cronjobs/rss/lastAcquired-1.0.conf
+++ b/misc/cronjobs/rss/lastAcquired-1.0.conf
@@ -1,12 +1,12 @@
 channel
 title=Recent Acquisitions
-link=http://www.koha.org
+link=http://www.koha-community.org
 desc=The library's 15 most recent acquisitions
 lang=en
 image
 title=Koha, the worlds best Open Source Library System
-url=http://www.koha.org/images/foo.jpg
-link=http://www.koha.org
+url=http://www.koha-community.org/images/foo.jpg
+link=http://www.koha-community.org
 description=Koha, the worlds best Open Source Library System
 config
 tmpl=lastAcquired-1.0.tmpl
diff --git a/misc/cronjobs/rss/lastAcquired-2.0.conf b/misc/cronjobs/rss/lastAcquired-2.0.conf
index 5e6a1b5..0a03937 100644
--- a/misc/cronjobs/rss/lastAcquired-2.0.conf
+++ b/misc/cronjobs/rss/lastAcquired-2.0.conf
@@ -1,12 +1,12 @@
 channel
 title=Recent Acquisitions
-link=http://www.koha.org
+link=http://www.koha-community.org
 desc=The library's 15 most recent acquisitions
 lang=en
 image
 title=Koha, the worlds best Open Source Library System
-url=http://www.koha.org/images/foo.jpg
-link=http://www.koha.org
+url=http://www.koha-community.org/images/foo.jpg
+link=http://www.koha-community.org
 description=Koha, the worlds best Open Source Library System
 width=88
 height=31
diff --git a/misc/cronjobs/rss/lastAcquired.conf b/misc/cronjobs/rss/lastAcquired.conf
index 4ae696a..1147d94 100644
--- a/misc/cronjobs/rss/lastAcquired.conf
+++ b/misc/cronjobs/rss/lastAcquired.conf
@@ -1,13 +1,13 @@
 channel
 title=Recent Koha Acquisitions
-link=http://www.koha.org
+link=http://www.koha-community.org
 desc=The 15 most recent acquisitions
 lang=en
 lastBuild=Fri, 09 May 2003 08:00:00
 image
 title=Koha, the world's best Open Source Library System
-url=http://www.koha.org/images/foo.jpg
-link=http://www.koha.org
+url=http://www.koha-community.org/images/foo.jpg
+link=http://www.koha-community.org
 config
 tmpl=lastAcquired.tmpl
 output=lastAcquired.xml
diff --git a/misc/cronjobs/rss/longestUnseen.conf b/misc/cronjobs/rss/longestUnseen.conf
index 91d7186..7c0218c 100644
--- a/misc/cronjobs/rss/longestUnseen.conf
+++ b/misc/cronjobs/rss/longestUnseen.conf
@@ -1,12 +1,12 @@
 channel
 title=Longest Unseen Koha Items
-link=http://www.koha.org
+link=http://www.koha-community.org
 desc=The 15 least recently seen items
 lang=en
 image
 title=Koha, the worlds best Open Source Library System
-url=http://www.koha.org/images/foo.jpg
-link=http://www.koha.org
+url=http://www.koha-community.org/images/foo.jpg
+link=http://www.koha-community.org
 config
 tmpl=longestUnseen.tmpl
 output=longestUnseen.xml
diff --git a/misc/cronjobs/rss/mostReserved.conf b/misc/cronjobs/rss/mostReserved.conf
index 437b660..f6c44ad 100644
--- a/misc/cronjobs/rss/mostReserved.conf
+++ b/misc/cronjobs/rss/mostReserved.conf
@@ -1,12 +1,12 @@
 channel
 title=Most Reserved Items
-link=http://www.koha.org
+link=http://www.koha-community.org
 desc=The 15 most reserved items
 lang=en
 image
 title=Koha, the worlds best Open Source Library System
-url=http://www.koha.org/images/foo.jpg
-link=http://www.koha.org
+url=http://www.koha-community.org/images/foo.jpg
+link=http://www.koha-community.org
 config
 tmpl=mostReserved.tmpl
 output=mostReserved.xml
-- 
1.7.1


From Katrin.Fischer.83 at web.de  Sun Nov  7 11:59:00 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sun,  7 Nov 2010 11:59:00 +0100
Subject: [Koha-patches] [PATCH 3/3] Bug 5370: Fix all the references to
	koha.org
Message-ID: <1289127540-1823-1-git-send-email-Katrin.Fischer.83@web.de>

---
 Makefile.PL                                        |    1 -
 install-CPAN.pl                                    |    1 -
 .../README.fr.install_koha_on_fresh_debian         |    4 ++--
 install_misc/install_koha_on_fresh_debian          |    8 ++++----
 installer/data/mysql/backfill_statistics.pl        |    2 +-
 installer/data/mysql/update22to30.pl               |    2 +-
 rewrite-config.PL                                  |    1 -
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 6c96460..5021f6c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Current maintainer MJR http://mjr.towers.org.uk/
-# See http://www.koha.org/wiki/?page=KohaInstaller
 #
 
 use strict;
diff --git a/install-CPAN.pl b/install-CPAN.pl
index 4c79ecb..7b775fe 100644
--- a/install-CPAN.pl
+++ b/install-CPAN.pl
@@ -23,7 +23,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Current maintainer MJR http://mjr.towers.org.uk/
-# See http://www.koha.org/wiki/?page=KohaInstaller
 
 # Create a fake CPAN location for koha
 use CPAN;
diff --git a/install_misc/README.fr.install_koha_on_fresh_debian b/install_misc/README.fr.install_koha_on_fresh_debian
index 7815b68..3fb999b 100644
--- a/install_misc/README.fr.install_koha_on_fresh_debian
+++ b/install_misc/README.fr.install_koha_on_fresh_debian
@@ -52,7 +52,7 @@ Le script n?cessite les droits root. lancer l'installation:
 
 les modificateurs sont:
 
-b: installer koha grace au tarball du site koha.org
+b: installer koha grace au tarball du site koha-community.org
 c: ne pas configurer le systeme de paquet debian
 
 ils sont regroup?s (sans espace), ainsi
@@ -70,7 +70,7 @@ conseillons de conserver ce param?tre et de selectionner [dev] comme type
 d'installation lorsque cela vous sera demand?. Ce choix vous permet de mettre
 koha ? jour par un simple git pull.
 
-Si vous pr?f?rez utiliser le tarball disponible sur le site de koha.org,
+Si vous pr?f?rez utiliser le tarball disponible sur le site de koha-community.org,
 utilisez le modificateur b: 
 
     sh install_koha_on_fresh_debian b
diff --git a/install_misc/install_koha_on_fresh_debian b/install_misc/install_koha_on_fresh_debian
index f20127b..6ff1e14 100644
--- a/install_misc/install_koha_on_fresh_debian
+++ b/install_misc/install_koha_on_fresh_debian
@@ -2,7 +2,7 @@
 
 # Licensed under the GPL
 # Copyright 2008 Biblibre.com
-# Koha library project  www.koha.org
+# Koha library project  www.koha-community.org
 #
 # this script follow all the installtion procedure described in INSTALL.Debian
 # with some additions to use lenny packages.
@@ -270,11 +270,11 @@ get_koha_git_clone () {
 
     dpkg -l git-core ||
 	aptitude -y  install git-core git-email
-    git clone git://git.koha.org/pub/scm/koha.git "$base"
+    git clone git://git.koha-community.org/koha.git "$base"
 }
 
 get_koha_release () {
-    wget -O- http://download.koha.org/koha-3.00.00.tar.gz |
+    wget -O- http://download.koha-community.org/koha-3.00.00.tar.gz |
 	tar xzf - 
 }
 
@@ -292,7 +292,7 @@ get_koha_beta () {
     local i basename; i=2
     while [ $i != 11 ]; do
 	basename=koha-3.00.00-beta$i
-	wget -O- http://download.koha.org/$basename.tar.gz |
+	wget -O- http://download.koha-community.org/$basename.tar.gz |
 	    tar xzf - &&
 		mv $basename "$base" &&
 		return 0
diff --git a/installer/data/mysql/backfill_statistics.pl b/installer/data/mysql/backfill_statistics.pl
index 2820dea..361f544 100755
--- a/installer/data/mysql/backfill_statistics.pl
+++ b/installer/data/mysql/backfill_statistics.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Part of the Koha Library Software www.koha.org
+# Part of the Koha Library Software www.koha-community.org
 # Licensed under the GPL.
 
 use strict;
diff --git a/installer/data/mysql/update22to30.pl b/installer/data/mysql/update22to30.pl
index c12c5bb..6d5b1cc 100755
--- a/installer/data/mysql/update22to30.pl
+++ b/installer/data/mysql/update22to30.pl
@@ -4,7 +4,7 @@
 # Database Updater
 # This script checks for required updates to the database.
 
-# Part of the Koha Library Software www.koha.org
+# Part of the Koha Library Software www.koha-community.org
 # Licensed under the GPL.
 
 # Bugs/ToDo:
diff --git a/rewrite-config.PL b/rewrite-config.PL
index c1c84c0..7817f91 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Current maintainer MJR http://mjr.towers.org.uk/
-# See http://www.koha.org/wiki/?page=KohaInstaller
 # 
 # 2007/11/12	Added DB_PORT and changed other keywords to reflect multi-dbms support.	-fbcit
 
-- 
1.7.1


From f.demians at tamil.fr  Sun Nov  7 13:26:14 2010
From: f.demians at tamil.fr (=?utf-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Sun,  7 Nov 2010 13:26:14 +0100
Subject: [Koha-patches] [PATCH] Bug 5372 Existing value can be replace by
	default value
Message-ID: <1289132774-22277-1-git-send-email-f.demians@tamil.fr>

The way an existing value was tested was wrong. 0 is a valid value but a
false value for Perl.

[3.2] Should also apply.
---
 cataloguing/addbiblio.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 2cd6e73..de30aaa 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -299,7 +299,7 @@ sub create_input {
     }
 
     # if there is no value provided but a default value in parameters, get it
-    unless ($value) {
+    unless (defined $value) {
         $value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
 
         # get today date & replace YYYY, MM, DD if provided in the default value
-- 
1.5.6.5


From f.demians at tamil.fr  Sun Nov  7 14:33:36 2010
From: f.demians at tamil.fr (=?utf-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Sun,  7 Nov 2010 14:33:36 +0100
Subject: [Koha-patches] [PATCH] Bug 5372 (v2) Existing value can be replace
	by default value
Message-ID: <1289136816-25443-1-git-send-email-f.demians@tamil.fr>

The way an existing value was tested was wrong. 0 is a valid value but a
false value for Perl.

=> replace privious proposal.

[3.2] Should also apply.
---
 cataloguing/addbiblio.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 2cd6e73..85c0566 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -299,7 +299,7 @@ sub create_input {
     }
 
     # if there is no value provided but a default value in parameters, get it
-    unless ($value) {
+    if ( $value eq '' ) {
         $value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
 
         # get today date & replace YYYY, MM, DD if provided in the default value
-- 
1.5.6.5


From f.demians at tamil.fr  Mon Nov  8 09:38:49 2010
From: f.demians at tamil.fr (=?utf-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Mon,  8 Nov 2010 09:38:49 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 4440: Revised combined
	patch to print fee receipts and invoices
Message-ID: <1289205529-15524-1-git-send-email-f.demians@tamil.fr>

From: Koustubha Kale <kmkale at anantcorp.com>

This patch adds a small enhancement to allow printing of Fees  / Fines
receipts from the Fines page.

Patch adds print links to the Fines page next to Fines or Receipts
transactions.  Clicking on the link will pop a new window and will print
that with total outstanding as on date.  You can edit
koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css to better
control printing this type of material.

18-Oct-2010 -- Changed template and script names to match. Corrected
invalid markup in the templates.

8-Nov-2010 -- Fr?d?ric Demians comments

This patch apply and works as published.

Styling may be improved:

  - The invoice recipient is labelled 'to: ' + recipient name. But the
    recipient name is on a new line after the 'to' line.
  - There are borders outside amounts table.

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 .../prog/en/css/printreceiptinvoice.css            |  353 ++++++++++++++++++++
 .../prog/en/modules/members/boraccount.tmpl        |   12 +-
 .../prog/en/modules/members/printfeercpt.tmpl      |   59 ++++
 .../prog/en/modules/members/printinvoice.tmpl      |   59 ++++
 members/printfeercpt.pl                            |  143 ++++++++
 members/printinvoice.pl                            |  142 ++++++++
 6 files changed, 766 insertions(+), 2 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
 create mode 100755 members/printfeercpt.pl
 create mode 100755 members/printinvoice.pl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
new file mode 100644
index 0000000..d8a675f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
@@ -0,0 +1,353 @@
+a:link {
+	color : #000066;
+	text-decoration: none;
+}
+
+a:visited {
+	color : #000066;
+	text-decoration: none;
+}
+
+a:hover {
+	color : #993300;
+	text-decoration: none;
+}
+
+body {
+	background-color : #FFF;
+	color : #333333;
+	font-family : arial, geneva, sans-serif;
+	font-size : 14px;
+	margin : 0px 0px 0px 0px;
+}
+
+caption {
+	color : #000066;
+	font-size : 18px;
+	font-weight : bold;
+	margin-top : 5px;
+	text-align : left;
+}
+
+form {
+	margin : 0px;
+	padding : 0px;
+}
+
+h1
+	{
+	color : #000066;
+	font-size : 22px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h1#logo {
+	display: none;
+}
+
+h2 {
+	color : #000066;
+	font-size : 20px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h3 {
+	color : #000066;
+	font-size : 18px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h4 {
+	color : #000066;
+	font-size : 16px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h5 {
+	color : #000066;
+	font-size : 15px;
+	font-weight : bold;
+	margin-bottom : 1px;
+	margin-top : 1px;
+}
+
+h6 {
+	color : #000066;
+	font-size : 14px;
+	font-weight : bold;
+	margin-bottom : 1px;
+	margin-top : 1px;
+}
+
+table {
+	background-color : #FFFFFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-collapse : collapse;
+	border-left : 1px solid #CCCCCC;
+	margin : 3px 0px 5px 0px;
+	padding : 0px;
+	width : 99%;
+}
+
+table.list {
+	background-color : #FFFFFF;
+	border : 0;
+	border-collapse : collapse;
+	margin : 3px 0px 5px 0px;
+	padding : 0px;
+	width : 99%;
+}
+
+td {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 12px;
+	padding : 5px 5px 5px 5px;
+}
+
+td:last-child {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 0px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 12px;
+	padding : 5px 5px 5px 5px;
+}
+
+table.list th {
+	background-color : #FFFFFF;
+	border-top : 0;
+	border-left : 0;
+	text-align: left;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 5px;
+	width : 25%;
+}
+
+th {
+	background-color : #E9E9E9;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 14px;
+	font-weight : bold;
+	padding : 5px 5px 5px 5px;
+}
+
+th:last-child {
+	background-color : #E9E9E9;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 0px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 14px;
+	font-weight : bold;
+	padding : 5px 5px 5px 5px;
+}
+
+td.input, div.form td, div.details td {
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+	color : #000000;
+	line-height : 1.5em;
+	padding : 4px;
+	text-align : left;
+}
+
+td.label, div.form th, div.details th {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 0px;
+	border-top : 0px;
+	color : #000088;
+	font-weight : bold;
+	line-height : 1.5em;
+	padding : 4px;
+	text-align : right;
+	vertical-align : top;
+}
+
+tr.highlight {
+	background-color: #CCCCCC;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+.error {
+	font-weight: bold;
+}
+
+.ex {
+	font-family : "Courier New", Courier, monospace;
+}
+.inline {
+	display : inline;
+}
+
+tr.overdue {
+	font-weight : bold;
+}
+
+tfoot {
+	font-weight : bold;
+}
+
+tfoot td, tfoot td:last-child {
+	background-color : #EEEEEE;
+	border-right : 1px solid #666666;
+	border-bottom : 1px solid #666666;
+}
+
+td.credit, td.debit, td.sum {
+	font-family : "Courier New", Courier, monospace;
+	text-align : right;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+td.debit {
+	color : #990000;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+#receipt {
+	background-color : #FFFFFF;
+	font-family : serif;
+	font-size : .9em;
+	margin : 0 0px 0px 0;
+	padding : 0px;
+	position : relative;
+}
+
+#receipt a:link {
+	color : #000066;
+	text-decoration: none;
+}
+
+#receipt a:visited {
+	color : #000066;
+	text-decoration: none;
+}
+
+#receipt a:hover {
+	color : #993300;
+	text-decoration: none;
+}
+
+#receipt caption {
+	color : #000000;
+	font-weight : bold;
+	margin-top : 5px;
+	text-align : left;
+}
+
+#receipt div.table {
+	background-color : transparent;
+	font-weight: normal;
+}
+
+#receipt h3, #receipt caption, #receipt h4 {
+	background-color : transparent;
+	color : #000000;
+	font-size : 1em;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+#receipt h2 {
+	background-color : transparent;
+	color : #000000;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+#receipt table {
+	background-color : transparent;
+	border : 0;
+	border-collapse : collapse;
+	width : auto;
+}
+
+#receipt td, #receipt th {
+	background-color : transparent;
+	border : 0;
+	font-size : 1em;
+	font-weight : normal;
+	padding : 1px;
+	border-bottom : 1px solid #000000;
+	border-left : 1px solid #000000;
+	border-right : 1px solid #000000;
+	border-top : 1px solid #000000;
+	}
+
+#receipt th {
+	font-weight : bold;
+	text-align : left;
+	}
+
+#receipt th.centerednames {
+	font-weight : bold;
+	text-align: center;
+	color: red;
+	border-top : 0px;
+	border-bottom : 0px;
+}
+
+div#breadcrumbs,
+div#toplevelnav,
+div#login,
+div#header_search,
+div#toolbar,
+div#changelanguage,
+div#menu,
+div.yui-b,
+.noprint,
+form#sortbyform,
+#cartDetails,
+fieldset.action,
+.list-actions,
+.print {
+    display: none;
+}
+
+div#yui-main div.yui-b {
+	display : block;
+}
+
+.yui-t1 #yui-main div.yui-b,
+.yui-t2 #yui-main div.yui-b,
+.yui-t7 #yui-main div.yui-b {
+	margin-left : 0;
+}
+fieldset {
+	border : 0;
+}
+#cataloguing_additem_itemlist {
+	overflow : visible !important;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index fce5a4d..ef59ad2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -35,6 +35,7 @@
     <!-- TMPL_IF NAME="reverse_col" -->
     <th>&nbsp;</th>
     <!-- /TMPL_IF -->
+    <th>Print</th>
   </tr>
 
 	<!-- FIXME: Shouldn't hardcode dollar signs, since Euro or Pound might be needed -->
@@ -48,18 +49,25 @@
     <!-- TMPL_IF NAME="reverse_col" -->
       <td>
 	<!-- TMPL_IF NAME="payment" -->
-		<a href="boraccount.pl?action=reverse&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&accountno=<!-- TMPL_VAR NAME="accountno" -->">Reverse</a>
+		<a href="boraccount.pl?action=reverse&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Reverse</a>
 	<!-- TMPL_ELSE -->
 		&nbsp;
 	<!-- /TMPL_IF -->
       </td>
 	<!-- /TMPL_IF -->
+<td>
+	<!-- TMPL_IF NAME="payment" -->
+		<a target="_blank" href="printfeercpt.pl?action=print&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Print</a>
+	<!-- TMPL_ELSE -->
+		<a target="_blank" href="printinvoice.pl?action=print&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Print</a>
+	<!-- /TMPL_IF -->
+      </td>
     </tr>
 
   <!-- /TMPL_LOOP -->
 <tfoot>
   <tr>
-    <td colspan="3">Total due</td>
+    <td colspan="4">Total due</td>
     <!-- TMPL_IF NAME="totalcredit" --><td colspan="2" class="credit"><!-- TMPL_ELSE --><td colspan="2" class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
   </tr>
   </tfoot>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
new file mode 100644
index 0000000..a53278f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
@@ -0,0 +1,59 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />
+<script language="javascript">
+        window.print();
+        window.close();
+</script>
+</head>
+<body>
+
+<div id="receipt">
+<!-- The table with the account items -->
+<table>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<h2><u>Fee Receipt</u></h2>
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<!-- TMPL_IF NAME="branchname" --><h2><!-- TMPL_VAR NAME="branchname" --></h2><!-- /TMPL_IF -->
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 >
+		Received with thanks from  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
+	</th>
+ </tr>
+  <tr>
+	<th>Date</th>
+    <th>Description of charges</th>
+    <th>Amount</th>
+ </tr>
+
+  <!-- TMPL_LOOP NAME="accounts" -->
+<tr class="highlight">
+      <td><!-- TMPL_VAR NAME="date" --></td>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
+    </tr>
+
+  <!-- /TMPL_LOOP -->
+<tfoot>
+  <tr>
+    <td colspan="2">Total outstanding dues as on date : </td>
+    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
+  </tr>
+  </tfoot>
+</table>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
new file mode 100644
index 0000000..3fc314e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
@@ -0,0 +1,59 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />
+<script language="javascript">
+        window.print();
+        window.close();
+</script>
+</head>
+<body>
+
+<div id="receipt">
+<!-- The table with the account items -->
+<table>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<h2><u>INVOICE</u></h2>
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<!-- TMPL_IF NAME="branchname" --><h2><!-- TMPL_VAR NAME="branchname" --></h2><!-- /TMPL_IF -->
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 >
+		To,<br />  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
+	</th>
+  </tr>
+  <tr>
+	<th>Date</th>
+    <th>Description of charges</th>
+    <th>Amount</th>
+ </tr>
+
+  <!-- TMPL_LOOP NAME="accounts" -->
+<tr class="highlight">
+      <td><!-- TMPL_VAR NAME="date" --></td>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
+    </tr>
+
+  <!-- /TMPL_LOOP -->
+<tfoot>
+  <tr>
+    <td colspan="2">Total outstanding dues as on date : </td>
+    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
+  </tr>
+  </tfoot>
+</table>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
new file mode 100755
index 0000000..59d5cb3
--- /dev/null
+++ b/members/printfeercpt.pl
@@ -0,0 +1,143 @@
+#!/usr/bin/perl
+
+
+#writen 3rd May 2010 by kmkale at anantcorp.com adapted from boraccount.pl by chris at katipo.oc.nz
+#script to print fee receipts
+
+
+# Copyright Koustubha Kale
+#
+# 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::Auth;
+use C4::Output;
+use C4::Dates qw/format_date/;
+use CGI;
+use C4::Members;
+use C4::Branch;
+use C4::Accounts;
+
+my $input=new CGI;
+
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/printfeercpt.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            debug => 1,
+                            });
+
+my $borrowernumber=$input->param('borrowernumber');
+my $action = $input->param('action') || '';
+my $accountno = $input->param('accountno');
+
+#get borrower details
+my $data=GetMember('borrowernumber' => $borrowernumber);
+
+if ( $action eq 'print' ) {
+#  ReversePayment( $borrowernumber, $input->param('accountno') );
+}
+
+if ( $data->{'category_type'} eq 'C') {
+   my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+   my $cnt = scalar(@$catcodes);
+   $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+   $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
+
+#get account details
+my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
+my $totalcredit;
+if($total <= 0){
+        $totalcredit = 1;
+}
+my @accountrows; # this is for the tmpl-loop
+
+my $toggle;
+for (my $i=0;$i<$numaccts;$i++){
+   next if ($accts->[$i]{'accountno'} ne $accountno);
+    if($i%2){
+            $toggle = 0;
+    } else {
+            $toggle = 1;
+    }
+    $accts->[$i]{'toggle'} = $toggle;
+    $accts->[$i]{'amount'}+=0.00;
+    if($accts->[$i]{'amount'} <= 0){
+        $accts->[$i]{'amountcredit'} = 1;
+	$accts->[$i]{'amount'}*=-1.00;
+    }
+    $accts->[$i]{'amountoutstanding'}+=0.00;
+    if($accts->[$i]{'amountoutstanding'} <= 0){
+        $accts->[$i]{'amountoutstandingcredit'} = 1;
+    }
+    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+                'amountcredit' => $accts->[$i]{'amountcredit'},
+                'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
+                'toggle' => $accts->[$i]{'toggle'},
+                'description'       => $accts->[$i]{'description'},
+				'itemnumber'       => $accts->[$i]{'itemnumber'},
+				'biblionumber'       => $accts->[$i]{'biblionumber'},
+                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
+                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
+                'accountno' => $accts->[$i]{'accountno'},
+                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
+
+                );
+
+    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
+        $row{'printtitle'}=1;
+        $row{'title'} = $accts->[$i]{'title'};
+    }
+
+    push(@accountrows, \%row);
+}
+
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+$template->param(
+    finesview           => 1,
+    firstname           => $data->{'firstname'},
+    surname             => $data->{'surname'},
+    borrowernumber      => $borrowernumber,
+    cardnumber          => $data->{'cardnumber'},
+    categorycode        => $data->{'categorycode'},
+    category_type       => $data->{'category_type'},
+ #   category_description => $data->{'description'},
+    categoryname		 => $data->{'description'},
+    address             => $data->{'address'},
+    address2            => $data->{'address2'},
+    city                => $data->{'city'},
+    zipcode             => $data->{'zipcode'},
+    country             => $data->{'country'},
+    phone               => $data->{'phone'},
+    email               => $data->{'email'},
+    branchcode          => $data->{'branchcode'},
+	branchname			=> GetBranchName($data->{'branchcode'}),
+    total               => sprintf("%.2f",$total),
+    totalcredit         => $totalcredit,
+	is_child        => ($data->{'category_type'} eq 'C'),
+    accounts            => \@accountrows );
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/members/printinvoice.pl b/members/printinvoice.pl
new file mode 100755
index 0000000..039132f
--- /dev/null
+++ b/members/printinvoice.pl
@@ -0,0 +1,142 @@
+#!/usr/bin/perl
+
+
+#writen 3rd May 2010 by kmkale at anantcorp.com adapted from boraccount.pl by chris at katipo.oc.nz
+#script to print fee receipts
+
+
+# Copyright Koustubha Kale
+#
+# 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::Auth;
+use C4::Output;
+use C4::Dates qw/format_date/;
+use CGI;
+use C4::Members;
+use C4::Branch;
+use C4::Accounts;
+
+my $input=new CGI;
+
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/printinvoice.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            debug => 1,
+                            });
+
+my $borrowernumber=$input->param('borrowernumber');
+my $action = $input->param('action') || '';
+my $accountno = $input->param('accountno');
+
+#get borrower details
+my $data=GetMember('borrowernumber' => $borrowernumber);
+
+if ( $action eq 'print' ) {
+#  ReversePayment( $borrowernumber, $input->param('accountno') );
+}
+
+if ( $data->{'category_type'} eq 'C') {
+   my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+   my $cnt = scalar(@$catcodes);
+   $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+   $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
+
+#get account details
+my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
+my $totalcredit;
+if($total <= 0){
+        $totalcredit = 1;
+}
+my @accountrows; # this is for the tmpl-loop
+
+my $toggle;
+for (my $i=0;$i<$numaccts;$i++){
+   next if ($accts->[$i]{'accountno'} ne $accountno);
+    if($i%2){
+            $toggle = 0;
+    } else {
+            $toggle = 1;
+    }
+    $accts->[$i]{'toggle'} = $toggle;
+    $accts->[$i]{'amount'}+=0.00;
+    if($accts->[$i]{'amount'} <= 0){
+        $accts->[$i]{'amountcredit'} = 1;
+    }
+    $accts->[$i]{'amountoutstanding'}+=0.00;
+    if($accts->[$i]{'amountoutstanding'} <= 0){
+        $accts->[$i]{'amountoutstandingcredit'} = 1;
+    }
+    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+                'amountcredit' => $accts->[$i]{'amountcredit'},
+                'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
+                'toggle' => $accts->[$i]{'toggle'},
+                'description'       => $accts->[$i]{'description'},
+				'itemnumber'       => $accts->[$i]{'itemnumber'},
+				'biblionumber'       => $accts->[$i]{'biblionumber'},
+                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
+                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
+                'accountno' => $accts->[$i]{'accountno'},
+                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
+
+                );
+
+    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
+        $row{'printtitle'}=1;
+        $row{'title'} = $accts->[$i]{'title'};
+    }
+
+    push(@accountrows, \%row);
+}
+
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+$template->param(
+    finesview           => 1,
+    firstname           => $data->{'firstname'},
+    surname             => $data->{'surname'},
+    borrowernumber      => $borrowernumber,
+    cardnumber          => $data->{'cardnumber'},
+    categorycode        => $data->{'categorycode'},
+    category_type       => $data->{'category_type'},
+ #   category_description => $data->{'description'},
+    categoryname		 => $data->{'description'},
+    address             => $data->{'address'},
+    address2            => $data->{'address2'},
+    city                => $data->{'city'},
+    zipcode             => $data->{'zipcode'},
+    country             => $data->{'country'},
+    phone               => $data->{'phone'},
+    email               => $data->{'email'},
+    branchcode          => $data->{'branchcode'},
+	branchname			=> GetBranchName($data->{'branchcode'}),
+    total               => sprintf("%.2f",$total),
+    totalcredit         => $totalcredit,
+	is_child        => ($data->{'category_type'} eq 'C'),
+    accounts            => \@accountrows );
+
+output_html_with_http_headers $input, $cookie, $template->output;
-- 
1.5.6.5


From M.de.Rooy at rijksmuseum.nl  Mon Nov  8 12:47:04 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 8 Nov 2010 11:47:04 +0000
Subject: [Koha-patches] [PATCH] Bug 5374 (update transaction date when
	saving biblio)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3119CD7E@S-MAIL-1B.rijksmuseum.intra>

Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.

I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.
---
 C4/Biblio.pm                                  |    9 +++++++++
 cataloguing/value_builder/marc21_field_005.pl |   25 ++++---------------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 81ccfbb..1b2098e 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -3217,6 +3217,15 @@ sub ModBiblioMarc {
             $record->insert_grouped_field( MARC::Field->new( 100, "", "", "a" => $string ) );
         }
     }
+
+    #enhancement 5374: update transaction date (005) for marc21/unimarc
+    if($encoding =~ /MARC21|UNIMARC/) {
+      my @a= (localtime) [5,4,3,2,1,0]; $a[0]+=1900; $a[1]++;
+        # YY MM DD HH MM SS (update year and month)
+      my $f005= $record->field('005');
+      $f005->update(sprintf("%4d%02d%02d%02d%02d%04.1f", at a));
+    }
+
     my $oldRecord;
     if ( C4::Context->preference("NoZebra") ) {
 
diff --git a/cataloguing/value_builder/marc21_field_005.pl b/cataloguing/value_builder/marc21_field_005.pl
index 3c33145..23d5a4b 100755
--- a/cataloguing/value_builder/marc21_field_005.pl
+++ b/cataloguing/value_builder/marc21_field_005.pl
@@ -19,7 +19,7 @@
 
 use strict;
 #use warnings; FIXME - Bug 2505
-use C4::Context;
+#use C4::Context;
 
 =head1
 
@@ -51,26 +51,9 @@ sub plugin_javascript {
     my $function_name= $field_number;
 
     # find today's date
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-    $year +=1900;
-    $mon +=1;
-    if (length($mon)==1) {
-        $mon = "0".$mon;
-    }
-    if (length($mday)==1) {
-        $mday = "0".$mday;
-    }
-    if (length($hour)==1) {
-        $hour = "0".$hour;
-    }
-    if (length($min)==1) {
-        $min = "0".$min;
-    }
-    if (length($sec)==1) {
-        $hour = "0".$sec;
-    }
-
-    my $date = "$year$mon$mday$hour$min$sec".".0";
+    my @a= (localtime) [5,4,3,2,1,0]; $a[0]+=1900; $a[1]++;
+    my $date = sprintf("%4d%02d%02d%02d%02d%04.1f", at a);
+
     my $res  = "
 <script type=\"text/javascript\">
 //<![CDATA[
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Mon Nov  8 14:28:27 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 8 Nov 2010 13:28:27 +0000
Subject: [Koha-patches] [PATCH] Bug 5375 (Update date/time last transaction
 (MARC 005) when saving authority record)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3119CDF9@S-MAIL-1B.rijksmuseum.intra>

Update 005 date/time when saving authority record for MARC21 and UNIMARC.
---
 C4/AuthoritiesMarc.pm |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index d07cca4..9421be9 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -610,6 +610,16 @@ sub AddAuthority {
         $format= 'MARC21';
     }
 
+    #update date/time to 005 for marc and unimarc
+    my $time=POSIX::strftime("%Y%m%d%H%M%S",localtime);
+    my $f5=$record->field('005');
+    if (!$f5) {
+      $record->insert_fields_ordered( MARC::Field->new('005',$time.".0") );
+    }
+    else {
+      $f5->update($time.".0");
+    }
+
 	if ($format eq "MARC21") {
 		if (!$record->leader) {
 			$record->leader($leader);
@@ -619,12 +629,6 @@ sub AddAuthority {
 				MARC::Field->new('003',C4::Context->preference('MARCOrgCode'))
 			);
 		}
-		my $time=POSIX::strftime("%Y%m%d%H%M%S",localtime);
-		if (!$record->field('005')) {
-			$record->insert_fields_ordered(
-				MARC::Field->new('005',$time.".0")
-			);
-		}
 		my $date=POSIX::strftime("%y%m%d",localtime);
 		if (!$record->field('008')) {
 			$record->insert_fields_ordered(
-- 
1.6.0.6


From hdl at eliot.biblibre.com  Mon Nov  8 15:36:10 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:10 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-acquisitions
Message-ID: <20101108143610.EA87293806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-acquisitions

Alex Arnaud (5):
      (MT1177) aqplan.pl, fix the problem of calculating the total remaining.
      (MT1236) aqplan.pl - Fixe the problem of unrounded sums
      (BUG #4811) suggestion.pl: display borrowers name in suggestion information filters (Suggested By, Managed by, Accepted by)
      (MT #3651) Fills "book fund" combobox with bugdets and fix some bugs of research by filter.
      (MT #3651) Fix problems on search filters.

Christophe Croullebois (7):
      Creation of a quantity column in receipt summary
      (MT #4017) : Fixing disjointed results in budget when selecting a new branch.
      (MT #3742) : Add orders from staged file.
      (MT #2391) : acqui/neworderempty.pl
      (MT #4007) Filling a basket from the reservoir
      (MT #4717) Bug in Koha 3.2 on acqui-home.pl
      (MT #4717) Add the capability to have a filter by active budget

Henri-Damien LAURENT (2):
      (MT #3000) new cronjob script to delete old suggestions
      Translation problem on aqbudgets.tmpl

Jean-Andr?? Santoni (1):
      (bug #4110) Delete items from aq order

Matthias Meusburger (2):
      MT4590: Adds the ability to use a free delivery address for baskets
      MT4590: Adds the ability to use a free delivery address for baskets

Nahuel ANGELINETTI (1):
      (bug #3737) fix title search in order history

Paul POULAIN (4):
      consistency change: s/planning/statistic/
      MT3176 reloaded
      adding missing title (needed for lateorders.pl)
      fixing compilation error & some reindenting (rebase/branch problem)

St??phane Delaune (2):
      (MT #4628)Acq always shows '1 suggestions waiting'
      (MT #4626) followup debug suggestion management : "accepted by" was not correctly displayed on suggestion's edit page

 C4/Acquisition.pm                                  |   10 +-
 C4/Biblio.pm                                       |   28 ++
 C4/Budgets.pm                                      |   19 +-
 C4/Output.pm                                       |    2 +
 C4/Search.pm                                       |    2 +-
 C4/Suggestions.pm                                  |   56 ++-
 acqui/acqui-home.pl                                |   22 +-
 acqui/addorderiso2709.pl                           |  505 ++++++++++++--------
 acqui/basketgroup.pl                               |   10 +-
 acqui/neworderempty.pl                             |    2 +
 acqui/parcel.pl                                    |    1 +
 acqui/pdfformat/layout2pages.pm                    |   14 +-
 ...y to use a free delivery address for baskets.pl |   15 +
 .../prog/en/includes/acquisitions-menu.inc         |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |   21 +-
 .../prog/en/modules/acqui/acqui-home.tmpl          |    2 +-
 .../prog/en/modules/acqui/addorderiso2709.tmpl     |  125 +++++-
 .../prog/en/modules/acqui/basketgroup.tmpl         |   59 ++--
 .../prog/en/modules/acqui/neworderempty.tmpl       |   51 ++-
 .../prog/en/modules/acqui/parcel.tmpl              |   17 +-
 .../prog/en/modules/admin/aqbudgets.tmpl           |    8 +-
 misc/cronjobs/purge_suggestions.pl                 |   60 +++
 suggestion/suggestion.pl                           |   60 ++-
 23 files changed, 764 insertions(+), 327 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/MT4590 Adds the ability to use a free delivery address for baskets.pl
 create mode 100755 misc/cronjobs/purge_suggestions.pl

From hdl at eliot.biblibre.com  Mon Nov  8 15:36:11 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:11 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-admin
Message-ID: <20101108143611.93F5393806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-admin

Henri-Damien LAURENT (3):
      Followup admin/categorie.pl
      MT4009: followup removing systempreferences
      branch transfer limits

Matthias Meusburger (2):
      MT 2446 : Cancel authority edition for a field goes back to this field
      MT 2310 : New subfield for fields < 10 is now in a tab

Paul POULAIN (1):
      mybranch not exported (merge pb)

Paul Poulain (1):
      Removing usage of preferences.pl

St??phane Delaune (11):
      (MT #1577) complete langages checkbox for unique id
      (MT #1654) Adding jquery.tablesorter and jquery.tablesorter.pager support for authorised_values.pl
      (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for branches.pl
      (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for itemtypes.pl
      (MT #1654) followup : corrects tablesorting for authorised_values and itemtypes
      (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for categorie.pl
      (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for cities.pl
      (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for marctagstructure.pl
      (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for auth_tag_structure.pl
      (MT #1654) followup : corrects tablesorting for authorised_values.pl
      (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for branch_transfer_limits.pl

 C4/Branch.pm                                       |    1 +
 admin/auth_tag_structure.pl                        |   11 +-
 admin/branch_transfer_limits.pl                    |   10 +-
 admin/categorie.pl                                 |    2 +-
 admin/marctagstructure.pl                          |    6 +-
 .../prog/en/includes/prefs-admin-search.inc        |    2 +-
 .../lib/jquery/plugins/jquery.tablesorter.pager.js |  184 ++++++++++++++++++++
 .../prog/en/modules/admin/admin-home.tmpl          |    2 +-
 .../en/modules/admin/auth_subfields_structure.tmpl |    3 +-
 .../prog/en/modules/admin/auth_tag_structure.tmpl  |   38 +++-
 .../prog/en/modules/admin/authorised_values.tmpl   |   50 ++++--
 .../en/modules/admin/branch_transfer_limits.tmpl   |   27 +++
 .../prog/en/modules/admin/branches.tmpl            |   22 ++-
 .../prog/en/modules/admin/categorie.tmpl           |   33 +++-
 .../prog/en/modules/admin/cities.tmpl              |   33 ++++-
 .../prog/en/modules/admin/itemtypes.tmpl           |   37 ++++-
 .../en/modules/admin/marc_subfields_structure.tmpl |    2 -
 .../prog/en/modules/admin/marctagstructure.tmpl    |   39 +++-
 .../prog/en/modules/admin/systempreferences.tmpl   |    4 +-
 .../prog/en/modules/intranet-main.tmpl             |    2 +-
 koha-tmpl/intranet-tmpl/prog/img/first.png         |  Bin 0 -> 720 bytes
 koha-tmpl/intranet-tmpl/prog/img/last.png          |  Bin 0 -> 737 bytes
 koha-tmpl/intranet-tmpl/prog/img/next.png          |  Bin 0 -> 736 bytes
 koha-tmpl/intranet-tmpl/prog/img/prev.png          |  Bin 0 -> 745 bytes
 24 files changed, 443 insertions(+), 65 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.tablesorter.pager.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/first.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/last.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/next.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/prev.png

From hdl at eliot.biblibre.com  Mon Nov  8 15:36:12 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:12 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-authorities
Message-ID: <20101108143612.3868B93806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-authorities

Alex Arnaud (1):
      (MT4425) Replace search 'an' by 'an,phr' in searchresultlist.tmpl

Henri-Damien LAURENT (10):
      SetUTF8Flag on any incoming data
      (bug4309 MT3094) Error 500 Authorities search
      Bug Fix AuthoritiesMarc.pm
      MT3207 : Search Authorities Everywhere
      BuildUnimarcHierarchies : Fixing infinite loop
      Authorities list :removing link on Summary
      C4::AuthoritiesMarc.pm search enhancement
      BuildUnimarcHierarchies : Fixing infinite loop
      Fixing Hierarchies : taking any heading subfield
      followup BuildUnimarchierarchies fixing infinite loop

Matthias Meusburger (7):
      MT 2538 : Using default authtypecode for authority display
      MT2949: Remove broken link from authorities search results
      Do not delete authority when merging is about the same authority
      Removes numeric subfields from auth and adds numeric subfields from biblio in merge function
      Adds debug warns
      Merge authorities subfields orders
      C4 AuthoritiesMarc.pm merge problem : new subfields not taken

Nahuel ANGELINETTI (2):
      (MT #2543) allow users to search on all auth types
      (MT #2685) don't show authority edition menu

Paul Poulain (3):
      C4::AuthoritiesMarc AddAuthority
      Followup MT2974 : facets not working opac authorities
      improving/modifying authority display on OPAC

St??phane Delaune (1):
      (MT #4339) init default UNIMARC sql structure

 C4/AuthoritiesMarc.pm                              |  194 +++++----
 C4/Biblio.pm                                       |    2 +
 authorities/detail.pl                              |    3 +-
 .../Obligatoire/autorite_default.sql               |  454 ++++++++++++++++++++
 .../Obligatoire/autorite_default.txt               |    1 +
 .../prog/en/includes/authorities-search.inc        |    1 +
 .../prog/en/includes/authorities-toolbar.inc       |    3 +-
 .../en/modules/authorities/searchresultlist.tmpl   |    7 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    2 +-
 .../prog/en/modules/opac-authorities-home.tmpl     |   44 +--
 .../prog/en/modules/opac-authoritiesdetail.tmpl    |   16 +-
 .../modules/opac-authoritiessearchresultlist.tmpl  |    4 +-
 opac/opac-authoritiesdetail.pl                     |    5 +
 13 files changed, 612 insertions(+), 124 deletions(-)
 create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.sql
 create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.txt

From hdl at eliot.biblibre.com  Mon Nov  8 15:36:12 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:12 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-cataloguing
Message-ID: <20101108143612.DB8E993806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-cataloguing

Alex Arnaud (1):
      (MT3170) neworderempty - display the user branch as default value in scrolling list

Christophe Croullebois (2):
      (MT #4117) Fast cataloging
      (MT #1365) Delete all items

Henri-Damien LAURENT (29):
      MT2938 : Adds a permission for editing items
      rebuild_zebra.pl : deleted biblios were not deleted
      Bug Fixing : considering deleted biblioitems
      Revert "MT3160 : Fix plugin callback when subfields are cloned"
      Inconsistency between BranchName used on opac-detail and search result
      items.statisticalvalue not updated from marc when adding item
      MT3522: Biblio Batch Edition enhancement
      MT3522: Batch Biblio edit enhancement Reports
      MT3522: Followup Batchedit enhancement
      MT3522: followup BatchEdit Biblio
      stocknumber was not managed in AddItems
      NormalizeString POD Fixing and variable renaming
      MT3947: items.timestamp were not updated on edition
      MT3915: deleted biblios would stick in zebra indexes
      bug4263 followup : Can't blank subfields
      MT3394 : title in z3950 results was HTML escaped
      Fixing spurrious warnings in GetCOinsBiblio
      Adding some more information for Inventory
      Fix a merge problem in additem.pl
      Reverting rebuild_zebra SUDOC special chars management
      MT4539 : batchedit deletion
      Followup remove items
      Revert "Followup remove items"
      Fix prior patch apl=plication DeleteAllItems
      (MT #1365) Delete all items
      BiblioAddAuthorities : When subfield 3 authority not added
      merge conflict solving : unimarc_field_210c
      cataloguing/additem.pl rebase failure.
      (bug #4321) clean C4::Biblio::GetBiblio and uses

Jean-Andr?? Santoni (2):
      Fixes leading zeroes in Add Mulpiple Copies
      (bug #4110) Fix DelBiblio call in DelOrder

Matthias Meusburger (13):
      MT1059, Follow-up : Fix merge reference selection presentation
      MT3713: Fixes biblio adding from serials when framework is modified
      MT3864: Normalizing strings in order to avoid utf8 errors
      MT4004 : additem.pl Some Status were not defaulted to the correct value
      Adds completion also on click on plugin button
      MT4586: Adds an alternative cataloguing plugin for 210$c
      MT4586: Adjust query delay
      MT4586: IBSN plugin now also works with non-normalized ISBNs
      MT4586: Use zebra instead of mysql for publisher and collectiontitle searches
      MT4586: Expand coins definition
      MT4586: Fallback on mysql search for plugins
      MT4586: Display fix
      Removes unuseful warning for coins value

Nahuel ANGELINETTI (13):
      (MT #2978) deny form submission with "enter"
      (MT #2991) (Feature) Batch biblio modifications
      (bug #4263) fix the edition of items with repeatable subfields
      (bug #4263) dateaccessionned is cleaned on item modification
      (bug #4522) fix plugin unimarc 210$c
      (MT #2991) Fix batch record modification
      (MT #2991) Add support of delete without condition in batch edit
      (bug #4856) fix rebuild zebra to delete NSB/NSE chars
      (bug #4856) delete forgotten debug code
      (bug #4931) add the ability to choose home or holding branch in stocktaking
      (bug #4931) fix forgottens input in buttons
      (MT #4123) fix batch record edition for deleting field/subfield
      (MT #4124) fix inserting new fields in batch biblio edit

Paul POULAIN (4):
      revert wrong commit
      MT4076 : permission to edit items
      Fix permission to move item : edit_items is enough
      batch edit final changes

Paul Poulain (1):
      Minor bug fix rebuild_zebra

Sophie Meynieux (1):
      MT4611: batch edit record Error when adding subfield

kohaadmin (1):
      Removing warnings from zebra logs

 C4/Acquisition.pm                                  |    3 +
 C4/Barcodes.pm                                     |    9 +-
 C4/Biblio.pm                                       |  200 ++++++++-
 C4/Charset.pm                                      |   31 +-
 C4/ILSDI/Services.pm                               |    6 +-
 C4/ImportBatch.pm                                  |    4 +-
 C4/Items.pm                                        |   73 +++-
 C4/Search.pm                                       |    3 +-
 C4/Serials.pm                                      |    2 +-
 catalogue/issuehistory.pl                          |    6 +-
 cataloguing/addbiblio.pl                           |    2 +-
 cataloguing/additem.pl                             |  445 ++++++++++----------
 cataloguing/moveitem.pl                            |    2 +-
 cataloguing/value_builder/unimarc_field_010.pl     |    3 +-
 cataloguing/value_builder/unimarc_field_210c.pl    |  217 +++++-----
 .../value_builder/unimarc_field_210c_bis.pl        |  109 +++++
 cataloguing/value_builder/unimarc_field_225a.pl    |    2 +-
 cataloguing/ysearchzebra.pl                        |   52 +++
 .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |    1 +
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |   24 +-
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |    6 +
 .../prog/en/modules/basket/basket.tmpl             |    5 +
 .../prog/en/modules/cataloguing/addbiblio.tmpl     |   44 +--
 .../prog/en/modules/cataloguing/additem.tmpl       |    1 +
 .../prog/en/modules/cataloguing/merge.tmpl         |    4 +-
 .../value_builder/unimarc_field_210c_bis.tmpl      |   73 ++++
 .../prog/en/modules/cataloguing/z3950_search.tmpl  |    2 +-
 .../prog/en/modules/circ/circulation.tmpl          |    1 +
 .../prog/en/modules/tools/batchedit.tmpl           |  231 ++++++++++
 .../prog/en/modules/tools/inventory.tmpl           |    6 +
 misc/migration_tools/rebuild_zebra.pl              |   27 +-
 tools/batchedit.pl                                 |  222 ++++++++++
 tools/inventory.pl                                 |    4 +-
 virtualshelves/addbybiblionumber.pl                |   12 +-
 34 files changed, 1376 insertions(+), 456 deletions(-)
 create mode 100755 cataloguing/value_builder/unimarc_field_210c_bis.pl
 create mode 100644 cataloguing/ysearchzebra.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchedit.tmpl
 create mode 100755 tools/batchedit.pl

From hdl at eliot.biblibre.com  Mon Nov  8 15:36:13 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:13 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-memb-circ-upd
Message-ID: <20101108143613.AC4AC93806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-memb-circ-upd

Alex Arnaud (8):
      (MT2990) opac-detail.pl: adding of search rebound on author and subject
      (BUG #4806) circ/circulation.tmpl: Add "reservenumber" in the reserved table.
      (BUG #4807) - C4/Reserves.pm : define a max pick up date when reserving an item.
      (MT4089) fix probleme sur mMail de mise ?? disposition
      (MT3523) Cacher la loupe quand l'autid n'est pas un nombre.
      (MT4089) fix bug with retrieving user email address and item's barcode
      (MT4316) Add AdvancedSearchContent and OpacAdvancedSearchContent syspref in Searching tab
      (MT4388) Add foreign key on auth_subfield_structure.authtypecode and auth_subfield_structure.tagfield for deleting on cascade

Christophe Croullebois (4):
      (MT #3828) fixing filters on result page for patrons search
      (MT # 4073) Fix in member.pl an inactive "new" button
      (MT #4119) : Possibility to give a quitus.
      (MT #4645) Added of an option filter by date in overdue.pl

Henri-Damien LAURENT (146):
      C4::Search :Removing warn of biblio record
      Removing hidelostitems
      Enhancing relevancy ranking
      CirculationRule : TooMany HomeOrHoldingBranch mgt
      Circulation : Global Quota management
      Adding C4/IssuingRules
      bug3393 : take care of default rules in overdues
      C4/Reserves.pm : HomeOrHoldingBranch Management
      (MT 2260 MT 2263) Adding updatedatabase scripts
      (MT 2259) BranchTransferLimit restriction on return
      C4::Circulation adding sub FixFineDaysOnReturn
      Adding EXPIRED flag to Members management
      Set Status : setting debarred to NULL
      (MT3079) : checkoverdues too restrictive
      bug 3482 : followup overduenotices
      bug 3482: Fix csv output (missing country)
      Removing excessive export restrictions
      Fixing updatedatabase DBRev 130 debarred
      bug fixing : Patron Search : IndependentBranches
      (MT 2260 MT 2263) Adding updatedatabase scripts
      (MT 2259) BranchTransferLimit restriction on return
      MT2938 : Adds a permission for editing items
      Change debarring system (MT2263)
      Member improvements
      Members and SearchInTable Fix :
      Updatedatabase String for reports update
      (MT 2265) Adding report on reserves
      (MT #2260) migrate reservesmaxpickupdelay to smart rules
      (MT 2259) BranchTransferLimit restriction on return
      Bug fixing opac/opac-reserve.pl
      MT 2285 : enhancement for patronSearch
      (MT 2468) Partial Fix Circulation Error Message enhancement
      Ergonomy improvement in smart rule management
      Problem with debarred not shown in circulation
      Bug Fix : Incorrect date tests for overdue
      Circulation.tmpl
      moremember.tmpl : flag displayed only when debarred
      Enabling Display of comments in moremember and circulation.pl
      renewalperiod problem
      MT2861 : fixing reserve/request.pl
      using GetReservesControlBranch
      renewals were loosing the count
      Followup 2350 : Fixing column count
      MT2836 : Renewals Fixes
      (Followup : MT2423) todaysissues were not shown
      MT3002 : Grace period taken into account for finedays if defined
      (MT 3036) moremember.pl Circulation note not displayed
      Rewriting detect_truncation in C4/Search.pm
      Circulation : Removing the check on NON attributed itemtypes
      (MT3064) Override Renewals display
      MT3063 : CanBookBeRenewed : overdue blocks renewals
      MT3063 : Followup
      Fixing GetItemIssues
      Bug 3063 : Simplifying circulation.tmpl
      MT 3063 : Holds Management to circulation and moremember
      MT2631 : adds sysprefs for MARC or ISBD display in OPAC
      Minor Bug Fix Circulation.tmpl
      circulation.tmpl : Calendar manipulation
      Adding C4::Items
      MT2957 : smart rules edition
      smart rules minor update
      MT3127 : New System Preference OpacPickupLocation
      MT3127 : New System Preference OPACPickup Location
      MT2957 : followup Smart rules edition
      Circulation Log Fixing :
      synching permissions between english and French
      MT3138 : Adding permissions on viewlog
      moremember Debarred flagged not stressed out
      MT3009 : Reserves on checkin on checkout/moremember
      Followup Display renewals
      MT3009 : print notices
      DB Rev : 02.00.022 : Adding CI-3M:AuthorizedIPs
      (bug #4319) allow reserves on waiting items
      Followup C4/Circulation.pm
      Followup View/HideAddress
      Bug Fix Rebase :
      Editing XSLTs to remove Sudoc Special characters
      MT3213 : Override Limit checkbox should be unchecked
      MT3113 : Showing cards should use marcflavour
      MT3113: Fixing UNIMARC_compact.xsl
      MT3212 : members modification wipeout dateexpiry
      MT3232 : followup cannot remove debarredcomment
      Followup Replace items price by matierial
      MT3232 : debarredcomment not set to NULL when empty
      MT3010: maxpickupdate
      Followup MT3010 : not exported function
      Removing an unconditionnal warning in circ/returns.pl
      Bug Fix : format_date usage in C4/Circulation.pm
      C4::Members : flags comments added
      MT3219 MT3233
      followup MT3219 MT3233 : return display
      MT3233 fix : When reserve displayed, flags would not be
      MT3289 : Search results would display only first item
      MT3289 followup : C4/Reserves.pm : syspref misspelled
      Perf enhancement : C4/SQLHelper.pm
      MT3491 : member search results order
      Merge problem overdue_notices.pl
      MT2116 : subfield separator
      Bug Fix : C4/Members.pm missing variable declaration
      (MT #2995) add items.location in return informations
      Followup MT3233 : When reserve displayed, flags would not be
      waitingreserve compilation error : calcDate usage
      C4/Reserves.pm Exporting CanHoldOnShelf
      followup bug4239 : allow multiple holds
      Search Results Removing extra character a
      C4/Search.pm : Problem when no Query* set and using big search box
      MT3619 : Offline circulation problem of link
      MT3596 : Followup revert bug 3778 for patronsearch
      smart-rules : Problem with rentaldiscount added in rules
      Followup (MT #3623) fix commented code, and add a forgotten updatedb
      MT3623 : Display problem on Circulation.tmpl
      MT3627 Followup : Error 500 when reservation confirmed
      MT3619 Followup : Offline circulation Error
      MT3623 Followup : Todays checkout
      MT3288 moredetail.tmpl Lost and Damaged first choice is empty
      MT3660 : Circulation Restricted still displayed even after debarred date
      When No ccode, then moredetail show error 500
      MT3660 followup : former debarred user raises warning
      MT3884 : Basic Search Intranet should provide limits
      MT3533: followup returns.tmpl enhancements
      C4/Search.pm results incorrectly encoded lead to error 500
      merge conflict on moredetail.tmpl improperly solved.
      DB-Rev 2.00.0024 Synching borrowers and deletedborrowers
      MT4058 : Problem on koha_notify_reserve
      Update 22 to 30 budgets
      MT3686 Followup : Sets reserve status when hold in confirmed
      MT3519 : Multiple item request.
      Adding systempreference AllowMultipleHoldsPerBib
      Displaying maxpickupdate for all the intranet screens
      Holds from circulation.pl and moremember.pl
      MT3949: Search results can result in Error 500
      MT4153: Placing a reserve on an undefined item would fail silently
      C4/Circulation.pm Synching API
      Preferences are now case sensitive.
      DBRev 02.00.028 Adding holdspickupdelay to issuingrules
      MT4229: hidelostitems side effect
      C4::Search empty limits or operands would prevent search
      merge problem
      (MT4046) Adding bc search on barcode
      C4::Reserves Only borrower email address considered
      Using GetFirstValidEmailAddress in overduenotices.pl
      printoverdues.sh
      Removing notices tab.
      Reserves: Problem when updating item reserve
      MT4250 followup ModReserveFill
      Reserves: Problem when updating item reserve

Jean-Andr?? Santoni (24):
      Tab display for patron details
      Stop displaying borrowernumber in patron library details
      Display ccode, stocknumber and barcode in member checkouts
      Ergonomy improvement in smart rule management
      Added an new column AllowOnShelfHolds with checkboxes in the template
      Fix for the checkbox bug
      View/Hide address improvement in moremember.pl
      Converts COUNTRY authorised values to uppercase
      Offline circulation management
      Offline Circulation huge improvements
      (MT3643) Fix tab display on moremember
      (MT3630) Fix a smart rule deletion bug
      (MT3625) Fix column order in issue history
      Fixes a syntax error in syspref.sql
      Removes a duplicate syspref in syspref.sql
      Fixes a syntax error in sample_records.sql
      Removes another duplicate syspref in syspref.sql
      Removes yet another duplicate syspref in syspref.sql
      (bug #3247) Inline ajax editor for the smart-rules
      (bug #3714) Fix renewal date computation
      Adds pending_offline_operations SQL table
      (bug #4444) Fixes a tiny display bug in intranet details XSLT
      (bug #4450) Makes AllowNotForLoanOverride work with new smartrules
      (bug #4453) Force return in AddIssue

Kyle Hall (1):
      Bug 4239: Allow Multiple Item Level Holds For A Single Record

Matthias Meusburger (46):
      MT 2413 : Attention message only to display if there are some warnings
      MT 2422 : clone-rules.pl not a landing page
      MT2361 : Adds items.statisticvalue
      MT 2424 : Add branch in checkouts table
      MT 2423 : fix date format in checkouts
      MT 0002412: Patron's account has been renewed
      MT 2487 : Advanced search style
      MT 2554 : Comments can be added for "Gone No Address" and "Lost Card" flags for borrowers
      MT2554, Follow-up : Comment deleted when flag set to no
      MT 2423 : fix date format in checkouts
      MT2894 : Adds a download link for big error reports to import_borrowers
      MT 3129: Fix wrong names between fromBranch and toBranch for branch transfer limits
      MT 3130: adds execute_reports permission for overdue.pl
      MT3208: Fix intranet cart
      MT3218: Adds enrollment fee when a patron's category is modified
      MT3218, Follow-up: Adds enrollment fee when a patron's category is modified
      MT3334: Fix returns template (so that Checked-In items table is displayed)
      MT3599 : Fix ISBD display
      Remove useless warn
      MT3597 : Fix patron attribute adding
      Fixing opac serial item information not showing on opac-detail
      MT 3686: Holds can be confirmed when checking in from circulation.pl
      MT3686: Sets reserve status when hold in confirmed
      Quickfix : Do not crash if waiting date is null
      MT3940: Adds EAN deduping when adding a biblio
      Search Results Error 500 when unable to decode marcrecord
      MT3747: Shows member relatives in issues lists
      MT3531: Intranet cart is emptied when session is closed
      MT4061 : problem when inputing an exiprationdate
      MT4096: Adults can also be added to an organization
      MT4096, Follow-up: Fix guarantor display for adults
      MT4096, Follow-up: Fix guarantor display when editing patron
      MT 4096, Follow-up : Fix gurantor pop-up closing for adults
      MT3747, Follow-up: Shows member relatives in issues lists
      MT3747, Follow-up: Shows member relatives in issues lists
      MT3747, Follow-up: Shows member relatives in issues lists
      MT3747, Follow-up: Shows member relatives in issues lists
      Prevent from placing a hold on an item for which AllowMutipleHoldsPerBib is not enabled
      Prevent from placing a hold on an item for which AllowMutipleHoldsPerBib is not enabled [Follow-up]
      MT4360 : Fix javascript errors in request.tmpl
      MT4360: Fix waiting status for multiple holds on the same item
      Prevent GetMaxPickupDate from crashing if there is no date
      3166: Adds the ability to attach a circulation note to items
      MT4588: Adds coins to intranet
      MT4588: [Follow-up] Adds coins to intranet
      Fix broken updatedatabase

Nahuel ANGELINETTI (39):
      (MT #2930) fix return date
      (MT #2267) show borrower charges returning a document
      (MT2690) fix members-home
      (MT #2970) fix returning document with branch transfert limits
      (bug #3924 MT2500) fix useDaysMode use
      (MT823) add the possibility to have enrolment end date
      (MT 2258) Add homebranch/holding branch un return.pl
      (MT #2443) add renewalperiod
      (MT #2863) debarring system fixes
      (MT2690) fix ordering in member list
      (MT 2928) fix sticky due date and due date form
      (MT #2725) fix problems in branch transfert limits
      (MT #2922) add confirmation message for damaged items
      (MT #2725) fix updating transfert policies
      (MT #2921) return not for loan or damaged documents
      (MT #2924) fix circulation.pl alert box
      (MT #3067) change message from issuingimpossible to needsconfirmation
      (MT #3076) make cancel button working on return
      (MT #3073) use useDaysMode in C4::Circulation::_FixFineDaysOnReturn
      (MT #3073) use calendar to check how long is the overdue
      (MT #3081) permit loans for today
      (MT #3233) make overdues only if document is considered as returned
      (MT #3232) set empty debar comment when librarian lift debarment
      (MT #3223) do not auto-check issues
      (bug #4491) fix weird code in search scripts
      (MT #3627) fix some leak in reservation system
      (MT #3627)(bug #4238) add reservenumber column
      (MT #3623) fix commented code, and add a forgotten updatedb
      (MT #3632)(MT #3611) fix return.tmpl merge problems
      (MT #3631) fix calcdatedue backport problem
      (MT #3683) Fix IsAvailableForItemLevelRequest
      (MT #3681) reserved confirmation condition error
      (MT #3533) add callnumber and location in return table
      (MT #2991) add permissions for batch edit
      (bug #4239) forgotten syspref definition
      (bug 4989) add index on guarantorid
      (MT #4129) forgotten "use" in opac isbd view
      (bug #5098) csv headers in overdues
      Modify bad columns in borrowers table

Nicolas Morin (10):
      phrasing: check out limit reached
      adding link to items from list results
      phrasing: check out limit reached
      moremember.tmpl typo
      link to items on intranet results
      Term "Total Renewals" misleading, change to "Current Renewals"
      correcting typo
      text for holding rank
      Shelf -> List
      redirect to circulation.pl?borrowernumber when $borrowernumber is passed

Paul POULAIN (8):
      BUGFIX: adding delivery place & comment & billing place fields
      BUGFIX: statisticvalue missing in items table
      MT4398 Apply filter is translatable AND used as a filter checker
      MT4437removing duplicate circ confirmation message
      minor change s/(/#/ in a q
      merge fix : few lines forgotten
      fixing trailing " that resulted in a SQL error
      merge errors (missing functions,...)

Paul Poulain (21):
      MT2467 : limit available reenabling
      (bug3482) followup :Problems with html
      fix for Perl error, due to missing declared sub
      (MT 2264) AllowOnshelfHolds into issuing rules
      (MT#2650) misusing Red css for overdues
      MT3004 Name of the letter used was wrong
      Bug Fixing Members : Expired Flag Problem
      MT 3128 : Fix unability to reserve an item when overriding is required
      Followup MT3073 FixFineDaysOnReturn Calculation
      Adding Lyon3 XSLTs
      Fixing xsl Univ_Lyon3
      Followup MT3127 ; OPACPickupLocation
      MT3217 : scan index intranet
      MT3244 : tabs in detail OPAC view
      Followup MT3010 : reserves
      MT2268 : Adding headers to overduenotices
      MT2268 : followup html output
      Bug4239 improved : enable checking of CanHoldMultipleItems at item-level
      Userpermissions.sql cannot load
      fixing updatedatabase
      =?UTF-8?q?Suppression=20des=20cl=C3=A9s=20uniques=20sur=20items.stocknumber=20et

St??phane Delaune (19):
      (bug #2166) Label renaming for members emails
      (bug #1416) Fix borrower address display in intranet
      (MT #1936) Enhancement to secondary email management overdues
      (MT #1936) followup : Enhancement to secondary email management overdues
      (MT #4095) add exact matching filter for categorycode and branchcode fields in search members's result
      (MT #3322) adding if not exist syspref SpecifyDueDate
      (MT #4584b)Add duplicate support for borrowers
      (MT #4585)add manage suggestions on borrowers
      (MT #4626) debug suggestion management (suggestion's status and document's type)
      (MT #4585)add manage suggestions on borrowers
      (MT #4626) debug suggestion management (suggestion's status and document's type)
      (MT #1874) adding note and manager_id fields to accountlines
      (MT #1874) followup : adding note and manager_id fields to accountlines
      (MT #2179) Add tablesorter support for Additional attributes in moremember.pl
      (MT #1654) followup:duplicate paging system at the top of search results tables
      (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for MARCdetail.pl
      (MT #1654) followup for MT #3137 : Adding jquery.tablesorter and jquery.tablesorter.pager support for readingrec.pl
      (MT #4317)adding ccode's logos on opac-search.pl
      (MT #4883)debug html template on moremember.tmpl

koha (1):
      MT3949: Search results can result in Error 500

koha user (1):
      GetCircControlBranch using ItemhomeLibrary

koha user account (1):
      (bug #3840) Fix default values in serial receive

kohaadmin (3):
      Remplaceitemsms.price par items.materials dans l'affichage des prets
      Changement ponctuation 200 $i xlst opac
      Suppression des onglets d'affichage MARC intranet

 C4/Accounts.pm                                     |   29 +-
 C4/Auth.pm                                         |    1 +
 C4/Biblio.pm                                       |   10 +-
 C4/Circulation.pm                                  |  918 +++++++++-----------
 C4/Context.pm                                      |    2 +-
 C4/IssuingRules.pm                                 |  261 ++++++
 C4/Koha.pm                                         |   40 +
 C4/Letters.pm                                      |    4 +
 C4/Members.pm                                      |  252 ++++--
 C4/Members/AttributeTypes.pm                       |   31 +-
 C4/Members/Attributes.pm                           |    3 +-
 C4/Overdues.pm                                     |   81 +--
 C4/Record.pm                                       |   49 +-
 C4/Reserves.pm                                     |  631 ++++++++++----
 C4/SQLHelper.pm                                    |   40 +-
 C4/Search.pm                                       |  134 ++-
 C4/XSLT.pm                                         |    7 +-
 admin/branch_transfer_limits.pl                    |   22 +-
 admin/patron-attr-types.pl                         |    9 +-
 admin/smart-rules-service.pl                       |   59 ++
 admin/smart-rules.pl                               |  567 +++----------
 admin/systempreferences.pl                         |    8 +-
 catalogue/ISBDdetail.pl                            |    1 +
 catalogue/MARCdetail.pl                            |   11 +-
 catalogue/cardview.pl                              |    3 +-
 catalogue/detail.pl                                |    2 +
 catalogue/moredetail.pl                            |    2 +-
 catalogue/search.pl                                |   45 +-
 catalogue/showmarc.pl                              |    3 +-
 circ/branchtransfers.pl                            |    4 +-
 circ/circulation.pl                                |  282 +++++--
 circ/overdue.pl                                    |   12 +-
 circ/returns.pl                                    |  141 +++-
 circ/waitingreserves.pl                            |   32 +-
 circ/ysearch.pl                                    |   10 +-
 .../0009-patron-attr-display-checkout.pl           |    7 +
 .../atomicupdate/0010-holds-on-smart-rules.pl      |   11 +
 .../atomicupdate/0011-debarred-modifications.pl    |    8 +
 .../data/mysql/en/mandatory/sample_notices.sql     |    3 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |   15 +-
 .../data/mysql/en/mandatory/userpermissions.sql    |    2 +
 .../fr-FR/1-Obligatoire/authorised_values.sql      |  490 ++++++------
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    7 +-
 .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |   24 +-
 installer/data/mysql/kohastructure.sql             |   46 +-
 ...m_preferences_full_optimal_for_install_only.sql |    1 -
 ...m_preferences_full_optimal_for_install_only.sql |    1 -
 installer/data/mysql/updatedatabase.pl             |  548 ++++++++++++-
 .../intranet-tmpl/prog/en/css/staff-global.css     |   75 ++-
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    4 +-
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |  117 ++-
 .../intranet-tmpl/prog/en/includes/header.inc      |    2 +-
 .../prog/en/includes/members-menu.inc              |    2 +-
 .../prog/en/includes/members-toolbar.inc           |    2 +
 .../prog/en/includes/patron-search.inc             |   19 +-
 .../prog/en/includes/reserves_waiting.inc          |   44 +
 .../prog/en/includes/search_indexes.inc            |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |    9 +-
 .../en/lib/jquery/plugins/jquery.uitablefilter.js  |   90 ++
 .../en/modules/admin/branch_transfer_limits.tmpl   |   15 +-
 .../prog/en/modules/admin/clone-rules.tmpl         |    3 +-
 .../prog/en/modules/admin/patron-attr-types.tmpl   |    5 +
 .../en/modules/admin/preferences/circulation.pref  |    4 +
 .../prog/en/modules/admin/preferences/opac.pref    |    6 +
 .../prog/en/modules/admin/smart-rules.tmpl         |  646 ++++++++------
 .../prog/en/modules/basket/basket.tmpl             |    7 +
 .../prog/en/modules/catalogue/ISBDdetail.tmpl      |    6 +
 .../prog/en/modules/catalogue/MARCdetail.tmpl      |   44 +-
 .../prog/en/modules/catalogue/advsearch.tmpl       |    8 +-
 .../prog/en/modules/catalogue/detail.tmpl          |    6 +
 .../prog/en/modules/catalogue/issuehistory.tmpl    |    5 +
 .../prog/en/modules/catalogue/moredetail.tmpl      |    6 +-
 .../prog/en/modules/catalogue/results.tmpl         |   19 +-
 .../prog/en/modules/circ/circulation-home.tmpl     |    6 +-
 .../prog/en/modules/circ/circulation.tmpl          |  401 +++++----
 .../prog/en/modules/circ/overdue.tmpl              |   33 +-
 .../prog/en/modules/circ/returns.tmpl              |  151 ++--
 .../prog/en/modules/members/boraccount.tmpl        |    4 +-
 .../prog/en/modules/members/guarantor_search.tmpl  |    3 +
 .../prog/en/modules/members/mancredit.tmpl         |    1 +
 .../prog/en/modules/members/maninvoice.tmpl        |    1 +
 .../prog/en/modules/members/member.tmpl            |    3 +-
 .../prog/en/modules/members/memberentrygen.tmpl    |  192 +++--
 .../prog/en/modules/members/moremember-print.tmpl  |    3 +-
 .../prog/en/modules/members/moremember.tmpl        |  393 +++++++--
 .../intranet-tmpl/prog/en/modules/members/pay.tmpl |   12 +-
 .../prog/en/modules/members/readingrec.tmpl        |   31 +-
 .../prog/en/modules/reports/reports-home.tmpl      |    1 +
 .../prog/en/modules/reports/reserves_stats.tmpl    |  549 ++++++++++++
 .../prog/en/modules/reserve/request.tmpl           |   30 +-
 .../prog/en/modules/suggestion/suggestion.tmpl     |   31 +-
 .../prog/en/modules/tools/import_borrowers.tmpl    |    8 +
 .../intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl |   19 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |  588 +++++++++++++
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl       |  195 +++++
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |    2 +-
 .../prog/en/xslt/UNIMARCslimUtils.xsl              |    8 +
 .../intranet-tmpl/prog/img/more-right-arrow.gif    |  Bin 0 -> 81 bytes
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   35 +
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl |    5 +-
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl |    6 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |    8 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |  174 ++++-
 .../opac-tmpl/prog/en/modules/opac-reserve.tmpl    |   53 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |    5 +-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |    8 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |  882 ++++++++++---------
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl       |   77 +-
 .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl    |  172 ++--
 kohaversion.pl                                     |    2 +-
 members/mancredit.pl                               |    5 +-
 members/maninvoice.pl                              |    6 +-
 members/member.pl                                  |   23 +-
 members/memberentry.pl                             |   60 +-
 members/members-home.pl                            |   18 +-
 members/moremember.pl                              |  180 ++++-
 members/pay.pl                                     |    9 +
 members/setdebar.pl                                |   61 --
 members/setstatus.pl                               |   13 +-
 misc/cronjobs/holds/build_holds_queue.pl           |    8 +-
 misc/cronjobs/overdue_notices.pl                   |  150 ++--
 misc/cronjobs/printoverdues.sh                     |    9 +-
 offline_circ/list.pl                               |   57 ++
 offline_circ/process.pl                            |   48 +
 offline_circ/service.pl                            |   60 ++
 opac/opac-ISBDdetail.pl                            |   13 +-
 opac/opac-MARCdetail.pl                            |    4 +
 opac/opac-detail.pl                                |   73 ++-
 opac/opac-modrequest.pl                            |    4 +-
 opac/opac-reserve.pl                               |   64 +-
 opac/opac-search.pl                                |   23 +-
 opac/opac-user.pl                                  |   13 +-
 reports/reserves_stats.pl                          |  382 ++++++++
 reserve/modrequest.pl                              |   19 +-
 reserve/placerequest.pl                            |   92 +-
 reserve/renewscript.pl                             |   58 ++-
 reserve/request.pl                                 |   48 +-
 suggestion/suggestion.pl                           |   13 +-
 t/lib/KohaTest/Circulation.pm                      |    2 -
 t/lib/KohaTest/Members/GetMemberDetails.pm         |    6 +-
 t/lib/KohaTest/Overdues.pm                         |    1 -
 tools/import_borrowers.pl                          |  129 +++-
 tools/viewlog.pl                                   |    9 +-
 143 files changed, 8302 insertions(+), 3465 deletions(-)
 create mode 100644 C4/IssuingRules.pm
 create mode 100755 admin/smart-rules-service.pl
 create mode 100644 installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl
 create mode 100644 installer/data/mysql/atomicupdate/0010-holds-on-smart-rules.pl
 create mode 100644 installer/data/mysql/atomicupdate/0011-debarred-modifications.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/reserves_waiting.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.uitablefilter.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/more-right-arrow.gif
 delete mode 100755 members/setdebar.pl
 create mode 100755 offline_circ/list.pl
 create mode 100755 offline_circ/process.pl
 create mode 100755 offline_circ/service.pl
 create mode 100755 reports/reserves_stats.pl

From hdl at eliot.biblibre.com  Mon Nov  8 15:36:14 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:14 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-serials
Message-ID: <20101108143614.98D6D93806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-serials

Alex Arnaud (1):
      (MT4068) Display callnumber & location in serials-collection.pl & serials-edit.pl.

Christophe Croullebois (1):
      (MT #4108) Notes in serial

Henri-Damien LAURENT (11):
      (MT 3035) subscription created expired
      Serials/claims.pl fixing rebase conflict
      MT2972 : location dropbox would not show up
      merge problem
      Followup serials/claims.pl
      subscription-add : startdate and enddate definition
      MT3667 : multiple display of same subscription
      MT3801: Serials not received issues cannot be claimed
      MT3801: Serials not received issues cannot be claimed
      MT3667 followup MT3811 : unexpected issues not stored
      MT3801 followup : Cannot claim for issues

Jean-Andr?? Santoni (6):
      Checks serials item form
      Fixed the checkall checkbox
      Replaced CGI dropdown box call wich is deprecated
      Added table filter to claims.tmpl
      Fixed a bug about hidden checkboxes in claims
      (bug #4363) Fix subscription search error when no results

Matthias Meusburger (1):
      MT3802: Patron notification is not correctly shown in subscription modification

Nahuel ANGELINETTI (3):
      (MT #2972) use "select" box for location in subscription-add
      (MT #3110) fix repetable titles
      (MT #2972) use default framework, instead of none.

Nicolas Morin (1):
      correct vocabulary

Paul POULAIN (6):
      minor change: reordering branch/location/callnumber display
      adding some javascript strings for translator
      some display changes in subscription add
      MT2743 : add filter on subscription branch to subscription claims
      synching subscription-add with BibLibre master
      fixing unopened closed tmpl_if

Paul Poulain (2):
      Adding HasItems
      Editing help for subscription-add

St??phane Delaune (1):
      (MT #3506) Granular permissions for the serials module

 C4/Serials.pm                                      |   45 ++-
 installer/data/mysql/updatedatabase.pl             |   17 +
 .../intranet-tmpl/prog/en/includes/mainmenu.inc    |    2 +-
 .../prog/en/includes/serials-menu.inc              |   14 +-
 .../prog/en/includes/serials-search.inc            |    2 +-
 .../prog/en/includes/serials-toolbar.inc           |   34 ++
 .../en/modules/help/serials/subscription-add.tmpl  |  155 +++++--
 .../prog/en/modules/serials/claims.tmpl            |   75 +++-
 .../en/modules/serials/serials-collection.tmpl     |    5 +-
 .../prog/en/modules/serials/serials-edit.tmpl      |   46 +--
 .../prog/en/modules/serials/serials-home.tmpl      |    4 +
 .../prog/en/modules/serials/subscription-add.tmpl  |   62 ++--
 .../en/modules/serials/subscription-detail.tmpl    |    6 +-
 .../prog/en/modules/suggestion/suggestion.tmpl     |    2 +-
 .../en/modules/virtualshelves/downloadshelf.tmpl   |    3 +-
 serials/claims.pl                                  |   29 +-
 serials/member-search.pl                           |    2 +-
 serials/serials-collection.pl                      |   14 +-
 serials/serials-edit.pl                            |   11 +-
 serials/subscription-add.pl                        |  450 ++++++++++----------
 serials/subscription-bib-search.pl                 |   30 +-
 t/Serials.t                                        |    6 +-
 22 files changed, 592 insertions(+), 422 deletions(-)

From hdl at eliot.biblibre.com  Mon Nov  8 15:36:15 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:15 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-various
Message-ID: <20101108143615.49F1593806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-various

Frederic Demians (1):
      Use marcflavour in Stage MARC Records For Import

Henri-Damien LAURENT (51):
      Performance enhancing
      Performance enhancing : C4/Languages.pm
      warn removing : C4/Languages.pm
      Take care of encoding
      Adding sudoc submodule
      selenium tests on Univ_Lyon3 : comments for gna and lost
      bulkmarcimport : Adding checks on last update date
      ILS/Transaction Conforming to APIs
      (MT 2256)Followup bulkmarcimport enhancement
      Enhancement bulkmarcimport for Agates
      bulkmarcimport log correction
      bulkmarcimport.pl Minor fixes
      MT3138 Adding some permission management to viewlog
      Improving load_testing
      MT3157 : editing an attribute lead to Error500
      MT3269 : BatchMod Feature blanking subfields
      MT3269: Followup BatchMod
      MT3269 Fixing tools/batchMod.pl tags/subfields display
      MT3289 : check_sysprefs.pl case sensitive variable names
      perf enhancement Lyon3
      Perf work
      Perf enhancement : C4/SQLHelper.pm
      MT3044 : Fix CSV export when rer are blank characters
      Auth_with_cas : removing a warning
      Auth_with_ldap : removing warnings
      (MT #2993) add EAN, PUC and Music-Number indexes
      export.pl : removing useless condition
      SIP Fixing debarment management
      Bug3916 : Batch Modify tool overwrites branches fields
      MT4049: OverdueNotices : missing to_address in emails.
      ilsdi service AuthenticatePatron doesn't with CAS syspref on
      fixing C4/Auth.pm
      Adding Script to remove items from biblioitems.marcxml
      Date processinghas to be done on all dates
      Letters can be html in overdu_notices.pl
      overdue_notices :Removing warning
      Dates format
      Letters : Display branchname rather than branchcode
      Followup Letters : Display branchname rather than branchcode
      SIP : Format dates as should be in Koha
      MT4653: Encoding Subject in letter message
      overduenotices fixing encoding for titles
      Letters : Fixing Subject encoding
      MT4862 : Problem with XSLT
      tools/batchMod.pl
      remove items.
      merge conflict solved bulkmarcimport
      Adding 2 new indexes don and codstat
      icu.xml edition
      C4::Record : Fixing bad usage of next
      rebuild_zebra : Adding a way to select the elements exported

Jean-Andr?? Santoni (3):
      Hide buttons when there is no more checkboxes
      (MT #3605) Fix escaping in ILSDI
      (bug #3945) Add Windows and Mac file support in CSV profiles

Marc Chantreux (1):
      add PSGI ability

Matthias Meusburger (19):
      MT2968: private lists display is no longer shortened to 10 lists
      MT2892: Fix security issue in intranet login
      MT2926: Fix default values import
      batchRebuildBiblioTables.pl doesn't crash anymore when GetMarcBiblio fails. Unprocessed biblionumbers are displayed at the end of the execution instead.
      MT 2270: CAS proxy
      MT2897 : Allow import_borrowers.pl to be used in commandline mode
      MT2889: Adds a script that re-create missing statistics from issues and old_issues tables
      MT2889, follow-up: Adds a script that re-create missing statistics from issues and old_issues tables
      MT3532: Deletes biblio record when there are no more items left for this biblio while batch item deleting
      Adds the ability to authenticate against multiple CAS servers
      (MT3584): Ajouter les icones de Nimes
      MT3815: Quickfix for CSV export (9999 rows limitation)
      MT3864 : Fix javascript syntax errors in items batchMod
      MT4380: Adds an empty choice for every select field in batch item edition
      Adds CAS documentation
      MT4057: Let the user choose the CAS server to authenticate against in case of multiple CAS servers
      MT4057: [Follow-up] Let the user choose the CAS server to authenticate against in case of multiple CAS servers
      MT4542 : duplicated notices sent to patrons
      MT4704: Fix multiple CAS authentication

Nahuel ANGELINETTI (4):
      (bug #3924 MT2500) fix useDaysMode use
      (bug #4290) searching for author in repository
      (bug #4916) permit tools/cleanborrowers.pl to be used by command line
      (bug #5164) fix csv in overdue notice

Nicolas Morin (2):
      removed host in label
      use of icu.xml

Owen Leonard (1):
      Fix for Bug 4451 Batch item tool can't process file with Windows line endings

Paul POULAIN (3):
      automatically recover silently invalid chars like < and > in records
      order branch list alphabetically, without taking care of uc/lc
      fixing merge problem

Paul Poulain (5):
      editing submodules for sudoc
      changing the head of the subproject
      Update sudoc
      Fixing Imporving YAML for authorities
      Bug Fix : C4::Context Failing when installing

Sophie Meynieux (1):
      printoverdues.sh bash odities

St??phane Delaune (1):
      (MT #1654) followup : Adding jquery.tablesorter.pager support for reviewswaiting.pl

 .gitmodules                                        |    3 +
 C4/Auth.pm                                         |  166 +++--
 C4/Auth_cas_servers.yaml.orig                      |   12 +
 C4/Auth_with_cas.pm                                |  181 +++-
 C4/Auth_with_ldap.pm                               |   48 +-
 C4/Biblio.pm                                       |   84 +--
 C4/Branch.pm                                       |   18 +-
 C4/Breeding.pm                                     |   11 +-
 C4/Context.pm                                      |   29 +-
 C4/ILSDI/Services.pm                               |   15 +-
 C4/Koha.pm                                         |   19 +-
 C4/Languages.pm                                    |  100 +--
 C4/Letters.pm                                      |   25 +-
 C4/Log.pm                                          |   24 +-
 C4/Record.pm                                       |    4 +-
 C4/Reports/Guided.pm                               |    2 +-
 C4/SIP/ILS/Patron.pm                               |   31 +-
 C4/SIP/ILS/Transaction/Checkout.pm                 |    3 +-
 C4/SIP/ILS/Transaction/Renew.pm                    |    3 +
 C4/SIP/Sip/MsgType.pm                              |   68 ++-
 C4/SQLHelper.pm                                    |   32 +-
 C4/Search.pm                                       |    3 +
 C4/VirtualShelves.pm                               |    8 +-
 C4/XSLT.pm                                         |    4 +-
 catalogue/search.pl                                |    2 +-
 docs/CAS/CAS/README                                |    8 +
 docs/CAS/CASProxy/README                           |    9 +
 docs/CAS/CASProxy/examples/casSession.tmp          |  Bin 0 -> 134 bytes
 docs/CAS/CASProxy/examples/koha_webservice.pl      |   58 ++
 docs/CAS/CASProxy/examples/proxy_cas.pl            |   91 ++
 docs/CAS/CASProxy/examples/proxy_cas_callback.pl   |   62 ++
 docs/CAS/CASProxy/examples/proxy_cas_data.pl       |   80 ++
 etc/zebradb/biblios/etc/bib1.att                   |    2 +
 etc/zebradb/ccl.properties                         |    8 +
 etc/zebradb/etc/default.idx                        |    8 +-
 etc/zebradb/etc/icu.xml                            |   33 +
 etc/zebradb/marc_defs/unimarc/biblios/record.abs   |    6 +
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    2 +-
 installer/data/mysql/updatedatabase.pl             |   28 +
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    2 +-
 .../prog/en/modules/cataloguing/z3950_search.tmpl  |    2 +-
 .../prog/en/modules/offline_circ/list.tmpl         |   97 +++
 .../prog/en/modules/reviews/reviewswaiting.tmpl    |   22 +-
 .../prog/en/modules/tools/batchMod-del.tmpl        |    2 +-
 .../prog/en/modules/tools/batchMod-edit.tmpl       |   52 +-
 .../prog/en/modules/tools/csv-profiles.tmpl        |   41 +-
 .../prog/en/modules/tools/stage-marc-import.tmpl   |   19 +-
 .../prog/en/modules/tools/viewlog.tmpl             |  142 ++--
 .../prog/img/itemtypeimg/carredart/bd.png          |  Bin 0 -> 1207 bytes
 .../prog/img/itemtypeimg/carredart/cd.png          |  Bin 0 -> 2005 bytes
 .../prog/img/itemtypeimg/carredart/cdrom.png       |  Bin 0 -> 787 bytes
 .../itemtypeimg/carredart/dossier_de_presse.png    |  Bin 0 -> 820 bytes
 .../prog/img/itemtypeimg/carredart/dvd.png         |  Bin 0 -> 1929 bytes
 .../prog/img/itemtypeimg/carredart/dvd_musical.png |  Bin 0 -> 2131 bytes
 .../prog/img/itemtypeimg/carredart/livre.png       |  Bin 0 -> 403 bytes
 .../img/itemtypeimg/carredart/livre_ancien.png     |  Bin 0 -> 2611 bytes
 .../img/itemtypeimg/carredart/livre_artiste.png    |  Bin 0 -> 1039 bytes
 .../prog/img/itemtypeimg/carredart/livre_audio.png |  Bin 0 -> 1886 bytes
 .../carredart/livre_en_gros_caracteres.png         |  Bin 0 -> 1279 bytes
 .../img/itemtypeimg/carredart/livre_multimedia.png |  Bin 0 -> 1372 bytes
 .../prog/img/itemtypeimg/carredart/partition.png   |  Bin 0 -> 976 bytes
 .../prog/img/itemtypeimg/carredart/revue.png       |  Bin 0 -> 624 bytes
 .../prog/img/itemtypeimg/carredart/vhs.png         |  Bin 0 -> 632 bytes
 koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl     |   44 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl |   14 +-
 kohaversion.pl                                     |    2 +-
 misc/batchRebuildBiblioTables.pl                   |    8 +
 misc/check_sysprefs.pl                             |    7 +-
 misc/cronjobs/overdue_notices.pl                   |   41 +-
 misc/cronjobs/printoverdues.sh                     |    3 +-
 misc/load_testing/benchmark_circulation.pl         |   39 +-
 misc/load_testing/benchmark_opac.pl                |  128 +++
 misc/maintenance/remove_items_from_biblioitems.pl  |   50 ++
 misc/migration_tools/bulkmarcimport.pl             |  206 ++++-
 misc/migration_tools/rebuild_zebra.pl              |   22 +-
 misc/recreateIssueStatistics.pl                    |  115 +++
 misc/sudoc                                         |    1 +
 opac/ilsdi.pl                                      |    1 -
 opac/opac-addbybiblionumber.pl                     |    2 +-
 selenium/Univ_Lyon3                                |   14 +
 selenium/univ_lyon3/gna comment                    |   97 +++
 selenium/univ_lyon3/lostcomment                    |   97 +++
 tools/batchMod.pl                                  |  886 +++++++++++---------
 tools/cleanborrowers.pl                            |   69 ++
 tools/export.pl                                    |   30 +-
 tools/import_borrowers.pl                          |  181 ++++-
 tools/import_borrowers.yaml                        |    3 +
 tools/stage-marc-import.pl                         |    8 +-
 tools/viewlog.pl                                   |   22 +-
 virtualshelves/addbybiblionumber.pl                |    2 +-
 90 files changed, 2770 insertions(+), 991 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 C4/Auth_cas_servers.yaml.orig
 create mode 100644 docs/CAS/CAS/README
 create mode 100644 docs/CAS/CASProxy/README
 create mode 100644 docs/CAS/CASProxy/examples/casSession.tmp
 create mode 100755 docs/CAS/CASProxy/examples/koha_webservice.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_callback.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_data.pl
 create mode 100644 etc/zebradb/etc/icu.xml
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/bd.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/cd.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/cdrom.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/dossier_de_presse.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/dvd.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/dvd_musical.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/livre.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/livre_ancien.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/livre_artiste.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/livre_audio.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/livre_en_gros_caracteres.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/livre_multimedia.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/partition.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/revue.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/carredart/vhs.png
 create mode 100755 misc/load_testing/benchmark_opac.pl
 create mode 100644 misc/maintenance/remove_items_from_biblioitems.pl
 create mode 100644 misc/recreateIssueStatistics.pl
 create mode 160000 misc/sudoc
 create mode 100644 selenium/Univ_Lyon3
 create mode 100644 selenium/univ_lyon3/gna comment
 create mode 100644 selenium/univ_lyon3/lostcomment
 create mode 100644 tools/import_borrowers.yaml

From hdl at eliot.biblibre.com  Mon Nov  8 15:36:44 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:44 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-opac
Message-ID: <20101108143644.7E50393806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-opac

Henri-Damien LAURENT (9):
      opac-detail.pl enhancement performance
      Modification for Plack
      MT3618 : search is duplicated
      MT3617 : opac search advanced Library set to my library
      MT3513 followup : searching authorities
      opac-ISBDdetail.pl Error 500
      OPAC : using OPACISBD systempreference to display link
      Adding location to search indexes
      Fix MT4231 : add search history limit

Matthias Meusburger (9):
      MT 3010: Adds waiting date for holds in opac-user
      MT3132: Change gonenoaddress message in opac-user.pl according to the OPACPatronDetails syspref
      Bug4943: Search history cookie size limit
      Fix opac search history
      MT 4231: Adds limits to search history
      MT 4231, Follow-up: Adds limits to search history
      MT4587 : Adds yaml config file for custom opac items hiding
      MT4587, Follow-up: Adds yaml config file for custom opac items hiding
      MT4587, Follow-up: Hiding rules are now in a syspref

Nahuel ANGELINETTI (1):
      (bug #4018) fix coins support in opac detail and xslt

Paul POULAIN (5):
      Minor change in description
      french translation + minor fix in html to improve translatability
      MT4491 : limitation by library group
      Synching opac-detail.pl with BibLibre git version
      Adding OpacHiddenItems syspref

Paul Poulain (1):
      Normalizing opac-detail.pl

 C4/Auth.pm                                         |   11 +-
 C4/Items.pm                                        |   53 ++
 C4/Search.pm                                       |   74 ++-
 catalogue/search.pl                                |    2 +-
 docs/opac/OpacHiddenItems.txt                      |   12 +
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    1 +
 installer/data/mysql/kohastructure.sql             |    2 +
 installer/data/mysql/updatedatabase.pl             |  337 +++++++++
 .../prog/en/includes/search_indexes.inc            |    1 +
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |   23 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl |   14 +-
 .../modules/opac-authoritiessearchresultlist.tmpl  |    2 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |  245 +++++--
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |    3 +-
 .../prog/en/modules/opac-search-history.tmpl       |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |    4 +-
 kohaversion.pl                                     |    2 +-
 opac/opac-ISBDdetail.pl                            |    1 +
 opac/opac-MARCdetail.pl                            |    4 +-
 opac/opac-detail.pl                                |  768 +++++++++++---------
 opac/opac-search-history.pl                        |   44 +-
 opac/opac-search.pl                                |  171 +++--
 opac/opac-topissues.pl                             |    8 +-
 opac/opac-user.pl                                  |    3 +
 25 files changed, 1225 insertions(+), 565 deletions(-)
 create mode 100644 docs/opac/OpacHiddenItems.txt

From hdl at eliot.biblibre.com  Mon Nov  8 15:36:45 2010
From: hdl at eliot.biblibre.com (LAURENT Henri-Damien)
Date: Mon,  8 Nov 2010 15:36:45 +0100 (CET)
Subject: [Koha-patches] request to pull 3.4/BibLibre-reports
Message-ID: <20101108143645.2225193806F@dell-desktop.example.com>

The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:

  Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)

are available in the git repository at:

  git://git.koha-community.org/wip/koha-biblibre.git 3.4/BibLibre-reports

Alex Arnaud (1):
      (MT 3267) Add Homebranch and Holdingbranch search criterion on circulation stat.

Henri-Damien LAURENT (1):
      MT4038 : guided reports

Jean-Andr?? Santoni (2):
      Fixes a permission problem in guided reports
      bugfix on catalogue_stat : barcode & acquire fields

Paul POULAIN (1):
      MT4578 : remove edit & delete button if the user don't have edit/create report permission

Paul Poulain (2):
      MT2268 : Guided Reports Fix columns.def
      MT2268 : Followup Reports Guided columns.def

St??phane Delaune (1):
      (MT #4417) support dates for debarred's patrons stats

 C4/Reports/Guided.pm                               |    5 +-
 koha-tmpl/intranet-tmpl/prog/en/columns.def        |    3 +
 .../en/modules/reports/guided_reports_start.tmpl   |   13 +-
 .../prog/en/modules/reports/issues_stats.tmpl      |   24 +
 reports/borrowers_stats.pl                         |   21 +
 reports/catalogue_stats.pl                         |  931 ++++++++++----------
 reports/catalogue_stats.pl.orig                    |  723 +++++++++++++++
 reports/guided_reports.pl                          |    7 +-
 reports/issues_stats.pl                            |   72 +-
 9 files changed, 1311 insertions(+), 488 deletions(-)
 create mode 100755 reports/catalogue_stats.pl.orig

From Katrin.Fischer.83 at web.de  Mon Nov  8 21:52:32 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Mon,  8 Nov 2010 21:52:32 +0100
Subject: [Koha-patches] [PATCH] Bug 5370: Fix all references to koha.org
Message-ID: <1289249552-23209-1-git-send-email-Katrin.Fischer.83@web.de>

Thx to Brooke for helping with the wiki.

This is the last patch.
We will have to change some more links, after translate.koha.org was moved.
---
 etc/zebradb/explain-authorities.xml                |    2 +-
 etc/zebradb/explain-biblios.xml                    |    2 +-
 .../en/modules/help/reports/guided_reports.tmpl    |    2 +-
 .../opac-tmpl/prog/en/modules/opac-browser.tmpl    |    2 +-
 misc/release_notes/README.txt                      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/zebradb/explain-authorities.xml b/etc/zebradb/explain-authorities.xml
index 6455fc0..e8425d8 100644
--- a/etc/zebradb/explain-authorities.xml
+++ b/etc/zebradb/explain-authorities.xml
@@ -46,7 +46,7 @@
    
     <history>
       Created for Koha 3
-      http://koha.org
+      http://koha-community.org
     </history>
 
     <implementation  identifier="zebra" version="1.4">
diff --git a/etc/zebradb/explain-biblios.xml b/etc/zebradb/explain-biblios.xml
index 10b9fa5..ff286fd 100644
--- a/etc/zebradb/explain-biblios.xml
+++ b/etc/zebradb/explain-biblios.xml
@@ -46,7 +46,7 @@
    
     <history>
       Created for Koha 3
-      http://koha.org
+      http://koha-community.org
     </history>
 
     <implementation  identifier="zebra" version="1.4">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tmpl
index b6c7b3e..a584de5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tmpl
@@ -48,7 +48,7 @@
 
 <p><strong>Is there a repository for reports?</strong></p>
 
-<p>There is a page on the Koha Wiki: <a href="http://wiki.koha.org/doku.php?id=sql_library" target="_new">http://wiki.koha.org/doku.php?id=sql_library</a> with reports written by Koha libraries around the world.</p>
+<p>There is a page on the Koha Wiki: <a href="http://wiki.koha-community.org/wiki/SQL_Reports_Library" target="_new">http://wiki.koha-community.org/wiki/SQL_Reports_Library</a> with reports written by Koha libraries around the world.</p>
 
 <p>NEKLS also has a great page (<a href="http://www.nexpresslibrary.org/training/reports-training/" target="_new">http://www.nexpresslibrary.org/training/reports-training/</a>) with a list of reports they have written.</p>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
index 66f2a66..dfb4884 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
@@ -41,7 +41,7 @@
         <!-- /TMPL_LOOP -->
         </ul></li></ul>
         <!-- TMPL_ELSE -->
-            <div class="warning">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha.org/doku.php?id=opacbrowser">Koha Wiki</a> for more information on what it does and how to configure it.</div>
+            <div class="warning">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha-community.org/wiki/Opac_browse_feature">Koha Wiki</a> for more information on what it does and how to configure it.</div>
         <!-- /TMPL_IF -->
 </div></div>
 </div>
diff --git a/misc/release_notes/README.txt b/misc/release_notes/README.txt
index 1a3f66f..b7c8813 100644
--- a/misc/release_notes/README.txt
+++ b/misc/release_notes/README.txt
@@ -31,7 +31,7 @@ Sign, MD5 the release, upload:
  $ gpg --clearsign koha-3.00.00-alpha.tar.gz.MD5
  $ cat koha-3.00.00-alpha.tar.gz.MD5.asc
  $ gpg --detach-sign koha-3.00.00-alpha.tar.gz
- $ scp * download.koha.org
+ $ scp * download.koha-community.org
 
 Tag the Release:
 From a clone of the RM repo, run:
-- 
1.7.1


From chris at bigballofwax.co.nz  Tue Nov  9 00:05:37 2010
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Tue, 09 Nov 2010 12:05:37 +1300
Subject: [Koha-patches] Request to Pull
Message-ID: <E1PFamP-00056y-Ei@ubuntu>

The following changes since commit 2a4c3d48d07d946d9846681f9ee2a31fcac0a18a:
  Chris Cormack (1):
        Merge remote branch 'kc/new/bug_5370' into kcmaster

are available in the git repository at:

  git://git.workbuffer.org/git/koha.git translation

Chris Cormack (3):
      Staff interface .po file updates
      Russian and Ukranian opac language updates
      Ukranian and Russian syspref language updates

 .../po/de-DE-i-staff-t-prog-v-3002000.po           |    9 +-
 .../translator/po/ru-RU-i-opac-t-prog-v-3002000.po | 8051 ++--
 .../po/ru-RU-i-staff-t-prog-v-3002000.po           |48328 ++++++++++---------
 misc/translator/po/ru-RU-pref.po                   |   39 +-
 .../translator/po/uk-UA-i-opac-t-prog-v-3002000.po | 8020 ++--
 .../po/uk-UA-i-staff-t-prog-v-3002000.po           |49517 ++++++++++----------
 misc/translator/po/uk-UA-pref.po                   |   24 +-
 7 files changed, 57527 insertions(+), 56461 deletions(-)

From cnighswonger at foundations.edu  Tue Nov  9 16:42:57 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Tue, 9 Nov 2010 10:42:57 -0500
Subject: [Koha-patches] [Bug 5379] Pull Request
Message-ID: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>

The following changes since commit 1aef81c354eb17c2cf2d557cac78d4e37c30a046:
  Chris Cormack (1):
        Ukranian and Russian syspref language updates

are available in the git repository at:

  git://git.koha-community.org/wip/koha-fbc.git k_bug_5379

Chris Nighswonger (1):
      Bug 5379 - import_borrowers.pl fails with db insert/update errors

 C4/Members.pm                                      |    5 +++++
 C4/Members/Attributes.pm                           |    6 ++++++
 .../prog/en/modules/tools/import_borrowers.tmpl    |    6 ++++--
 tools/import_borrowers.pl                          |   16 ++++++++++++++--
 4 files changed, 29 insertions(+), 4 deletions(-)

From M.de.Rooy at rijksmuseum.nl  Tue Nov  9 17:04:27 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Tue, 9 Nov 2010 16:04:27 +0000
Subject: [Koha-patches] [PATCH] Bug 5374 (update transaction date when
 saving biblio) RESENT with small fix
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA3119D192@S-MAIL-1B.rijksmuseum.intra>

Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.

I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.
---
 C4/Biblio.pm                                  |    9 +++++++++
 cataloguing/value_builder/marc21_field_005.pl |   25 ++++---------------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 81ccfbb..1b2098e 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -3217,6 +3217,15 @@ sub ModBiblioMarc {
             $record->insert_grouped_field( MARC::Field->new( 100, "", "", "a" => $string ) );
         }
     }
+
+    #enhancement 5374: update transaction date (005) for marc21/unimarc
+    if($encoding =~ /MARC21|UNIMARC/) {
+      my @a= (localtime) [5,4,3,2,1,0]; $a[0]+=1900; $a[1]++;
+        # YY MM DD HH MM SS (update year and month)
+      my $f005= $record->field('005');
+      $f005->update(sprintf("%4d%02d%02d%02d%02d%04.1f", at a)) if $f005;
+    }
+
     my $oldRecord;
     if ( C4::Context->preference("NoZebra") ) {

diff --git a/cataloguing/value_builder/marc21_field_005.pl b/cataloguing/value_builder/marc21_field_005.pl
index 3c33145..23d5a4b 100755
--- a/cataloguing/value_builder/marc21_field_005.pl
+++ b/cataloguing/value_builder/marc21_field_005.pl
@@ -19,7 +19,7 @@

 use strict;
 #use warnings; FIXME - Bug 2505
-use C4::Context;
+#use C4::Context;

 =head1

@@ -51,26 +51,9 @@ sub plugin_javascript {
     my $function_name= $field_number;

     # find today's date
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-    $year +=1900;
-    $mon +=1;
-    if (length($mon)==1) {
-        $mon = "0".$mon;
-    }
-    if (length($mday)==1) {
-        $mday = "0".$mday;
-    }
-    if (length($hour)==1) {
-        $hour = "0".$hour;
-    }
-    if (length($min)==1) {
-        $min = "0".$min;
-    }
-    if (length($sec)==1) {
-        $hour = "0".$sec;
-    }
-
-    my $date = "$year$mon$mday$hour$min$sec".".0";
+    my @a= (localtime) [5,4,3,2,1,0]; $a[0]+=1900; $a[1]++;
+    my $date = sprintf("%4d%02d%02d%02d%02d%04.1f", at a);
+
     my $res  = "
 <script type=\"text/javascript\">
 //<![CDATA[
--
1.6.0.6

From chrisc at catalyst.net.nz  Tue Nov  9 21:13:37 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 10 Nov 2010 09:13:37 +1300
Subject: [Koha-patches] request to pull 3.4/BibLibre-acquisitions
In-Reply-To: <20101108143610.EA87293806F@dell-desktop.example.com>
References: <20101108143610.EA87293806F@dell-desktop.example.com>
Message-ID: <20101109201337.GT4325@rorohiko>

* LAURENT Henri-Damien (hdl at eliot.biblibre.com) wrote:
> The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:
> 
>   Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)
> 
Great, these look ready for QA now

Colin would you like to do the honours and let me know when you have
some branches ready for me to pull from :) You may want to try and
recruit some others to help with QA for this pile, share the load some
... any volunteers? :-)

Chris

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101110/397e82d3/attachment.pgp>

From gmcharlt at gmail.com  Wed Nov 10 05:11:18 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue,  9 Nov 2010 23:11:18 -0500
Subject: [Koha-patches] Pull request -
	git://git.librarypolice.com/git/koha-galen.git
	3.4_BibLibre-reports-tested
Message-ID: <1289362278-14819-1-git-send-email-gmcharlt@gmail.com>

This is a tested version of BibLibre's 3.4/BibLibre-reports branch 
including some follow-up patches.  The following patches in BibLibre's
original pull request do  *not* have my sign-off and are consequently 
omitted from this branch:

* MT2268 : Followup Reports Guided columns.def

Patch resulted in double-encoding of diacritics in both
the column picker and report output.  Without the patch, diacritics
in report output and the column picker display correctly for me, so
whatever problem this patch was trying to solve ... works for me.

* MT4038 : guided reports (Guided reports should be exported 
  according to the delimiter system preference)

I am in agreement with the general idea, but the implementation needs work:

[1] The patch does not check the value of the delimiter syspref correctly; in 
particular, if you set the syspref to 'tabs', the delimiter will be set to 
the literal string 'tabulation'.
[2] To be consistent with the non-guided reports, what it should be doing
is giving the user a choice of delimiters and using the syspref only to 
select the default choice.

* bugfix on catalogue_stat : barcode & acquire fields

[1] This patch adds an extraneous file, reports/catalogue_stats.pl.orig
[2] It also contains a regression for bug 4176.

* (MT #4417) support dates for debarred's patrons stats

This patch assumes that borrowers.debarred is a date column; it is 
currently a Boolean.  If BibLibre is proposing to make that column a date,
this patch belongs on a separate topic branch implementing such a change.

The following changes since commit 1aef81c354eb17c2cf2d557cac78d4e37c30a046:
  Chris Cormack (1):
        Ukranian and Russian syspref language updates

are available in the git repository at:

  git://git.librarypolice.com/git/koha-galen.git 3.4_BibLibre-reports-tested

Alex Arnaud (1):
      (MT 3267) Add Homebranch and Holdingbranch search criterion on circulation stat.

Galen Charlton (3):
      Removed two column definitions added in previous patch
      follow-up: improve use of home and holding library in circ stats report
      follow-up to reports permissions patch

Jean-Andr?? Santoni (1):
      Fixes a permission problem in guided reports

Paul POULAIN (1):
      MT4578 : remove edit & delete button if the user don't have edit/create report permission

Paul Poulain (1):
      MT2268 : Guided Reports Fix columns.def

 C4/Reports/Guided.pm                               |    3 +-
 koha-tmpl/intranet-tmpl/prog/en/columns.def        |    1 +
 .../en/modules/reports/guided_reports_start.tmpl   |   20 ++++-
 .../prog/en/modules/reports/issues_stats.tmpl      |   24 ++++++
 reports/guided_reports.pl                          |    6 +-
 reports/issues_stats.pl                            |   74 ++++++++++++--------
 6 files changed, 90 insertions(+), 38 deletions(-)

From gmcharlt at gmail.com  Wed Nov 10 05:32:05 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue, 9 Nov 2010 23:32:05 -0500
Subject: [Koha-patches] [Bug 5379] Pull Request
In-Reply-To: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>
References: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>
Message-ID: <AANLkTin4dCBVaGKcL25Y=mTeT_QaEGry=zxUhy50dfLb@mail.gmail.com>

Hi,

I have the following comments on the patch:

[1] To bail out of SetBorrowerAttributes, just do a return, not return
0 - at present, nothing is looking for a return value for that
function, so a plain 'return' would do what the consumers expect and
return undef.
[2] Bailing out of AddMember should be done before invoking
manualinvoice.  I also suggest using a plain return; having AddMember
return undef (but note, I don't mean doing 'return undef;', I mean
'return;') would both signify the error condition *and* force
consumers to not blithely charge along trying to work with a patron
whose borrowernumber is 0.  I'm thinking of memberentry.pl in
particular.  Also, changing the return of AddMember is definitely
cause to update the POD.

Regards,

Galen

On Tue, Nov 9, 2010 at 10:42 AM, Chris Nighswonger
<cnighswonger at foundations.edu> wrote:
> The following changes since commit 1aef81c354eb17c2cf2d557cac78d4e37c30a046:
> ?Chris Cormack (1):
> ? ? ? ?Ukranian and Russian syspref language updates
>
> are available in the git repository at:
>
> ?git://git.koha-community.org/wip/koha-fbc.git k_bug_5379
>
> Chris Nighswonger (1):
> ? ? ?Bug 5379 - import_borrowers.pl fails with db insert/update errors
>
> ?C4/Members.pm ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?5 +++++
> ?C4/Members/Attributes.pm ? ? ? ? ? ? ? ? ? ? ? ? ? | ? ?6 ++++++
> ?.../prog/en/modules/tools/import_borrowers.tmpl ? ?| ? ?6 ++++--
> ?tools/import_borrowers.pl ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 16 ++++++++++++++--
> ?4 files changed, 29 insertions(+), 4 deletions(-)
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>



-- 
Galen Charlton
gmcharlt at gmail.com

From gmcharlt at gmail.com  Wed Nov 10 05:48:33 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue,  9 Nov 2010 23:48:33 -0500
Subject: [Koha-patches] [PATCH] bug 5372: identify empty field in authority
	record correctly
Message-ID: <1289364513-15290-1-git-send-email-gmcharlt@gmail.com>

This is the sibling to the fix for this bug for the bib
editor.  However, note that this change won't have a
direct effect yet, as currently you can't specify a
default value for a field or subfield in the authority
MARC frameworks.  See bug 4887.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 authorities/authorities.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 2973697..468021c 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -130,7 +130,7 @@ sub create_input {
     }
 
     # if there is no value provided but a default value in parameters, get it
-    unless ($value) {
+    if ($value eq '') {
         $value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
         if (!defined $value) {
             $value = q{};
-- 
1.7.0


From henridamien.laurent at biblibre.com  Wed Nov 10 06:06:19 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Wed, 10 Nov 2010 06:06:19 +0100
Subject: [Koha-patches] request to pull 3.4/BibLibre-acquisitions
In-Reply-To: <20101109201337.GT4325@rorohiko>
References: <20101108143610.EA87293806F@dell-desktop.example.com>
	<20101109201337.GT4325@rorohiko>
Message-ID: <4CDA284B.7060908@biblibre.com>

Le 09/11/2010 21:13, Chris Cormack a ?crit :
> * LAURENT Henri-Damien (hdl at eliot.biblibre.com) wrote:
>> The following changes since commit ce54fe0323a8ab523ae8992ff269bf82fea2dd10:
>>
>>   Merge branch 'trivial_bugs' of git://git.koha-community.org/wip/koha-fbc into kcmaster (2010-11-08 19:42:41 +1300)
>>
> Great, these look ready for QA now
> 
> Colin would you like to do the honours and let me know when you have
> some branches ready for me to pull from :) You may want to try and
> recruit some others to help with QA for this pile, share the load some
> ... any volunteers? :-)
> 
> Chris
I might not be the correct person, But if you need, you can ask me.
-- 
Henri-Damien LAURENT

From gmcharlt at gmail.com  Wed Nov 10 06:09:37 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 10 Nov 2010 00:09:37 -0500
Subject: [Koha-patches] [PATCH] bug 5380: remove copy-and-paste from
	authorities/detail.pl
Message-ID: <1289365777-15672-1-git-send-email-gmcharlt@gmail.com>

MARC editor code not needed here.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 authorities/detail.pl |  249 -------------------------------------------------
 1 files changed, 0 insertions(+), 249 deletions(-)

diff --git a/authorities/detail.pl b/authorities/detail.pl
index 4a6c074..18d6c6a 100755
--- a/authorities/detail.pl
+++ b/authorities/detail.pl
@@ -48,251 +48,9 @@ use C4::Output;
 use CGI;
 use MARC::Record;
 use C4::Koha;
-# use C4::Biblio;
-# use C4::Catalogue;
 
 our ($tagslib);
 
-=item build_authorized_values_list
-
-=cut
-
-sub build_authorized_values_list ($$$$$$$) {
-    my ( $tag, $subfield, $value, $dbh, $authorised_values_sth,$index_tag,$index_subfield ) = @_;
-
-    my @authorised_values;
-    my %authorised_lib;
-
-    # builds list, depending on authorised value...
-
-    #---- branch
-    if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
-        my $sth =
-          $dbh->prepare(
-            "select branchcode,branchname from branches order by branchname");
-        $sth->execute;
-        push @authorised_values, ""
-          unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-
-        while ( my ( $branchcode, $branchname ) = $sth->fetchrow_array ) {
-            push @authorised_values, $branchcode;
-            $authorised_lib{$branchcode} = $branchname;
-        }
-
-        #----- itemtypes
-    }
-    elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "itemtypes" ) {
-        my $sth =
-          $dbh->prepare(
-            "select itemtype,description from itemtypes order by description");
-        $sth->execute;
-        push @authorised_values, ""
-          unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-          
-        my $itemtype;
-        
-        while ( my ( $itemtype, $description ) = $sth->fetchrow_array ) {
-            push @authorised_values, $itemtype;
-            $authorised_lib{$itemtype} = $description;
-        }
-        $value = $itemtype unless ($value);
-
-        #---- "true" authorised value
-    }
-    else {
-        $authorised_values_sth->execute(
-            $tagslib->{$tag}->{$subfield}->{authorised_value} );
-
-        push @authorised_values, ""
-          unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
-
-        while ( my ( $value, $lib ) = $authorised_values_sth->fetchrow_array ) {
-            push @authorised_values, $value;
-            $authorised_lib{$value} = $lib;
-        }
-    }
-    return CGI::scrolling_list(
-        -name     => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
-        -values   => \@authorised_values,
-        -default  => $value,
-        -labels   => \%authorised_lib,
-        -override => 1,
-        -size     => 1,
-        -multiple => 0,
-        -tabindex => 1,
-        -id       => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
-        -class    => "input_marceditor",
-    );
-}
-
-
-=item create_input
- builds the <input ...> entry for a subfield.
-=cut
-
-sub create_input {
-    my ( $tag, $subfield, $value, $index_tag, $tabloop, $rec, $authorised_values_sth,$cgi ) = @_;
-    
-    my $index_subfield = CreateKey(); # create a specifique key for each subfield
-
-    $value =~ s/"/&quot;/g;
-
-    # if there is no value provided but a default value in parameters, get it
-    unless ($value) {
-        $value = $tagslib->{$tag}->{$subfield}->{defaultvalue};
-
-        # get today date & replace YYYY, MM, DD if provided in the default value
-        my ( $year, $month, $day ) = Today();
-        $month = sprintf( "%02d", $month );
-        $day   = sprintf( "%02d", $day );
-        $value =~ s/YYYY/$year/g;
-        $value =~ s/MM/$month/g;
-        $value =~ s/DD/$day/g;
-    }
-    my $dbh = C4::Context->dbh;
-    my %subfield_data = (
-        tag        => $tag,
-        subfield   => $subfield,
-        marc_lib   => substr( $tagslib->{$tag}->{$subfield}->{lib}, 0, 22 ),
-        marc_lib_plain => $tagslib->{$tag}->{$subfield}->{lib}, 
-        tag_mandatory  => $tagslib->{$tag}->{mandatory},
-        mandatory      => $tagslib->{$tag}->{$subfield}->{mandatory},
-        repeatable     => $tagslib->{$tag}->{$subfield}->{repeatable},
-        kohafield      => $tagslib->{$tag}->{$subfield}->{kohafield},
-        index          => $index_tag,
-        id             => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
-        value          => $value,
-    );
-    if($subfield eq '@'){
-        $subfield_data{id} = "tag_".$tag."_subfield_00_".$index_tag."_".$index_subfield;
-    } else {
-         $subfield_data{id} = "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield;
-    }
-
-    
-    $subfield_data{visibility} = "display:none;"
-        if (    ($tagslib->{$tag}->{$subfield}->{hidden} % 2 == 1) and $value ne ''
-            or ($value eq '' and !$tagslib->{$tag}->{$subfield}->{mandatory})
-        );
-    
-    # it's an authorised field
-    if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
-        $subfield_data{marc_value} =
-          build_authorized_values_list( $tag, $subfield, $value, $dbh,
-            $authorised_values_sth,$index_tag,$index_subfield );
-
-    # it's a thesaurus / authority field
-    }
-    elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
-        $subfield_data{marc_value} =
-    "<input type=\"text\"
-                        id=\"".$subfield_data{id}."\"
-                        name=\"".$subfield_data{id}."\"
-      value=\"$value\"
-      class=\"input_marceditor\"
-                        tabindex=\"1\"                     
-      DISABLE READONLY \/>
-      <span class=\"buttonDot\"
-        onclick=\"Dopop('/cgi-bin/koha/authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$subfield_data{id}','$subfield_data{id}')\">...</span>
-    ";
-    # it's a plugin field
-    }
-    elsif ( $tagslib->{$tag}->{$subfield}->{'value_builder'} ) {
-
-        # opening plugin. Just check wether we are on a developper computer on a production one
-        # (the cgidir differs)
-        my $cgidir = C4::Context->intranetdir . "/cgi-bin/cataloguing/value_builder";
-        unless (-r $cgidir and -d $cgidir) {
-            $cgidir = C4::Context->intranetdir . "/cataloguing/value_builder";
-        }
-        my $plugin = $cgidir . "/" . $tagslib->{$tag}->{$subfield}->{'value_builder'};
-        do $plugin || die "Plugin Failed: ".$plugin;
-        my $extended_param = plugin_parameters( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
-        my ( $function_name, $javascript ) = plugin_javascript( $dbh, $rec, $tagslib, $subfield_data{id}, $tabloop );
-#         my ( $function_name, $javascript,$extended_param );
-        
-        $subfield_data{marc_value} =
-    "<input tabindex=\"1\"
-                        type=\"text\"
-                        id=".$subfield_data{id}."
-      name=".$subfield_data{id}."
-      value=\"$value\"
-                        class=\"input_marceditor\"
-      onfocus=\"javascript:Focus$function_name($index_tag)\"
-      onblur=\"javascript:Blur$function_name($index_tag); \" \/>
-    <span class=\"buttonDot\"
-      onclick=\"Clic$function_name('$subfield_data{id}')\">...</a>
-    $javascript";
-        # it's an hidden field
-    }
-    elsif ( $tag eq '' ) {
-        $subfield_data{marc_value} =
-            "<input tabindex=\"1\"
-                    type=\"hidden\"
-                    id=".$subfield_data{id}."
-                    name=".$subfield_data{id}."
-                    value=\"$value\" \/>
-            ";
-    }
-    elsif ( $tagslib->{$tag}->{$subfield}->{'hidden'} ) {
-        $subfield_data{marc_value} =
-            "<input type=\"text\"
-                    id=".$subfield_data{id}."
-                    name=".$subfield_data{id}."
-                    class=\"input_marceditor\"
-                    tabindex=\"1\"
-                    value=\"$value\"
-            \/>";
-
-        # it's a standard field
-    }
-    else {
-        if (
-            length($value) > 100
-            or
-            ( C4::Context->preference("marcflavour") eq "UNIMARC" && $tag >= 300
-                and $tag < 400 && $subfield eq 'a' )
-            or (    $tag >= 500
-                and $tag < 600
-                && C4::Context->preference("marcflavour") eq "MARC21" )
-          )
-        {
-            $subfield_data{marc_value} =
-                "<textarea cols=\"70\"
-                           rows=\"4\"
-                           id=".$subfield_data{id}."
-                           name=".$subfield_data{id}."
-                           class=\"input_marceditor\"
-                           tabindex=\"1\"
-                           >$value</textarea>
-                ";
-        }
-        else {
-            $subfield_data{marc_value} =
-                "<input type=\"text\"
-                        id=".$subfield_data{id}."
-                        name=".$subfield_data{id}."
-                        value=\"$value\"
-                        tabindex=\"1\"
-                        class=\"input_marceditor\"
-                \/>
-                ";
-        }
-    }
-    $subfield_data{'index_subfield'} = $index_subfield;
-    return \%subfield_data;
-}
-
-=item CreateKey
-
-    Create a random value to set it into the input name
-
-=cut
-
-sub CreateKey(){
-    return int(rand(1000000));
-}
-
 sub build_tabs ($$$$$) {
     my ( $template, $record, $dbh, $encoding,$input ) = @_;
 
@@ -300,12 +58,6 @@ sub build_tabs ($$$$$) {
     my @loop_data = ();
     my $tag;
 
-    my $authorised_values_sth = $dbh->prepare(
-        "select authorised_value,lib
-        from authorised_values
-        where category=? order by lib"
-    );
-    
     # in this array, we will push all the 10 tabs
     # to avoid having 10 tabs in the template : they will all be in the same BIG_LOOP
     my @BIG_LOOP;
@@ -325,7 +77,6 @@ sub build_tabs ($$$$$) {
         foreach my $tag (sort @tab_data) {
             $i++;
             next if ! $tag;
-            my $index_tag = CreateKey;
 
             # if MARC::Record is not empty =>use it as master loop, then add missing subfields that should be in the tab.
             # if MARC::Record is empty => use tab as master loop.
-- 
1.7.0


From Katrin.Fischer.83 at web.de  Wed Nov 10 07:53:11 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Wed, 10 Nov 2010 07:53:11 +0100
Subject: [Koha-patches] [PATCH] Bug 5003: Can not search for organisation by
	name
Message-ID: <1289371991-9393-1-git-send-email-Katrin.Fischer.83@web.de>

Rebased to current HEAD, small error fixed.
Should also apply to 3.2
---
 .../prog/en/modules/members/guarantor_search.tmpl  |    1 +
 .../prog/en/modules/members/memberentrygen.tmpl    |    4 ++--
 members/guarantor_search.pl                        |   12 +++++++++---
 members/memberentry.pl                             |    1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
index 7fa5099..13fb052 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
@@ -48,6 +48,7 @@
 <h3>Search for guarantor</h3>
 	<form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
 		<fieldset>
+		<input type="hidden" name="category_type" id="category_type" value="<!-- TMPL_VAR NAME="category_type" -->" />
 		<input type="text" name="member" id="member" value="<!-- TMPL_VAR NAME="member" -->" class="focus" /> Ordered by
 		<select name="orderby">
 			<option value="surname,firstname">Surname</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index bf5ea1a..5fa4f82 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -350,9 +350,9 @@
         <li>
             <span class="label">&nbsp;</span>
             <!-- TMPL_IF NAME="guarantorid" -->
-            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />
+            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl?category_type=<!-- TMPL_VAR NAME="category_type" -->');" />
             <!-- TMPL_ELSE -->
-            <input id="guarantorsearch" type="button" value="Set to Patron" onclick="Dopopguarantor('guarantor_search.pl');" />
+            <input id="guarantorsearch" type="button" value="Set to Patron" onclick="Dopopguarantor('guarantor_search.pl?category_type=<!-- TMPL_VAR NAME="category_type" -->');" />
             <!-- /TMPL_IF -->
             <input id="guarantordelete" type="button" value="Delete" />
         </li>
diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl
index d25d71f..cbd958d 100755
--- a/members/guarantor_search.pl
+++ b/members/guarantor_search.pl
@@ -46,6 +46,7 @@ my $theme = $input->param('theme') || "default";
 
 my $member=$input->param('member');
 my $orderby=$input->param('orderby');
+my $category_type=$input->param('category_type');
 $orderby = "surname,firstname" unless $orderby;
 $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
@@ -55,6 +56,11 @@ if ($member eq ''){
 		$template->param(results=>1);
 }	
 
+my $search_category = 'A';
+if ($category_type eq 'P'){
+	$search_category = 'I';
+}
+
 my ($count,$results);
 my @resultsdata;
 my $background = 0;
@@ -62,11 +68,11 @@ my $background = 0;
 if ($member ne ''){
 	if(length($member) == 1)
 	{
-		($count,$results)=SearchMember($member,$orderby,"simple",'A');
+		($count,$results)=SearchMember($member,$orderby,"simple",$search_category);
 	}
 	else
 	{
-		($count,$results)=SearchMember($member,$orderby,"advanced",'A');
+		($count,$results)=SearchMember($member,$orderby,"advanced",$search_category);
 	}
 	for (my $i=0; $i < $count; $i++){
 	#find out stats
@@ -101,7 +107,7 @@ if ($member ne ''){
 $template->param( 
 			member          => $member,
 			numresults		=> $count,
-			
+			category_type   => $category_type,
 			resultsloop     => \@resultsdata );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/members/memberentry.pl b/members/memberentry.pl
index eacb2ff..c25f7c9 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -648,6 +648,7 @@ $template->param(
   dateformat      => C4::Dates->new()->visual(),
   C4::Context->preference('dateformat') => 1,
   check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
+  category_type =>$category_type,
   modify          => $modify,
   nok     => $nok,#flag to konw if an error 
   CGIbranch => $CGIbranch,
-- 
1.7.1


From gmcharlt at gmail.com  Wed Nov 10 14:45:33 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 10 Nov 2010 08:45:33 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5003: Can not search for
	organisation by name
Message-ID: <1289396733-17216-1-git-send-email-gmcharlt@gmail.com>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

Rebased to current HEAD, small error fixed.
Should also apply to 3.2

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/members/guarantor_search.tmpl  |    1 +
 .../prog/en/modules/members/memberentrygen.tmpl    |    4 ++--
 members/guarantor_search.pl                        |   12 +++++++++---
 members/memberentry.pl                             |    1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
index 7fa5099..13fb052 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
@@ -48,6 +48,7 @@
 <h3>Search for guarantor</h3>
 	<form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
 		<fieldset>
+		<input type="hidden" name="category_type" id="category_type" value="<!-- TMPL_VAR NAME="category_type" -->" />
 		<input type="text" name="member" id="member" value="<!-- TMPL_VAR NAME="member" -->" class="focus" /> Ordered by
 		<select name="orderby">
 			<option value="surname,firstname">Surname</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index bf5ea1a..5fa4f82 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -350,9 +350,9 @@
         <li>
             <span class="label">&nbsp;</span>
             <!-- TMPL_IF NAME="guarantorid" -->
-            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />
+            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl?category_type=<!-- TMPL_VAR NAME="category_type" -->');" />
             <!-- TMPL_ELSE -->
-            <input id="guarantorsearch" type="button" value="Set to Patron" onclick="Dopopguarantor('guarantor_search.pl');" />
+            <input id="guarantorsearch" type="button" value="Set to Patron" onclick="Dopopguarantor('guarantor_search.pl?category_type=<!-- TMPL_VAR NAME="category_type" -->');" />
             <!-- /TMPL_IF -->
             <input id="guarantordelete" type="button" value="Delete" />
         </li>
diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl
index d25d71f..cbd958d 100755
--- a/members/guarantor_search.pl
+++ b/members/guarantor_search.pl
@@ -46,6 +46,7 @@ my $theme = $input->param('theme') || "default";
 
 my $member=$input->param('member');
 my $orderby=$input->param('orderby');
+my $category_type=$input->param('category_type');
 $orderby = "surname,firstname" unless $orderby;
 $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
@@ -55,6 +56,11 @@ if ($member eq ''){
 		$template->param(results=>1);
 }	
 
+my $search_category = 'A';
+if ($category_type eq 'P'){
+	$search_category = 'I';
+}
+
 my ($count,$results);
 my @resultsdata;
 my $background = 0;
@@ -62,11 +68,11 @@ my $background = 0;
 if ($member ne ''){
 	if(length($member) == 1)
 	{
-		($count,$results)=SearchMember($member,$orderby,"simple",'A');
+		($count,$results)=SearchMember($member,$orderby,"simple",$search_category);
 	}
 	else
 	{
-		($count,$results)=SearchMember($member,$orderby,"advanced",'A');
+		($count,$results)=SearchMember($member,$orderby,"advanced",$search_category);
 	}
 	for (my $i=0; $i < $count; $i++){
 	#find out stats
@@ -101,7 +107,7 @@ if ($member ne ''){
 $template->param( 
 			member          => $member,
 			numresults		=> $count,
-			
+			category_type   => $category_type,
 			resultsloop     => \@resultsdata );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/members/memberentry.pl b/members/memberentry.pl
index eacb2ff..c25f7c9 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -648,6 +648,7 @@ $template->param(
   dateformat      => C4::Dates->new()->visual(),
   C4::Context->preference('dateformat') => 1,
   check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
+  category_type =>$category_type,
   modify          => $modify,
   nok     => $nok,#flag to konw if an error 
   CGIbranch => $CGIbranch,
-- 
1.7.0


From savitra.sirohi at osslabs.biz  Wed Nov 10 19:22:04 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Wed, 10 Nov 2010 23:52:04 +0530
Subject: [Koha-patches] [PATCH] Ability to link to items belong to host
	records from a analytical record
Message-ID: <1289413324-3877-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 cataloguing/linkitem.pl                            |   98 ++++++++++++++++++++
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    1 +
 .../prog/en/modules/cataloguing/linkitem.tmpl      |   57 +++++++++++
 3 files changed, 156 insertions(+), 0 deletions(-)
 create mode 100755 cataloguing/linkitem.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl

diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
new file mode 100755
index 0000000..bff001e
--- /dev/null
+++ b/cataloguing/linkitem.pl
@@ -0,0 +1,98 @@
+#!/usr/bin/perl
+
+# Move an item from a biblio to another
+#
+# Copyright 2009 BibLibre
+#
+# 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 CGI;
+use C4::Auth;
+use C4::Output;
+use C4::Biblio;
+use C4::Items;
+use C4::Context;
+use C4::Koha;
+use C4::Branch;
+
+
+my $query = CGI->new;
+
+my $biblionumber = $query->param('biblionumber');
+my $barcode	 = $query->param('barcode');
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "cataloguing/linkitem.tmpl",
+                 query => $query,
+                 type => "intranet",
+                 authnotrequired => 0,
+                 flagsrequired => {editcatalogue => 'edit_catalogue'},
+                 debug => 1,
+                 });
+
+my $biblio = GetMarcBiblio($biblionumber);
+$template->param(bibliotitle => $biblio->subfield('245','a'));
+$template->param(biblionumber => $biblionumber);
+
+if ($barcode && $biblionumber) { 
+    
+    # We get the host itemnumber
+    my $hostitemnumber = GetItemnumberFromBarcode($barcode);
+
+    if ($hostitemnumber) {
+	my $hostbiblionumber = GetBiblionumberFromItemnumber($hostitemnumber);
+	my $hostrecord = GetMarcBiblio($hostbiblionumber);
+
+	if ($hostbiblionumber) {
+	        my $field = MARC::Field->new(
+			773, '', '',
+			'w' => $hostbiblionumber,
+			'o' => $hostitemnumber,
+               		'a' => $hostrecord->subfield('245','a'),
+	                'x' => $hostrecord->subfield('245','x')
+                );
+		$biblio->append_fields($field);
+
+		my $modresult = ModBiblio($biblio, $biblionumber, ''); 
+		if ($modresult) { 
+			$template->param(success => 1);
+		} else {
+			$template->param(error => 1,
+					 errornomodbiblio => 1); 
+		}
+	} else {
+		$template->param(error => 1,
+	        	             errornohostbiblionumber => 1);
+	}
+    } else {
+	    $template->param(error => 1,
+			     errornohostitemnumber => 1);
+
+    }
+    $template->param(
+			barcode => $barcode,  
+			hostitemnumber => $hostitemnumber,
+		    );
+
+} else {
+    $template->param(missingparameter => 1);
+    if (!$barcode)      { $template->param(missingbarcode      => 1); }
+    if (!$biblionumber) { $template->param(missingbiblionumber => 1); }
+}
+
+
+output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 228ebf3..f3776a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -85,6 +85,7 @@ function confirm_items_deletion() {
 	        { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=" },
 	        { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
 	        { text: _("Attach Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
+                { text: _("Link to Host Item"), url: "/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
 	        { text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=duplicate" },
 			{ text: _("Delete Record"), onclick: {fn: confirm_deletion }<!-- TMPL_IF NAME="count" -->,id:'disabled'<!-- /TMPL_IF --> },
             { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion }<!-- TMPL_UNLESS NAME="count" -->,id:'disabled'<!-- /TMPL_UNLESS --> }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl
new file mode 100644
index 0000000..bcddf17
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl
@@ -0,0 +1,57 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Attach item</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloging/addbooks.pl">Cataloging</a>  &rsaquo; Attach an item to <i><!-- TMPL_VAR NAME="bibliotitle" escape="html" --></i></div>
+<div id="doc3" class="yui-t2">
+
+<!-- TMPL_IF NAME="error" -->
+    <div class="dialog alert">
+	<!-- TMPL_IF NAME="errornomodbiblio" -->ERROR: Unable to modify the bibliographic record.<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="errornohostbiblionumber" -->ERROR: Unable to get the biblio number of host item.<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="errornohostitemnumber" -->ERROR: Unable to get the item number from this barcode.<!-- /TMPL_IF -->
+    </div>
+    <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
+	<input type="submit" value="OK" />
+	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+    </form>
+<!-- TMPL_ELSE -->
+    <!-- TMPL_IF NAME="success" -->
+	<div class="dialog">The item has successfully been linked to <i><!-- TMPL_VAR NAME="bibliotitle" escape="html" --></i>.</div>    
+	<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
+	    <input type="submit" value="OK" />
+	    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+	</form>
+    <!-- TMPL_ELSE -->
+	<!-- TMPL_IF NAME="missingparameter" -->
+	<form method="post" action="/cgi-bin/koha/cataloguing/linkitem.pl">
+	    <!-- TMPL_IF NAME="missingbiblionumber" -->
+	    <fieldset id="biblionumber_fieldset">
+		<label for="biblionumber_fieldset">Select the biblionumber to link the item to</label>
+		    <div class="hint">Enter biblionumber:</div>
+		    <input type="text" name="biblionumber" id="biblionumber" class="focus" size="14" /> 
+	    </fieldset>
+	    <!-- TMPL_ELSE -->
+	    <input type="hidden" name="biblionumber" id="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+	    <!-- /TMPL_IF -->
+
+    	    <!-- TMPL_IF NAME="missingbarcode" -->
+	    <fieldset id="barcode_fieldset">
+		<label for="barcode_fieldset">Select the item to attach<!-- TMPL_IF NAME="bibliotitle" --> to <i><!-- TMPL_VAR NAME="bibliotitle" escape="html" --></i><!-- /TMPL_IF --></label>
+		    <div class="hint">Enter item barcode:</div>
+		    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> 
+	    </fieldset>
+	    <!-- TMPL_ELSE -->
+	    <input type="hidden" name="barcode" id="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
+	    <!-- /TMPL_IF -->
+
+	    <input type="submit" value="Select" />
+
+	</form>
+	<!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
1.5.4.5


From savitra.sirohi at osslabs.biz  Wed Nov 10 19:22:42 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Wed, 10 Nov 2010 23:52:42 +0530
Subject: [Koha-patches] [PATCH] Analytical record: improved code to create
	analytical record from an item
Message-ID: <1289413362-4031-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 cataloguing/addbiblio.pl                           |   57 ++++++-------------
 .../prog/en/modules/cataloguing/addbiblio.tmpl     |    2 +-
 2 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 4e56fad..28aad1f 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -346,8 +346,6 @@ sub create_input {
         );
     # always expand all subfields of a mandatory field
     $subfield_data{visibility} = "" if $tagslib->{$tag}->{mandatory};
-    # expand all subfields of 773 if there is a host item provided in the input
-    $subfield_data{visibility} ="" if ($tag eq 773 and $cgi->param('hostitemnumber'));
     # it's an authorised field
     if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
         $subfield_data{marc_value} =
@@ -679,14 +677,6 @@ sub build_tabs ($$$$$) {
             # if breeding is empty
             }
             else {
-               my $hostbiblionumber;
-               my $hostitemnumber;
-               my $hostrecord;
-               if ($tag eq 773){
-			$hostbiblionumber = $input->param('hostbiblionumber');
-			$hostitemnumber = $input->param('hostitemnumber');
-			$hostrecord = &GetMarcBiblio($hostbiblionumber);
-               }
                 my @subfields_data;
                 foreach my $subfield ( sort( keys %{ $tagslib->{$tag} } ) ) {
                     next if ( length $subfield != 1 );
@@ -703,35 +693,6 @@ sub build_tabs ($$$$$) {
                            # always include in the form regardless of the hidden setting - bug 2206
                     next
                       if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
-                    if ( $tag eq 773 and $hostbiblionumber){
-                                if ($subfield eq "w"){
-                                        push(
-                                                @subfields_data,
-                                        &create_input(
-                                            $tag, $subfield,$hostbiblionumber, $index_tag, $tabloop, $record,
-                                            $authorised_values_sth,$input
-                                        ));
-					next;
-                                }
-                                if ($subfield eq "a"){
-                                        push(
-                                        @subfields_data,
-                                        &create_input(
-                                            $tag, $subfield,$hostrecord->subfield('245',"a"), $index_tag, $tabloop, $record,
-                                            $authorised_values_sth,$input
-                                        ));
-					next;
-                                }
-                                if ($subfield eq "o"){
-                                        push(
-                                        @subfields_data,
-                                        &create_input(
-                                            $tag, $subfield,$hostitemnumber, $index_tag, $tabloop, $record,
-                                            $authorised_values_sth,$input
-                                        ));
-					next;
-                                }
-                    }
 			push(
                         @subfields_data,
                         &create_input(
@@ -870,6 +831,8 @@ my $mode          = $input->param('mode');
 my $frameworkcode = $input->param('frameworkcode');
 my $redirect      = $input->param('redirect');
 my $dbh           = C4::Context->dbh;
+my $hostbiblionumber = $input->param('hostbiblionumber');
+my $hostitemnumber = $input->param('hostitemnumber');
 
 my $userflags = ($frameworkcode eq 'FA') ? "fast_cataloging" : "edit_catalogue";
 
@@ -927,6 +890,20 @@ if (($biblionumber) && !($breedingid)){
 if ($breedingid) {
     ( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;
 }
+#populate 773 if hostbiblionumber is available
+if ($hostbiblionumber){
+        my $hostrecord = &GetMarcBiblio($hostbiblionumber);
+	$record=MARC::Record->new();
+	$record->leader('');
+	my $field = MARC::Field->new(
+              773, '', '',
+              'w' => $hostbiblionumber,
+              'o' => $hostitemnumber,
+		'a' => $hostrecord->subfield('245','a'),
+		'x' => $hostrecord->subfield('245','x')
+		);
+	$record->append_fields($field);
+}
 
 $is_a_modif = 0;
     
@@ -1053,6 +1030,8 @@ elsif ( $op eq "delete" ) {
         biblioitemnumtagfield    => $biblioitemnumtagfield,
         biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
         biblioitemnumber         => $biblioitemnumber,
+	hostbiblionumber	=> $hostbiblionumber,
+	hostitemnumber		=> $hostitemnumber
     );
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index 3e510c5..86905ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -195,7 +195,7 @@ function GetZ3950Terms(){
 
 function Changefwk(FwkList) {
 	var fwk = FwkList.options[FwkList.selectedIndex].value;
- 	window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&breedingid=<!-- TMPL_VAR name="breedingid" -->&frameworkcode="+fwk;
+ 	window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&breedingid=<!-- TMPL_VAR name="breedingid" -->&hostbiblionumber=<!-- TMPL_VAR Name="hostbiblionumber" -->&hostitemnumber=<!--TMPL_VAR Name="hostitemnumber" -->&frameworkcode="+fwk;
 
 }
 
-- 
1.5.4.5


From frederic at tamil.fr  Wed Nov 10 22:42:34 2010
From: frederic at tamil.fr (=?ISO-8859-1?Q?Fr=E9d=E9ric_Demians?=)
Date: Wed, 10 Nov 2010 22:42:34 +0100
Subject: [Koha-patches] Patch 92e20471
Message-ID: <4CDB11CA.4040107@tamil.fr>

Patch 92e20471 introduces a dependency to Perl 5.10.1 or higher by using 
a switch statement (around lines 600). It doesn't work anymore with Perl 
version shipped with Debian Lenny. opac-detail.pl page fails. Its isn't 
easy to revert since this patch update the DB and add a new syspref.

From gmcharlt at gmail.com  Wed Nov 10 22:48:05 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 10 Nov 2010 16:48:05 -0500
Subject: [Koha-patches] Patch 92e20471
In-Reply-To: <4CDB11CA.4040107@tamil.fr>
References: <4CDB11CA.4040107@tamil.fr>
Message-ID: <AANLkTi=++QuSzbgxKoz_GfNJdJ267S1B7BkhSP9z2o46@mail.gmail.com>

Hi,

2010/11/10 Fr?d?ric Demians <frederic at tamil.fr>:
> Patch 92e20471 introduces a dependency to Perl 5.10.1 or higher by using a
> switch statement (around lines 600). It doesn't work anymore with Perl
> version shipped with Debian Lenny. opac-detail.pl page fails. Its isn't easy
> to revert since this patch update the DB and add a new syspref.

Good catch.  Colin had earlier pointed out problems with the Switch
module, and I agree with him that since it is deprecated, it should
not be used.

I will not have an opportunity until tomorrow to fix this (by
replacing the switch with a if/elsif cascade), but if you care to
submit a patch today, I'll be happy to test and sign off on it.
Otherwise I'll submit a patch tomorrow.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From chrisc at catalyst.net.nz  Wed Nov 10 22:48:56 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 11 Nov 2010 10:48:56 +1300
Subject: [Koha-patches] Patch 92e20471
In-Reply-To: <4CDB11CA.4040107@tamil.fr>
References: <4CDB11CA.4040107@tamil.fr>
Message-ID: <20101110214856.GZ4325@rorohiko>

* Fr?d?ric Demians (frederic at tamil.fr) wrote:
> Patch 92e20471 introduces a dependency to Perl 5.10.1 or higher by
> using a switch statement (around lines 600). It doesn't work anymore
> with Perl version shipped with Debian Lenny. opac-detail.pl page
> fails. Its isn't easy to revert since this patch update the DB and
> add a new syspref.


Wow thats an old one, good spotting Frederic

Yes that switch will break Plack also.

I will work on a patch to change the switch to an if.

Will you sign it off for me?

Chris
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101111/4d9278b7/attachment-0001.pgp>

From henridamien.laurent at biblibre.com  Wed Nov 10 22:56:11 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Wed, 10 Nov 2010 22:56:11 +0100
Subject: [Koha-patches] Patch 92e20471
In-Reply-To: <AANLkTi=++QuSzbgxKoz_GfNJdJ267S1B7BkhSP9z2o46@mail.gmail.com>
References: <4CDB11CA.4040107@tamil.fr>
	<AANLkTi=++QuSzbgxKoz_GfNJdJ267S1B7BkhSP9z2o46@mail.gmail.com>
Message-ID: <4CDB14FB.8010000@biblibre.com>

Le 10/11/2010 22:48, Galen Charlton a ?crit :
> Hi,
> 
> 2010/11/10 Fr?d?ric Demians <frederic at tamil.fr>:
>> Patch 92e20471 introduces a dependency to Perl 5.10.1 or higher by using a
>> switch statement (around lines 600). It doesn't work anymore with Perl
>> version shipped with Debian Lenny. opac-detail.pl page fails. Its isn't easy
>> to revert since this patch update the DB and add a new syspref.
> 
> Good catch.  Colin had earlier pointed out problems with the Switch
> module, and I agree with him that since it is deprecated, it should
> not be used.
> 
> I will not have an opportunity until tomorrow to fix this (by
> replacing the switch with a if/elsif cascade), but if you care to
> submit a patch today, I'll be happy to test and sign off on it.
> Otherwise I'll submit a patch tomorrow.
> 
> Regards,
> 
> Galen
In lenny you can install perl 5.10.
But problem could be on more "exotic" distribution... like CentOS or else...
Is there a concensus on the perl version we should stick to? I know it
has been discussed at some point but... don't recall whether a concensus
was met.

-- 
Henri-Damien LAURENT

From frederic at tamil.fr  Wed Nov 10 22:55:56 2010
From: frederic at tamil.fr (=?windows-1252?Q?Fr=E9d=E9ric_Demians?=)
Date: Wed, 10 Nov 2010 22:55:56 +0100
Subject: [Koha-patches] Patch 92e20471
In-Reply-To: <20101110214856.GZ4325@rorohiko>
References: <4CDB11CA.4040107@tamil.fr> <20101110214856.GZ4325@rorohiko>
Message-ID: <4CDB14EC.1060506@tamil.fr>


> I will work on a patch to change the switch to an if.

I have one I?m about to send. I've been filling a bug but since you have 
an eye on it I will just send it.

Thanks.


From henridamien.laurent at biblibre.com  Wed Nov 10 22:59:43 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Wed, 10 Nov 2010 22:59:43 +0100
Subject: [Koha-patches] [PATCH] Analytical record: improved code to
 create analytical record from an item
In-Reply-To: <1289413362-4031-1-git-send-email-savitra.sirohi@osslabs.biz>
References: <1289413362-4031-1-git-send-email-savitra.sirohi@osslabs.biz>
Message-ID: <4CDB15CF.2080104@biblibre.com>

Le 10/11/2010 19:22, savitra.sirohi at osslabs.biz a ?crit :
> From: Amit Gupta <amit.gupta at osslabs.biz>
> 
> ---
>  cataloguing/addbiblio.pl                           |   57 ++++++-------------
>  .../prog/en/modules/cataloguing/addbiblio.tmpl     |    2 +-
>  2 files changed, 19 insertions(+), 40 deletions(-)
> 
> diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
> index 4e56fad..28aad1f 100755
> --- a/cataloguing/addbiblio.pl
> +++ b/cataloguing/addbiblio.pl
> @@ -346,8 +346,6 @@ sub create_input {
>          );
>      # always expand all subfields of a mandatory field
>      $subfield_data{visibility} = "" if $tagslib->{$tag}->{mandatory};
> -    # expand all subfields of 773 if there is a host item provided in the input
> -    $subfield_data{visibility} ="" if ($tag eq 773 and $cgi->param('hostitemnumber'));
>      # it's an authorised field
>      if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
>          $subfield_data{marc_value} =
> @@ -679,14 +677,6 @@ sub build_tabs ($$$$$) {
>              # if breeding is empty
>              }
>              else {
> -               my $hostbiblionumber;
> -               my $hostitemnumber;
> -               my $hostrecord;
> -               if ($tag eq 773){
> -			$hostbiblionumber = $input->param('hostbiblionumber');
> -			$hostitemnumber = $input->param('hostitemnumber');
> -			$hostrecord = &GetMarcBiblio($hostbiblionumber);
> -               }
>                  my @subfields_data;
>                  foreach my $subfield ( sort( keys %{ $tagslib->{$tag} } ) ) {
>                      next if ( length $subfield != 1 );
> @@ -703,35 +693,6 @@ sub build_tabs ($$$$$) {
>                             # always include in the form regardless of the hidden setting - bug 2206
>                      next
>                        if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
> -                    if ( $tag eq 773 and $hostbiblionumber){
> -                                if ($subfield eq "w"){
> -                                        push(
> -                                                @subfields_data,
> -                                        &create_input(
> -                                            $tag, $subfield,$hostbiblionumber, $index_tag, $tabloop, $record,
> -                                            $authorised_values_sth,$input
> -                                        ));
> -					next;
> -                                }
> -                                if ($subfield eq "a"){
> -                                        push(
> -                                        @subfields_data,
> -                                        &create_input(
> -                                            $tag, $subfield,$hostrecord->subfield('245',"a"), $index_tag, $tabloop, $record,
> -                                            $authorised_values_sth,$input
> -                                        ));
> -					next;
> -                                }
> -                                if ($subfield eq "o"){
> -                                        push(
> -                                        @subfields_data,
> -                                        &create_input(
> -                                            $tag, $subfield,$hostitemnumber, $index_tag, $tabloop, $record,
> -                                            $authorised_values_sth,$input
> -                                        ));
> -					next;
> -                                }
> -                    }
>  			push(
>                          @subfields_data,
>                          &create_input(
> @@ -870,6 +831,8 @@ my $mode          = $input->param('mode');
>  my $frameworkcode = $input->param('frameworkcode');
>  my $redirect      = $input->param('redirect');
>  my $dbh           = C4::Context->dbh;
> +my $hostbiblionumber = $input->param('hostbiblionumber');
> +my $hostitemnumber = $input->param('hostitemnumber');
>  
>  my $userflags = ($frameworkcode eq 'FA') ? "fast_cataloging" : "edit_catalogue";
>  
> @@ -927,6 +890,20 @@ if (($biblionumber) && !($breedingid)){
>  if ($breedingid) {
>      ( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;
>  }
> +#populate 773 if hostbiblionumber is available
> +if ($hostbiblionumber){
> +        my $hostrecord = &GetMarcBiblio($hostbiblionumber);
> +	$record=MARC::Record->new();
> +	$record->leader('');
> +	my $field = MARC::Field->new(
> +              773, '', '',
> +              'w' => $hostbiblionumber,
> +              'o' => $hostitemnumber,
> +		'a' => $hostrecord->subfield('245','a'),
> +		'x' => $hostrecord->subfield('245','x')
This is marc21 only.
Could you be so kind as to at least use some variables ?
Or create the variable and then populate it ?

> +		);
> +	$record->append_fields($field);
> +}
>  
>  $is_a_modif = 0;
>      
> @@ -1053,6 +1030,8 @@ elsif ( $op eq "delete" ) {
>          biblioitemnumtagfield    => $biblioitemnumtagfield,
>          biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
>          biblioitemnumber         => $biblioitemnumber,
> +	hostbiblionumber	=> $hostbiblionumber,
> +	hostitemnumber		=> $hostitemnumber
>      );
>  }
>  
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
> index 3e510c5..86905ad 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
> @@ -195,7 +195,7 @@ function GetZ3950Terms(){
>  
>  function Changefwk(FwkList) {
>  	var fwk = FwkList.options[FwkList.selectedIndex].value;
> - 	window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&breedingid=<!-- TMPL_VAR name="breedingid" -->&frameworkcode="+fwk;
> + 	window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&breedingid=<!-- TMPL_VAR name="breedingid" -->&hostbiblionumber=<!-- TMPL_VAR Name="hostbiblionumber" -->&hostitemnumber=<!--TMPL_VAR Name="hostitemnumber" -->&frameworkcode="+fwk;
>  
>  }
>  


From f.demians at tamil.fr  Wed Nov 10 23:00:54 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Wed, 10 Nov 2010 23:00:54 +0100
Subject: [Koha-patches] [PATCH] Fix bug on opac-detail.pl with switch
	statement
Message-ID: <1289426454-31120-1-git-send-email-f.demians@tamil.fr>

---
 opac/opac-detail.pl |   50 ++++++++++++--------------------------------------
 1 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 629ebd2..29a299f 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -596,44 +596,18 @@ if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
 
 # We try to select the best default tab to show, according to what
 # the user wants, and what's available for display
-my $defaulttab = '';
-switch (C4::Context->preference('opacSerialDefaultTab')) {
-
-    # If the user wants subscriptions by default
-    case "subscriptions" { 
-	# And there are subscriptions, we display them
-	if ($subscriptionsnumber) {
-	    $defaulttab = 'subscriptions';
-	} else {
-	   # Else, we try next option
-	   next; 
-	}
-    }
-
-    case "serialcollection" {
-	if (scalar(@serialcollections) > 0) {
-	    $defaulttab = 'serialcollection' ;
-	} else {
-	    next;
-	}
-    }
-
-    case "holdings" {
-	if ($dat->{'count'} > 0) {
-	   $defaulttab = 'holdings'; 
-	} else {
-	     # As this is the last option, we try other options if there are no items
-	     if ($subscriptionsnumber) {
-		$defaulttab = 'subscriptions';
-	     } elsif (scalar(@serialcollections) > 0) {
-		$defaulttab = 'serialcollection' ;
-	     }
-	}
-
-    }
-
-}
+my $opac_serial_default = C4::Context->preference('opacSerialDefaultTab');
+my $defaulttab = 
+    $opac_serial_default eq 'subscriptions' && $subscriptionsnumber
+        ? 'subscriptions' :
+    $opac_serial_default eq 'serialcollection' && @serialcollections > 0
+        ? 'serialcollection' :
+    $opac_serial_default eq 'holdings' && $dat->{'count'} > 0
+        ? 'holdings' :
+    $subscriptionsnumber
+        ? 'subscriptions' :
+    @serialcollections > 0 
+        ? 'serialcollection' : 'subscription';
 $template->param('defaulttab' => $defaulttab);
 
-
 output_html_with_http_headers $query, $cookie, $template->output;
-- 
1.7.3.2


From f.demians at tamil.fr  Wed Nov 10 23:02:56 2010
From: f.demians at tamil.fr (=?UTF-8?B?RnLDqWTDqXJpYyBERU1JQU5T?=)
Date: Wed, 10 Nov 2010 23:02:56 +0100
Subject: [Koha-patches] Patch 92e20471
In-Reply-To: <4CDB14FB.8010000@biblibre.com>
References: <4CDB11CA.4040107@tamil.fr>	<AANLkTi=++QuSzbgxKoz_GfNJdJ267S1B7BkhSP9z2o46@mail.gmail.com>
	<4CDB14FB.8010000@biblibre.com>
Message-ID: <4CDB1690.8040804@tamil.fr>


> In lenny you can install perl 5.10.
> But problem could be on more "exotic" distribution... like CentOS or 
> else...
> Is there a concensus on the perl version we should stick to? I know it
> has been discussed at some point but... don't recall whether a concensus
> was met.

It doesn't work with an up-to-date Lenny which has Perl version 5.10.0.



From f.demians at tamil.fr  Wed Nov 10 23:03:06 2010
From: f.demians at tamil.fr (=?UTF-8?B?RnLDqWTDqXJpYyBERU1JQU5T?=)
Date: Wed, 10 Nov 2010 23:03:06 +0100
Subject: [Koha-patches] Patch 92e20471
In-Reply-To: <4CDB14FB.8010000@biblibre.com>
References: <4CDB11CA.4040107@tamil.fr>	<AANLkTi=++QuSzbgxKoz_GfNJdJ267S1B7BkhSP9z2o46@mail.gmail.com>
	<4CDB14FB.8010000@biblibre.com>
Message-ID: <4CDB169A.1070903@tamil.fr>


> In lenny you can install perl 5.10.
> But problem could be on more "exotic" distribution... like CentOS or 
> else...
> Is there a concensus on the perl version we should stick to? I know it
> has been discussed at some point but... don't recall whether a concensus
> was met.

It doesn't work with an up-to-date Lenny which has Perl version 5.10.0.



From Katrin.Fischer.83 at web.de  Wed Nov 10 22:52:32 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Wed, 10 Nov 2010 22:52:32 +0100
Subject: [Koha-patches] [PATCH] Bug 5112: Organisation does not show links
	to professionals
Message-ID: <1289425952-10170-1-git-send-email-Katrin.Fischer.83@web.de>

---
 members/moremember.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/members/moremember.pl b/members/moremember.pl
index 34a3e09..3fffb54 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -168,7 +168,7 @@ if ( $category_type eq 'C') {
 if ( $data->{'ethnicity'} || $data->{'ethnotes'} ) {
     $template->param( printethnicityline => 1 );
 }
-if ( $category_type eq 'A' ) {
+if ( $category_type eq 'A' || $category_type eq 'I') {
     $template->param( isguarantee => 1 );
 
     # FIXME
@@ -188,7 +188,7 @@ if ( $category_type eq 'A' ) {
         );
     }
     $template->param( guaranteeloop => \@guaranteedata );
-    ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+    ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' || $category_type eq 'I' );
 }
 else {
     if ($data->{'guarantorid'}){
-- 
1.7.1


From gmcharlt at gmail.com  Wed Nov 10 23:05:19 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 10 Nov 2010 17:05:19 -0500
Subject: [Koha-patches] Patch 92e20471
In-Reply-To: <4CDB14FB.8010000@biblibre.com>
References: <4CDB11CA.4040107@tamil.fr>
	<AANLkTi=++QuSzbgxKoz_GfNJdJ267S1B7BkhSP9z2o46@mail.gmail.com>
	<4CDB14FB.8010000@biblibre.com>
Message-ID: <AANLkTimhNRvKesmrgTCwkDS4WF45DENEmd=g-QLFKhd2@mail.gmail.com>

Hi,

On Wed, Nov 10, 2010 at 4:56 PM, LAURENT Henri-Damien
<henridamien.laurent at biblibre.com> wrote:
> In lenny you can install perl 5.10.
> But problem could be on more "exotic" distribution... like CentOS or else...
> Is there a concensus on the perl version we should stick to? I know it
> has been discussed at some point but... don't recall whether a concensus
> was met.

It was settled on 5.8.8 for Koha 3.2.  I've no objection to (say)
requiring 5.10 for Koha 3.4, but in no event should we use the Switch
module -- it is deprecated, and there are few enough usages of it that
it would be easy to remove the remaining ones.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From chrisc at catalyst.net.nz  Wed Nov 10 23:09:15 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 11 Nov 2010 11:09:15 +1300
Subject: [Koha-patches] Patch 92e20471
In-Reply-To: <4CDB14EC.1060506@tamil.fr>
References: <4CDB11CA.4040107@tamil.fr> <20101110214856.GZ4325@rorohiko>
	<4CDB14EC.1060506@tamil.fr>
Message-ID: <20101110220915.GA4325@rorohiko>

* Fr?d?ric Demians (frederic at tamil.fr) wrote:
> 
> >I will work on a patch to change the switch to an if.
> 
> I have one I?m about to send. I've been filling a bug but since you
> have an eye on it I will just send it.
> 
> Thanks.
> 

Looks great, bug 5382, if you wish to attach it to that

Ill make a new/bug_5382 and push it up now

Chris

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101111/5323b4ed/attachment-0001.pgp>

From chrisc at catalyst.net.nz  Wed Nov 10 23:19:14 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 11 Nov 2010 11:19:14 +1300
Subject: [Koha-patches] [PATCH] Ability to link to items belong to host
 records from a analytical record
In-Reply-To: <1289413324-3877-1-git-send-email-savitra.sirohi@osslabs.biz>
References: <1289413324-3877-1-git-send-email-savitra.sirohi@osslabs.biz>
Message-ID: <20101110221914.GC4325@rorohiko>

* savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz) wrote:
> From: Amit Gupta <amit.gupta at osslabs.biz>
> 
> ---
>  cataloguing/linkitem.pl                            |   98 ++++++++++++++++++++
>  .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    1 +
>  .../prog/en/modules/cataloguing/linkitem.tmpl      |   57 +++++++++++
>  3 files changed, 156 insertions(+), 0 deletions(-)
>  create mode 100755 cataloguing/linkitem.pl
>  create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl
> 
> diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
> new file mode 100755
> index 0000000..bff001e
> --- /dev/null
> +++ b/cataloguing/linkitem.pl
> @@ -0,0 +1,98 @@
> +#!/usr/bin/perl
> +
> +# Move an item from a biblio to another
> +#
> +# Copyright 2009 BibLibre

Can you please fix the copyright statement here, and resend

(You might want to check the other patches too, if we want to get into
debian we need correct copyright (or at least a lot more correct than we
have now) statements

Chris

> +#
> +# 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 CGI;
> +use C4::Auth;
> +use C4::Output;
> +use C4::Biblio;
> +use C4::Items;
> +use C4::Context;
> +use C4::Koha;
> +use C4::Branch;
> +
> +
> +my $query = CGI->new;
> +
> +my $biblionumber = $query->param('biblionumber');
> +my $barcode	 = $query->param('barcode');
> +
> +my ($template, $loggedinuser, $cookie)
> +    = get_template_and_user({template_name => "cataloguing/linkitem.tmpl",
> +                 query => $query,
> +                 type => "intranet",
> +                 authnotrequired => 0,
> +                 flagsrequired => {editcatalogue => 'edit_catalogue'},
> +                 debug => 1,
> +                 });
> +
> +my $biblio = GetMarcBiblio($biblionumber);
> +$template->param(bibliotitle => $biblio->subfield('245','a'));
> +$template->param(biblionumber => $biblionumber);
> +
> +if ($barcode && $biblionumber) { 
> +    
> +    # We get the host itemnumber
> +    my $hostitemnumber = GetItemnumberFromBarcode($barcode);
> +
> +    if ($hostitemnumber) {
> +	my $hostbiblionumber = GetBiblionumberFromItemnumber($hostitemnumber);
> +	my $hostrecord = GetMarcBiblio($hostbiblionumber);
> +
> +	if ($hostbiblionumber) {
> +	        my $field = MARC::Field->new(
> +			773, '', '',
> +			'w' => $hostbiblionumber,
> +			'o' => $hostitemnumber,
> +               		'a' => $hostrecord->subfield('245','a'),
> +	                'x' => $hostrecord->subfield('245','x')
> +                );
> +		$biblio->append_fields($field);
> +
> +		my $modresult = ModBiblio($biblio, $biblionumber, ''); 
> +		if ($modresult) { 
> +			$template->param(success => 1);
> +		} else {
> +			$template->param(error => 1,
> +					 errornomodbiblio => 1); 
> +		}
> +	} else {
> +		$template->param(error => 1,
> +	        	             errornohostbiblionumber => 1);
> +	}
> +    } else {
> +	    $template->param(error => 1,
> +			     errornohostitemnumber => 1);
> +
> +    }
> +    $template->param(
> +			barcode => $barcode,  
> +			hostitemnumber => $hostitemnumber,
> +		    );
> +
> +} else {
> +    $template->param(missingparameter => 1);
> +    if (!$barcode)      { $template->param(missingbarcode      => 1); }
> +    if (!$biblionumber) { $template->param(missingbiblionumber => 1); }
> +}
> +
> +
> +output_html_with_http_headers $query, $cookie, $template->output;
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
> index 228ebf3..f3776a6 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
> +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
> @@ -85,6 +85,7 @@ function confirm_items_deletion() {
>  	        { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=" },
>  	        { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
>  	        { text: _("Attach Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
> +                { text: _("Link to Host Item"), url: "/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
>  	        { text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=duplicate" },
>  			{ text: _("Delete Record"), onclick: {fn: confirm_deletion }<!-- TMPL_IF NAME="count" -->,id:'disabled'<!-- /TMPL_IF --> },
>              { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion }<!-- TMPL_UNLESS NAME="count" -->,id:'disabled'<!-- /TMPL_UNLESS --> }
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl
> new file mode 100644
> index 0000000..bcddf17
> --- /dev/null
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl
> @@ -0,0 +1,57 @@
> +<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
> +<title>Attach item</title>
> +<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
> +</head>
> +<body>
> +<!-- TMPL_INCLUDE NAME="header.inc" -->
> +<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
> +<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloging/addbooks.pl">Cataloging</a>  &rsaquo; Attach an item to <i><!-- TMPL_VAR NAME="bibliotitle" escape="html" --></i></div>
> +<div id="doc3" class="yui-t2">
> +
> +<!-- TMPL_IF NAME="error" -->
> +    <div class="dialog alert">
> +	<!-- TMPL_IF NAME="errornomodbiblio" -->ERROR: Unable to modify the bibliographic record.<!-- /TMPL_IF -->
> +	<!-- TMPL_IF NAME="errornohostbiblionumber" -->ERROR: Unable to get the biblio number of host item.<!-- /TMPL_IF -->
> +	<!-- TMPL_IF NAME="errornohostitemnumber" -->ERROR: Unable to get the item number from this barcode.<!-- /TMPL_IF -->
> +    </div>
> +    <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
> +	<input type="submit" value="OK" />
> +	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
> +    </form>
> +<!-- TMPL_ELSE -->
> +    <!-- TMPL_IF NAME="success" -->
> +	<div class="dialog">The item has successfully been linked to <i><!-- TMPL_VAR NAME="bibliotitle" escape="html" --></i>.</div>    
> +	<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
> +	    <input type="submit" value="OK" />
> +	    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
> +	</form>
> +    <!-- TMPL_ELSE -->
> +	<!-- TMPL_IF NAME="missingparameter" -->
> +	<form method="post" action="/cgi-bin/koha/cataloguing/linkitem.pl">
> +	    <!-- TMPL_IF NAME="missingbiblionumber" -->
> +	    <fieldset id="biblionumber_fieldset">
> +		<label for="biblionumber_fieldset">Select the biblionumber to link the item to</label>
> +		    <div class="hint">Enter biblionumber:</div>
> +		    <input type="text" name="biblionumber" id="biblionumber" class="focus" size="14" /> 
> +	    </fieldset>
> +	    <!-- TMPL_ELSE -->
> +	    <input type="hidden" name="biblionumber" id="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
> +	    <!-- /TMPL_IF -->
> +
> +    	    <!-- TMPL_IF NAME="missingbarcode" -->
> +	    <fieldset id="barcode_fieldset">
> +		<label for="barcode_fieldset">Select the item to attach<!-- TMPL_IF NAME="bibliotitle" --> to <i><!-- TMPL_VAR NAME="bibliotitle" escape="html" --></i><!-- /TMPL_IF --></label>
> +		    <div class="hint">Enter item barcode:</div>
> +		    <input type="text" name="barcode" id="barcode" class="barcode focus" size="14" /> 
> +	    </fieldset>
> +	    <!-- TMPL_ELSE -->
> +	    <input type="hidden" name="barcode" id="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
> +	    <!-- /TMPL_IF -->
> +
> +	    <input type="submit" value="Select" />
> +
> +	</form>
> +	<!-- /TMPL_IF -->
> +    <!-- /TMPL_IF -->
> +<!-- /TMPL_IF -->
> +<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
> -- 
> 1.5.4.5
> 
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101111/5074a266/attachment.pgp>

From Katrin.Fischer.83 at web.de  Wed Nov 10 23:32:54 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Wed, 10 Nov 2010 23:32:54 +0100 (CET)
Subject: [Koha-patches] Pull request, bug 4506 linking between records,
	analytics
Message-ID: <249160938.707022.1289428374132.JavaMail.fmail@mwmweb073>

An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101110/ea027eab/attachment.htm>

From chrisc at catalyst.net.nz  Thu Nov 11 08:33:21 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 11 Nov 2010 20:33:21 +1300
Subject: [Koha-patches] [PATCH] Script to test modules compile,
	when used with a pre-commit hook this can test before a commit
Message-ID: <1289460801-15278-1-git-send-email-chrisc@catalyst.net.nz>

---
 t/00-load.t |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 t/00-load.t

diff --git a/t/00-load.t b/t/00-load.t
new file mode 100644
index 0000000..6b3172c
--- /dev/null
+++ b/t/00-load.t
@@ -0,0 +1,25 @@
+# This script is called by the pre-commit git hook to test modules compile
+
+use strict;
+use warnings;
+use Test::More;
+use Path::Class;
+use File::Find;
+
+my $lib = dir('C4')->absolute->resolve;
+find({
+    bydepth => 1,
+    no_chdir => 1,
+    wanted => sub {
+        my $m = $_;
+	return unless $m =~ s/[.]pm$//;
+	return if $m =~ /Auth_with_ldap/; # Dont test this, it will fail on use
+	return if $m =~ /Cache/; # Cache modules are a WIP, add the tests back when we are using them more
+	return if $m =~ /SIP/; # SIP modules will not load clean
+	$m =~ s{^.*/C4/}{C4/};	
+	$m =~ s{/}{::}g;
+	use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
+    },
+}, $lib);
+done_testing();
+   
-- 
1.7.0.4


From f.demians at tamil.fr  Thu Nov 11 09:06:00 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Thu, 11 Nov 2010 09:06:00 +0100
Subject: [Koha-patches] [PATCH] Test modules compile
Message-ID: <1289462760-28676-1-git-send-email-f.demians@tamil.fr>

From: Chris Cormack <chrisc at catalyst.net.nz>

Script to test modules compile, when used with a pre-commit hook this
can test before a commit

Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 t/00-load.t |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 t/00-load.t

diff --git a/t/00-load.t b/t/00-load.t
new file mode 100644
index 0000000..6b3172c
--- /dev/null
+++ b/t/00-load.t
@@ -0,0 +1,25 @@
+# This script is called by the pre-commit git hook to test modules compile
+
+use strict;
+use warnings;
+use Test::More;
+use Path::Class;
+use File::Find;
+
+my $lib = dir('C4')->absolute->resolve;
+find({
+    bydepth => 1,
+    no_chdir => 1,
+    wanted => sub {
+        my $m = $_;
+	return unless $m =~ s/[.]pm$//;
+	return if $m =~ /Auth_with_ldap/; # Dont test this, it will fail on use
+	return if $m =~ /Cache/; # Cache modules are a WIP, add the tests back when we are using them more
+	return if $m =~ /SIP/; # SIP modules will not load clean
+	$m =~ s{^.*/C4/}{C4/};	
+	$m =~ s{/}{::}g;
+	use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
+    },
+}, $lib);
+done_testing();
+   
-- 
1.7.3.2


From f.demians at tamil.fr  Thu Nov 11 09:11:00 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Thu, 11 Nov 2010 09:11:00 +0100
Subject: [Koha-patches] [PATCH] Bug 5105 Regression test for switch statement
Message-ID: <1289463060-29007-1-git-send-email-f.demians@tamil.fr>

Add a test identifying Perl scripts and modules using switch statements.
This test file follow Chris pre-hook naming convention in order to be
triggered for patch submissions.
---
 t/00-deprecated.t |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100755 t/00-deprecated.t

diff --git a/t/00-deprecated.t b/t/00-deprecated.t
new file mode 100755
index 0000000..6eba09d
--- /dev/null
+++ b/t/00-deprecated.t
@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+#
+# Tests usage of deprecated Perl syntax. Deprecated could be extended to the
+# sense of 'not allowed'.
+#
+use warnings;
+use strict;
+use Test::More tests => 1;
+use File::Find;
+use Cwd;
+
+my @files_with_switch = do {
+    my @files;
+    local $/ = undef;
+    find( sub {
+        my $dir = getcwd();
+        return if $dir =~ /blib/;
+        return unless /\.(pl|pm)$/; # Don't inspect non-Perl files
+        open my $fh, "<", $_;
+        my $content = <$fh>;
+        push @files, "$dir/$_"  if $content =~ /switch\s*\(.*{/;
+      }, ( '.' ) );
+    @files;
+};
+ok( !@files_with_switch, "Perl syntax: no use of switch statement" )
+    or diag( "Files list: " . join(', ', @files_with_switch) );
+
-- 
1.7.3.2


From Katrin.Fischer.83 at web.de  Thu Nov 11 13:10:15 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Thu, 11 Nov 2010 13:10:15 +0100 (CET)
Subject: [Koha-patches] Pull request, bug 4506 linking between records,
	analytics
Message-ID: <534667358.1019740.1289477415386.JavaMail.fmail@mwmweb075>

Resend as text mail.

The following changes since commit 863830f3f91110bdbd930755139f844870234ccc:

Bug 5003: Can not search for organisation by name (2010-11-11 09:35:41 +1300)

are available in the git repository at:
https://github.com/kfischer/Koha.git bug_4506_xslt

Katrin Fischer (14):
 Bug 4506: Add index Record-control-number = rcn for indexing of $w subfields
 BUG 4506: Add 8xx $w subfields to MARC-Frameworks en, fr-FR
 BUG 4506: Add 8xx $w subfields to MARC-Frameworks pl-PL
 Bug 4506: Some work on article to serial links
 BUG 4506: Add 8xx $w subfields to MARC-Frameworks de-DE
 Bug 4506: New icon for sets
 Bug 4506: Add set > volume link
 Bug 4506: Add volume > set link
 Bug 4506: Add links to other editions, some minor corrections
 Bug 4506: Traced series
 Bug 4506: Add link to volumes of traced series to series record
 Bug 4506: Add rcn links to 780 and 785
 Bug 4506: Add rcn links to host item entry = 773
 Bug 4506: Correct wrong links in intranet

 C4/Search.pm                                       |    2 +
 etc/zebradb/biblios/etc/bib1.att                   |    1 +
 etc/zebradb/ccl.properties                         |    4 +
 etc/zebradb/marc_defs/marc21/biblios/record.abs    |   14 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    4 +
 .../optional/marc21_simple_bib_frameworks.sql      |   32 +++
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    4 +
 .../optional/marc21_simple_bib_frameworks.sql      |   32 +++
 .../Obligatoire/marc21_framework_DEFAULT.sql       |   28 ++-
 .../Optionnel/marc21_simple_bib_frameworks.sql     |  256 +++++++++++---------
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    4 +
 .../optional/marc21_simple_bib_frameworks.sql      |   32 +++
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |  202 +++++++++++++++-
 koha-tmpl/intranet-tmpl/prog/img/famfamfam/ST.png  |  Bin 0 -> 789 bytes
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |  165 ++++++++++++-
 17 files changed, 637 insertions(+), 146 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/ST.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/famfamfam/ST.png
___________________________________________________________
WEB.DE DSL Doppel-Flat ab 19,99 &euro;/mtl.! Jetzt auch mit 
gratis Notebook-Flat! http://produkte.web.de/go/DSL_Doppel_Flatrate/2

From gmcharlt at gmail.com  Thu Nov 11 13:39:32 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 07:39:32 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5112: Organisation does not
	show links to professionals
Message-ID: <1289479172-21472-1-git-send-email-gmcharlt@gmail.com>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 members/moremember.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/members/moremember.pl b/members/moremember.pl
index 34a3e09..3fffb54 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -168,7 +168,7 @@ if ( $category_type eq 'C') {
 if ( $data->{'ethnicity'} || $data->{'ethnotes'} ) {
     $template->param( printethnicityline => 1 );
 }
-if ( $category_type eq 'A' ) {
+if ( $category_type eq 'A' || $category_type eq 'I') {
     $template->param( isguarantee => 1 );
 
     # FIXME
@@ -188,7 +188,7 @@ if ( $category_type eq 'A' ) {
         );
     }
     $template->param( guaranteeloop => \@guaranteedata );
-    ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+    ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' || $category_type eq 'I' );
 }
 else {
     if ($data->{'guarantorid'}){
-- 
1.7.0


From andrew.elwell at gmail.com  Thu Nov 11 13:52:29 2010
From: andrew.elwell at gmail.com (Andrew Elwell)
Date: Thu, 11 Nov 2010 13:52:29 +0100
Subject: [Koha-patches] [PATCH 1/2] POD Cleanups (part 1)
Message-ID: <1289479950-3085-1-git-send-email-Andrew.Elwell@gmail.com>

working through the master branch to eliminate all
podchecker warnings/errors

Actual improvement to the quality of the POD will
come later (hopefully with assistance of others)

Signed-off-by: Andrew Elwell <Andrew.Elwell at gmail.com>
---
 C4/AuthoritiesMarc/MARC21.pm                       |   18 +-
 C4/AuthoritiesMarc/UNIMARC.pm                      |   12 +-
 C4/Barcodes/PrinterConfig.pm                       |   50 ++--
 C4/Barcodes/incremental.pm                         |    2 +-
 C4/Cache/Memcached.pm                              |    8 +-
 C4/Cache/Memoize/Memcached.pm                      |    6 +-
 C4/Creators/Lib.pm                                 |  127 ++++-----
 C4/External/Amazon.pm                              |    2 +
 C4/External/BakerTaylor.pm                         |   11 +-
 C4/External/Syndetics.pm                           |    8 +-
 C4/Heading/MARC21.pm                               |    6 +-
 C4/ILSDI/Services.pm                               |  316 ++++++++++----------
 C4/Members/AttributeTypes.pm                       |  148 +++-------
 C4/Members/Attributes.pm                           |   55 +---
 C4/Reports/Guided.pm                               |   30 +-
 C4/SIP/ILS/Item.pm                                 |    6 +-
 C4/SIP/ILS/Patron.pm                               |  160 +++++-----
 C4/Search/PazPar2.pm                               |    2 +
 C4/VirtualShelves/Page.pm                          |   22 +-
 Makefile.PL                                        |    1 +
 acqui/addorder.pl                                  |    6 +-
 acqui/check_budget_total.pl                        |    2 +-
 acqui/fetch_sort_dropbox.pl                        |    4 +-
 acqui/neworderempty.pl                             |    5 +-
 acqui/orderreceive.pl                              |    4 +
 acqui/parcel.pl                                    |    4 +
 acqui/supplier.pl                                  |    2 +
 acqui/updatesupplier.pl                            |    8 +-
 admin/branches.pl                                  |    4 +-
 admin/check_budget_parent.pl                       |    2 +-
 admin/check_parent_total.pl                        |    2 +-
 authorities/authorities.pl                         |   16 +-
 cataloguing/value_builder/barcode.pl               |    2 +
 cataloguing/value_builder/dateaccessioned.pl       |    2 +
 cataloguing/value_builder/macles.pl                |    1 +
 cataloguing/value_builder/marc21_field_003.pl      |    2 +
 cataloguing/value_builder/marc21_field_005.pl      |    1 +
 cataloguing/value_builder/marc21_leader.pl         |    1 +
 .../value_builder/marc21_leader_authorities.pl     |    1 +
 cataloguing/value_builder/marc21_leader_book.pl    |    1 +
 .../value_builder/marc21_leader_computerfile.pl    |    1 +
 cataloguing/value_builder/marc21_leader_video.pl   |    1 +
 cataloguing/value_builder/stocknumber.pl           |   10 +-
 installer/data/mysql/update22to30.pl               |   18 +-
 kohaversion.pl                                     |   20 +-
 labels/label-create-csv.pl                         |    4 -
 labels/label-create-xml.pl                         |    4 -
 members/patronimage.pl                             |    2 -
 misc/cronjobs/check-url.pl                         |    2 +-
 tools/letter.pl                                    |    1 +
 50 files changed, 525 insertions(+), 598 deletions(-)

diff --git a/C4/AuthoritiesMarc/MARC21.pm b/C4/AuthoritiesMarc/MARC21.pm
index bd0eb2e..a148bbb 100644
--- a/C4/AuthoritiesMarc/MARC21.pm
+++ b/C4/AuthoritiesMarc/MARC21.pm
@@ -48,11 +48,7 @@ function based on the marcflavour system preference.
 
 =head2 get_heading_type_from_marc
 
-=over 4
-
-my $auth_type = get_auth_type_from_marc($marc);
-
-=back
+  my $auth_type = get_auth_type_from_marc($marc);
 
 Given a MARC::Record object containing an authority record,
 determine its heading type (e.g., personal name, topical term,
@@ -62,11 +58,7 @@ etc.).
 
 =head2 default_auth_type_location
 
-=over 4
-
-my ($tag, $subfield) = default_auth_type_location();
-
-=back
+  my ($tag, $subfield) = default_auth_type_location();
 
 Get the tag and subfield used to store the heading type
 if not specified in the MARC framework.  For MARC21,
@@ -80,11 +72,7 @@ sub default_auth_type_location {
 
 =head2 fix_marc21_auth_type_location 
 
-=over 4
-
-fix_marc21_auth_type_location($auth_marc, $auth_type_tag, $auth_type_subfield);
-
-=back
+  fix_marc21_auth_type_location($auth_marc, $auth_type_tag, $auth_type_subfield);
 
 If the incoming C<MARC::Record> object has a 152$b, remove it.  If no
 field already exists that contains the specified C<$auth_type_tag>
diff --git a/C4/AuthoritiesMarc/UNIMARC.pm b/C4/AuthoritiesMarc/UNIMARC.pm
index a7af735..b089ec9 100644
--- a/C4/AuthoritiesMarc/UNIMARC.pm
+++ b/C4/AuthoritiesMarc/UNIMARC.pm
@@ -47,11 +47,7 @@ function based on the marcflavour system preference.
 
 =head2 get_heading_type_from_marc
 
-=over 4
-
-my $auth_type = get_auth_type_from_marc($marc);
-
-=back
+  my $auth_type = get_auth_type_from_marc($marc);
 
 Given a MARC::Record object containing an authority record,
 determine its heading type (e.g., personal name, topical term,
@@ -61,11 +57,7 @@ etc.).
 
 =head2 default_auth_type_location
 
-=over 4
-
-my ($tag, $subfield) = default_auth_type_location();
-
-=back
+  my ($tag, $subfield) = default_auth_type_location();
 
 Get the tag and subfield used to store the heading type
 if not specified in the MARC framework.  For UNIMARC,
diff --git a/C4/Barcodes/PrinterConfig.pm b/C4/Barcodes/PrinterConfig.pm
index 183d4e4..28854df 100644
--- a/C4/Barcodes/PrinterConfig.pm
+++ b/C4/Barcodes/PrinterConfig.pm
@@ -35,7 +35,7 @@ C4::Barcodes::PrinterConfig - Koha module dealing with labels in a PDF.
 
 =head1 SYNOPSIS
 
-	use C4::Barcodes::PrinterConfig;
+use C4::Barcodes::PrinterConfig;
 
 =head1 DESCRIPTION
 
@@ -45,17 +45,21 @@ environment of the pdf file.
 
 =head1 FUNCTIONS
 
-=over 2
+=head2 my @positionsForX;
 
-=cut
+Takes all the X positions of the pdf file.
+
+=head2 my @positionsForY; 
+
+Takes all the Y positions of the pdf file.
 
-my @positionsForX; # Takes all the X positions of the pdf file.
-my @positionsForY; # Takes all the Y positions of the pdf file.
-my $firstLabel = 1; # Test if the label passed as a parameter is the first label to be printed into the pdf file.
+=head2 my $firstLabel = 1; 
 
-=item setPositionsForX
+Test if the label passed as a parameter is the first label to be printed into the pdf file.
 
-	C4::Barcodes::PrinterConfig::setPositionsForX($marginLeft, $labelWidth, $columns, $pageType);
+=head2 setPositionsForX
+
+  C4::Barcodes::PrinterConfig::setPositionsForX($marginLeft, $labelWidth, $columns, $pageType);
 
 Calculate and stores all the X positions across the pdf page.
 
@@ -68,7 +72,7 @@ C<$columns> Indicates how many columns do you want in your page type.
 C<$pageType> Page type to print (eg: a4, legal, etc).
 
 =cut
-#'
+
 sub setPositionsForX {
 	my ($marginLeft, $labelWidth, $columns, $pageType) = @_;
 	my $defaultDpi = 72/25.4; # By default we know 25.4 mm -> 1 inch -> 72 dots per inch
@@ -82,9 +86,9 @@ sub setPositionsForX {
 	@positionsForX = @positions;
 }
 
-=item setPositionsForY
+=head2 setPositionsForY
 
-	C4::Barcodes::PrinterConfig::setPositionsForY($marginBottom, $labelHeigth, $rows, $pageType);
+  C4::Barcodes::PrinterConfig::setPositionsForY($marginBottom, $labelHeigth, $rows, $pageType);
 
 Calculate and stores all tha Y positions across the pdf page.
 
@@ -97,7 +101,7 @@ C<$rows> Indicates how many rows do you want in your page type.
 C<$pageType> Page type to print (eg: a4, legal, etc).
 
 =cut
-#'
+
 sub setPositionsForY {
 	my ($marginBottom, $labelHeigth, $rows, $pageType) = @_;
 	my $defaultDpi = 72/25.4; # By default we know 25.4 mm -> 1 inch -> 72 dots per inch
@@ -111,16 +115,10 @@ sub setPositionsForY {
 	@positionsForY = @positions;
 }
 
-=item getLabelPosition
+=head2 getLabelPosition
 
-	(my $x, my $y, $pdfObject, $pageObject, $gfxObject, $textObject, $coreObject, $labelPosition) = 
-					C4::Barcodes::PrinterConfig::getLabelPosition($labelPosition, 
-																  $pdfObject, 
-																  $page,
-																  $gfx,
-																  $text,
-																  $fontObject,
-																  $pageType);	
+  (my $x, my $y, $pdfObject, $pageObject, $gfxObject, $textObject, $coreObject, $labelPosition) = 
+     C4::Barcodes::PrinterConfig::getLabelPosition($labelPosition, $pdfObject, $page, $gfx, $text, $fontObject, $pageType);	
 
 Return the (x,y) position of the label that you are going to print considering the environment.
 
@@ -139,7 +137,7 @@ C<$fontObject> The font object
 C<$pageType> Page type to print (eg: a4, legal, etc).
 
 =cut
-#'
+
 sub getLabelPosition {
 	my ($labelNum, $pdf, $page, $gfxObject, $textObject, $fontObject, $pageType) = @_;
 	my $indexX = $labelNum % @positionsForX;
@@ -168,9 +166,9 @@ sub getLabelPosition {
 	return ($positionsForX[$indexX], $positionsForY[$indexY], $pdf, $page, $gfxObject, $textObject, $fontObject, $labelNum);
 }
 
-=item labelsPage
+=head2 labelsPage
 
-	my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($rows, $columns);
+  my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($rows, $columns);
 
 This function will help you to build the labels panel, where you can choose
 wich label position do you want to start the printer process.
@@ -180,7 +178,7 @@ C<$rows> Indicates how many rows do you want in your page type.
 C<$columns> Indicates how many rows do you want in your page type.
 
 =cut
-#'
+
 sub labelsPage{
 	my ($rows, $columns) = @_;
 	my @pageType;
@@ -213,8 +211,6 @@ sub labelsPage{
 
 __END__
 
-=back
-
 =head1 AUTHOR
 
 Koha Physics Library UNLP <matias_veleda at hotmail.com>
diff --git a/C4/Barcodes/incremental.pm b/C4/Barcodes/incremental.pm
index 1fae3c6..33b21bc 100644
--- a/C4/Barcodes/incremental.pm
+++ b/C4/Barcodes/incremental.pm
@@ -30,7 +30,7 @@ BEGIN {
 1;
 __END__
 
-=head2
+=head1 NOTES
 
 Since incremental is the default in C4::Barcodes, we do not override anything here.
 In fact, this file is more of a place holder.
diff --git a/C4/Cache/Memcached.pm b/C4/Cache/Memcached.pm
index 2f022d5..1233d41 100644
--- a/C4/Cache/Memcached.pm
+++ b/C4/Cache/Memcached.pm
@@ -69,8 +69,8 @@ sub flush_all {
 1;
 __END__                                                                         
                                                                                   
-=head1 NAME                                                                     
-                                                                                
-  C4::Cache::Memcached - memcached subclass of C4::Cache                
-                                                                                  
+=head1 NAME
+
+C4::Cache::Memcached - memcached subclass of C4::Cache
+
 =cut
diff --git a/C4/Cache/Memoize/Memcached.pm b/C4/Cache/Memoize/Memcached.pm
index 927218c..c65e8a6 100644
--- a/C4/Cache/Memoize/Memcached.pm
+++ b/C4/Cache/Memoize/Memcached.pm
@@ -51,7 +51,7 @@ sub memcached_memoize {
 __END__                                                                         
                                                                                   
 =head1 NAME                                                                     
-                                                                                
-  C4::Cache::Memoize::Memcached - subclass of C4::Cache                
-                                                                                  
+
+C4::Cache::Memoize::Memcached - subclass of C4::Cache
+
 =cut
diff --git a/C4/Creators/Lib.pm b/C4/Creators/Lib.pm
index 6e07847..ded0a5d 100644
--- a/C4/Creators/Lib.pm
+++ b/C4/Creators/Lib.pm
@@ -47,6 +47,16 @@ BEGIN {
     );
 }
 
+=head1 NAME
+
+C4::Creators::Lib
+
+=cut
+
+=head1 FUNCTIONS
+
+=cut
+
 #=head2 C4::Creators::Lib::_SELECT()
 #
 #    This function returns a recordset upon success and 1 upon failure. Errors are logged to the Apache log.
@@ -135,11 +145,9 @@ my $output_formats = [
 
 =head2 C4::Creators::Lib::get_all_templates()
 
-    This function returns a reference to a hash containing all templates upon success and 1 upon failure. Errors are logged to the Apache log.
-
-    examples:
+  my $templates = get_all_templates();
 
-        my $templates = get_all_templates();
+This function returns a reference to a hash containing all templates upon success and 1 upon failure. Errors are logged to the Apache log.
 
 =cut
 
@@ -163,11 +171,9 @@ sub get_all_templates {
 
 =head2 C4::Creators::Lib::get_all_layouts()
 
-    This function returns a reference to a hash containing all layouts upon success and 1 upon failure. Errors are logged to the Apache log.
+  my $layouts = get_all_layouts();
 
-    examples:
-
-        my $layouts = get_all_layouts();
+This function returns a reference to a hash containing all layouts upon success and 1 upon failure. Errors are logged to the Apache log.
 
 =cut
 
@@ -191,16 +197,15 @@ sub get_all_layouts {
 
 =head2 C4::Creators::Lib::get_all_profiles()
 
-    This function returns an arrayref whose elements are hashes containing all profiles upon success and 1 upon failure. Errors are logged
-    to the Apache log. Two parameters are accepted. The first limits the field(s) returned. This parameter should be string of comma separted
-    fields. ie. "field_1, field_2, ...field_n" The second limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+  my $profiles = get_all_profiles();
 
-    NOTE: Do not pass in the keyword 'WHERE.'
+  my $profiles = get_all_profiles(field_list => field_list, filter => filter_string);
 
-    examples:
+This function returns an arrayref whose elements are hashes containing all profiles upon success and 1 upon failure. Errors are logged
+to the Apache log. Two parameters are accepted. The first limits the field(s) returned. This parameter should be string of comma separted
+fields. ie. "field_1, field_2, ...field_n" The second limits the records returned based on a string containing a valud SQL 'WHERE' filter.
 
-        my $profiles = get_all_profiles();
-        my $profiles = get_all_profiles(field_list => field_list, filter => filter_string);
+NOTE: Do not pass in the keyword 'WHERE.'
 
 =cut
 
@@ -243,16 +248,15 @@ sub get_all_image_names {
 
 =head2 C4::Creators::Lib::get_batch_summary()
 
-    This function returns an arrayref whose elements are hashes containing the batch_ids of current batches along with the item count
-    for each batch upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-    One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+  my $batches = get_batch_summary();
 
-    NOTE: Do not pass in the keyword 'WHERE.'
+  my $batches = get_batch_summary(filter => filter_string);
 
-    examples:
+This function returns an arrayref whose elements are hashes containing the batch_ids of current batches along with the item count
+for each batch upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
+One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
 
-        my $batches = get_batch_summary();
-        my $batches = get_batch_summary(filter => filter_string);
+NOTE: Do not pass in the keyword 'WHERE.'
 
 =cut
 
@@ -286,16 +290,15 @@ sub get_batch_summary {
 
 =head2 C4::Creators::Lib::get_label_summary()
 
-    This function returns an arrayref whose elements are hashes containing the label_ids of current labels along with the item count
-    for each label upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-    One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+  my $labels = get_label_summary();
 
-    NOTE: Do not pass in the keyword 'WHERE.'
+  my $labels = get_label_summary(items => @item_list);
 
-    examples:
+This function returns an arrayref whose elements are hashes containing the label_ids of current labels along with the item count
+for each label upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
+One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
 
-        my $labels = get_label_summary();
-        my $labels = get_label_summary(items => @item_list);
+NOTE: Do not pass in the keyword 'WHERE.'
 
 =cut
 
@@ -337,16 +340,15 @@ sub get_label_summary {
 
 =head2 C4::Creators::Lib::get_card_summary()
 
-    This function returns an arrayref whose elements are hashes containing the label_ids of current cards along with the item count
-    for each card upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-    One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+  my $cards = get_card_summary();
 
-    NOTE: Do not pass in the keyword 'WHERE.'
+  my $cards = get_card_summary(items => @item_list);
 
-    examples:
+This function returns an arrayref whose elements are hashes containing the label_ids of current cards along with the item count
+for each card upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
+One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
 
-        my $cards = get_card_summary();
-        my $cards = get_card_summary(items => @item_list);
+NOTE: Do not pass in the keyword 'WHERE.'
 
 =cut
 
@@ -375,11 +377,9 @@ sub get_card_summary {
 
 =head2 C4::Creators::Lib::get_barcode_types()
 
-    This function returns a reference to an array of hashes containing all barcode types along with their name and description.
-
-    examples:
+  my $barcode_types = get_barcode_types();
 
-        my $barcode_types = get_barcode_types();
+This function returns a reference to an array of hashes containing all barcode types along with their name and description.
 
 =cut
 
@@ -389,11 +389,9 @@ sub get_barcode_types {
 
 =head2 C4::Creators::Lib::get_label_types()
 
-    This function returns a reference to an array of hashes containing all label types along with their name and description.
+  my $label_types = get_label_types();
 
-    examples:
-
-        my $label_types = get_label_types();
+This function returns a reference to an array of hashes containing all label types along with their name and description.
 
 =cut
 
@@ -403,11 +401,9 @@ sub get_label_types {
 
 =head2 C4::Creators::Lib::get_font_types()
 
-    This function returns a reference to an array of hashes containing all font types along with their name and description.
-
-    examples:
+  my $font_types = get_font_types();
 
-        my $font_types = get_font_types();
+This function returns a reference to an array of hashes containing all font types along with their name and description.
 
 =cut
 
@@ -417,11 +413,9 @@ sub get_font_types {
 
 =head2 C4::Creators::Lib::get_text_justification_types()
 
-    This function returns a reference to an array of hashes containing all text justification types along with their name and description.
+  my $text_justification_types = get_text_justification_types();
 
-    examples:
-
-        my $text_justification_types = get_text_justification_types();
+This function returns a reference to an array of hashes containing all text justification types along with their name and description.
 
 =cut
 
@@ -431,12 +425,11 @@ sub get_text_justification_types {
 
 =head2 C4::Creators::Lib::get_unit_values()
 
-    This function returns a reference to an array of  hashes containing all unit types along with their description and multiplier. NOTE: All units are relative to a PostScript Point.
-    There are 72 PS points to the inch.
-
-    examples:
+  my $unit_values = get_unit_values();
 
-        my $unit_values = get_unit_values();
+This function returns a reference to an array of  hashes containing all unit types along with their description and multiplier.
+NOTE: All units are relative to a PostScript Point.
+There are 72 PS points to the inch.
 
 =cut
 
@@ -446,11 +439,9 @@ sub get_unit_values {
 
 =head2 C4::Creators::Lib::get_output_formats()
 
-    This function returns a reference to an array of hashes containing all label output formats along with their description.
+  my $label_output_formats = get_output_formats();
 
-    examples:
-
-        my $label_output_formats = get_output_formats();
+This function returns a reference to an array of hashes containing all label output formats along with their description.
 
 =cut
 
@@ -494,15 +485,13 @@ sub get_table_names {
 
 =head2 C4::Creators::Lib::html_table()
 
-    This function returns an arrayref of an array of hashes contianing the supplied data formatted suitably to
-    be passed off as a T::P template parameter and used to build an html table.
-
-    examples:
+This function returns an arrayref of an array of hashes contianing the supplied data formatted suitably to
+be passed off as a T::P template parameter and used to build an html table.
 
-       my $table = html_table(header_fields, array_of_row_data);
-       $template->param(
-            TABLE => $table,
-       );
+   my $table = html_table(header_fields, array_of_row_data);
+   $template->param(
+       TABLE => $table,
+   );
 
     html example:
 
diff --git a/C4/External/Amazon.pm b/C4/External/Amazon.pm
index 9e503b6..54141db 100644
--- a/C4/External/Amazon.pm
+++ b/C4/External/Amazon.pm
@@ -201,6 +201,8 @@ __END__
 
 =head1 NOTES
 
+=cut
+
 =head1 AUTHOR
 
 Joshua Ferraro <jmf at liblime.com>
diff --git a/C4/External/BakerTaylor.pm b/C4/External/BakerTaylor.pm
index 39768b5..7845811 100644
--- a/C4/External/BakerTaylor.pm
+++ b/C4/External/BakerTaylor.pm
@@ -103,16 +103,21 @@ __END__
 
 =head1 NAME
 
-C4::External::BakerTaylor - Functions for retrieving content from Baker and Taylor, inventory availability and "Content Cafe".
+C4::External::BakerTaylor
+
+=head1 DESCRIPTION
+
+Functions for retrieving content from Baker and Taylor, inventory availability and "Content Cafe".
+
 The settings for this module are controlled by System Preferences:
 
 These can be overridden for testing purposes using the initialize function.
 
 =head1 FUNCTIONS
 
-=head1 availability($isbn);
+=head2 availability($isbn);
 
-=head2 $isbn is a isbn string
+$isbn is a isbn string
 
 =head1 NOTES
 
diff --git a/C4/External/Syndetics.pm b/C4/External/Syndetics.pm
index 4a49379..f94345d 100644
--- a/C4/External/Syndetics.pm
+++ b/C4/External/Syndetics.pm
@@ -56,11 +56,7 @@ This module provides facilities for retrieving Syndetics.com content in Koha
 
 =head2 get_syndetics_summary
 
-=over 4
-
-my $syndetics_summary= &get_syndetics_summary( $isbn );
-
-=back
+  my $syndetics_summary= &get_syndetics_summary( $isbn );
 
 Get Summary data from Syndetics
 
@@ -275,6 +271,8 @@ __END__
 
 =head1 NOTES
 
+=cut
+
 =head1 AUTHOR
 
 Joshua Ferraro <jmf at liblime.com>
diff --git a/C4/Heading/MARC21.pm b/C4/Heading/MARC21.pm
index 4867c4b..77cdac2 100644
--- a/C4/Heading/MARC21.pm
+++ b/C4/Heading/MARC21.pm
@@ -87,11 +87,7 @@ my %subdivisions = (
 
 =head2 new
 
-=over 4
-
-my $marc_handler = C4::Heading::MARC21->new();
-
-=back
+  my $marc_handler = C4::Heading::MARC21->new();
 
 =cut
 
diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index be093f0..c99f2a9 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -40,9 +40,9 @@ C4::ILS-DI::Services - ILS-DI Services
 
 =head1 DESCRIPTION
 
-	Each function in this module represents an ILS-DI service.
-	They all takes a CGI instance as argument and most of them return a 
-	hashref that will be printed by XML::Simple in opac/ilsdi.pl
+Each function in this module represents an ILS-DI service.
+They all takes a CGI instance as argument and most of them return a 
+hashref that will be printed by XML::Simple in opac/ilsdi.pl
 
 =head1 SYNOPSIS
 
@@ -65,28 +65,39 @@ C4::ILS-DI::Services - ILS-DI Services
 
 =cut
 
+=head1 FUNCTIONS
+
 =head2 GetAvailability
-    
-	Given a set of biblionumbers or itemnumbers, returns a list with 
-	availability of the items associated with the identifiers.
-	
-	Parameters :
-
-	- id (Required)
-		list of either biblionumbers or itemnumbers
-	- id_type (Required)
-		defines the type of record identifier being used in the request, 
-		possible values:
-			- bib
-			- item
-	- return_type (Optional)
-		requests a particular level of detail in reporting availability, 
-		possible values:
-			- bib
-			- item
-	- return_fmt (Optional)
-		requests a particular format or set of formats in reporting 
-		availability 
+
+Given a set of biblionumbers or itemnumbers, returns a list with 
+availability of the items associated with the identifiers.
+
+Parameters:
+
+=head3 id (Required)
+
+list of either biblionumbers or itemnumbers
+
+=head3 id_type (Required)
+
+defines the type of record identifier being used in the request, 
+possible values:
+
+  - bib
+  - item
+
+=head3 return_type (Optional)
+
+requests a particular level of detail in reporting availability, 
+possible values:
+
+  - bib
+  - item
+
+=head3 return_fmt (Optional)
+
+requests a particular format or set of formats in reporting 
+availability 
 
 =cut
 
@@ -143,25 +154,26 @@ sub GetAvailability {
 }
 
 =head2 GetRecords
-    
-	Given a list of biblionumbers, returns a list of record objects that 
-	contain bibliographic information, as well as associated holdings and item
-	information. The caller may request a specific metadata schema for the 
-	record objects to be returned.
-	This function behaves similarly to HarvestBibliographicRecords and 
-	HarvestExpandedRecords in Data Aggregation, but allows quick, real time 
-	lookup by bibliographic identifier.
-
-	You can use OAI-PMH ListRecords instead of this service.
-	
-	Parameters:
-
-	- id (Required)
-		list of system record identifiers
-	- id_type (Optional)
-		Defines the metadata schema in which the records are returned, 
-		possible values:
-			- MARCXML
+
+Given a list of biblionumbers, returns a list of record objects that 
+contain bibliographic information, as well as associated holdings and item
+information. The caller may request a specific metadata schema for the 
+record objects to be returned.
+
+This function behaves similarly to HarvestBibliographicRecords and 
+HarvestExpandedRecords in Data Aggregation, but allows quick, real time 
+lookup by bibliographic identifier.
+
+You can use OAI-PMH ListRecords instead of this service.
+
+Parameters:
+
+  - id (Required)
+	list of system record identifiers
+  - id_type (Optional)
+	Defines the metadata schema in which the records are returned, 
+	possible values:
+  	  - MARCXML
 
 =cut
 
@@ -221,18 +233,18 @@ sub GetRecords {
 }
 
 =head2 GetAuthorityRecords
-    
-	Given a list of authority record identifiers, returns a list of record 
-	objects that contain the authority records. The function user may request 
-	a specific metadata schema for the record objects.
 
-	Parameters:
+Given a list of authority record identifiers, returns a list of record 
+objects that contain the authority records. The function user may request 
+a specific metadata schema for the record objects.
+
+Parameters:
 
-	- id (Required)
-	    list of authority record identifiers
-	- schema (Optional)
-	    specifies the metadata schema of records to be returned, possible values:
-		  - MARCXML
+  - id (Required)
+    list of authority record identifiers
+  - schema (Optional)
+    specifies the metadata schema of records to be returned, possible values:
+      - MARCXML
 
 =cut
 
@@ -259,19 +271,19 @@ sub GetAuthorityRecords {
 }
 
 =head2 LookupPatron
-    
-	Looks up a patron in the ILS by an identifier, and returns the borrowernumber.
-	
-	Parameters:
-
-	- id (Required)
-		an identifier used to look up the patron in Koha
-	- id_type (Optional)
-		the type of the identifier, possible values:
-			- cardnumber
-			- firstname
-			- userid
-			- borrowernumber
+
+Looks up a patron in the ILS by an identifier, and returns the borrowernumber.
+
+Parameters:
+
+  - id (Required)
+	an identifier used to look up the patron in Koha
+  - id_type (Optional)
+	the type of the identifier, possible values:
+	- cardnumber
+	- firstname
+	- userid
+	- borrowernumber
 
 =cut
 
@@ -294,16 +306,16 @@ sub LookupPatron {
 
 =head2 AuthenticatePatron
 
-	Authenticates a user's login credentials and returns the identifier for 
-	the patron.
-	
-	Parameters:
+Authenticates a user's login credentials and returns the identifier for 
+the patron.
+
+Parameters:
+
+  - username (Required)
+	user's login identifier
+  - password (Required)
+	user's password
 
-	- username (Required)
-		user's login identifier
-	- password (Required)
-		user's password
-		
 =cut
 
 sub AuthenticatePatron {
@@ -326,23 +338,23 @@ sub AuthenticatePatron {
 
 =head2 GetPatronInfo
 
-	Returns specified information about the patron, based on options in the 
-	request. This function can optionally return patron's contact information, 
-	fine information, hold request information, and loan information.
-	
-	Parameters:
-
-	- patron_id (Required)
-		the borrowernumber
-	- show_contact (Optional, default 1)
-		whether or not to return patron's contact information in the response
-	- show_fines (Optional, default 0)
-		whether or not to return fine information in the response
-	- show_holds (Optional, default 0)
-		whether or not to return hold request information in the response
-	- show_loans (Optional, default 0)
-		whether or not to return loan information request information in the response 
-		
+Returns specified information about the patron, based on options in the 
+request. This function can optionally return patron's contact information, 
+fine information, hold request information, and loan information.
+
+Parameters:
+
+  - patron_id (Required)
+	the borrowernumber
+  - show_contact (Optional, default 1)
+	whether or not to return patron's contact information in the response
+  - show_fines (Optional, default 0)
+	whether or not to return fine information in the response
+  - show_holds (Optional, default 0)
+	whether or not to return hold request information in the response
+  - show_loans (Optional, default 0)
+	whether or not to return loan information request information in the response 
+
 =cut
 
 sub GetPatronInfo {
@@ -421,12 +433,12 @@ sub GetPatronInfo {
 
 =head2 GetPatronStatus
 
-	Returns a patron's status information.
-	
-	Parameters:
+Returns a patron's status information.
 
-	- patron_id (Required)
-		the borrower ID
+Parameters:
+
+  - patron_id (Required)
+	the borrower ID
 
 =cut
 
@@ -448,15 +460,15 @@ sub GetPatronStatus {
 
 =head2 GetServices
 
-	Returns information about the services available on a particular item for 
-	a particular patron.
-	
-	Parameters:
+Returns information about the services available on a particular item for 
+a particular patron.
+
+Parameters:
 
-	- patron_id (Required)
-		a borrowernumber
-	- item_id (Required)
-		an itemnumber
+  - patron_id (Required)
+	a borrowernumber
+  - item_id (Required)
+	an itemnumber
 =cut
 
 sub GetServices {
@@ -518,16 +530,16 @@ sub GetServices {
 
 =head2 RenewLoan
 
-	Extends the due date for a borrower's existing issue.
-	
-	Parameters:
+Extends the due date for a borrower's existing issue.
 
-	- patron_id (Required)
-		a borrowernumber
-	- item_id (Required)
-		an itemnumber
-	- desired_due_date (Required)
-		the date the patron would like the item returned by 
+Parameters:
+
+  - patron_id (Required)
+	a borrowernumber
+  - item_id (Required)
+	an itemnumber
+  - desired_due_date (Required)
+	the date the patron would like the item returned by 
 
 =cut
 
@@ -562,22 +574,22 @@ sub RenewLoan {
 
 =head2 HoldTitle
 
-	Creates, for a borrower, a biblio-level hold reserve.
-	
-	Parameters:
-
-	- patron_id (Required)
-		a borrowernumber
-	- bib_id (Required)
-		a biblionumber
-	- request_location (Required)
-		IP address where the end user request is being placed
-	- pickup_location (Optional)
-		a branch code indicating the location to which to deliver the item for pickup
-	- needed_before_date (Optional)
-		date after which hold request is no longer needed
-	- pickup_expiry_date (Optional)
-		date after which item returned to shelf if item is not picked up 
+Creates, for a borrower, a biblio-level hold reserve.
+
+Parameters:
+
+  - patron_id (Required)
+	a borrowernumber
+  - bib_id (Required)
+	a biblionumber
+  - request_location (Required)
+	IP address where the end user request is being placed
+  - pickup_location (Optional)
+	a branch code indicating the location to which to deliver the item for pickup
+  - needed_before_date (Optional)
+	date after which hold request is no longer needed
+  - pickup_expiry_date (Optional)
+	date after which item returned to shelf if item is not picked up 
 
 =cut
 
@@ -626,23 +638,23 @@ sub HoldTitle {
 
 =head2 HoldItem
 
-	Creates, for a borrower, an item-level hold request on a specific item of 
-	a bibliographic record in Koha.
+Creates, for a borrower, an item-level hold request on a specific item of 
+a bibliographic record in Koha.
 
-	Parameters:
+Parameters:
 
-	- patron_id (Required)
-		a borrowernumber
-	- bib_id (Required)
-		a biblionumber
-	- item_id (Required)
-		an itemnumber
-	- pickup_location (Optional)
-		a branch code indicating the location to which to deliver the item for pickup
-	- needed_before_date (Optional)
-		date after which hold request is no longer needed
-	- pickup_expiry_date (Optional)
-		date after which item returned to shelf if item is not picked up 
+  - patron_id (Required)
+	a borrowernumber
+  - bib_id (Required)
+	a biblionumber
+  - item_id (Required)
+	an itemnumber
+  - pickup_location (Optional)
+	a branch code indicating the location to which to deliver the item for pickup
+  - needed_before_date (Optional)
+	date after which hold request is no longer needed
+  - pickup_expiry_date (Optional)
+	date after which item returned to shelf if item is not picked up 
 
 =cut
 
@@ -709,14 +721,14 @@ sub HoldItem {
 
 =head2 CancelHold
 
-	Cancels an active reserve request for the borrower.
-	
-	Parameters:
+Cancels an active reserve request for the borrower.
+
+Parameters:
 
-	- patron_id (Required)
-		a borrowernumber
-	- item_id (Required)
-		an itemnumber 
+  - patron_id (Required)
+	a borrowernumber
+  - item_id (Required)
+	an itemnumber 
 
 =cut
 
diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm
index 9fb39e0..21d17eb 100644
--- a/C4/Members/AttributeTypes.pm
+++ b/C4/Members/AttributeTypes.pm
@@ -34,43 +34,35 @@ C4::Members::AttributeTypes - mananage extended patron attribute types
 
 =head1 SYNOPSIS
 
-=over 4
-
-my @attribute_types = C4::Members::AttributeTypes::GetAttributeTypes();
-
-my $attr_type = C4::Members::AttributeTypes->new($code, $description);
-$attr_type->code($code);
-$attr_type->description($description);
-$attr_type->repeatable($repeatable);
-$attr_type->unique_id($unique_id);
-$attr_type->opac_display($opac_display);
-$attr_type->password_allowed($password_allowed);
-$attr_type->staff_searchable($staff_searchable);
-$attr_type->authorised_value_category($authorised_value_category);
-$attr_type->store();
-$attr_type->delete();
-
-my $attr_type = C4::Members::AttributeTypes->fetch($code);
-$attr_type = C4::Members::AttributeTypes->delete($code);
-
-=back
+  my @attribute_types = C4::Members::AttributeTypes::GetAttributeTypes();
+
+  my $attr_type = C4::Members::AttributeTypes->new($code, $description);
+  $attr_type->code($code);
+  $attr_type->description($description);
+  $attr_type->repeatable($repeatable);
+  $attr_type->unique_id($unique_id);
+  $attr_type->opac_display($opac_display);
+  $attr_type->password_allowed($password_allowed);
+  $attr_type->staff_searchable($staff_searchable);
+  $attr_type->authorised_value_category($authorised_value_category);
+  $attr_type->store();
+  $attr_type->delete();
+
+  my $attr_type = C4::Members::AttributeTypes->fetch($code);
+  $attr_type = C4::Members::AttributeTypes->delete($code);
 
 =head1 FUNCTIONS
 
 =head2 GetAttributeTypes
 
-=over 4
-
-my @attribute_types = C4::Members::AttributeTypes::GetAttributeTypes($all_fields);
-
-=back
+  my @attribute_types = C4::Members::AttributeTypes::GetAttributeTypes($all_fields);
 
 Returns an array of hashrefs of each attribute type defined
 in the database.  The array is sorted by code.  Each hashref contains
 at least the following fields:
 
-code
-description
+ - code
+ - description
 
 If $all_fields is true, then each hashref also contains the other fields from borrower_attribute_types.
 
@@ -93,11 +85,7 @@ sub GetAttributeTypes_hashref {
 
 =head1 METHODS 
 
-=over 4
-
-my $attr_type = C4::Members::AttributeTypes->new($code, $description);
-
-=back
+  my $attr_type = C4::Members::AttributeTypes->new($code, $description);
 
 Create a new attribute type.
 
@@ -122,11 +110,7 @@ sub new {
 
 =head2 fetch
 
-=over 4
-
-my $attr_type = C4::Members::AttributeTypes->fetch($code);
-
-=back
+  my $attr_type = C4::Members::AttributeTypes->fetch($code);
 
 Fetches an attribute type from the database.  If no
 type with the given C<$code> exists, returns undef.
@@ -160,11 +144,7 @@ sub fetch {
 
 =head2 store
 
-=over 4
-
-$attr_type->store();
-
-=back
+  $attr_type->store();
 
 Stores attribute type in the database.  If the type
 previously retrieved from the database via the fetch()
@@ -209,12 +189,8 @@ sub store {
 
 =head2 code
 
-=over 4
-
-my $code = $attr_type->code();
-$attr_type->code($code);
-
-=back
+  my $code = $attr_type->code();
+  $attr_type->code($code);
 
 Accessor.  Note that the code is immutable once
 a type is created or fetched from the database.
@@ -228,12 +204,8 @@ sub code {
 
 =head2 description
 
-=over 4
-
-my $description = $attr_type->description();
-$attr_type->description($description);
-
-=back
+  my $description = $attr_type->description();
+  $attr_type->description($description);
 
 Accessor.
 
@@ -246,12 +218,8 @@ sub description {
 
 =head2 repeatable
 
-=over 4
-
-my $repeatable = $attr_type->repeatable();
-$attr_type->repeatable($repeatable);
-
-=back
+  my $repeatable = $attr_type->repeatable();
+  $attr_type->repeatable($repeatable);
 
 Accessor.  The C<$repeatable> argument
 is interpreted as a Perl boolean.
@@ -265,12 +233,8 @@ sub repeatable {
 
 =head2 unique_id
 
-=over 4
-
-my $unique_id = $attr_type->unique_id();
-$attr_type->unique_id($unique_id);
-
-=back
+  my $unique_id = $attr_type->unique_id();
+  $attr_type->unique_id($unique_id);
 
 Accessor.  The C<$unique_id> argument
 is interpreted as a Perl boolean.
@@ -283,12 +247,8 @@ sub unique_id {
 }
 =head2 opac_display
 
-=over 4
-
-my $opac_display = $attr_type->opac_display();
-$attr_type->opac_display($opac_display);
-
-=back
+  my $opac_display = $attr_type->opac_display();
+  $attr_type->opac_display($opac_display);
 
 Accessor.  The C<$opac_display> argument
 is interpreted as a Perl boolean.
@@ -301,12 +261,8 @@ sub opac_display {
 }
 =head2 password_allowed
 
-=over 4
-
-my $password_allowed = $attr_type->password_allowed();
-$attr_type->password_allowed($password_allowed);
-
-=back
+  my $password_allowed = $attr_type->password_allowed();
+  $attr_type->password_allowed($password_allowed);
 
 Accessor.  The C<$password_allowed> argument
 is interpreted as a Perl boolean.
@@ -319,12 +275,8 @@ sub password_allowed {
 }
 =head2 staff_searchable
 
-=over 4
-
-my $staff_searchable = $attr_type->staff_searchable();
-$attr_type->staff_searchable($staff_searchable);
-
-=back
+  my $staff_searchable = $attr_type->staff_searchable();
+  $attr_type->staff_searchable($staff_searchable);
 
 Accessor.  The C<$staff_searchable> argument
 is interpreted as a Perl boolean.
@@ -338,12 +290,8 @@ sub staff_searchable {
 
 =head2 authorised_value_category
 
-=over 4
-
-my $authorised_value_category = $attr_type->authorised_value_category();
-$attr_type->authorised_value_category($authorised_value_category);
-
-=back
+  my $authorised_value_category = $attr_type->authorised_value_category();
+  $attr_type->authorised_value_category($authorised_value_category);
 
 Accessor.
 
@@ -356,12 +304,8 @@ sub authorised_value_category {
 
 =head2 delete
 
-=over 4
-
-$attr_type->delete();
-C4::Members::AttributeTypes->delete($code);
-
-=back
+  $attr_type->delete();
+  C4::Members::AttributeTypes->delete($code);
 
 Delete an attribute type from the database.  The attribute
 type may be specified either by an object or by a code.
@@ -384,11 +328,7 @@ sub delete {
 
 =head2 num_patrons
 
-=over 4
-
-my $count = $attr_type->num_patrons();
-
-=back
+  my $count = $attr_type->num_patrons();
 
 Returns the number of patron records that use
 this attribute type.
@@ -410,11 +350,7 @@ sub num_patrons {
 
 =head2 get_patrons
 
-=over 4
-
-my @borrowernumbers = $attr_type->get_patrons($attribute);
-
-=back
+  my @borrowernumbers = $attr_type->get_patrons($attribute);
 
 Returns the borrowernumber of the patron records that
 have an attribute with the specifie value.
diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm
index 72af3c8..70c34b4 100644
--- a/C4/Members/Attributes.pm
+++ b/C4/Members/Attributes.pm
@@ -43,22 +43,14 @@ C4::Members::Attributes - manage extend patron attributes
 
 =head1 SYNOPSIS
 
-=over 4
-
-    use C4::Members::Attributes;
-    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
-
-=back
+  use C4::Members::Attributes;
+  my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
 
 =head1 FUNCTIONS
 
 =head2 GetBorrowerAttributes
 
-=over 4
-
-my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber[, $opac_only]);
-
-=back
+  my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber[, $opac_only]);
 
 Retrieve an arrayref of extended attributes associated with the
 patron specified by C<$borrowernumber>.  Each entry in the arrayref
@@ -104,12 +96,7 @@ sub GetBorrowerAttributes {
 
 =head2 SearchIdMatchingAttribute
 
-=over 4
-
-my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($filter);
-
-=back
-
+  my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($filter);
 
 =cut
 
@@ -130,11 +117,7 @@ AND attribute like ?};
 
 =head2 CheckUniqueness
 
-=over 4
-
-    my $ok = CheckUniqueness($code, $value[, $borrowernumber]);
-
-=back
+  my $ok = CheckUniqueness($code, $value[, $borrowernumber]);
 
 Given an attribute type and value, verify if would violate
 a unique_id restriction if added to the patron.  The
@@ -178,11 +161,7 @@ sub CheckUniqueness {
 
 =head2 SetBorrowerAttributes 
 
-=over 4
-
-    SetBorrowerAttributes($borrowernumber, [ { code => 'CODE', value => 'value', password => 'password' }, ... ] );
-
-=back
+  SetBorrowerAttributes($borrowernumber, [ { code => 'CODE', value => 'value', password => 'password' }, ... ] );
 
 Set patron attributes for the patron identified by C<$borrowernumber>,
 replacing any that existed previously.
@@ -207,12 +186,8 @@ sub SetBorrowerAttributes {
 
 =head2 extended_attributes_code_value_arrayref 
 
-=over 4
-
-    my $patron_attributes = "homeroom:1150605,grade:01,extradata:foobar";
-    my $aref = extended_attributes_code_value_arrayref($patron_attributes);
-
-=back
+   my $patron_attributes = "homeroom:1150605,grade:01,extradata:foobar";
+   my $aref = extended_attributes_code_value_arrayref($patron_attributes);
 
 Takes a comma-delimited CSV-style string argument and returns the kind of data structure that SetBorrowerAttributes wants, 
 namely a reference to array of hashrefs like:
@@ -238,16 +213,12 @@ sub extended_attributes_code_value_arrayref {
 
 =head2 extended_attributes_merge
 
-=over 4
-
-    my $old_attributes = extended_attributes_code_value_arrayref("homeroom:224,grade:04,deanslist:2007,deanslist:2008,somedata:xxx");
-    my $new_attributes = extended_attributes_code_value_arrayref("homeroom:115,grade:05,deanslist:2009,extradata:foobar");
-    my $merged = extended_attributes_merge($patron_attributes, $new_attributes, 1);
-
-    # assuming deanslist is a repeatable code, value same as:
-    # $merged = extended_attributes_code_value_arrayref("homeroom:115,grade:05,deanslist:2007,deanslist:2008,deanslist:2009,extradata:foobar,somedata:xxx");
+  my $old_attributes = extended_attributes_code_value_arrayref("homeroom:224,grade:04,deanslist:2007,deanslist:2008,somedata:xxx");
+  my $new_attributes = extended_attributes_code_value_arrayref("homeroom:115,grade:05,deanslist:2009,extradata:foobar");
+  my $merged = extended_attributes_merge($patron_attributes, $new_attributes, 1);
 
-=back
+  # assuming deanslist is a repeatable code, value same as:
+  # $merged = extended_attributes_code_value_arrayref("homeroom:115,grade:05,deanslist:2007,deanslist:2008,deanslist:2009,extradata:foobar,somedata:xxx");
 
 Takes three arguments.  The first two are references to array of hashrefs, each like:
  [ { code => 'CODE', value => 'value' }, { code => 'CODE2', value => 'othervalue' } ... ]
diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index 5fb1aae..22ee977 100644
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -106,7 +106,7 @@ if (C4::Context->preference('item-level_itypes')) {
 }
 
 =head1 NAME
-   
+
 C4::Reports::Guided - Module for generating guided reports 
 
 =head1 SYNOPSIS
@@ -115,6 +115,7 @@ C4::Reports::Guided - Module for generating guided reports
 
 =head1 DESCRIPTION
 
+=cut
 
 =head1 METHODS
 
@@ -374,25 +375,22 @@ sub get_criteria {
 
 =item execute_query
 
-=over
+  ($results, $total, $error) = execute_query($sql, $offset, $limit)
 
-($results, $total, $error) = execute_query($sql, $offset, $limit)
 
-=back
+When passed C<$sql>, this function returns an array ref containing a result set
+suitably formatted for display in html or for output as a flat file when passed in
+C<$format> and C<$id>. It also returns the C<$total> records available for the
+supplied query. If passed any query other than a SELECT, or if there is a db error,
+C<$errors> an array ref is returned containing the error after this manner:
 
-    When passed C<$sql>, this function returns an array ref containing a result set
-    suitably formatted for display in html or for output as a flat file when passed in
-    C<$format> and C<$id>. It also returns the C<$total> records available for the
-    supplied query. If passed any query other than a SELECT, or if there is a db error,
-    C<$errors> an array ref is returned containing the error after this manner:
+C<$error->{'sqlerr'}> contains the offending SQL keyword.
+C<$error->{'queryerr'}> contains the native db engine error returned for the query.
 
-    C<$error->{'sqlerr'}> contains the offending SQL keyword.
-    C<$error->{'queryerr'}> contains the native db engine error returned for the query.
-    
-    Valid values for C<$format> are 'text,' 'tab,' 'csv,' or 'url. C<$sql>, C<$type>,
-    C<$offset>, and C<$limit> are required parameters. If a valid C<$format> is passed
-    in, C<$offset> and C<$limit> are ignored for obvious reasons. A LIMIT specified by
-    the user in a user-supplied SQL query WILL apply in any case.
+Valid values for C<$format> are 'text,' 'tab,' 'csv,' or 'url. C<$sql>, C<$type>,
+C<$offset>, and C<$limit> are required parameters. If a valid C<$format> is passed
+in, C<$offset> and C<$limit> are ignored for obvious reasons. A LIMIT specified by
+the user in a user-supplied SQL query WILL apply in any case.
 
 =cut
 
diff --git a/C4/SIP/ILS/Item.pm b/C4/SIP/ILS/Item.pm
index b0c385c..3ff7f10 100644
--- a/C4/SIP/ILS/Item.pm
+++ b/C4/SIP/ILS/Item.pm
@@ -32,9 +32,9 @@ BEGIN {
 	@EXPORT_OK = qw();
 }
 
-=head2 EXAMPLE
+=head1 EXAMPLE
 
-our %item_db = (
+ our %item_db = (
     '1565921879' => {
         title => "Perl 5 desktop reference",
         id => '1565921879',
@@ -234,7 +234,7 @@ sub status_update {     # FIXME: this looks unimplemented
     $status->{ok} = 1;
     return $status;
 }
-    
+
 sub title_id {
     my $self = shift;
     return $self->{title};
diff --git a/C4/SIP/ILS/Patron.pm b/C4/SIP/ILS/Patron.pm
index e6b53b1..3f4e136 100644
--- a/C4/SIP/ILS/Patron.pm
+++ b/C4/SIP/ILS/Patron.pm
@@ -354,9 +354,9 @@ sub charge_denied {
 1;
 __END__
 
-=head2 EXAMPLES
+=head1 EXAMPLES
 
-our %patron_example = (
+  our %patron_example = (
 		  djfiander => {
 		      name => "David J. Fiander",
 		      id => 'djfiander',
@@ -388,96 +388,96 @@ our %patron_example = (
 		  },
   );
 
-From borrowers table:
-+---------------------+--------------+------+-----+
-| Field               | Type         | Null | Key |
-+---------------------+--------------+------+-----+
-| borrowernumber      | int(11)      | NO   | PRI |
-| cardnumber          | varchar(16)  | YES  | UNI |
-| surname             | mediumtext   | NO   |     |
-| firstname           | text         | YES  |     |
-| title               | mediumtext   | YES  |     |
-| othernames          | mediumtext   | YES  |     |
-| initials            | text         | YES  |     |
-| streetnumber        | varchar(10)  | YES  |     |
-| streettype          | varchar(50)  | YES  |     |
-| address             | mediumtext   | NO   |     |
-| address2            | text         | YES  |     |
-| city                | mediumtext   | NO   |     |
-| zipcode             | varchar(25)  | YES  |     |
-| country             | text         | YES  |     |
-| email               | mediumtext   | YES  |     |
-| phone               | text         | YES  |     |
-| mobile              | varchar(50)  | YES  |     |
-| fax                 | mediumtext   | YES  |     |
-| emailpro            | text         | YES  |     |
-| phonepro            | text         | YES  |     |
-| B_streetnumber      | varchar(10)  | YES  |     |
-| B_streettype        | varchar(50)  | YES  |     |
-| B_address           | varchar(100) | YES  |     |
-| B_address2          | text         | YES  |     |
-| B_city              | mediumtext   | YES  |     |
-| B_zipcode           | varchar(25)  | YES  |     |
-| B_country           | text         | YES  |     |
-| B_email             | text         | YES  |     |
-| B_phone             | mediumtext   | YES  |     |
-| dateofbirth         | date         | YES  |     |
-| branchcode          | varchar(10)  | NO   | MUL |
-| categorycode        | varchar(10)  | NO   | MUL |
-| dateenrolled        | date         | YES  |     |
-| dateexpiry          | date         | YES  |     |
-| gonenoaddress       | tinyint(1)   | YES  |     |
-| lost                | tinyint(1)   | YES  |     |
-| debarred            | tinyint(1)   | YES  |     |
-| contactname         | mediumtext   | YES  |     |
-| contactfirstname    | text         | YES  |     |
-| contacttitle        | text         | YES  |     |
-| guarantorid         | int(11)      | YES  |     |
-| borrowernotes       | mediumtext   | YES  |     |
-| relationship        | varchar(100) | YES  |     |
-| ethnicity           | varchar(50)  | YES  |     |
-| ethnotes            | varchar(255) | YES  |     |
-| sex                 | varchar(1)   | YES  |     |
-| password            | varchar(30)  | YES  |     |
-| flags               | int(11)      | YES  |     |
-| userid              | varchar(30)  | YES  | MUL |
-| opacnote            | mediumtext   | YES  |     |
-| contactnote         | varchar(255) | YES  |     |
-| sort1               | varchar(80)  | YES  |     |
-| sort2               | varchar(80)  | YES  |     |
-| altcontactfirstname | varchar(255) | YES  |     |
-| altcontactsurname   | varchar(255) | YES  |     |
-| altcontactaddress1  | varchar(255) | YES  |     |
-| altcontactaddress2  | varchar(255) | YES  |     |
-| altcontactaddress3  | varchar(255) | YES  |     |
-| altcontactzipcode   | varchar(50)  | YES  |     |
-| altcontactcountry   | text         | YES  |     |
-| altcontactphone     | varchar(50)  | YES  |     |
-| smsalertnumber      | varchar(50)  | YES  |     |
-+---------------------+--------------+------+-----+
-
-From C4::Members
-
-$flags->{KEY}
-{CHARGES}
+ From borrowers table:
+ +---------------------+--------------+------+-----+
+ | Field               | Type         | Null | Key |
+ +---------------------+--------------+------+-----+
+ | borrowernumber      | int(11)      | NO   | PRI |
+ | cardnumber          | varchar(16)  | YES  | UNI |
+ | surname             | mediumtext   | NO   |     |
+ | firstname           | text         | YES  |     |
+ | title               | mediumtext   | YES  |     |
+ | othernames          | mediumtext   | YES  |     |
+ | initials            | text         | YES  |     |
+ | streetnumber        | varchar(10)  | YES  |     |
+ | streettype          | varchar(50)  | YES  |     |
+ | address             | mediumtext   | NO   |     |
+ | address2            | text         | YES  |     |
+ | city                | mediumtext   | NO   |     |
+ | zipcode             | varchar(25)  | YES  |     |
+ | country             | text         | YES  |     |
+ | email               | mediumtext   | YES  |     |
+ | phone               | text         | YES  |     |
+ | mobile              | varchar(50)  | YES  |     |
+ | fax                 | mediumtext   | YES  |     |
+ | emailpro            | text         | YES  |     |
+ | phonepro            | text         | YES  |     |
+ | B_streetnumber      | varchar(10)  | YES  |     |
+ | B_streettype        | varchar(50)  | YES  |     |
+ | B_address           | varchar(100) | YES  |     |
+ | B_address2          | text         | YES  |     |
+ | B_city              | mediumtext   | YES  |     |
+ | B_zipcode           | varchar(25)  | YES  |     |
+ | B_country           | text         | YES  |     |
+ | B_email             | text         | YES  |     |
+ | B_phone             | mediumtext   | YES  |     |
+ | dateofbirth         | date         | YES  |     |
+ | branchcode          | varchar(10)  | NO   | MUL |
+ | categorycode        | varchar(10)  | NO   | MUL |
+ | dateenrolled        | date         | YES  |     |
+ | dateexpiry          | date         | YES  |     |
+ | gonenoaddress       | tinyint(1)   | YES  |     |
+ | lost                | tinyint(1)   | YES  |     |
+ | debarred            | tinyint(1)   | YES  |     |
+ | contactname         | mediumtext   | YES  |     |
+ | contactfirstname    | text         | YES  |     |
+ | contacttitle        | text         | YES  |     |
+ | guarantorid         | int(11)      | YES  |     |
+ | borrowernotes       | mediumtext   | YES  |     |
+ | relationship        | varchar(100) | YES  |     |
+ | ethnicity           | varchar(50)  | YES  |     |
+ | ethnotes            | varchar(255) | YES  |     |
+ | sex                 | varchar(1)   | YES  |     |
+ | password            | varchar(30)  | YES  |     |
+ | flags               | int(11)      | YES  |     |
+ | userid              | varchar(30)  | YES  | MUL |
+ | opacnote            | mediumtext   | YES  |     |
+ | contactnote         | varchar(255) | YES  |     |
+ | sort1               | varchar(80)  | YES  |     |
+ | sort2               | varchar(80)  | YES  |     |
+ | altcontactfirstname | varchar(255) | YES  |     |
+ | altcontactsurname   | varchar(255) | YES  |     |
+ | altcontactaddress1  | varchar(255) | YES  |     |
+ | altcontactaddress2  | varchar(255) | YES  |     |
+ | altcontactaddress3  | varchar(255) | YES  |     |
+ | altcontactzipcode   | varchar(50)  | YES  |     |
+ | altcontactcountry   | text         | YES  |     |
+ | altcontactphone     | varchar(50)  | YES  |     |
+ | smsalertnumber      | varchar(50)  | YES  |     |
+ +---------------------+--------------+------+-----+
+
+ From C4::Members
+
+ $flags->{KEY}
+ {CHARGES}
 	{message}     Message showing patron's credit or debt
 	{noissues}    Set if patron owes >$5.00
-{GNA}         	Set if patron gone w/o address
+ {GNA}         	Set if patron gone w/o address
 	{message}     "Borrower has no valid address"
 	{noissues}    Set.
-{LOST}        	Set if patron's card reported lost
+ {LOST}        	Set if patron's card reported lost
 	{message}     Message to this effect
 	{noissues}    Set.
-{DBARRED}     	Set if patron is debarred
+ {DBARRED}     	Set if patron is debarred
 	{message}     Message to this effect
 	{noissues}    Set.
-{NOTES}       	Set if patron has notes
+ {NOTES}       	Set if patron has notes
 	{message}     Notes about patron
-{ODUES}       	Set if patron has overdue books
+ {ODUES}       	Set if patron has overdue books
 	{message}     "Yes"
 	{itemlist}    ref-to-array: list of overdue books
 	{itemlisttext}    Text list of overdue items
-{WAITING}     	Set if there are items available that the patron reserved
+ {WAITING}     	Set if there are items available that the patron reserved
 	{message}     Message to this effect
 	{itemlist}    ref-to-array: list of available items
 
diff --git a/C4/Search/PazPar2.pm b/C4/Search/PazPar2.pm
index 59f4103..3aceb95 100644
--- a/C4/Search/PazPar2.pm
+++ b/C4/Search/PazPar2.pm
@@ -34,6 +34,8 @@ C4::Search::PazPar2 - implement client for PazPar2
 
 =head1 SYNOPSIS
 
+=cut
+
 =head1 DESCRIPTION
 
 =cut
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 9d15847..e772db8 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -387,11 +387,11 @@ __END__
 
 =head1 NAME
 
-    VirtualShelves/Page.pm
+VirtualShelves/Page.pm
 
 =head1 DESCRIPTION
 
-    Module used for both OPAC and intranet pages.
+Module used for both OPAC and intranet pages.
 
 =head1 CGI PARAMETERS
 
@@ -399,32 +399,32 @@ __END__
 
 =item C<modifyshelfcontents>
 
-    If this script has to modify the shelf content.
+If this script has to modify the shelf content.
 
 =item C<shelfnumber>
 
-    To know on which shelf to work.
+To know on which shelf to work.
 
 =item C<addbarcode>
 
 =item C<op>
 
-    Op can be:
-        * modif: show the template allowing modification of the shelves;
-        * modifsave: save changes from modif mode.
+ Op can be:
+    * modif: show the template allowing modification of the shelves;
+    * modifsave: save changes from modif mode.
 
 =item C<viewshelf>
 
-    Load template with 'viewshelves param' displaying the shelf's information.
+Load template with 'viewshelves param' displaying the shelf's information.
 
 =item C<shelves>
 
-    If the param shelves == 1, then add or delete a shelf.
+If the param shelves == 1, then add or delete a shelf.
 
 =item C<addshelf>
 
-    If the param shelves == 1, then addshelf is the name of the shelf to add.
+If the param shelves == 1, then addshelf is the name of the shelf to add.
 
 =back
 
-=cut
\ No newline at end of file
+=cut
diff --git a/Makefile.PL b/Makefile.PL
index 5021f6c..0f75325 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1578,4 +1578,5 @@ MJ Ray mjr at phonecoop.coop
 Galen Charlton galen.charlton at liblime.com
 
 =cut
+
 FIXME: deal with .htaccess
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 94560c4..35d3507 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -30,17 +30,21 @@ addorder.pl
 this script allows to add an order.
 It is called by :
 
+=over
+
 =item neworderbiblio.pl to add an order from nothing.
 
 =item neworderempty.pl to add an order from an existing biblio.
 
 =item newordersuggestion.pl to add an order from an existing suggestion.
 
+=back
+
 =head1 CGI PARAMETERS
 
 All of the cgi parameters below are related to the new order.
 
-=over 4
+=over
 
 =item C<ordernumber>
 the number of this new order.
diff --git a/acqui/check_budget_total.pl b/acqui/check_budget_total.pl
index 62e5453..6ee346c 100755
--- a/acqui/check_budget_total.pl
+++ b/acqui/check_budget_total.pl
@@ -25,7 +25,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 DESCRIPTION
 
 fetches the budget amount fron the DB
 
diff --git a/acqui/fetch_sort_dropbox.pl b/acqui/fetch_sort_dropbox.pl
index 1bc9332..21d3c61 100755
--- a/acqui/fetch_sort_dropbox.pl
+++ b/acqui/fetch_sort_dropbox.pl
@@ -25,9 +25,9 @@ use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 NAME
 
-fetch_sort_dropbox : 
+fetch_sort_dropbox
 
 =cut
 
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 6c10459..61f0962 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -26,6 +26,7 @@
 neworderempty.pl
 
 =head1 DESCRIPTION
+
 this script allows to create a new record to order it. This record shouldn't exist
 on database.
 
@@ -363,9 +364,9 @@ $template->param(
 output_html_with_http_headers $input, $cookie, $template->output;
 
 
-=item MARCfindbreeding
+=head2 MARCfindbreeding
 
-    $record = MARCfindbreeding($breedingid);
+  $record = MARCfindbreeding($breedingid);
 
 Look up the import record repository for the record with
 record with id $breedingid.  If found, returns the decoded
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index a1e6fce..f084f8f 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -26,6 +26,7 @@
 orderreceive.pl
 
 =head1 DESCRIPTION
+
 This script shows all order already receive and all pendings orders.
 It permit to write a new order as 'received'.
 
@@ -34,16 +35,19 @@ It permit to write a new order as 'received'.
 =over 4
 
 =item supplierid
+
 to know on what supplier this script has to display receive order.
 
 =item receive
 
 =item invoice
+
 the number of this invoice.
 
 =item freight
 
 =item biblio
+
 The biblionumber of this order.
 
 =item datereceived
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 675b07d..b1e11e7 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -26,6 +26,7 @@
 parcel.pl
 
 =head1 DESCRIPTION
+
 This script shows all orders receipt or pending for a given supplier.
 It allows to write an order as 'received' when he arrives.
 
@@ -34,9 +35,11 @@ It allows to write an order as 'received' when he arrives.
 =over 4
 
 =item supplierid
+
 To know the supplier this script has to show orders.
 
 =item code
+
 is the bookseller invoice number.
 
 =item freight
@@ -46,6 +49,7 @@ is the bookseller invoice number.
 
 
 =item datereceived
+
 To filter the results list on this given date.
 
 =back
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 6c49a90..a939ce1 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -24,6 +24,7 @@
 supplier.pl
 
 =head1 DESCRIPTION
+
 this script shows the details for a bookseller given on input arg.
 It allows to edit & save information about this bookseller.
 
@@ -32,6 +33,7 @@ It allows to edit & save information about this bookseller.
 =over 4
 
 =item supplierid
+
 To know the bookseller this script has to display details.
 
 =back
diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index e324a29..05e8db2 100755
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -23,27 +23,27 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 NAME
+
 updatesupplier.pl
 
 =head1 DESCRIPTION
+
 this script allow to update or create (if id == 0)
 a supplier. This script is called from acqui/supplier.pl.
 
 =head1 CGI PARAMETERS
 
-=over 4
-
 All informations regarding this supplier are listed on input parameter.
 Here is the list :
+
 supplier, id, company, company_postal, physical, company_phone,
 physical, company_phone, company_fax, website, company_contact_name,
 company_contact_position, contact_phone, contact_phone_2, contact_fax,
 company_email, contact_notes, notes, status, publishers_imprints,
 list_currency, gst, list_gst, invoice_gst, discount, gstrate.
 
-=back
-
 =cut
+
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
diff --git a/admin/branches.pl b/admin/branches.pl
index 27d374e..758fa32 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -21,7 +21,7 @@
 
  FIXME: individual fields in branch address need to be exported to templates,
         in order to fix bug 180; need to notify translators
-FIXME: looped html (e.g., list of checkboxes) need to be properly
+ FIXME: looped html (e.g., list of checkboxes) need to be properly
         TMPL_LOOP'ized; doing this properly will fix bug 130; need to
         notify translators
  FIXME: need to implement the branch categories stuff
@@ -34,7 +34,7 @@ FIXME: looped html (e.g., list of checkboxes) need to be properly
 
  Finlay working on this file from 26-03-2002
  Reorganising this branches admin page.....
- 
+
 =cut
 
 use strict;
diff --git a/admin/check_budget_parent.pl b/admin/check_budget_parent.pl
index 810e117..8f56e2c 100755
--- a/admin/check_budget_parent.pl
+++ b/admin/check_budget_parent.pl
@@ -25,7 +25,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 DESCRIPTION
 
 fetches the budget amount fron the DB,
 called by aqbudgets.pl and neworderempty.pl
diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl
index 76b3e9a..f5d5000 100755
--- a/admin/check_parent_total.pl
+++ b/admin/check_parent_total.pl
@@ -25,7 +25,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 DESCRIPTION
 
 This script checks the amount unallocated from the new parent budget , or the period - if no parent_id is given
 
diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 468021c..491aed6 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -37,8 +37,14 @@ use vars qw( $is_a_modif );
 my $itemtype; # created here because it can be used in build_authorized_values_list sub
 our($authorised_values_sth,$is_a_modif,$usedTagsLib,$mandatory_z3950);
 
+=head1 FUNCTIONS
+
+=over
+
 =item build_authorized_values_list
 
+builds list, depending on authorised value...
+
 =cut
 
 sub build_authorized_values_list ($$$$$$$) {
@@ -47,7 +53,6 @@ sub build_authorized_values_list ($$$$$$$) {
     my @authorised_values;
     my %authorised_lib;
 
-    # builds list, depending on authorised value...
 
     #---- branch
     if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
@@ -111,7 +116,9 @@ sub build_authorized_values_list ($$$$$$$) {
 
 
 =item create_input
+
 builds the <input ...> entry for a subfield.
+
 =cut
 
 sub create_input {
@@ -310,7 +317,7 @@ sub format_indicator {
 
 =item CreateKey
 
-    Create a random value to set it into the input name
+Create a random value to set it into the input name
 
 =cut
 
@@ -519,6 +526,11 @@ sub build_hidden_data () {
     }
 }
 
+=back
+
+=cut
+
+
 # ======================== 
 #          MAIN 
 #=========================
diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl
index e21105b..3c6ef74 100755
--- a/cataloguing/value_builder/barcode.pl
+++ b/cataloguing/value_builder/barcode.pl
@@ -30,6 +30,7 @@ my $DEBUG = 0;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 #   my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
     return "";
@@ -49,6 +50,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
 	my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 	my $function_name= "barcode".(int(rand(100000))+1);
diff --git a/cataloguing/value_builder/dateaccessioned.pl b/cataloguing/value_builder/dateaccessioned.pl
index 3b8e8c0..3a9a3da 100755
--- a/cataloguing/value_builder/dateaccessioned.pl
+++ b/cataloguing/value_builder/dateaccessioned.pl
@@ -27,6 +27,7 @@
 plugin_parameters : useless here
 
 =cut
+
 sub plugin_parameters {
 	# my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 	return "";
@@ -46,6 +47,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
 	# my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 	my $function_name = "dateaccessioned".(int(rand(100000))+1);
diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl
index 4b2a202..2d535c1 100755
--- a/cataloguing/value_builder/macles.pl
+++ b/cataloguing/value_builder/macles.pl
@@ -36,6 +36,7 @@ use utf8;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_field_003.pl b/cataloguing/value_builder/marc21_field_003.pl
index 531f586..e08ee6c 100755
--- a/cataloguing/value_builder/marc21_field_003.pl
+++ b/cataloguing/value_builder/marc21_field_003.pl
@@ -27,6 +27,7 @@ use C4::Context;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
     # my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
     return "";
@@ -46,6 +47,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
     my $function_name= $field_number;
diff --git a/cataloguing/value_builder/marc21_field_005.pl b/cataloguing/value_builder/marc21_field_005.pl
index 3c33145..7db29b7 100755
--- a/cataloguing/value_builder/marc21_field_005.pl
+++ b/cataloguing/value_builder/marc21_field_005.pl
@@ -46,6 +46,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
     my $function_name= $field_number;
diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl
index b244f0b..69b79d0 100755
--- a/cataloguing/value_builder/marc21_leader.pl
+++ b/cataloguing/value_builder/marc21_leader.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_leader_authorities.pl b/cataloguing/value_builder/marc21_leader_authorities.pl
index bbbc85e..b9cbe8b 100755
--- a/cataloguing/value_builder/marc21_leader_authorities.pl
+++ b/cataloguing/value_builder/marc21_leader_authorities.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_leader_book.pl b/cataloguing/value_builder/marc21_leader_book.pl
index 6eb0f61..005ea97 100755
--- a/cataloguing/value_builder/marc21_leader_book.pl
+++ b/cataloguing/value_builder/marc21_leader_book.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_leader_computerfile.pl b/cataloguing/value_builder/marc21_leader_computerfile.pl
index 9ce7f91..800b445 100755
--- a/cataloguing/value_builder/marc21_leader_computerfile.pl
+++ b/cataloguing/value_builder/marc21_leader_computerfile.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_leader_video.pl b/cataloguing/value_builder/marc21_leader_video.pl
index 62e98da..3e72ad9 100755
--- a/cataloguing/value_builder/marc21_leader_video.pl
+++ b/cataloguing/value_builder/marc21_leader_video.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/stocknumber.pl b/cataloguing/value_builder/stocknumber.pl
index 88e726a..005f011 100755
--- a/cataloguing/value_builder/stocknumber.pl
+++ b/cataloguing/value_builder/stocknumber.pl
@@ -21,19 +21,20 @@
 #use warnings; FIXME - Bug 2505
 use C4::Context;
 
-=head1
+=head1 plugin_parameters
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 #   my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
     return "";
 }
 
-=head1
+=head1 plugin_javascript
 
-plugin_javascript : the javascript function called when the user enters the subfield.
+The javascript function called when the user enters the subfield.
 contain 3 javascript functions :
 * one called when the field is entered (OnFocus). Named FocusXXX
 * one called when the field is leaved (onBlur). Named BlurXXX
@@ -45,6 +46,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
 	my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 	my $function_name= "inventory".(int(rand(100000))+1);
diff --git a/installer/data/mysql/update22to30.pl b/installer/data/mysql/update22to30.pl
index 6d5b1cc..76bb3c2 100755
--- a/installer/data/mysql/update22to30.pl
+++ b/installer/data/mysql/update22to30.pl
@@ -3538,12 +3538,12 @@ my $DBversion = "3.00.00.000";
     print "upgrade to Koha 3.0 done\n";
     SetVersion ($DBversion);
 
-
-=item GetDefaultClause
+=head1 GetDefaultClause
 
 Generate a default clause (for an ALTER TABLE command)
 
 =cut
+
 sub GetDefaultClause {
     my $default = shift;
 
@@ -3554,11 +3554,11 @@ sub GetDefaultClause {
     return "default " . $dbh->quote($default);
 }
 
-=item TransformToNum
+=head1 TransformToNum
+
+Transform the Koha version from a 4 parts string
+to a number, with just 1.
 
-  Transform the Koha version from a 4 parts string
-  to a number, with just 1 .
-  
 =cut
 
 sub TransformToNum {
@@ -3568,8 +3568,10 @@ sub TransformToNum {
     return $version;
 }
 
-=item SetVersion
-    set the DBversion in the systempreferences
+=head1 SetVersion
+
+set the DBversion in the systempreferences
+
 =cut
 
 sub SetVersion {
diff --git a/kohaversion.pl b/kohaversion.pl
index 0ddf98e..1c409f3 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -1,11 +1,17 @@
 # the next koha public release version number;
-# the kohaversion is divided in 4 parts :
-# - #1 : the major number. 3 atm
-# - #2 : the functionnal release. 00 atm
-# - #3 : the subnumber, moves only on a public release
-# - #4 : the developer version. The 4th number is the database subversion.
-#        used by developers when the database changes. updatedatabase take care of the changes itself
-#        and is automatically called by Auth.pm when needed.
+
+=head1 FUNCTIONS
+
+=head2 kohaversion
+
+the kohaversion is divided in 4 parts :
+ - #1 : the major number. 3 atm
+ - #2 : the functionnal release. 00 atm
+ - #3 : the subnumber, moves only on a public release
+ - #4 : the developer version. The 4th number is the database subversion.
+        used by developers when the database changes. updatedatabase take care of the changes itself
+        and is automatically called by Auth.pm when needed.
+=cut
 
 use strict;
 
diff --git a/labels/label-create-csv.pl b/labels/label-create-csv.pl
index c053842..50262df 100755
--- a/labels/label-create-csv.pl
+++ b/labels/label-create-csv.pl
@@ -11,10 +11,6 @@ use C4::Debug;
 use C4::Creators 1.000000;
 use C4::Labels 1.000000;
 
-=head
-
-=cut
-
 my $cgi = new CGI;
 
 my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
diff --git a/labels/label-create-xml.pl b/labels/label-create-xml.pl
index 85e4136..a6c5808 100755
--- a/labels/label-create-xml.pl
+++ b/labels/label-create-xml.pl
@@ -11,10 +11,6 @@ use C4::Debug;
 use C4::Creators 1.000000;
 use C4::Labels 1.000000;
 
-=head
-
-=cut
-
 my $cgi = new CGI;
 
 my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
diff --git a/members/patronimage.pl b/members/patronimage.pl
index c5e061a..e76d117 100755
--- a/members/patronimage.pl
+++ b/members/patronimage.pl
@@ -76,8 +76,6 @@ if ($imagedata) {
 
 exit;
 
-=back
-
 =head1 AUTHOR
 
 Chris Nighswonger cnighswonger <at> foundations <dot> edu
diff --git a/misc/cronjobs/check-url.pl b/misc/cronjobs/check-url.pl
index 063eb7e..3936b49 100755
--- a/misc/cronjobs/check-url.pl
+++ b/misc/cronjobs/check-url.pl
@@ -38,7 +38,7 @@ C4::URL::Checker - base object for checking URL stored in Koha DB
            "is_success: ", $url->{ is_success }, "\n",
            "status:     ", $url->{ status     }, "\n";
  }
- 
+
 =head1 FUNCTIONS
 
 =head2 new
diff --git a/tools/letter.pl b/tools/letter.pl
index 0f5113d..4416c3f 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -36,6 +36,7 @@
 	- we delete the designated record
 
 =cut
+
 # TODO This script drives the CRUD operations on the letter table
 # The DB interaction should be handled by calls to C4/Letters.pm
 
-- 
1.7.0.4


From andrew.elwell at gmail.com  Thu Nov 11 13:52:30 2010
From: andrew.elwell at gmail.com (Andrew Elwell)
Date: Thu, 11 Nov 2010 13:52:30 +0100
Subject: [Koha-patches] [PATCH 2/2] POD Cleanups (part 2)
In-Reply-To: <1289479950-3085-1-git-send-email-Andrew.Elwell@gmail.com>
References: <1289479950-3085-1-git-send-email-Andrew.Elwell@gmail.com>
Message-ID: <1289479950-3085-2-git-send-email-Andrew.Elwell@gmail.com>

More podchecker cleanups to eliminate warnings / errors

Signed-off-by: Andrew Elwell <Andrew.Elwell at gmail.com>
---
 authorities/blinddetail-biblio-search.pl           |    3 +-
 authorities/detail-biblio-search.pl                |    5 +--
 authorities/detail.pl                              |    3 +-
 catalogue/ISBDdetail.pl                            |    3 +-
 catalogue/MARCdetail.pl                            |    3 +-
 catalogue/search.pl                                |    2 +-
 cataloguing/addbiblio.pl                           |   16 ++++++-----
 cataloguing/merge.pl                               |    7 +++-
 cataloguing/value_builder/callnumber.pl            |    2 +-
 cataloguing/value_builder/marc21_field_006.pl      |    2 +-
 cataloguing/value_builder/marc21_field_007.pl      |    2 +-
 cataloguing/value_builder/marc21_field_008.pl      |    2 +-
 .../value_builder/marc21_field_008_authorities.pl  |    2 +-
 cataloguing/value_builder/marc21_field_040d.pl     |   22 +++++++++-------
 cataloguing/value_builder/marc21_field_245h.pl     |   24 +++++++++--------
 cataloguing/value_builder/stocknumberam123.pl      |    2 +-
 cataloguing/value_builder/unimarc_field_010.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_100.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_105.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_106.pl     |    7 +++-
 cataloguing/value_builder/unimarc_field_110.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_115a.pl    |    6 +++-
 cataloguing/value_builder/unimarc_field_115b.pl    |    6 +++-
 cataloguing/value_builder/unimarc_field_116.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_117.pl     |    7 +++-
 cataloguing/value_builder/unimarc_field_120.pl     |    7 +++-
 cataloguing/value_builder/unimarc_field_121a.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_121b.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_122.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_123a.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_123d.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_123e.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_123f.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_123g.pl    |    7 +++-
 installer/data/mysql/updatedatabase.pl             |   27 ++++++++-----------
 misc/cronjobs/cloud-kw.pl                          |    2 +-
 misc/cronjobs/holds/build_holds_queue.pl           |   26 ++++--------------
 misc/cronjobs/runreport.pl                         |   18 +++++++++---
 misc/maintenance/fix_accountlines_date.pl          |    2 +
 misc/translator/update.pl                          |    7 +++--
 offline_circ/process_koc.pl                        |   10 ++++---
 opac/opac-ISBDdetail.pl                            |    5 +---
 opac/opac-MARCdetail.pl                            |    1 +
 opac/opac-authoritiesdetail.pl                     |    3 +-
 opac/opac-tags.pl                                  |    6 +++-
 opac/opac-topissues.pl                             |    2 -
 reports/dictionary.pl                              |    3 --
 reports/guided_reports.pl                          |    2 -
 tools/csv-profiles.pl                              |    3 +-
 tools/picture-upload.pl                            |    4 +--
 50 files changed, 187 insertions(+), 152 deletions(-)

diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index e723187..1495348 100755
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -23,6 +23,7 @@ blinddetail-biblio-search.pl : script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,8 +34,6 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/authorities/detail-biblio-search.pl b/authorities/detail-biblio-search.pl
index 31b5146..56a1a45 100755
--- a/authorities/detail-biblio-search.pl
+++ b/authorities/detail-biblio-search.pl
@@ -19,10 +19,11 @@
 
 =head1 NAME
 
-etail.pl : script to show an authority in MARC format
+detail-biblio-search.pl - script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,8 +34,6 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 
diff --git a/authorities/detail.pl b/authorities/detail.pl
index 18d6c6a..f92e04b 100755
--- a/authorities/detail.pl
+++ b/authorities/detail.pl
@@ -23,6 +23,7 @@ detail.pl : script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,8 +34,6 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 
diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index 40a434d..7ebe8e0 100755
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -23,6 +23,7 @@ ISBDdetail.pl : script to show a biblio in ISBD format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -30,8 +31,6 @@ This script needs a biblionumber as parameter
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index b543d75..2dc7b1d 100755
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -23,6 +23,7 @@ MARCdetail.pl : script to show a biblio in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -39,8 +40,6 @@ the items attached to the biblio
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/catalogue/search.pl b/catalogue/search.pl
index 920afb7..485af67 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -79,7 +79,7 @@ There are several additional secondary functions performed that I will
 not cover in detail.
 
 =head3 1. Building Query Strings
-    
+
 There are several types of queries needed in the process of search and retrieve:
 
 =over
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 85c0566..86c049e 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -45,7 +45,9 @@ if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
 
 our($tagslib,$authorised_values_sth,$is_a_modif,$usedTagsLib,$mandatory_z3950);
 
-=item MARCfindbreeding
+=head1 FUNCTIONS
+
+=head2 MARCfindbreeding
 
     $record = MARCfindbreeding($breedingid);
 
@@ -152,7 +154,7 @@ sub MARCfindbreeding {
     return -1;
 }
 
-=item build_authorized_values_list
+=head2 build_authorized_values_list
 
 =cut
 
@@ -243,7 +245,7 @@ sub build_authorized_values_list ($$$$$$$) {
     );
 }
 
-=item CreateKey
+=head2 CreateKey
 
     Create a random value to set it into the input name
 
@@ -253,11 +255,11 @@ sub CreateKey(){
     return int(rand(1000000));
 }
 
-=item GetMandatoryFieldZ3950
+=head2 GetMandatoryFieldZ3950
 
     This function return an hashref which containts all mandatory field
     to search with z3950 server.
-    
+
 =cut
 
 sub GetMandatoryFieldZ3950($){
@@ -277,7 +279,7 @@ sub GetMandatoryFieldZ3950($){
     };
 }
 
-=item create_input
+=head2 create_input
 
  builds the <input ...> entry for a subfield.
 
@@ -514,7 +516,7 @@ sub create_input {
 }
 
 
-=item format_indicator
+=head2 format_indicator
 
 Translate indicator value for output form - specifically, map
 indicator = ' ' to ''.  This is for the convenience of a cataloger
diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl
index 1b890ba..eaf0c97 100755
--- a/cataloguing/merge.pl
+++ b/cataloguing/merge.pl
@@ -179,6 +179,9 @@ if ($merge) {
 output_html_with_http_headers $input, $cookie, $template->output;
 exit;
 
+=head1 FUNCTIONS
+
+=cut
 
 # ------------------------
 # Functions
@@ -238,9 +241,9 @@ sub _createMarcHash {
 
 }
 
-=item CreateKey
+=head2 CreateKey
 
-    Create a random value to set it into the input name
+Create a random value to set it into the input name
 
 =cut
 
diff --git a/cataloguing/value_builder/callnumber.pl b/cataloguing/value_builder/callnumber.pl
index 2b56958..cc37af0 100755
--- a/cataloguing/value_builder/callnumber.pl
+++ b/cataloguing/value_builder/callnumber.pl
@@ -23,7 +23,7 @@ use C4::Auth;
 use CGI;
 use C4::Context;
 
-=head1
+=head1 DESCRIPTION
 
 Is used for callnumber computation.
 
diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index c2de828..6d84cb4 100755
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -26,7 +26,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index 240e4d6..c852fa0 100755
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -27,7 +27,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index 0ed2963..57e0690 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -26,7 +26,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl
index fd3f203..b887806 100755
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -27,7 +27,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
diff --git a/cataloguing/value_builder/marc21_field_040d.pl b/cataloguing/value_builder/marc21_field_040d.pl
index 51a053f..64e5bd3 100755
--- a/cataloguing/value_builder/marc21_field_040d.pl
+++ b/cataloguing/value_builder/marc21_field_040d.pl
@@ -23,7 +23,7 @@ use strict;
 use C4::Context;
 # use MARC::Record;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
@@ -34,17 +34,19 @@ sub plugin_parameters {
     return "";
 }
 
-=head1
+=head1 FUNCTIONS
 
-plugin_javascript : the javascript function called when the user enters the subfield.
+=head2 plugin_javascript
+
+The javascript function called when the user enters the subfield.
 contain 3 javascript functions :
-* one called when the field is entered (OnFocus). Named FocusXXX
-* one called when the field is leaved (onBlur). Named BlurXXX
-* one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
+ * one called when the field is entered (OnFocus). Named FocusXXX
+ * one called when the field is leaved (onBlur). Named BlurXXX
+ * one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
 
 returns :
-* XXX
-* a variable containing the 3 scripts.
+ * XXX
+ * a variable containing the 3 scripts.
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
@@ -76,9 +78,9 @@ function Clic$function_name(subfield_managed) {
 return ($function_name,$res);
 }
 
-=head1
+=head2 plugin
 
-plugin : the true value_builded. The screen that is open in the popup window.
+the true value_builded. The screen that is open in the popup window.
 
 =cut
 
diff --git a/cataloguing/value_builder/marc21_field_245h.pl b/cataloguing/value_builder/marc21_field_245h.pl
index 6198456..9ab2ca1 100755
--- a/cataloguing/value_builder/marc21_field_245h.pl
+++ b/cataloguing/value_builder/marc21_field_245h.pl
@@ -22,9 +22,11 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+other parameters added when the plugin is called by the dopop function
 
 =cut
 
@@ -32,17 +34,17 @@ sub plugin_parameters {
     return "";
 }
 
-=head1
+=head2 plugin_javascript
 
-plugin_javascript : the javascript function called when the user enters the subfield.
+Thee javascript function called when the user enters the subfield.
 contain 3 javascript functions :
-* one called when the field is entered (OnFocus). Named FocusXXX
-* one called when the field is leaved (onBlur). Named BlurXXX
-* one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
+ * one called when the field is entered (OnFocus). Named FocusXXX
+ * one called when the field is leaved (onBlur). Named BlurXXX
+ * one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
 
 returns :
-* XXX
-* a variable containing the 3 scripts.
+ * XXX
+ * a variable containing the 3 scripts.
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
@@ -79,9 +81,9 @@ function Clic$function_name(subfield_managed) {
 return ($function_name,$res);
 }
 
-=head1
+=head2 plugin
 
-plugin : the true value_builded. The screen that is open in the popup window.
+The true value_builded. The screen that is open in the popup window.
 
 =cut
 
diff --git a/cataloguing/value_builder/stocknumberam123.pl b/cataloguing/value_builder/stocknumberam123.pl
index 014fd86..ab88f61 100755
--- a/cataloguing/value_builder/stocknumberam123.pl
+++ b/cataloguing/value_builder/stocknumberam123.pl
@@ -23,7 +23,7 @@ use C4::Auth;
 use CGI;
 use C4::Context;
 
-=head1
+=head1 DESCRIPTION
 
 This plugin is specific to AM123 but could be used as a base for similar operations.
 It is used for stocknumber computation.
diff --git a/cataloguing/value_builder/unimarc_field_010.pl b/cataloguing/value_builder/unimarc_field_010.pl
index 5e319d9..19dbb9f 100755
--- a/cataloguing/value_builder/unimarc_field_010.pl
+++ b/cataloguing/value_builder/unimarc_field_010.pl
@@ -25,9 +25,11 @@ use CGI;
 use C4::Context;
 
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index 917b5c1..c49b956 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -26,9 +26,11 @@ use C4::Context;
 use C4::Output;
 
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index 94cf84c..8d44a82 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_106.pl b/cataloguing/value_builder/unimarc_field_106.pl
index 725baf9..0b51a18 100755
--- a/cataloguing/value_builder/unimarc_field_106.pl
+++ b/cataloguing/value_builder/unimarc_field_106.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index 56f4bc8..848a53a 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index b6a89ef..6144771 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 50a1433..7582e74 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index 696d5a7..21e2368 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index 8bc9fc7..ff206f7 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index 8da2f6b..3f72c85 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index f94dda2..a855332 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_121b.pl b/cataloguing/value_builder/unimarc_field_121b.pl
index 9891b29..2d570d7 100755
--- a/cataloguing/value_builder/unimarc_field_121b.pl
+++ b/cataloguing/value_builder/unimarc_field_121b.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_122.pl b/cataloguing/value_builder/unimarc_field_122.pl
index 47d8d4c..045bd66 100755
--- a/cataloguing/value_builder/unimarc_field_122.pl
+++ b/cataloguing/value_builder/unimarc_field_122.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_123a.pl b/cataloguing/value_builder/unimarc_field_123a.pl
index 7b8b9e3..0fe85dc 100755
--- a/cataloguing/value_builder/unimarc_field_123a.pl
+++ b/cataloguing/value_builder/unimarc_field_123a.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_123d.pl b/cataloguing/value_builder/unimarc_field_123d.pl
index 4627aea..1df7fbc 100755
--- a/cataloguing/value_builder/unimarc_field_123d.pl
+++ b/cataloguing/value_builder/unimarc_field_123d.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_123e.pl b/cataloguing/value_builder/unimarc_field_123e.pl
index 4627aea..1df7fbc 100755
--- a/cataloguing/value_builder/unimarc_field_123e.pl
+++ b/cataloguing/value_builder/unimarc_field_123e.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_123f.pl b/cataloguing/value_builder/unimarc_field_123f.pl
index c598552..5932db5 100755
--- a/cataloguing/value_builder/unimarc_field_123f.pl
+++ b/cataloguing/value_builder/unimarc_field_123f.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_123g.pl b/cataloguing/value_builder/unimarc_field_123g.pl
index 4627aea..1df7fbc 100755
--- a/cataloguing/value_builder/unimarc_field_123g.pl
+++ b/cataloguing/value_builder/unimarc_field_123g.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 3aa1e20..27daa38 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -50,11 +50,8 @@ GetOptions(
 my $dbh = C4::Context->dbh;
 $|=1; # flushes output
 
-=item
 
-    Deal with virtualshelves
-
-=cut
+# Deal with virtualshelves
 
 my $DBversion = "3.00.00.001";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
@@ -2789,11 +2786,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 	print "Upgrade to $DBversion done ( Adding enddate to subscription)\n";
 }
 
-=item
-
-Acquisitions update
-
-=cut
+# Acquisitions update
 
 $DBversion = "3.01.00.072";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
@@ -3842,9 +3835,11 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
-=item DropAllForeignKeys($table)
+=head1 FUNCTIONS
+
+=head2 DropAllForeignKeys($table)
 
-  Drop all foreign keys of the table $table
+Drop all foreign keys of the table $table
 
 =cut
 
@@ -3871,10 +3866,10 @@ sub DropAllForeignKeys {
 }
 
 
-=item TransformToNum
+=head2 TransformToNum
 
-  Transform the Koha version from a 4 parts string
-  to a number, with just 1 .
+Transform the Koha version from a 4 parts string
+to a number, with just 1 .
 
 =cut
 
@@ -3885,9 +3880,9 @@ sub TransformToNum {
     return $version;
 }
 
-=item SetVersion
+=head2 SetVersion
 
-    set the DBversion in the systempreferences
+set the DBversion in the systempreferences
 
 =cut
 
diff --git a/misc/cronjobs/cloud-kw.pl b/misc/cronjobs/cloud-kw.pl
index ae917fe..11aaf88 100755
--- a/misc/cronjobs/cloud-kw.pl
+++ b/misc/cronjobs/cloud-kw.pl
@@ -345,7 +345,7 @@ Print this help page.
 =back
 
 =head1 CONFIGURATION
-    
+
 Configuration file looks like that:
 
  --- 
diff --git a/misc/cronjobs/holds/build_holds_queue.pl b/misc/cronjobs/holds/build_holds_queue.pl
index fab6b96..b02ab60 100755
--- a/misc/cronjobs/holds/build_holds_queue.pl
+++ b/misc/cronjobs/holds/build_holds_queue.pl
@@ -64,13 +64,11 @@ foreach my $biblionumber (@$bibs_with_pending_requests) {
 
 exit 0;
 
-=head2 GetBibsWithPendingHoldRequests
-
-=over 4
+=head1 FUNCTIONS
 
-my $biblionumber_aref = GetBibsWithPendingHoldRequests();
+=head2 GetBibsWithPendingHoldRequests
 
-=back
+  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
 
 Return an arrayref of the biblionumbers of all bibs
 that have one or more unfilled hold requests.
@@ -95,11 +93,7 @@ sub GetBibsWithPendingHoldRequests {
 
 =head2 GetPendingHoldRequestsForBib
 
-=over 4
-
-my $requests = GetPendingHoldRequestsForBib($biblionumber);
-
-=back
+  my $requests = GetPendingHoldRequestsForBib($biblionumber);
 
 Returns an arrayref of hashrefs to pending, unfilled hold requests
 on the bib identified by $biblionumber.  The following keys
@@ -142,11 +136,7 @@ sub GetPendingHoldRequestsForBib {
 
 =head2 GetItemsAvailableToFillHoldRequestsForBib
 
-=over 4
-
-my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber);
-
-=back
+  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber);
 
 Returns an arrayref of items available to fill hold requests
 for the bib identified by C<$biblionumber>.  An item is available
@@ -205,11 +195,7 @@ sub GetItemsAvailableToFillHoldRequestsForBib {
 
 =head2 MapItemsToHoldRequests
 
-=over 4
-
-MapItemsToHoldRequests($hold_requests, $available_items);
-
-=back
+  MapItemsToHoldRequests($hold_requests, $available_items);
 
 =cut
 
diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl
index bb91b15..3187e92 100755
--- a/misc/cronjobs/runreport.pl
+++ b/misc/cronjobs/runreport.pl
@@ -57,7 +57,7 @@ runreport.pl [ -h | -m ] [ -v ] reportID [ reportID ... ]
 
 =head1 OPTIONS
 
-=over 8
+=over
 
 =item B<-help>
 
@@ -90,11 +90,19 @@ Same as above, but also runs report #17.
 
 =head1 TO DO
 
-=over 8
+=over
 
- ~ Complete testing for Sendmail related options: --email, --to, and --from.
- ~ Allow Saved Results option.
- ~ Possible --format option for CSV or tab-delimited output.
+=item * 
+
+Complete testing for Sendmail related options: --email, --to, and --from.
+
+=item *
+
+Allow Saved Results option.
+
+=item *
+
+Possible --format option for CSV or tab-delimited output.
 
 =back
 
diff --git a/misc/maintenance/fix_accountlines_date.pl b/misc/maintenance/fix_accountlines_date.pl
index 94a33cd..2956f57 100755
--- a/misc/maintenance/fix_accountlines_date.pl
+++ b/misc/maintenance/fix_accountlines_date.pl
@@ -81,6 +81,8 @@ be in whatever format your 'dateformat' system preference specifies.
 Run in debugging mode; this prints out a lot of information and should be used
 only if there is a problem and with the '-n' option.
 
+=back
+
 =cut
 
 my $mode = '';
diff --git a/misc/translator/update.pl b/misc/translator/update.pl
index 9970c1e..6f31ffb 100755
--- a/misc/translator/update.pl
+++ b/misc/translator/update.pl
@@ -20,8 +20,9 @@ while (defined($po = readdir(DIR))) {
 }
 closedir DIR;
 
-=head
-my($theme, $module) = @$spec;
+=head1 EXAMPLE
+
+ my($theme, $module) = @$spec;
    my $pid = fork;
    die "fork: $!\n" unless defined $pid;
    if (!$pid) {
@@ -47,5 +48,5 @@ my($theme, $module) = @$spec;
       die "tmpl_process3.pl: exec: $!\n";
    }
    wait;
-}
+ }
 =cut
diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl
index d0a2596..5f0d9ff 100755
--- a/offline_circ/process_koc.pl
+++ b/offline_circ/process_koc.pl
@@ -158,7 +158,9 @@ if ($completedJobID) {
 
 output_html_with_http_headers $query, $cookie, $template->output;
 
-=head3 parse_header_line
+=head1 FUNCTIONS
+
+=head2 parse_header_line
 
 parses the header line from a .koc file. This is the line that
 specifies things such as the file version, and the name and version of
@@ -183,7 +185,7 @@ sub parse_header_line {
     return \%header_info;
 }
 
-=head3 parse_command_line
+=head2 parse_command_line
 
 =cut
 
@@ -210,7 +212,7 @@ sub parse_command_line {
 
 }
 
-=head3 arguments_for_command
+=head2 arguments_for_command
 
 fetches the names of the columns (and function arguments) found in the
 .koc file for a particular command name. For instance, the C<issue>
@@ -367,7 +369,7 @@ sub kocMakePayment {
     } );
 }
 
-=head3 _get_borrowernumber_from_barcode
+=head2 _get_borrowernumber_from_barcode
 
 pass in a barcode
 get back the borrowernumber of the patron who has it checked out.
diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 4883e89..88904da 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -20,8 +20,7 @@
 
 =head1 NAME
 
-opac-ISBDdetail.pl : script to show a biblio in ISBD format
-
+opac-ISBDdetail.pl - script to show a biblio in ISBD format
 
 =head1 DESCRIPTION
 
@@ -37,8 +36,6 @@ the items attached to the biblio
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index fae749c..d127202 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -23,6 +23,7 @@ MARCdetail.pl : script to show a biblio in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index be4beca..71f746e 100755
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.pl
@@ -23,6 +23,7 @@ opac-authoritiesdetail.pl : script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,8 +34,6 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl
index a362c74..b98ce40 100755
--- a/opac/opac-tags.pl
+++ b/opac/opac-tags.pl
@@ -18,7 +18,11 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-=head1 
+=head1 NAME
+
+opac-tags.pl
+
+=head1 DESCRIPTION
 
 TODO :: Description here
 
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 1d88850..70b712e 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -36,8 +36,6 @@ plugin that shows a stats on borrowers
 
 =head1 DESCRIPTION
 
-=over 2
-
 =cut
 
 my $input = new CGI;
diff --git a/reports/dictionary.pl b/reports/dictionary.pl
index 163e978..393c917 100755
--- a/reports/dictionary.pl
+++ b/reports/dictionary.pl
@@ -31,9 +31,6 @@ Script to control the guided report creation
 
 =head1 DESCRIPTION
 
-
-=over2
-
 =cut
 
 my $input = new CGI;
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index dbda180..dfec379 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -36,8 +36,6 @@ guided_reports.pl
 
 Script to control the guided report creation
 
-=over2
-
 =cut
 
 my $input = new CGI;
diff --git a/tools/csv-profiles.pl b/tools/csv-profiles.pl
index 6f467ee..32f2b98 100755
--- a/tools/csv-profiles.pl
+++ b/tools/csv-profiles.pl
@@ -23,6 +23,7 @@ csv-profile.pl : Defines a CSV export profile
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -30,8 +31,6 @@ This script allow the user to define a new profile for CSV export
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index 4642365..f4c75d8 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -58,7 +58,7 @@ $debug and warn "Params are: filetype=$filetype, cardnumber=$cardnumber, borrowe
 
 =head1 NAME
 
-picture-upload.p. - Script for handling uploading of both single and bulk patronimages and importing them into the database.
+picture-upload.pl - Script for handling uploading of both single and bulk patronimages and importing them into the database.
 
 =head1 SYNOPSIS
 
@@ -296,8 +296,6 @@ sub handle_file {
     return (%count);
 }
 
-=back
-
 =head1 AUTHORS
 
 Original contributor(s) undocumented
-- 
1.7.0.4


From gmcharlt at gmail.com  Thu Nov 11 14:18:47 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 08:18:47 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF 2/2] Bug 5385: POD Cleanups
	(part 2)
In-Reply-To: <1289481527-22761-1-git-send-email-gmcharlt@gmail.com>
References: <1289481527-22761-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289481527-22761-2-git-send-email-gmcharlt@gmail.com>

From: Andrew Elwell <andrew.elwell at gmail.com>

More podchecker cleanups to eliminate warnings / errors

Signed-off-by: Andrew Elwell <Andrew.Elwell at gmail.com>
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 authorities/blinddetail-biblio-search.pl           |    3 +-
 authorities/detail-biblio-search.pl                |    5 +--
 authorities/detail.pl                              |    3 +-
 catalogue/ISBDdetail.pl                            |    3 +-
 catalogue/MARCdetail.pl                            |    3 +-
 catalogue/search.pl                                |    2 +-
 cataloguing/addbiblio.pl                           |   16 ++++++-----
 cataloguing/merge.pl                               |    7 +++-
 cataloguing/value_builder/callnumber.pl            |    2 +-
 cataloguing/value_builder/marc21_field_006.pl      |    2 +-
 cataloguing/value_builder/marc21_field_007.pl      |    2 +-
 cataloguing/value_builder/marc21_field_008.pl      |    2 +-
 .../value_builder/marc21_field_008_authorities.pl  |    2 +-
 cataloguing/value_builder/marc21_field_040d.pl     |   22 +++++++++-------
 cataloguing/value_builder/marc21_field_245h.pl     |   24 +++++++++--------
 cataloguing/value_builder/stocknumberam123.pl      |    2 +-
 cataloguing/value_builder/unimarc_field_010.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_100.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_105.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_106.pl     |    7 +++-
 cataloguing/value_builder/unimarc_field_110.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_115a.pl    |    6 +++-
 cataloguing/value_builder/unimarc_field_115b.pl    |    6 +++-
 cataloguing/value_builder/unimarc_field_116.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_117.pl     |    7 +++-
 cataloguing/value_builder/unimarc_field_120.pl     |    7 +++-
 cataloguing/value_builder/unimarc_field_121a.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_121b.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_122.pl     |    6 +++-
 cataloguing/value_builder/unimarc_field_123a.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_123d.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_123e.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_123f.pl    |    7 +++-
 cataloguing/value_builder/unimarc_field_123g.pl    |    7 +++-
 installer/data/mysql/updatedatabase.pl             |   27 ++++++++-----------
 misc/cronjobs/cloud-kw.pl                          |    2 +-
 misc/cronjobs/holds/build_holds_queue.pl           |   26 ++++--------------
 misc/cronjobs/runreport.pl                         |   18 +++++++++---
 misc/maintenance/fix_accountlines_date.pl          |    2 +
 misc/translator/update.pl                          |    7 +++--
 offline_circ/process_koc.pl                        |   10 ++++---
 opac/opac-ISBDdetail.pl                            |    5 +---
 opac/opac-MARCdetail.pl                            |    1 +
 opac/opac-authoritiesdetail.pl                     |    3 +-
 opac/opac-tags.pl                                  |    6 +++-
 opac/opac-topissues.pl                             |    2 -
 reports/dictionary.pl                              |    3 --
 reports/guided_reports.pl                          |    2 -
 tools/csv-profiles.pl                              |    3 +-
 tools/picture-upload.pl                            |    4 +--
 50 files changed, 187 insertions(+), 152 deletions(-)

diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index e723187..1495348 100755
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -23,6 +23,7 @@ blinddetail-biblio-search.pl : script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,8 +34,6 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/authorities/detail-biblio-search.pl b/authorities/detail-biblio-search.pl
index 31b5146..56a1a45 100755
--- a/authorities/detail-biblio-search.pl
+++ b/authorities/detail-biblio-search.pl
@@ -19,10 +19,11 @@
 
 =head1 NAME
 
-etail.pl : script to show an authority in MARC format
+detail-biblio-search.pl - script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,8 +34,6 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 
diff --git a/authorities/detail.pl b/authorities/detail.pl
index 18d6c6a..f92e04b 100755
--- a/authorities/detail.pl
+++ b/authorities/detail.pl
@@ -23,6 +23,7 @@ detail.pl : script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,8 +34,6 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 
diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index 40a434d..7ebe8e0 100755
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -23,6 +23,7 @@ ISBDdetail.pl : script to show a biblio in ISBD format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -30,8 +31,6 @@ This script needs a biblionumber as parameter
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index b543d75..2dc7b1d 100755
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -23,6 +23,7 @@ MARCdetail.pl : script to show a biblio in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -39,8 +40,6 @@ the items attached to the biblio
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/catalogue/search.pl b/catalogue/search.pl
index 920afb7..485af67 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -79,7 +79,7 @@ There are several additional secondary functions performed that I will
 not cover in detail.
 
 =head3 1. Building Query Strings
-    
+
 There are several types of queries needed in the process of search and retrieve:
 
 =over
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 85c0566..86c049e 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -45,7 +45,9 @@ if ( C4::Context->preference('marcflavour') eq 'UNIMARC' ) {
 
 our($tagslib,$authorised_values_sth,$is_a_modif,$usedTagsLib,$mandatory_z3950);
 
-=item MARCfindbreeding
+=head1 FUNCTIONS
+
+=head2 MARCfindbreeding
 
     $record = MARCfindbreeding($breedingid);
 
@@ -152,7 +154,7 @@ sub MARCfindbreeding {
     return -1;
 }
 
-=item build_authorized_values_list
+=head2 build_authorized_values_list
 
 =cut
 
@@ -243,7 +245,7 @@ sub build_authorized_values_list ($$$$$$$) {
     );
 }
 
-=item CreateKey
+=head2 CreateKey
 
     Create a random value to set it into the input name
 
@@ -253,11 +255,11 @@ sub CreateKey(){
     return int(rand(1000000));
 }
 
-=item GetMandatoryFieldZ3950
+=head2 GetMandatoryFieldZ3950
 
     This function return an hashref which containts all mandatory field
     to search with z3950 server.
-    
+
 =cut
 
 sub GetMandatoryFieldZ3950($){
@@ -277,7 +279,7 @@ sub GetMandatoryFieldZ3950($){
     };
 }
 
-=item create_input
+=head2 create_input
 
  builds the <input ...> entry for a subfield.
 
@@ -514,7 +516,7 @@ sub create_input {
 }
 
 
-=item format_indicator
+=head2 format_indicator
 
 Translate indicator value for output form - specifically, map
 indicator = ' ' to ''.  This is for the convenience of a cataloger
diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl
index 1b890ba..eaf0c97 100755
--- a/cataloguing/merge.pl
+++ b/cataloguing/merge.pl
@@ -179,6 +179,9 @@ if ($merge) {
 output_html_with_http_headers $input, $cookie, $template->output;
 exit;
 
+=head1 FUNCTIONS
+
+=cut
 
 # ------------------------
 # Functions
@@ -238,9 +241,9 @@ sub _createMarcHash {
 
 }
 
-=item CreateKey
+=head2 CreateKey
 
-    Create a random value to set it into the input name
+Create a random value to set it into the input name
 
 =cut
 
diff --git a/cataloguing/value_builder/callnumber.pl b/cataloguing/value_builder/callnumber.pl
index 2b56958..cc37af0 100755
--- a/cataloguing/value_builder/callnumber.pl
+++ b/cataloguing/value_builder/callnumber.pl
@@ -23,7 +23,7 @@ use C4::Auth;
 use CGI;
 use C4::Context;
 
-=head1
+=head1 DESCRIPTION
 
 Is used for callnumber computation.
 
diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index c2de828..6d84cb4 100755
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -26,7 +26,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index 240e4d6..c852fa0 100755
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -27,7 +27,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index 0ed2963..57e0690 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -26,7 +26,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl
index fd3f203..b887806 100755
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -27,7 +27,7 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
diff --git a/cataloguing/value_builder/marc21_field_040d.pl b/cataloguing/value_builder/marc21_field_040d.pl
index 51a053f..64e5bd3 100755
--- a/cataloguing/value_builder/marc21_field_040d.pl
+++ b/cataloguing/value_builder/marc21_field_040d.pl
@@ -23,7 +23,7 @@ use strict;
 use C4::Context;
 # use MARC::Record;
 
-=head1
+=head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
@@ -34,17 +34,19 @@ sub plugin_parameters {
     return "";
 }
 
-=head1
+=head1 FUNCTIONS
 
-plugin_javascript : the javascript function called when the user enters the subfield.
+=head2 plugin_javascript
+
+The javascript function called when the user enters the subfield.
 contain 3 javascript functions :
-* one called when the field is entered (OnFocus). Named FocusXXX
-* one called when the field is leaved (onBlur). Named BlurXXX
-* one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
+ * one called when the field is entered (OnFocus). Named FocusXXX
+ * one called when the field is leaved (onBlur). Named BlurXXX
+ * one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
 
 returns :
-* XXX
-* a variable containing the 3 scripts.
+ * XXX
+ * a variable containing the 3 scripts.
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
@@ -76,9 +78,9 @@ function Clic$function_name(subfield_managed) {
 return ($function_name,$res);
 }
 
-=head1
+=head2 plugin
 
-plugin : the true value_builded. The screen that is open in the popup window.
+the true value_builded. The screen that is open in the popup window.
 
 =cut
 
diff --git a/cataloguing/value_builder/marc21_field_245h.pl b/cataloguing/value_builder/marc21_field_245h.pl
index 6198456..9ab2ca1 100755
--- a/cataloguing/value_builder/marc21_field_245h.pl
+++ b/cataloguing/value_builder/marc21_field_245h.pl
@@ -22,9 +22,11 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+other parameters added when the plugin is called by the dopop function
 
 =cut
 
@@ -32,17 +34,17 @@ sub plugin_parameters {
     return "";
 }
 
-=head1
+=head2 plugin_javascript
 
-plugin_javascript : the javascript function called when the user enters the subfield.
+Thee javascript function called when the user enters the subfield.
 contain 3 javascript functions :
-* one called when the field is entered (OnFocus). Named FocusXXX
-* one called when the field is leaved (onBlur). Named BlurXXX
-* one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
+ * one called when the field is entered (OnFocus). Named FocusXXX
+ * one called when the field is leaved (onBlur). Named BlurXXX
+ * one called when the ... link is clicked (<a href="javascript:function">) named ClicXXX
 
 returns :
-* XXX
-* a variable containing the 3 scripts.
+ * XXX
+ * a variable containing the 3 scripts.
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
@@ -79,9 +81,9 @@ function Clic$function_name(subfield_managed) {
 return ($function_name,$res);
 }
 
-=head1
+=head2 plugin
 
-plugin : the true value_builded. The screen that is open in the popup window.
+The true value_builded. The screen that is open in the popup window.
 
 =cut
 
diff --git a/cataloguing/value_builder/stocknumberam123.pl b/cataloguing/value_builder/stocknumberam123.pl
index 014fd86..ab88f61 100755
--- a/cataloguing/value_builder/stocknumberam123.pl
+++ b/cataloguing/value_builder/stocknumberam123.pl
@@ -23,7 +23,7 @@ use C4::Auth;
 use CGI;
 use C4::Context;
 
-=head1
+=head1 DESCRIPTION
 
 This plugin is specific to AM123 but could be used as a base for similar operations.
 It is used for stocknumber computation.
diff --git a/cataloguing/value_builder/unimarc_field_010.pl b/cataloguing/value_builder/unimarc_field_010.pl
index 5e319d9..19dbb9f 100755
--- a/cataloguing/value_builder/unimarc_field_010.pl
+++ b/cataloguing/value_builder/unimarc_field_010.pl
@@ -25,9 +25,11 @@ use CGI;
 use C4::Context;
 
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index 917b5c1..c49b956 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -26,9 +26,11 @@ use C4::Context;
 use C4::Output;
 
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index 94cf84c..8d44a82 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_106.pl b/cataloguing/value_builder/unimarc_field_106.pl
index 725baf9..0b51a18 100755
--- a/cataloguing/value_builder/unimarc_field_106.pl
+++ b/cataloguing/value_builder/unimarc_field_106.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index 56f4bc8..848a53a 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index b6a89ef..6144771 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 50a1433..7582e74 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index 696d5a7..21e2368 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index 8bc9fc7..ff206f7 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index 8da2f6b..3f72c85 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index f94dda2..a855332 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_121b.pl b/cataloguing/value_builder/unimarc_field_121b.pl
index 9891b29..2d570d7 100755
--- a/cataloguing/value_builder/unimarc_field_121b.pl
+++ b/cataloguing/value_builder/unimarc_field_121b.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_122.pl b/cataloguing/value_builder/unimarc_field_122.pl
index 47d8d4c..045bd66 100755
--- a/cataloguing/value_builder/unimarc_field_122.pl
+++ b/cataloguing/value_builder/unimarc_field_122.pl
@@ -27,9 +27,11 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
 
diff --git a/cataloguing/value_builder/unimarc_field_123a.pl b/cataloguing/value_builder/unimarc_field_123a.pl
index 7b8b9e3..0fe85dc 100755
--- a/cataloguing/value_builder/unimarc_field_123a.pl
+++ b/cataloguing/value_builder/unimarc_field_123a.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_123d.pl b/cataloguing/value_builder/unimarc_field_123d.pl
index 4627aea..1df7fbc 100755
--- a/cataloguing/value_builder/unimarc_field_123d.pl
+++ b/cataloguing/value_builder/unimarc_field_123d.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_123e.pl b/cataloguing/value_builder/unimarc_field_123e.pl
index 4627aea..1df7fbc 100755
--- a/cataloguing/value_builder/unimarc_field_123e.pl
+++ b/cataloguing/value_builder/unimarc_field_123e.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_123f.pl b/cataloguing/value_builder/unimarc_field_123f.pl
index c598552..5932db5 100755
--- a/cataloguing/value_builder/unimarc_field_123f.pl
+++ b/cataloguing/value_builder/unimarc_field_123f.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/unimarc_field_123g.pl b/cataloguing/value_builder/unimarc_field_123g.pl
index 4627aea..1df7fbc 100755
--- a/cataloguing/value_builder/unimarc_field_123g.pl
+++ b/cataloguing/value_builder/unimarc_field_123g.pl
@@ -27,11 +27,14 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
-=head1
+=head1 FUNCTIONS
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+=head2 plugin_parameters
+
+Other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 3aa1e20..27daa38 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -50,11 +50,8 @@ GetOptions(
 my $dbh = C4::Context->dbh;
 $|=1; # flushes output
 
-=item
 
-    Deal with virtualshelves
-
-=cut
+# Deal with virtualshelves
 
 my $DBversion = "3.00.00.001";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
@@ -2789,11 +2786,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 	print "Upgrade to $DBversion done ( Adding enddate to subscription)\n";
 }
 
-=item
-
-Acquisitions update
-
-=cut
+# Acquisitions update
 
 $DBversion = "3.01.00.072";
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
@@ -3842,9 +3835,11 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
-=item DropAllForeignKeys($table)
+=head1 FUNCTIONS
+
+=head2 DropAllForeignKeys($table)
 
-  Drop all foreign keys of the table $table
+Drop all foreign keys of the table $table
 
 =cut
 
@@ -3871,10 +3866,10 @@ sub DropAllForeignKeys {
 }
 
 
-=item TransformToNum
+=head2 TransformToNum
 
-  Transform the Koha version from a 4 parts string
-  to a number, with just 1 .
+Transform the Koha version from a 4 parts string
+to a number, with just 1 .
 
 =cut
 
@@ -3885,9 +3880,9 @@ sub TransformToNum {
     return $version;
 }
 
-=item SetVersion
+=head2 SetVersion
 
-    set the DBversion in the systempreferences
+set the DBversion in the systempreferences
 
 =cut
 
diff --git a/misc/cronjobs/cloud-kw.pl b/misc/cronjobs/cloud-kw.pl
index ae917fe..11aaf88 100755
--- a/misc/cronjobs/cloud-kw.pl
+++ b/misc/cronjobs/cloud-kw.pl
@@ -345,7 +345,7 @@ Print this help page.
 =back
 
 =head1 CONFIGURATION
-    
+
 Configuration file looks like that:
 
  --- 
diff --git a/misc/cronjobs/holds/build_holds_queue.pl b/misc/cronjobs/holds/build_holds_queue.pl
index fab6b96..b02ab60 100755
--- a/misc/cronjobs/holds/build_holds_queue.pl
+++ b/misc/cronjobs/holds/build_holds_queue.pl
@@ -64,13 +64,11 @@ foreach my $biblionumber (@$bibs_with_pending_requests) {
 
 exit 0;
 
-=head2 GetBibsWithPendingHoldRequests
-
-=over 4
+=head1 FUNCTIONS
 
-my $biblionumber_aref = GetBibsWithPendingHoldRequests();
+=head2 GetBibsWithPendingHoldRequests
 
-=back
+  my $biblionumber_aref = GetBibsWithPendingHoldRequests();
 
 Return an arrayref of the biblionumbers of all bibs
 that have one or more unfilled hold requests.
@@ -95,11 +93,7 @@ sub GetBibsWithPendingHoldRequests {
 
 =head2 GetPendingHoldRequestsForBib
 
-=over 4
-
-my $requests = GetPendingHoldRequestsForBib($biblionumber);
-
-=back
+  my $requests = GetPendingHoldRequestsForBib($biblionumber);
 
 Returns an arrayref of hashrefs to pending, unfilled hold requests
 on the bib identified by $biblionumber.  The following keys
@@ -142,11 +136,7 @@ sub GetPendingHoldRequestsForBib {
 
 =head2 GetItemsAvailableToFillHoldRequestsForBib
 
-=over 4
-
-my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber);
-
-=back
+  my $available_items = GetItemsAvailableToFillHoldRequestsForBib($biblionumber);
 
 Returns an arrayref of items available to fill hold requests
 for the bib identified by C<$biblionumber>.  An item is available
@@ -205,11 +195,7 @@ sub GetItemsAvailableToFillHoldRequestsForBib {
 
 =head2 MapItemsToHoldRequests
 
-=over 4
-
-MapItemsToHoldRequests($hold_requests, $available_items);
-
-=back
+  MapItemsToHoldRequests($hold_requests, $available_items);
 
 =cut
 
diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl
index bb91b15..3187e92 100755
--- a/misc/cronjobs/runreport.pl
+++ b/misc/cronjobs/runreport.pl
@@ -57,7 +57,7 @@ runreport.pl [ -h | -m ] [ -v ] reportID [ reportID ... ]
 
 =head1 OPTIONS
 
-=over 8
+=over
 
 =item B<-help>
 
@@ -90,11 +90,19 @@ Same as above, but also runs report #17.
 
 =head1 TO DO
 
-=over 8
+=over
 
- ~ Complete testing for Sendmail related options: --email, --to, and --from.
- ~ Allow Saved Results option.
- ~ Possible --format option for CSV or tab-delimited output.
+=item * 
+
+Complete testing for Sendmail related options: --email, --to, and --from.
+
+=item *
+
+Allow Saved Results option.
+
+=item *
+
+Possible --format option for CSV or tab-delimited output.
 
 =back
 
diff --git a/misc/maintenance/fix_accountlines_date.pl b/misc/maintenance/fix_accountlines_date.pl
index 94a33cd..2956f57 100755
--- a/misc/maintenance/fix_accountlines_date.pl
+++ b/misc/maintenance/fix_accountlines_date.pl
@@ -81,6 +81,8 @@ be in whatever format your 'dateformat' system preference specifies.
 Run in debugging mode; this prints out a lot of information and should be used
 only if there is a problem and with the '-n' option.
 
+=back
+
 =cut
 
 my $mode = '';
diff --git a/misc/translator/update.pl b/misc/translator/update.pl
index 9970c1e..6f31ffb 100755
--- a/misc/translator/update.pl
+++ b/misc/translator/update.pl
@@ -20,8 +20,9 @@ while (defined($po = readdir(DIR))) {
 }
 closedir DIR;
 
-=head
-my($theme, $module) = @$spec;
+=head1 EXAMPLE
+
+ my($theme, $module) = @$spec;
    my $pid = fork;
    die "fork: $!\n" unless defined $pid;
    if (!$pid) {
@@ -47,5 +48,5 @@ my($theme, $module) = @$spec;
       die "tmpl_process3.pl: exec: $!\n";
    }
    wait;
-}
+ }
 =cut
diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl
index d0a2596..5f0d9ff 100755
--- a/offline_circ/process_koc.pl
+++ b/offline_circ/process_koc.pl
@@ -158,7 +158,9 @@ if ($completedJobID) {
 
 output_html_with_http_headers $query, $cookie, $template->output;
 
-=head3 parse_header_line
+=head1 FUNCTIONS
+
+=head2 parse_header_line
 
 parses the header line from a .koc file. This is the line that
 specifies things such as the file version, and the name and version of
@@ -183,7 +185,7 @@ sub parse_header_line {
     return \%header_info;
 }
 
-=head3 parse_command_line
+=head2 parse_command_line
 
 =cut
 
@@ -210,7 +212,7 @@ sub parse_command_line {
 
 }
 
-=head3 arguments_for_command
+=head2 arguments_for_command
 
 fetches the names of the columns (and function arguments) found in the
 .koc file for a particular command name. For instance, the C<issue>
@@ -367,7 +369,7 @@ sub kocMakePayment {
     } );
 }
 
-=head3 _get_borrowernumber_from_barcode
+=head2 _get_borrowernumber_from_barcode
 
 pass in a barcode
 get back the borrowernumber of the patron who has it checked out.
diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 4883e89..88904da 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -20,8 +20,7 @@
 
 =head1 NAME
 
-opac-ISBDdetail.pl : script to show a biblio in ISBD format
-
+opac-ISBDdetail.pl - script to show a biblio in ISBD format
 
 =head1 DESCRIPTION
 
@@ -37,8 +36,6 @@ the items attached to the biblio
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index fae749c..d127202 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -23,6 +23,7 @@ MARCdetail.pl : script to show a biblio in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index be4beca..71f746e 100755
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.pl
@@ -23,6 +23,7 @@ opac-authoritiesdetail.pl : script to show an authority in MARC format
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -33,8 +34,6 @@ parameters tables.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl
index a362c74..b98ce40 100755
--- a/opac/opac-tags.pl
+++ b/opac/opac-tags.pl
@@ -18,7 +18,11 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
-=head1 
+=head1 NAME
+
+opac-tags.pl
+
+=head1 DESCRIPTION
 
 TODO :: Description here
 
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 1d88850..70b712e 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -36,8 +36,6 @@ plugin that shows a stats on borrowers
 
 =head1 DESCRIPTION
 
-=over 2
-
 =cut
 
 my $input = new CGI;
diff --git a/reports/dictionary.pl b/reports/dictionary.pl
index 163e978..393c917 100755
--- a/reports/dictionary.pl
+++ b/reports/dictionary.pl
@@ -31,9 +31,6 @@ Script to control the guided report creation
 
 =head1 DESCRIPTION
 
-
-=over2
-
 =cut
 
 my $input = new CGI;
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index dbda180..dfec379 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -36,8 +36,6 @@ guided_reports.pl
 
 Script to control the guided report creation
 
-=over2
-
 =cut
 
 my $input = new CGI;
diff --git a/tools/csv-profiles.pl b/tools/csv-profiles.pl
index 6f467ee..32f2b98 100755
--- a/tools/csv-profiles.pl
+++ b/tools/csv-profiles.pl
@@ -23,6 +23,7 @@ csv-profile.pl : Defines a CSV export profile
 
 =head1 SYNOPSIS
 
+=cut
 
 =head1 DESCRIPTION
 
@@ -30,8 +31,6 @@ This script allow the user to define a new profile for CSV export
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 use strict;
diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index 4642365..f4c75d8 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -58,7 +58,7 @@ $debug and warn "Params are: filetype=$filetype, cardnumber=$cardnumber, borrowe
 
 =head1 NAME
 
-picture-upload.p. - Script for handling uploading of both single and bulk patronimages and importing them into the database.
+picture-upload.pl - Script for handling uploading of both single and bulk patronimages and importing them into the database.
 
 =head1 SYNOPSIS
 
@@ -296,8 +296,6 @@ sub handle_file {
     return (%count);
 }
 
-=back
-
 =head1 AUTHORS
 
 Original contributor(s) undocumented
-- 
1.7.0


From gmcharlt at gmail.com  Thu Nov 11 14:18:46 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 08:18:46 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF 1/2] Bug 5385: POD Cleanups
	(part 1)
Message-ID: <1289481527-22761-1-git-send-email-gmcharlt@gmail.com>

From: Andrew Elwell <andrew.elwell at gmail.com>

working through the master branch to eliminate all
podchecker warnings/errors

Actual improvement to the quality of the POD will
come later (hopefully with assistance of others)

Signed-off-by: Andrew Elwell <Andrew.Elwell at gmail.com>
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/AuthoritiesMarc/MARC21.pm                       |   18 +-
 C4/AuthoritiesMarc/UNIMARC.pm                      |   12 +-
 C4/Barcodes/PrinterConfig.pm                       |   50 ++--
 C4/Barcodes/incremental.pm                         |    2 +-
 C4/Cache/Memcached.pm                              |    8 +-
 C4/Cache/Memoize/Memcached.pm                      |    6 +-
 C4/Creators/Lib.pm                                 |  127 ++++-----
 C4/External/Amazon.pm                              |    2 +
 C4/External/BakerTaylor.pm                         |   11 +-
 C4/External/Syndetics.pm                           |    8 +-
 C4/Heading/MARC21.pm                               |    6 +-
 C4/ILSDI/Services.pm                               |  316 ++++++++++----------
 C4/Members/AttributeTypes.pm                       |  148 +++-------
 C4/Members/Attributes.pm                           |   55 +---
 C4/Reports/Guided.pm                               |   30 +-
 C4/SIP/ILS/Item.pm                                 |    6 +-
 C4/SIP/ILS/Patron.pm                               |  160 +++++-----
 C4/Search/PazPar2.pm                               |    2 +
 C4/VirtualShelves/Page.pm                          |   22 +-
 Makefile.PL                                        |    1 +
 acqui/addorder.pl                                  |    6 +-
 acqui/check_budget_total.pl                        |    2 +-
 acqui/fetch_sort_dropbox.pl                        |    4 +-
 acqui/neworderempty.pl                             |    5 +-
 acqui/orderreceive.pl                              |    4 +
 acqui/parcel.pl                                    |    4 +
 acqui/supplier.pl                                  |    2 +
 acqui/updatesupplier.pl                            |    8 +-
 admin/branches.pl                                  |    4 +-
 admin/check_budget_parent.pl                       |    2 +-
 admin/check_parent_total.pl                        |    2 +-
 authorities/authorities.pl                         |   16 +-
 cataloguing/value_builder/barcode.pl               |    2 +
 cataloguing/value_builder/dateaccessioned.pl       |    2 +
 cataloguing/value_builder/macles.pl                |    1 +
 cataloguing/value_builder/marc21_field_003.pl      |    2 +
 cataloguing/value_builder/marc21_field_005.pl      |    1 +
 cataloguing/value_builder/marc21_leader.pl         |    1 +
 .../value_builder/marc21_leader_authorities.pl     |    1 +
 cataloguing/value_builder/marc21_leader_book.pl    |    1 +
 .../value_builder/marc21_leader_computerfile.pl    |    1 +
 cataloguing/value_builder/marc21_leader_video.pl   |    1 +
 cataloguing/value_builder/stocknumber.pl           |   10 +-
 installer/data/mysql/update22to30.pl               |   18 +-
 kohaversion.pl                                     |   20 +-
 labels/label-create-csv.pl                         |    4 -
 labels/label-create-xml.pl                         |    4 -
 members/patronimage.pl                             |    2 -
 misc/cronjobs/check-url.pl                         |    2 +-
 tools/letter.pl                                    |    1 +
 50 files changed, 525 insertions(+), 598 deletions(-)

diff --git a/C4/AuthoritiesMarc/MARC21.pm b/C4/AuthoritiesMarc/MARC21.pm
index bd0eb2e..a148bbb 100644
--- a/C4/AuthoritiesMarc/MARC21.pm
+++ b/C4/AuthoritiesMarc/MARC21.pm
@@ -48,11 +48,7 @@ function based on the marcflavour system preference.
 
 =head2 get_heading_type_from_marc
 
-=over 4
-
-my $auth_type = get_auth_type_from_marc($marc);
-
-=back
+  my $auth_type = get_auth_type_from_marc($marc);
 
 Given a MARC::Record object containing an authority record,
 determine its heading type (e.g., personal name, topical term,
@@ -62,11 +58,7 @@ etc.).
 
 =head2 default_auth_type_location
 
-=over 4
-
-my ($tag, $subfield) = default_auth_type_location();
-
-=back
+  my ($tag, $subfield) = default_auth_type_location();
 
 Get the tag and subfield used to store the heading type
 if not specified in the MARC framework.  For MARC21,
@@ -80,11 +72,7 @@ sub default_auth_type_location {
 
 =head2 fix_marc21_auth_type_location 
 
-=over 4
-
-fix_marc21_auth_type_location($auth_marc, $auth_type_tag, $auth_type_subfield);
-
-=back
+  fix_marc21_auth_type_location($auth_marc, $auth_type_tag, $auth_type_subfield);
 
 If the incoming C<MARC::Record> object has a 152$b, remove it.  If no
 field already exists that contains the specified C<$auth_type_tag>
diff --git a/C4/AuthoritiesMarc/UNIMARC.pm b/C4/AuthoritiesMarc/UNIMARC.pm
index a7af735..b089ec9 100644
--- a/C4/AuthoritiesMarc/UNIMARC.pm
+++ b/C4/AuthoritiesMarc/UNIMARC.pm
@@ -47,11 +47,7 @@ function based on the marcflavour system preference.
 
 =head2 get_heading_type_from_marc
 
-=over 4
-
-my $auth_type = get_auth_type_from_marc($marc);
-
-=back
+  my $auth_type = get_auth_type_from_marc($marc);
 
 Given a MARC::Record object containing an authority record,
 determine its heading type (e.g., personal name, topical term,
@@ -61,11 +57,7 @@ etc.).
 
 =head2 default_auth_type_location
 
-=over 4
-
-my ($tag, $subfield) = default_auth_type_location();
-
-=back
+  my ($tag, $subfield) = default_auth_type_location();
 
 Get the tag and subfield used to store the heading type
 if not specified in the MARC framework.  For UNIMARC,
diff --git a/C4/Barcodes/PrinterConfig.pm b/C4/Barcodes/PrinterConfig.pm
index 183d4e4..28854df 100644
--- a/C4/Barcodes/PrinterConfig.pm
+++ b/C4/Barcodes/PrinterConfig.pm
@@ -35,7 +35,7 @@ C4::Barcodes::PrinterConfig - Koha module dealing with labels in a PDF.
 
 =head1 SYNOPSIS
 
-	use C4::Barcodes::PrinterConfig;
+use C4::Barcodes::PrinterConfig;
 
 =head1 DESCRIPTION
 
@@ -45,17 +45,21 @@ environment of the pdf file.
 
 =head1 FUNCTIONS
 
-=over 2
+=head2 my @positionsForX;
 
-=cut
+Takes all the X positions of the pdf file.
+
+=head2 my @positionsForY; 
+
+Takes all the Y positions of the pdf file.
 
-my @positionsForX; # Takes all the X positions of the pdf file.
-my @positionsForY; # Takes all the Y positions of the pdf file.
-my $firstLabel = 1; # Test if the label passed as a parameter is the first label to be printed into the pdf file.
+=head2 my $firstLabel = 1; 
 
-=item setPositionsForX
+Test if the label passed as a parameter is the first label to be printed into the pdf file.
 
-	C4::Barcodes::PrinterConfig::setPositionsForX($marginLeft, $labelWidth, $columns, $pageType);
+=head2 setPositionsForX
+
+  C4::Barcodes::PrinterConfig::setPositionsForX($marginLeft, $labelWidth, $columns, $pageType);
 
 Calculate and stores all the X positions across the pdf page.
 
@@ -68,7 +72,7 @@ C<$columns> Indicates how many columns do you want in your page type.
 C<$pageType> Page type to print (eg: a4, legal, etc).
 
 =cut
-#'
+
 sub setPositionsForX {
 	my ($marginLeft, $labelWidth, $columns, $pageType) = @_;
 	my $defaultDpi = 72/25.4; # By default we know 25.4 mm -> 1 inch -> 72 dots per inch
@@ -82,9 +86,9 @@ sub setPositionsForX {
 	@positionsForX = @positions;
 }
 
-=item setPositionsForY
+=head2 setPositionsForY
 
-	C4::Barcodes::PrinterConfig::setPositionsForY($marginBottom, $labelHeigth, $rows, $pageType);
+  C4::Barcodes::PrinterConfig::setPositionsForY($marginBottom, $labelHeigth, $rows, $pageType);
 
 Calculate and stores all tha Y positions across the pdf page.
 
@@ -97,7 +101,7 @@ C<$rows> Indicates how many rows do you want in your page type.
 C<$pageType> Page type to print (eg: a4, legal, etc).
 
 =cut
-#'
+
 sub setPositionsForY {
 	my ($marginBottom, $labelHeigth, $rows, $pageType) = @_;
 	my $defaultDpi = 72/25.4; # By default we know 25.4 mm -> 1 inch -> 72 dots per inch
@@ -111,16 +115,10 @@ sub setPositionsForY {
 	@positionsForY = @positions;
 }
 
-=item getLabelPosition
+=head2 getLabelPosition
 
-	(my $x, my $y, $pdfObject, $pageObject, $gfxObject, $textObject, $coreObject, $labelPosition) = 
-					C4::Barcodes::PrinterConfig::getLabelPosition($labelPosition, 
-																  $pdfObject, 
-																  $page,
-																  $gfx,
-																  $text,
-																  $fontObject,
-																  $pageType);	
+  (my $x, my $y, $pdfObject, $pageObject, $gfxObject, $textObject, $coreObject, $labelPosition) = 
+     C4::Barcodes::PrinterConfig::getLabelPosition($labelPosition, $pdfObject, $page, $gfx, $text, $fontObject, $pageType);	
 
 Return the (x,y) position of the label that you are going to print considering the environment.
 
@@ -139,7 +137,7 @@ C<$fontObject> The font object
 C<$pageType> Page type to print (eg: a4, legal, etc).
 
 =cut
-#'
+
 sub getLabelPosition {
 	my ($labelNum, $pdf, $page, $gfxObject, $textObject, $fontObject, $pageType) = @_;
 	my $indexX = $labelNum % @positionsForX;
@@ -168,9 +166,9 @@ sub getLabelPosition {
 	return ($positionsForX[$indexX], $positionsForY[$indexY], $pdf, $page, $gfxObject, $textObject, $fontObject, $labelNum);
 }
 
-=item labelsPage
+=head2 labelsPage
 
-	my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($rows, $columns);
+  my @labelTable = C4::Barcodes::PrinterConfig::labelsPage($rows, $columns);
 
 This function will help you to build the labels panel, where you can choose
 wich label position do you want to start the printer process.
@@ -180,7 +178,7 @@ C<$rows> Indicates how many rows do you want in your page type.
 C<$columns> Indicates how many rows do you want in your page type.
 
 =cut
-#'
+
 sub labelsPage{
 	my ($rows, $columns) = @_;
 	my @pageType;
@@ -213,8 +211,6 @@ sub labelsPage{
 
 __END__
 
-=back
-
 =head1 AUTHOR
 
 Koha Physics Library UNLP <matias_veleda at hotmail.com>
diff --git a/C4/Barcodes/incremental.pm b/C4/Barcodes/incremental.pm
index 1fae3c6..33b21bc 100644
--- a/C4/Barcodes/incremental.pm
+++ b/C4/Barcodes/incremental.pm
@@ -30,7 +30,7 @@ BEGIN {
 1;
 __END__
 
-=head2
+=head1 NOTES
 
 Since incremental is the default in C4::Barcodes, we do not override anything here.
 In fact, this file is more of a place holder.
diff --git a/C4/Cache/Memcached.pm b/C4/Cache/Memcached.pm
index 2f022d5..1233d41 100644
--- a/C4/Cache/Memcached.pm
+++ b/C4/Cache/Memcached.pm
@@ -69,8 +69,8 @@ sub flush_all {
 1;
 __END__                                                                         
                                                                                   
-=head1 NAME                                                                     
-                                                                                
-  C4::Cache::Memcached - memcached subclass of C4::Cache                
-                                                                                  
+=head1 NAME
+
+C4::Cache::Memcached - memcached subclass of C4::Cache
+
 =cut
diff --git a/C4/Cache/Memoize/Memcached.pm b/C4/Cache/Memoize/Memcached.pm
index 927218c..c65e8a6 100644
--- a/C4/Cache/Memoize/Memcached.pm
+++ b/C4/Cache/Memoize/Memcached.pm
@@ -51,7 +51,7 @@ sub memcached_memoize {
 __END__                                                                         
                                                                                   
 =head1 NAME                                                                     
-                                                                                
-  C4::Cache::Memoize::Memcached - subclass of C4::Cache                
-                                                                                  
+
+C4::Cache::Memoize::Memcached - subclass of C4::Cache
+
 =cut
diff --git a/C4/Creators/Lib.pm b/C4/Creators/Lib.pm
index 6e07847..ded0a5d 100644
--- a/C4/Creators/Lib.pm
+++ b/C4/Creators/Lib.pm
@@ -47,6 +47,16 @@ BEGIN {
     );
 }
 
+=head1 NAME
+
+C4::Creators::Lib
+
+=cut
+
+=head1 FUNCTIONS
+
+=cut
+
 #=head2 C4::Creators::Lib::_SELECT()
 #
 #    This function returns a recordset upon success and 1 upon failure. Errors are logged to the Apache log.
@@ -135,11 +145,9 @@ my $output_formats = [
 
 =head2 C4::Creators::Lib::get_all_templates()
 
-    This function returns a reference to a hash containing all templates upon success and 1 upon failure. Errors are logged to the Apache log.
-
-    examples:
+  my $templates = get_all_templates();
 
-        my $templates = get_all_templates();
+This function returns a reference to a hash containing all templates upon success and 1 upon failure. Errors are logged to the Apache log.
 
 =cut
 
@@ -163,11 +171,9 @@ sub get_all_templates {
 
 =head2 C4::Creators::Lib::get_all_layouts()
 
-    This function returns a reference to a hash containing all layouts upon success and 1 upon failure. Errors are logged to the Apache log.
+  my $layouts = get_all_layouts();
 
-    examples:
-
-        my $layouts = get_all_layouts();
+This function returns a reference to a hash containing all layouts upon success and 1 upon failure. Errors are logged to the Apache log.
 
 =cut
 
@@ -191,16 +197,15 @@ sub get_all_layouts {
 
 =head2 C4::Creators::Lib::get_all_profiles()
 
-    This function returns an arrayref whose elements are hashes containing all profiles upon success and 1 upon failure. Errors are logged
-    to the Apache log. Two parameters are accepted. The first limits the field(s) returned. This parameter should be string of comma separted
-    fields. ie. "field_1, field_2, ...field_n" The second limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+  my $profiles = get_all_profiles();
 
-    NOTE: Do not pass in the keyword 'WHERE.'
+  my $profiles = get_all_profiles(field_list => field_list, filter => filter_string);
 
-    examples:
+This function returns an arrayref whose elements are hashes containing all profiles upon success and 1 upon failure. Errors are logged
+to the Apache log. Two parameters are accepted. The first limits the field(s) returned. This parameter should be string of comma separted
+fields. ie. "field_1, field_2, ...field_n" The second limits the records returned based on a string containing a valud SQL 'WHERE' filter.
 
-        my $profiles = get_all_profiles();
-        my $profiles = get_all_profiles(field_list => field_list, filter => filter_string);
+NOTE: Do not pass in the keyword 'WHERE.'
 
 =cut
 
@@ -243,16 +248,15 @@ sub get_all_image_names {
 
 =head2 C4::Creators::Lib::get_batch_summary()
 
-    This function returns an arrayref whose elements are hashes containing the batch_ids of current batches along with the item count
-    for each batch upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-    One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+  my $batches = get_batch_summary();
 
-    NOTE: Do not pass in the keyword 'WHERE.'
+  my $batches = get_batch_summary(filter => filter_string);
 
-    examples:
+This function returns an arrayref whose elements are hashes containing the batch_ids of current batches along with the item count
+for each batch upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
+One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
 
-        my $batches = get_batch_summary();
-        my $batches = get_batch_summary(filter => filter_string);
+NOTE: Do not pass in the keyword 'WHERE.'
 
 =cut
 
@@ -286,16 +290,15 @@ sub get_batch_summary {
 
 =head2 C4::Creators::Lib::get_label_summary()
 
-    This function returns an arrayref whose elements are hashes containing the label_ids of current labels along with the item count
-    for each label upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-    One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+  my $labels = get_label_summary();
 
-    NOTE: Do not pass in the keyword 'WHERE.'
+  my $labels = get_label_summary(items => @item_list);
 
-    examples:
+This function returns an arrayref whose elements are hashes containing the label_ids of current labels along with the item count
+for each label upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
+One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
 
-        my $labels = get_label_summary();
-        my $labels = get_label_summary(items => @item_list);
+NOTE: Do not pass in the keyword 'WHERE.'
 
 =cut
 
@@ -337,16 +340,15 @@ sub get_label_summary {
 
 =head2 C4::Creators::Lib::get_card_summary()
 
-    This function returns an arrayref whose elements are hashes containing the label_ids of current cards along with the item count
-    for each card upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
-    One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
+  my $cards = get_card_summary();
 
-    NOTE: Do not pass in the keyword 'WHERE.'
+  my $cards = get_card_summary(items => @item_list);
 
-    examples:
+This function returns an arrayref whose elements are hashes containing the label_ids of current cards along with the item count
+for each card upon success and 1 upon failure. Item counts are stored under the key '_item_count' Errors are logged to the Apache log.
+One parameter is accepted which limits the records returned based on a string containing a valud SQL 'WHERE' filter.
 
-        my $cards = get_card_summary();
-        my $cards = get_card_summary(items => @item_list);
+NOTE: Do not pass in the keyword 'WHERE.'
 
 =cut
 
@@ -375,11 +377,9 @@ sub get_card_summary {
 
 =head2 C4::Creators::Lib::get_barcode_types()
 
-    This function returns a reference to an array of hashes containing all barcode types along with their name and description.
-
-    examples:
+  my $barcode_types = get_barcode_types();
 
-        my $barcode_types = get_barcode_types();
+This function returns a reference to an array of hashes containing all barcode types along with their name and description.
 
 =cut
 
@@ -389,11 +389,9 @@ sub get_barcode_types {
 
 =head2 C4::Creators::Lib::get_label_types()
 
-    This function returns a reference to an array of hashes containing all label types along with their name and description.
+  my $label_types = get_label_types();
 
-    examples:
-
-        my $label_types = get_label_types();
+This function returns a reference to an array of hashes containing all label types along with their name and description.
 
 =cut
 
@@ -403,11 +401,9 @@ sub get_label_types {
 
 =head2 C4::Creators::Lib::get_font_types()
 
-    This function returns a reference to an array of hashes containing all font types along with their name and description.
-
-    examples:
+  my $font_types = get_font_types();
 
-        my $font_types = get_font_types();
+This function returns a reference to an array of hashes containing all font types along with their name and description.
 
 =cut
 
@@ -417,11 +413,9 @@ sub get_font_types {
 
 =head2 C4::Creators::Lib::get_text_justification_types()
 
-    This function returns a reference to an array of hashes containing all text justification types along with their name and description.
+  my $text_justification_types = get_text_justification_types();
 
-    examples:
-
-        my $text_justification_types = get_text_justification_types();
+This function returns a reference to an array of hashes containing all text justification types along with their name and description.
 
 =cut
 
@@ -431,12 +425,11 @@ sub get_text_justification_types {
 
 =head2 C4::Creators::Lib::get_unit_values()
 
-    This function returns a reference to an array of  hashes containing all unit types along with their description and multiplier. NOTE: All units are relative to a PostScript Point.
-    There are 72 PS points to the inch.
-
-    examples:
+  my $unit_values = get_unit_values();
 
-        my $unit_values = get_unit_values();
+This function returns a reference to an array of  hashes containing all unit types along with their description and multiplier.
+NOTE: All units are relative to a PostScript Point.
+There are 72 PS points to the inch.
 
 =cut
 
@@ -446,11 +439,9 @@ sub get_unit_values {
 
 =head2 C4::Creators::Lib::get_output_formats()
 
-    This function returns a reference to an array of hashes containing all label output formats along with their description.
+  my $label_output_formats = get_output_formats();
 
-    examples:
-
-        my $label_output_formats = get_output_formats();
+This function returns a reference to an array of hashes containing all label output formats along with their description.
 
 =cut
 
@@ -494,15 +485,13 @@ sub get_table_names {
 
 =head2 C4::Creators::Lib::html_table()
 
-    This function returns an arrayref of an array of hashes contianing the supplied data formatted suitably to
-    be passed off as a T::P template parameter and used to build an html table.
-
-    examples:
+This function returns an arrayref of an array of hashes contianing the supplied data formatted suitably to
+be passed off as a T::P template parameter and used to build an html table.
 
-       my $table = html_table(header_fields, array_of_row_data);
-       $template->param(
-            TABLE => $table,
-       );
+   my $table = html_table(header_fields, array_of_row_data);
+   $template->param(
+       TABLE => $table,
+   );
 
     html example:
 
diff --git a/C4/External/Amazon.pm b/C4/External/Amazon.pm
index 9e503b6..54141db 100644
--- a/C4/External/Amazon.pm
+++ b/C4/External/Amazon.pm
@@ -201,6 +201,8 @@ __END__
 
 =head1 NOTES
 
+=cut
+
 =head1 AUTHOR
 
 Joshua Ferraro <jmf at liblime.com>
diff --git a/C4/External/BakerTaylor.pm b/C4/External/BakerTaylor.pm
index 39768b5..7845811 100644
--- a/C4/External/BakerTaylor.pm
+++ b/C4/External/BakerTaylor.pm
@@ -103,16 +103,21 @@ __END__
 
 =head1 NAME
 
-C4::External::BakerTaylor - Functions for retrieving content from Baker and Taylor, inventory availability and "Content Cafe".
+C4::External::BakerTaylor
+
+=head1 DESCRIPTION
+
+Functions for retrieving content from Baker and Taylor, inventory availability and "Content Cafe".
+
 The settings for this module are controlled by System Preferences:
 
 These can be overridden for testing purposes using the initialize function.
 
 =head1 FUNCTIONS
 
-=head1 availability($isbn);
+=head2 availability($isbn);
 
-=head2 $isbn is a isbn string
+$isbn is a isbn string
 
 =head1 NOTES
 
diff --git a/C4/External/Syndetics.pm b/C4/External/Syndetics.pm
index 4a49379..f94345d 100644
--- a/C4/External/Syndetics.pm
+++ b/C4/External/Syndetics.pm
@@ -56,11 +56,7 @@ This module provides facilities for retrieving Syndetics.com content in Koha
 
 =head2 get_syndetics_summary
 
-=over 4
-
-my $syndetics_summary= &get_syndetics_summary( $isbn );
-
-=back
+  my $syndetics_summary= &get_syndetics_summary( $isbn );
 
 Get Summary data from Syndetics
 
@@ -275,6 +271,8 @@ __END__
 
 =head1 NOTES
 
+=cut
+
 =head1 AUTHOR
 
 Joshua Ferraro <jmf at liblime.com>
diff --git a/C4/Heading/MARC21.pm b/C4/Heading/MARC21.pm
index 4867c4b..77cdac2 100644
--- a/C4/Heading/MARC21.pm
+++ b/C4/Heading/MARC21.pm
@@ -87,11 +87,7 @@ my %subdivisions = (
 
 =head2 new
 
-=over 4
-
-my $marc_handler = C4::Heading::MARC21->new();
-
-=back
+  my $marc_handler = C4::Heading::MARC21->new();
 
 =cut
 
diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index be093f0..c99f2a9 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -40,9 +40,9 @@ C4::ILS-DI::Services - ILS-DI Services
 
 =head1 DESCRIPTION
 
-	Each function in this module represents an ILS-DI service.
-	They all takes a CGI instance as argument and most of them return a 
-	hashref that will be printed by XML::Simple in opac/ilsdi.pl
+Each function in this module represents an ILS-DI service.
+They all takes a CGI instance as argument and most of them return a 
+hashref that will be printed by XML::Simple in opac/ilsdi.pl
 
 =head1 SYNOPSIS
 
@@ -65,28 +65,39 @@ C4::ILS-DI::Services - ILS-DI Services
 
 =cut
 
+=head1 FUNCTIONS
+
 =head2 GetAvailability
-    
-	Given a set of biblionumbers or itemnumbers, returns a list with 
-	availability of the items associated with the identifiers.
-	
-	Parameters :
-
-	- id (Required)
-		list of either biblionumbers or itemnumbers
-	- id_type (Required)
-		defines the type of record identifier being used in the request, 
-		possible values:
-			- bib
-			- item
-	- return_type (Optional)
-		requests a particular level of detail in reporting availability, 
-		possible values:
-			- bib
-			- item
-	- return_fmt (Optional)
-		requests a particular format or set of formats in reporting 
-		availability 
+
+Given a set of biblionumbers or itemnumbers, returns a list with 
+availability of the items associated with the identifiers.
+
+Parameters:
+
+=head3 id (Required)
+
+list of either biblionumbers or itemnumbers
+
+=head3 id_type (Required)
+
+defines the type of record identifier being used in the request, 
+possible values:
+
+  - bib
+  - item
+
+=head3 return_type (Optional)
+
+requests a particular level of detail in reporting availability, 
+possible values:
+
+  - bib
+  - item
+
+=head3 return_fmt (Optional)
+
+requests a particular format or set of formats in reporting 
+availability 
 
 =cut
 
@@ -143,25 +154,26 @@ sub GetAvailability {
 }
 
 =head2 GetRecords
-    
-	Given a list of biblionumbers, returns a list of record objects that 
-	contain bibliographic information, as well as associated holdings and item
-	information. The caller may request a specific metadata schema for the 
-	record objects to be returned.
-	This function behaves similarly to HarvestBibliographicRecords and 
-	HarvestExpandedRecords in Data Aggregation, but allows quick, real time 
-	lookup by bibliographic identifier.
-
-	You can use OAI-PMH ListRecords instead of this service.
-	
-	Parameters:
-
-	- id (Required)
-		list of system record identifiers
-	- id_type (Optional)
-		Defines the metadata schema in which the records are returned, 
-		possible values:
-			- MARCXML
+
+Given a list of biblionumbers, returns a list of record objects that 
+contain bibliographic information, as well as associated holdings and item
+information. The caller may request a specific metadata schema for the 
+record objects to be returned.
+
+This function behaves similarly to HarvestBibliographicRecords and 
+HarvestExpandedRecords in Data Aggregation, but allows quick, real time 
+lookup by bibliographic identifier.
+
+You can use OAI-PMH ListRecords instead of this service.
+
+Parameters:
+
+  - id (Required)
+	list of system record identifiers
+  - id_type (Optional)
+	Defines the metadata schema in which the records are returned, 
+	possible values:
+  	  - MARCXML
 
 =cut
 
@@ -221,18 +233,18 @@ sub GetRecords {
 }
 
 =head2 GetAuthorityRecords
-    
-	Given a list of authority record identifiers, returns a list of record 
-	objects that contain the authority records. The function user may request 
-	a specific metadata schema for the record objects.
 
-	Parameters:
+Given a list of authority record identifiers, returns a list of record 
+objects that contain the authority records. The function user may request 
+a specific metadata schema for the record objects.
+
+Parameters:
 
-	- id (Required)
-	    list of authority record identifiers
-	- schema (Optional)
-	    specifies the metadata schema of records to be returned, possible values:
-		  - MARCXML
+  - id (Required)
+    list of authority record identifiers
+  - schema (Optional)
+    specifies the metadata schema of records to be returned, possible values:
+      - MARCXML
 
 =cut
 
@@ -259,19 +271,19 @@ sub GetAuthorityRecords {
 }
 
 =head2 LookupPatron
-    
-	Looks up a patron in the ILS by an identifier, and returns the borrowernumber.
-	
-	Parameters:
-
-	- id (Required)
-		an identifier used to look up the patron in Koha
-	- id_type (Optional)
-		the type of the identifier, possible values:
-			- cardnumber
-			- firstname
-			- userid
-			- borrowernumber
+
+Looks up a patron in the ILS by an identifier, and returns the borrowernumber.
+
+Parameters:
+
+  - id (Required)
+	an identifier used to look up the patron in Koha
+  - id_type (Optional)
+	the type of the identifier, possible values:
+	- cardnumber
+	- firstname
+	- userid
+	- borrowernumber
 
 =cut
 
@@ -294,16 +306,16 @@ sub LookupPatron {
 
 =head2 AuthenticatePatron
 
-	Authenticates a user's login credentials and returns the identifier for 
-	the patron.
-	
-	Parameters:
+Authenticates a user's login credentials and returns the identifier for 
+the patron.
+
+Parameters:
+
+  - username (Required)
+	user's login identifier
+  - password (Required)
+	user's password
 
-	- username (Required)
-		user's login identifier
-	- password (Required)
-		user's password
-		
 =cut
 
 sub AuthenticatePatron {
@@ -326,23 +338,23 @@ sub AuthenticatePatron {
 
 =head2 GetPatronInfo
 
-	Returns specified information about the patron, based on options in the 
-	request. This function can optionally return patron's contact information, 
-	fine information, hold request information, and loan information.
-	
-	Parameters:
-
-	- patron_id (Required)
-		the borrowernumber
-	- show_contact (Optional, default 1)
-		whether or not to return patron's contact information in the response
-	- show_fines (Optional, default 0)
-		whether or not to return fine information in the response
-	- show_holds (Optional, default 0)
-		whether or not to return hold request information in the response
-	- show_loans (Optional, default 0)
-		whether or not to return loan information request information in the response 
-		
+Returns specified information about the patron, based on options in the 
+request. This function can optionally return patron's contact information, 
+fine information, hold request information, and loan information.
+
+Parameters:
+
+  - patron_id (Required)
+	the borrowernumber
+  - show_contact (Optional, default 1)
+	whether or not to return patron's contact information in the response
+  - show_fines (Optional, default 0)
+	whether or not to return fine information in the response
+  - show_holds (Optional, default 0)
+	whether or not to return hold request information in the response
+  - show_loans (Optional, default 0)
+	whether or not to return loan information request information in the response 
+
 =cut
 
 sub GetPatronInfo {
@@ -421,12 +433,12 @@ sub GetPatronInfo {
 
 =head2 GetPatronStatus
 
-	Returns a patron's status information.
-	
-	Parameters:
+Returns a patron's status information.
 
-	- patron_id (Required)
-		the borrower ID
+Parameters:
+
+  - patron_id (Required)
+	the borrower ID
 
 =cut
 
@@ -448,15 +460,15 @@ sub GetPatronStatus {
 
 =head2 GetServices
 
-	Returns information about the services available on a particular item for 
-	a particular patron.
-	
-	Parameters:
+Returns information about the services available on a particular item for 
+a particular patron.
+
+Parameters:
 
-	- patron_id (Required)
-		a borrowernumber
-	- item_id (Required)
-		an itemnumber
+  - patron_id (Required)
+	a borrowernumber
+  - item_id (Required)
+	an itemnumber
 =cut
 
 sub GetServices {
@@ -518,16 +530,16 @@ sub GetServices {
 
 =head2 RenewLoan
 
-	Extends the due date for a borrower's existing issue.
-	
-	Parameters:
+Extends the due date for a borrower's existing issue.
 
-	- patron_id (Required)
-		a borrowernumber
-	- item_id (Required)
-		an itemnumber
-	- desired_due_date (Required)
-		the date the patron would like the item returned by 
+Parameters:
+
+  - patron_id (Required)
+	a borrowernumber
+  - item_id (Required)
+	an itemnumber
+  - desired_due_date (Required)
+	the date the patron would like the item returned by 
 
 =cut
 
@@ -562,22 +574,22 @@ sub RenewLoan {
 
 =head2 HoldTitle
 
-	Creates, for a borrower, a biblio-level hold reserve.
-	
-	Parameters:
-
-	- patron_id (Required)
-		a borrowernumber
-	- bib_id (Required)
-		a biblionumber
-	- request_location (Required)
-		IP address where the end user request is being placed
-	- pickup_location (Optional)
-		a branch code indicating the location to which to deliver the item for pickup
-	- needed_before_date (Optional)
-		date after which hold request is no longer needed
-	- pickup_expiry_date (Optional)
-		date after which item returned to shelf if item is not picked up 
+Creates, for a borrower, a biblio-level hold reserve.
+
+Parameters:
+
+  - patron_id (Required)
+	a borrowernumber
+  - bib_id (Required)
+	a biblionumber
+  - request_location (Required)
+	IP address where the end user request is being placed
+  - pickup_location (Optional)
+	a branch code indicating the location to which to deliver the item for pickup
+  - needed_before_date (Optional)
+	date after which hold request is no longer needed
+  - pickup_expiry_date (Optional)
+	date after which item returned to shelf if item is not picked up 
 
 =cut
 
@@ -626,23 +638,23 @@ sub HoldTitle {
 
 =head2 HoldItem
 
-	Creates, for a borrower, an item-level hold request on a specific item of 
-	a bibliographic record in Koha.
+Creates, for a borrower, an item-level hold request on a specific item of 
+a bibliographic record in Koha.
 
-	Parameters:
+Parameters:
 
-	- patron_id (Required)
-		a borrowernumber
-	- bib_id (Required)
-		a biblionumber
-	- item_id (Required)
-		an itemnumber
-	- pickup_location (Optional)
-		a branch code indicating the location to which to deliver the item for pickup
-	- needed_before_date (Optional)
-		date after which hold request is no longer needed
-	- pickup_expiry_date (Optional)
-		date after which item returned to shelf if item is not picked up 
+  - patron_id (Required)
+	a borrowernumber
+  - bib_id (Required)
+	a biblionumber
+  - item_id (Required)
+	an itemnumber
+  - pickup_location (Optional)
+	a branch code indicating the location to which to deliver the item for pickup
+  - needed_before_date (Optional)
+	date after which hold request is no longer needed
+  - pickup_expiry_date (Optional)
+	date after which item returned to shelf if item is not picked up 
 
 =cut
 
@@ -709,14 +721,14 @@ sub HoldItem {
 
 =head2 CancelHold
 
-	Cancels an active reserve request for the borrower.
-	
-	Parameters:
+Cancels an active reserve request for the borrower.
+
+Parameters:
 
-	- patron_id (Required)
-		a borrowernumber
-	- item_id (Required)
-		an itemnumber 
+  - patron_id (Required)
+	a borrowernumber
+  - item_id (Required)
+	an itemnumber 
 
 =cut
 
diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm
index 9fb39e0..21d17eb 100644
--- a/C4/Members/AttributeTypes.pm
+++ b/C4/Members/AttributeTypes.pm
@@ -34,43 +34,35 @@ C4::Members::AttributeTypes - mananage extended patron attribute types
 
 =head1 SYNOPSIS
 
-=over 4
-
-my @attribute_types = C4::Members::AttributeTypes::GetAttributeTypes();
-
-my $attr_type = C4::Members::AttributeTypes->new($code, $description);
-$attr_type->code($code);
-$attr_type->description($description);
-$attr_type->repeatable($repeatable);
-$attr_type->unique_id($unique_id);
-$attr_type->opac_display($opac_display);
-$attr_type->password_allowed($password_allowed);
-$attr_type->staff_searchable($staff_searchable);
-$attr_type->authorised_value_category($authorised_value_category);
-$attr_type->store();
-$attr_type->delete();
-
-my $attr_type = C4::Members::AttributeTypes->fetch($code);
-$attr_type = C4::Members::AttributeTypes->delete($code);
-
-=back
+  my @attribute_types = C4::Members::AttributeTypes::GetAttributeTypes();
+
+  my $attr_type = C4::Members::AttributeTypes->new($code, $description);
+  $attr_type->code($code);
+  $attr_type->description($description);
+  $attr_type->repeatable($repeatable);
+  $attr_type->unique_id($unique_id);
+  $attr_type->opac_display($opac_display);
+  $attr_type->password_allowed($password_allowed);
+  $attr_type->staff_searchable($staff_searchable);
+  $attr_type->authorised_value_category($authorised_value_category);
+  $attr_type->store();
+  $attr_type->delete();
+
+  my $attr_type = C4::Members::AttributeTypes->fetch($code);
+  $attr_type = C4::Members::AttributeTypes->delete($code);
 
 =head1 FUNCTIONS
 
 =head2 GetAttributeTypes
 
-=over 4
-
-my @attribute_types = C4::Members::AttributeTypes::GetAttributeTypes($all_fields);
-
-=back
+  my @attribute_types = C4::Members::AttributeTypes::GetAttributeTypes($all_fields);
 
 Returns an array of hashrefs of each attribute type defined
 in the database.  The array is sorted by code.  Each hashref contains
 at least the following fields:
 
-code
-description
+ - code
+ - description
 
 If $all_fields is true, then each hashref also contains the other fields from borrower_attribute_types.
 
@@ -93,11 +85,7 @@ sub GetAttributeTypes_hashref {
 
 =head1 METHODS 
 
-=over 4
-
-my $attr_type = C4::Members::AttributeTypes->new($code, $description);
-
-=back
+  my $attr_type = C4::Members::AttributeTypes->new($code, $description);
 
 Create a new attribute type.
 
@@ -122,11 +110,7 @@ sub new {
 
 =head2 fetch
 
-=over 4
-
-my $attr_type = C4::Members::AttributeTypes->fetch($code);
-
-=back
+  my $attr_type = C4::Members::AttributeTypes->fetch($code);
 
 Fetches an attribute type from the database.  If no
 type with the given C<$code> exists, returns undef.
@@ -160,11 +144,7 @@ sub fetch {
 
 =head2 store
 
-=over 4
-
-$attr_type->store();
-
-=back
+  $attr_type->store();
 
 Stores attribute type in the database.  If the type
 previously retrieved from the database via the fetch()
@@ -209,12 +189,8 @@ sub store {
 
 =head2 code
 
-=over 4
-
-my $code = $attr_type->code();
-$attr_type->code($code);
-
-=back
+  my $code = $attr_type->code();
+  $attr_type->code($code);
 
 Accessor.  Note that the code is immutable once
 a type is created or fetched from the database.
@@ -228,12 +204,8 @@ sub code {
 
 =head2 description
 
-=over 4
-
-my $description = $attr_type->description();
-$attr_type->description($description);
-
-=back
+  my $description = $attr_type->description();
+  $attr_type->description($description);
 
 Accessor.
 
@@ -246,12 +218,8 @@ sub description {
 
 =head2 repeatable
 
-=over 4
-
-my $repeatable = $attr_type->repeatable();
-$attr_type->repeatable($repeatable);
-
-=back
+  my $repeatable = $attr_type->repeatable();
+  $attr_type->repeatable($repeatable);
 
 Accessor.  The C<$repeatable> argument
 is interpreted as a Perl boolean.
@@ -265,12 +233,8 @@ sub repeatable {
 
 =head2 unique_id
 
-=over 4
-
-my $unique_id = $attr_type->unique_id();
-$attr_type->unique_id($unique_id);
-
-=back
+  my $unique_id = $attr_type->unique_id();
+  $attr_type->unique_id($unique_id);
 
 Accessor.  The C<$unique_id> argument
 is interpreted as a Perl boolean.
@@ -283,12 +247,8 @@ sub unique_id {
 }
 =head2 opac_display
 
-=over 4
-
-my $opac_display = $attr_type->opac_display();
-$attr_type->opac_display($opac_display);
-
-=back
+  my $opac_display = $attr_type->opac_display();
+  $attr_type->opac_display($opac_display);
 
 Accessor.  The C<$opac_display> argument
 is interpreted as a Perl boolean.
@@ -301,12 +261,8 @@ sub opac_display {
 }
 =head2 password_allowed
 
-=over 4
-
-my $password_allowed = $attr_type->password_allowed();
-$attr_type->password_allowed($password_allowed);
-
-=back
+  my $password_allowed = $attr_type->password_allowed();
+  $attr_type->password_allowed($password_allowed);
 
 Accessor.  The C<$password_allowed> argument
 is interpreted as a Perl boolean.
@@ -319,12 +275,8 @@ sub password_allowed {
 }
 =head2 staff_searchable
 
-=over 4
-
-my $staff_searchable = $attr_type->staff_searchable();
-$attr_type->staff_searchable($staff_searchable);
-
-=back
+  my $staff_searchable = $attr_type->staff_searchable();
+  $attr_type->staff_searchable($staff_searchable);
 
 Accessor.  The C<$staff_searchable> argument
 is interpreted as a Perl boolean.
@@ -338,12 +290,8 @@ sub staff_searchable {
 
 =head2 authorised_value_category
 
-=over 4
-
-my $authorised_value_category = $attr_type->authorised_value_category();
-$attr_type->authorised_value_category($authorised_value_category);
-
-=back
+  my $authorised_value_category = $attr_type->authorised_value_category();
+  $attr_type->authorised_value_category($authorised_value_category);
 
 Accessor.
 
@@ -356,12 +304,8 @@ sub authorised_value_category {
 
 =head2 delete
 
-=over 4
-
-$attr_type->delete();
-C4::Members::AttributeTypes->delete($code);
-
-=back
+  $attr_type->delete();
+  C4::Members::AttributeTypes->delete($code);
 
 Delete an attribute type from the database.  The attribute
 type may be specified either by an object or by a code.
@@ -384,11 +328,7 @@ sub delete {
 
 =head2 num_patrons
 
-=over 4
-
-my $count = $attr_type->num_patrons();
-
-=back
+  my $count = $attr_type->num_patrons();
 
 Returns the number of patron records that use
 this attribute type.
@@ -410,11 +350,7 @@ sub num_patrons {
 
 =head2 get_patrons
 
-=over 4
-
-my @borrowernumbers = $attr_type->get_patrons($attribute);
-
-=back
+  my @borrowernumbers = $attr_type->get_patrons($attribute);
 
 Returns the borrowernumber of the patron records that
 have an attribute with the specifie value.
diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm
index 72af3c8..70c34b4 100644
--- a/C4/Members/Attributes.pm
+++ b/C4/Members/Attributes.pm
@@ -43,22 +43,14 @@ C4::Members::Attributes - manage extend patron attributes
 
 =head1 SYNOPSIS
 
-=over 4
-
-    use C4::Members::Attributes;
-    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
-
-=back
+  use C4::Members::Attributes;
+  my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
 
 =head1 FUNCTIONS
 
 =head2 GetBorrowerAttributes
 
-=over 4
-
-my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber[, $opac_only]);
-
-=back
+  my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber[, $opac_only]);
 
 Retrieve an arrayref of extended attributes associated with the
 patron specified by C<$borrowernumber>.  Each entry in the arrayref
@@ -104,12 +96,7 @@ sub GetBorrowerAttributes {
 
 =head2 SearchIdMatchingAttribute
 
-=over 4
-
-my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($filter);
-
-=back
-
+  my $matching_records = C4::Members::Attributes::SearchIdMatchingAttribute($filter);
 
 =cut
 
@@ -130,11 +117,7 @@ AND attribute like ?};
 
 =head2 CheckUniqueness
 
-=over 4
-
-    my $ok = CheckUniqueness($code, $value[, $borrowernumber]);
-
-=back
+  my $ok = CheckUniqueness($code, $value[, $borrowernumber]);
 
 Given an attribute type and value, verify if would violate
 a unique_id restriction if added to the patron.  The
@@ -178,11 +161,7 @@ sub CheckUniqueness {
 
 =head2 SetBorrowerAttributes 
 
-=over 4
-
-    SetBorrowerAttributes($borrowernumber, [ { code => 'CODE', value => 'value', password => 'password' }, ... ] );
-
-=back
+  SetBorrowerAttributes($borrowernumber, [ { code => 'CODE', value => 'value', password => 'password' }, ... ] );
 
 Set patron attributes for the patron identified by C<$borrowernumber>,
 replacing any that existed previously.
@@ -207,12 +186,8 @@ sub SetBorrowerAttributes {
 
 =head2 extended_attributes_code_value_arrayref 
 
-=over 4
-
-    my $patron_attributes = "homeroom:1150605,grade:01,extradata:foobar";
-    my $aref = extended_attributes_code_value_arrayref($patron_attributes);
-
-=back
+   my $patron_attributes = "homeroom:1150605,grade:01,extradata:foobar";
+   my $aref = extended_attributes_code_value_arrayref($patron_attributes);
 
 Takes a comma-delimited CSV-style string argument and returns the kind of data structure that SetBorrowerAttributes wants, 
 namely a reference to array of hashrefs like:
@@ -238,16 +213,12 @@ sub extended_attributes_code_value_arrayref {
 
 =head2 extended_attributes_merge
 
-=over 4
-
-    my $old_attributes = extended_attributes_code_value_arrayref("homeroom:224,grade:04,deanslist:2007,deanslist:2008,somedata:xxx");
-    my $new_attributes = extended_attributes_code_value_arrayref("homeroom:115,grade:05,deanslist:2009,extradata:foobar");
-    my $merged = extended_attributes_merge($patron_attributes, $new_attributes, 1);
-
-    # assuming deanslist is a repeatable code, value same as:
-    # $merged = extended_attributes_code_value_arrayref("homeroom:115,grade:05,deanslist:2007,deanslist:2008,deanslist:2009,extradata:foobar,somedata:xxx");
+  my $old_attributes = extended_attributes_code_value_arrayref("homeroom:224,grade:04,deanslist:2007,deanslist:2008,somedata:xxx");
+  my $new_attributes = extended_attributes_code_value_arrayref("homeroom:115,grade:05,deanslist:2009,extradata:foobar");
+  my $merged = extended_attributes_merge($patron_attributes, $new_attributes, 1);
 
-=back
+  # assuming deanslist is a repeatable code, value same as:
+  # $merged = extended_attributes_code_value_arrayref("homeroom:115,grade:05,deanslist:2007,deanslist:2008,deanslist:2009,extradata:foobar,somedata:xxx");
 
 Takes three arguments.  The first two are references to array of hashrefs, each like:
  [ { code => 'CODE', value => 'value' }, { code => 'CODE2', value => 'othervalue' } ... ]
diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index 5fb1aae..22ee977 100644
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -106,7 +106,7 @@ if (C4::Context->preference('item-level_itypes')) {
 }
 
 =head1 NAME
-   
+
 C4::Reports::Guided - Module for generating guided reports 
 
 =head1 SYNOPSIS
@@ -115,6 +115,7 @@ C4::Reports::Guided - Module for generating guided reports
 
 =head1 DESCRIPTION
 
+=cut
 
 =head1 METHODS
 
@@ -374,25 +375,22 @@ sub get_criteria {
 
 =item execute_query
 
-=over
+  ($results, $total, $error) = execute_query($sql, $offset, $limit)
 
-($results, $total, $error) = execute_query($sql, $offset, $limit)
 
-=back
+When passed C<$sql>, this function returns an array ref containing a result set
+suitably formatted for display in html or for output as a flat file when passed in
+C<$format> and C<$id>. It also returns the C<$total> records available for the
+supplied query. If passed any query other than a SELECT, or if there is a db error,
+C<$errors> an array ref is returned containing the error after this manner:
 
-    When passed C<$sql>, this function returns an array ref containing a result set
-    suitably formatted for display in html or for output as a flat file when passed in
-    C<$format> and C<$id>. It also returns the C<$total> records available for the
-    supplied query. If passed any query other than a SELECT, or if there is a db error,
-    C<$errors> an array ref is returned containing the error after this manner:
+C<$error->{'sqlerr'}> contains the offending SQL keyword.
+C<$error->{'queryerr'}> contains the native db engine error returned for the query.
 
-    C<$error->{'sqlerr'}> contains the offending SQL keyword.
-    C<$error->{'queryerr'}> contains the native db engine error returned for the query.
-    
-    Valid values for C<$format> are 'text,' 'tab,' 'csv,' or 'url. C<$sql>, C<$type>,
-    C<$offset>, and C<$limit> are required parameters. If a valid C<$format> is passed
-    in, C<$offset> and C<$limit> are ignored for obvious reasons. A LIMIT specified by
-    the user in a user-supplied SQL query WILL apply in any case.
+Valid values for C<$format> are 'text,' 'tab,' 'csv,' or 'url. C<$sql>, C<$type>,
+C<$offset>, and C<$limit> are required parameters. If a valid C<$format> is passed
+in, C<$offset> and C<$limit> are ignored for obvious reasons. A LIMIT specified by
+the user in a user-supplied SQL query WILL apply in any case.
 
 =cut
 
diff --git a/C4/SIP/ILS/Item.pm b/C4/SIP/ILS/Item.pm
index b0c385c..3ff7f10 100644
--- a/C4/SIP/ILS/Item.pm
+++ b/C4/SIP/ILS/Item.pm
@@ -32,9 +32,9 @@ BEGIN {
 	@EXPORT_OK = qw();
 }
 
-=head2 EXAMPLE
+=head1 EXAMPLE
 
-our %item_db = (
+ our %item_db = (
     '1565921879' => {
         title => "Perl 5 desktop reference",
         id => '1565921879',
@@ -234,7 +234,7 @@ sub status_update {     # FIXME: this looks unimplemented
     $status->{ok} = 1;
     return $status;
 }
-    
+
 sub title_id {
     my $self = shift;
     return $self->{title};
diff --git a/C4/SIP/ILS/Patron.pm b/C4/SIP/ILS/Patron.pm
index e6b53b1..3f4e136 100644
--- a/C4/SIP/ILS/Patron.pm
+++ b/C4/SIP/ILS/Patron.pm
@@ -354,9 +354,9 @@ sub charge_denied {
 1;
 __END__
 
-=head2 EXAMPLES
+=head1 EXAMPLES
 
-our %patron_example = (
+  our %patron_example = (
 		  djfiander => {
 		      name => "David J. Fiander",
 		      id => 'djfiander',
@@ -388,96 +388,96 @@ our %patron_example = (
 		  },
   );
 
-From borrowers table:
-+---------------------+--------------+------+-----+
-| Field               | Type         | Null | Key |
-+---------------------+--------------+------+-----+
-| borrowernumber      | int(11)      | NO   | PRI |
-| cardnumber          | varchar(16)  | YES  | UNI |
-| surname             | mediumtext   | NO   |     |
-| firstname           | text         | YES  |     |
-| title               | mediumtext   | YES  |     |
-| othernames          | mediumtext   | YES  |     |
-| initials            | text         | YES  |     |
-| streetnumber        | varchar(10)  | YES  |     |
-| streettype          | varchar(50)  | YES  |     |
-| address             | mediumtext   | NO   |     |
-| address2            | text         | YES  |     |
-| city                | mediumtext   | NO   |     |
-| zipcode             | varchar(25)  | YES  |     |
-| country             | text         | YES  |     |
-| email               | mediumtext   | YES  |     |
-| phone               | text         | YES  |     |
-| mobile              | varchar(50)  | YES  |     |
-| fax                 | mediumtext   | YES  |     |
-| emailpro            | text         | YES  |     |
-| phonepro            | text         | YES  |     |
-| B_streetnumber      | varchar(10)  | YES  |     |
-| B_streettype        | varchar(50)  | YES  |     |
-| B_address           | varchar(100) | YES  |     |
-| B_address2          | text         | YES  |     |
-| B_city              | mediumtext   | YES  |     |
-| B_zipcode           | varchar(25)  | YES  |     |
-| B_country           | text         | YES  |     |
-| B_email             | text         | YES  |     |
-| B_phone             | mediumtext   | YES  |     |
-| dateofbirth         | date         | YES  |     |
-| branchcode          | varchar(10)  | NO   | MUL |
-| categorycode        | varchar(10)  | NO   | MUL |
-| dateenrolled        | date         | YES  |     |
-| dateexpiry          | date         | YES  |     |
-| gonenoaddress       | tinyint(1)   | YES  |     |
-| lost                | tinyint(1)   | YES  |     |
-| debarred            | tinyint(1)   | YES  |     |
-| contactname         | mediumtext   | YES  |     |
-| contactfirstname    | text         | YES  |     |
-| contacttitle        | text         | YES  |     |
-| guarantorid         | int(11)      | YES  |     |
-| borrowernotes       | mediumtext   | YES  |     |
-| relationship        | varchar(100) | YES  |     |
-| ethnicity           | varchar(50)  | YES  |     |
-| ethnotes            | varchar(255) | YES  |     |
-| sex                 | varchar(1)   | YES  |     |
-| password            | varchar(30)  | YES  |     |
-| flags               | int(11)      | YES  |     |
-| userid              | varchar(30)  | YES  | MUL |
-| opacnote            | mediumtext   | YES  |     |
-| contactnote         | varchar(255) | YES  |     |
-| sort1               | varchar(80)  | YES  |     |
-| sort2               | varchar(80)  | YES  |     |
-| altcontactfirstname | varchar(255) | YES  |     |
-| altcontactsurname   | varchar(255) | YES  |     |
-| altcontactaddress1  | varchar(255) | YES  |     |
-| altcontactaddress2  | varchar(255) | YES  |     |
-| altcontactaddress3  | varchar(255) | YES  |     |
-| altcontactzipcode   | varchar(50)  | YES  |     |
-| altcontactcountry   | text         | YES  |     |
-| altcontactphone     | varchar(50)  | YES  |     |
-| smsalertnumber      | varchar(50)  | YES  |     |
-+---------------------+--------------+------+-----+
-
-From C4::Members
-
-$flags->{KEY}
-{CHARGES}
+ From borrowers table:
+ +---------------------+--------------+------+-----+
+ | Field               | Type         | Null | Key |
+ +---------------------+--------------+------+-----+
+ | borrowernumber      | int(11)      | NO   | PRI |
+ | cardnumber          | varchar(16)  | YES  | UNI |
+ | surname             | mediumtext   | NO   |     |
+ | firstname           | text         | YES  |     |
+ | title               | mediumtext   | YES  |     |
+ | othernames          | mediumtext   | YES  |     |
+ | initials            | text         | YES  |     |
+ | streetnumber        | varchar(10)  | YES  |     |
+ | streettype          | varchar(50)  | YES  |     |
+ | address             | mediumtext   | NO   |     |
+ | address2            | text         | YES  |     |
+ | city                | mediumtext   | NO   |     |
+ | zipcode             | varchar(25)  | YES  |     |
+ | country             | text         | YES  |     |
+ | email               | mediumtext   | YES  |     |
+ | phone               | text         | YES  |     |
+ | mobile              | varchar(50)  | YES  |     |
+ | fax                 | mediumtext   | YES  |     |
+ | emailpro            | text         | YES  |     |
+ | phonepro            | text         | YES  |     |
+ | B_streetnumber      | varchar(10)  | YES  |     |
+ | B_streettype        | varchar(50)  | YES  |     |
+ | B_address           | varchar(100) | YES  |     |
+ | B_address2          | text         | YES  |     |
+ | B_city              | mediumtext   | YES  |     |
+ | B_zipcode           | varchar(25)  | YES  |     |
+ | B_country           | text         | YES  |     |
+ | B_email             | text         | YES  |     |
+ | B_phone             | mediumtext   | YES  |     |
+ | dateofbirth         | date         | YES  |     |
+ | branchcode          | varchar(10)  | NO   | MUL |
+ | categorycode        | varchar(10)  | NO   | MUL |
+ | dateenrolled        | date         | YES  |     |
+ | dateexpiry          | date         | YES  |     |
+ | gonenoaddress       | tinyint(1)   | YES  |     |
+ | lost                | tinyint(1)   | YES  |     |
+ | debarred            | tinyint(1)   | YES  |     |
+ | contactname         | mediumtext   | YES  |     |
+ | contactfirstname    | text         | YES  |     |
+ | contacttitle        | text         | YES  |     |
+ | guarantorid         | int(11)      | YES  |     |
+ | borrowernotes       | mediumtext   | YES  |     |
+ | relationship        | varchar(100) | YES  |     |
+ | ethnicity           | varchar(50)  | YES  |     |
+ | ethnotes            | varchar(255) | YES  |     |
+ | sex                 | varchar(1)   | YES  |     |
+ | password            | varchar(30)  | YES  |     |
+ | flags               | int(11)      | YES  |     |
+ | userid              | varchar(30)  | YES  | MUL |
+ | opacnote            | mediumtext   | YES  |     |
+ | contactnote         | varchar(255) | YES  |     |
+ | sort1               | varchar(80)  | YES  |     |
+ | sort2               | varchar(80)  | YES  |     |
+ | altcontactfirstname | varchar(255) | YES  |     |
+ | altcontactsurname   | varchar(255) | YES  |     |
+ | altcontactaddress1  | varchar(255) | YES  |     |
+ | altcontactaddress2  | varchar(255) | YES  |     |
+ | altcontactaddress3  | varchar(255) | YES  |     |
+ | altcontactzipcode   | varchar(50)  | YES  |     |
+ | altcontactcountry   | text         | YES  |     |
+ | altcontactphone     | varchar(50)  | YES  |     |
+ | smsalertnumber      | varchar(50)  | YES  |     |
+ +---------------------+--------------+------+-----+
+
+ From C4::Members
+
+ $flags->{KEY}
+ {CHARGES}
 	{message}     Message showing patron's credit or debt
 	{noissues}    Set if patron owes >$5.00
-{GNA}         	Set if patron gone w/o address
+ {GNA}         	Set if patron gone w/o address
 	{message}     "Borrower has no valid address"
 	{noissues}    Set.
-{LOST}        	Set if patron's card reported lost
+ {LOST}        	Set if patron's card reported lost
 	{message}     Message to this effect
 	{noissues}    Set.
-{DBARRED}     	Set if patron is debarred
+ {DBARRED}     	Set if patron is debarred
 	{message}     Message to this effect
 	{noissues}    Set.
-{NOTES}       	Set if patron has notes
+ {NOTES}       	Set if patron has notes
 	{message}     Notes about patron
-{ODUES}       	Set if patron has overdue books
+ {ODUES}       	Set if patron has overdue books
 	{message}     "Yes"
 	{itemlist}    ref-to-array: list of overdue books
 	{itemlisttext}    Text list of overdue items
-{WAITING}     	Set if there are items available that the patron reserved
+ {WAITING}     	Set if there are items available that the patron reserved
 	{message}     Message to this effect
 	{itemlist}    ref-to-array: list of available items
 
diff --git a/C4/Search/PazPar2.pm b/C4/Search/PazPar2.pm
index 59f4103..3aceb95 100644
--- a/C4/Search/PazPar2.pm
+++ b/C4/Search/PazPar2.pm
@@ -34,6 +34,8 @@ C4::Search::PazPar2 - implement client for PazPar2
 
 =head1 SYNOPSIS
 
+=cut
+
 =head1 DESCRIPTION
 
 =cut
diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 9d15847..e772db8 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -387,11 +387,11 @@ __END__
 
 =head1 NAME
 
-    VirtualShelves/Page.pm
+VirtualShelves/Page.pm
 
 =head1 DESCRIPTION
 
-    Module used for both OPAC and intranet pages.
+Module used for both OPAC and intranet pages.
 
 =head1 CGI PARAMETERS
 
@@ -399,32 +399,32 @@ __END__
 
 =item C<modifyshelfcontents>
 
-    If this script has to modify the shelf content.
+If this script has to modify the shelf content.
 
 =item C<shelfnumber>
 
-    To know on which shelf to work.
+To know on which shelf to work.
 
 =item C<addbarcode>
 
 =item C<op>
 
-    Op can be:
-        * modif: show the template allowing modification of the shelves;
-        * modifsave: save changes from modif mode.
+ Op can be:
+    * modif: show the template allowing modification of the shelves;
+    * modifsave: save changes from modif mode.
 
 =item C<viewshelf>
 
-    Load template with 'viewshelves param' displaying the shelf's information.
+Load template with 'viewshelves param' displaying the shelf's information.
 
 =item C<shelves>
 
-    If the param shelves == 1, then add or delete a shelf.
+If the param shelves == 1, then add or delete a shelf.
 
 =item C<addshelf>
 
-    If the param shelves == 1, then addshelf is the name of the shelf to add.
+If the param shelves == 1, then addshelf is the name of the shelf to add.
 
 =back
 
-=cut
\ No newline at end of file
+=cut
diff --git a/Makefile.PL b/Makefile.PL
index 5021f6c..0f75325 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1578,4 +1578,5 @@ MJ Ray mjr at phonecoop.coop
 Galen Charlton galen.charlton at liblime.com
 
 =cut
+
 FIXME: deal with .htaccess
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 94560c4..35d3507 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -30,17 +30,21 @@ addorder.pl
 this script allows to add an order.
 It is called by :
 
+=over
+
 =item neworderbiblio.pl to add an order from nothing.
 
 =item neworderempty.pl to add an order from an existing biblio.
 
 =item newordersuggestion.pl to add an order from an existing suggestion.
 
+=back
+
 =head1 CGI PARAMETERS
 
 All of the cgi parameters below are related to the new order.
 
-=over 4
+=over
 
 =item C<ordernumber>
 the number of this new order.
diff --git a/acqui/check_budget_total.pl b/acqui/check_budget_total.pl
index 62e5453..6ee346c 100755
--- a/acqui/check_budget_total.pl
+++ b/acqui/check_budget_total.pl
@@ -25,7 +25,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 DESCRIPTION
 
 fetches the budget amount fron the DB
 
diff --git a/acqui/fetch_sort_dropbox.pl b/acqui/fetch_sort_dropbox.pl
index 1bc9332..21d3c61 100755
--- a/acqui/fetch_sort_dropbox.pl
+++ b/acqui/fetch_sort_dropbox.pl
@@ -25,9 +25,9 @@ use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 NAME
 
-fetch_sort_dropbox : 
+fetch_sort_dropbox
 
 =cut
 
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 6c10459..61f0962 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -26,6 +26,7 @@
 neworderempty.pl
 
 =head1 DESCRIPTION
+
 this script allows to create a new record to order it. This record shouldn't exist
 on database.
 
@@ -363,9 +364,9 @@ $template->param(
 output_html_with_http_headers $input, $cookie, $template->output;
 
 
-=item MARCfindbreeding
+=head2 MARCfindbreeding
 
-    $record = MARCfindbreeding($breedingid);
+  $record = MARCfindbreeding($breedingid);
 
 Look up the import record repository for the record with
 record with id $breedingid.  If found, returns the decoded
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index a1e6fce..f084f8f 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -26,6 +26,7 @@
 orderreceive.pl
 
 =head1 DESCRIPTION
+
 This script shows all order already receive and all pendings orders.
 It permit to write a new order as 'received'.
 
@@ -34,16 +35,19 @@ It permit to write a new order as 'received'.
 =over 4
 
 =item supplierid
+
 to know on what supplier this script has to display receive order.
 
 =item receive
 
 =item invoice
+
 the number of this invoice.
 
 =item freight
 
 =item biblio
+
 The biblionumber of this order.
 
 =item datereceived
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 675b07d..b1e11e7 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -26,6 +26,7 @@
 parcel.pl
 
 =head1 DESCRIPTION
+
 This script shows all orders receipt or pending for a given supplier.
 It allows to write an order as 'received' when he arrives.
 
@@ -34,9 +35,11 @@ It allows to write an order as 'received' when he arrives.
 =over 4
 
 =item supplierid
+
 To know the supplier this script has to show orders.
 
 =item code
+
 is the bookseller invoice number.
 
 =item freight
@@ -46,6 +49,7 @@ is the bookseller invoice number.
 
 
 =item datereceived
+
 To filter the results list on this given date.
 
 =back
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 6c49a90..a939ce1 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -24,6 +24,7 @@
 supplier.pl
 
 =head1 DESCRIPTION
+
 this script shows the details for a bookseller given on input arg.
 It allows to edit & save information about this bookseller.
 
@@ -32,6 +33,7 @@ It allows to edit & save information about this bookseller.
 =over 4
 
 =item supplierid
+
 To know the bookseller this script has to display details.
 
 =back
diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index e324a29..05e8db2 100755
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -23,27 +23,27 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 NAME
+
 updatesupplier.pl
 
 =head1 DESCRIPTION
+
 this script allow to update or create (if id == 0)
 a supplier. This script is called from acqui/supplier.pl.
 
 =head1 CGI PARAMETERS
 
-=over 4
-
 All informations regarding this supplier are listed on input parameter.
 Here is the list :
+
 supplier, id, company, company_postal, physical, company_phone,
 physical, company_phone, company_fax, website, company_contact_name,
 company_contact_position, contact_phone, contact_phone_2, contact_fax,
 company_email, contact_notes, notes, status, publishers_imprints,
 list_currency, gst, list_gst, invoice_gst, discount, gstrate.
 
-=back
-
 =cut
+
 use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
diff --git a/admin/branches.pl b/admin/branches.pl
index 27d374e..758fa32 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -21,7 +21,7 @@
 
  FIXME: individual fields in branch address need to be exported to templates,
         in order to fix bug 180; need to notify translators
-FIXME: looped html (e.g., list of checkboxes) need to be properly
+ FIXME: looped html (e.g., list of checkboxes) need to be properly
         TMPL_LOOP'ized; doing this properly will fix bug 130; need to
         notify translators
  FIXME: need to implement the branch categories stuff
@@ -34,7 +34,7 @@ FIXME: looped html (e.g., list of checkboxes) need to be properly
 
  Finlay working on this file from 26-03-2002
  Reorganising this branches admin page.....
- 
+
 =cut
 
 use strict;
diff --git a/admin/check_budget_parent.pl b/admin/check_budget_parent.pl
index 810e117..8f56e2c 100755
--- a/admin/check_budget_parent.pl
+++ b/admin/check_budget_parent.pl
@@ -25,7 +25,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 DESCRIPTION
 
 fetches the budget amount fron the DB,
 called by aqbudgets.pl and neworderempty.pl
diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl
index 76b3e9a..f5d5000 100755
--- a/admin/check_parent_total.pl
+++ b/admin/check_parent_total.pl
@@ -25,7 +25,7 @@ use C4::Output;
 use C4::Auth;
 use C4::Budgets;
 
-=head1
+=head1 DESCRIPTION
 
 This script checks the amount unallocated from the new parent budget , or the period - if no parent_id is given
 
diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 468021c..491aed6 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -37,8 +37,14 @@ use vars qw( $is_a_modif );
 my $itemtype; # created here because it can be used in build_authorized_values_list sub
 our($authorised_values_sth,$is_a_modif,$usedTagsLib,$mandatory_z3950);
 
+=head1 FUNCTIONS
+
+=over
+
 =item build_authorized_values_list
 
+builds list, depending on authorised value...
+
 =cut
 
 sub build_authorized_values_list ($$$$$$$) {
@@ -47,7 +53,6 @@ sub build_authorized_values_list ($$$$$$$) {
     my @authorised_values;
     my %authorised_lib;
 
-    # builds list, depending on authorised value...
 
     #---- branch
     if ( $tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
@@ -111,7 +116,9 @@ sub build_authorized_values_list ($$$$$$$) {
 
 
 =item create_input
+
 builds the <input ...> entry for a subfield.
+
 =cut
 
 sub create_input {
@@ -310,7 +317,7 @@ sub format_indicator {
 
 =item CreateKey
 
-    Create a random value to set it into the input name
+Create a random value to set it into the input name
 
 =cut
 
@@ -519,6 +526,11 @@ sub build_hidden_data () {
     }
 }
 
+=back
+
+=cut
+
+
 # ======================== 
 #          MAIN 
 #=========================
diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl
index e21105b..3c6ef74 100755
--- a/cataloguing/value_builder/barcode.pl
+++ b/cataloguing/value_builder/barcode.pl
@@ -30,6 +30,7 @@ my $DEBUG = 0;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 #   my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
     return "";
@@ -49,6 +50,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
 	my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 	my $function_name= "barcode".(int(rand(100000))+1);
diff --git a/cataloguing/value_builder/dateaccessioned.pl b/cataloguing/value_builder/dateaccessioned.pl
index 3b8e8c0..3a9a3da 100755
--- a/cataloguing/value_builder/dateaccessioned.pl
+++ b/cataloguing/value_builder/dateaccessioned.pl
@@ -27,6 +27,7 @@
 plugin_parameters : useless here
 
 =cut
+
 sub plugin_parameters {
 	# my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 	return "";
@@ -46,6 +47,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
 	# my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 	my $function_name = "dateaccessioned".(int(rand(100000))+1);
diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl
index 4b2a202..2d535c1 100755
--- a/cataloguing/value_builder/macles.pl
+++ b/cataloguing/value_builder/macles.pl
@@ -36,6 +36,7 @@ use utf8;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_field_003.pl b/cataloguing/value_builder/marc21_field_003.pl
index 531f586..e08ee6c 100755
--- a/cataloguing/value_builder/marc21_field_003.pl
+++ b/cataloguing/value_builder/marc21_field_003.pl
@@ -27,6 +27,7 @@ use C4::Context;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
     # my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
     return "";
@@ -46,6 +47,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
     my $function_name= $field_number;
diff --git a/cataloguing/value_builder/marc21_field_005.pl b/cataloguing/value_builder/marc21_field_005.pl
index 3c33145..7db29b7 100755
--- a/cataloguing/value_builder/marc21_field_005.pl
+++ b/cataloguing/value_builder/marc21_field_005.pl
@@ -46,6 +46,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
     my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
     my $function_name= $field_number;
diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl
index b244f0b..69b79d0 100755
--- a/cataloguing/value_builder/marc21_leader.pl
+++ b/cataloguing/value_builder/marc21_leader.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_leader_authorities.pl b/cataloguing/value_builder/marc21_leader_authorities.pl
index bbbc85e..b9cbe8b 100755
--- a/cataloguing/value_builder/marc21_leader_authorities.pl
+++ b/cataloguing/value_builder/marc21_leader_authorities.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_leader_book.pl b/cataloguing/value_builder/marc21_leader_book.pl
index 6eb0f61..005ea97 100755
--- a/cataloguing/value_builder/marc21_leader_book.pl
+++ b/cataloguing/value_builder/marc21_leader_book.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_leader_computerfile.pl b/cataloguing/value_builder/marc21_leader_computerfile.pl
index 9ce7f91..800b445 100755
--- a/cataloguing/value_builder/marc21_leader_computerfile.pl
+++ b/cataloguing/value_builder/marc21_leader_computerfile.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/marc21_leader_video.pl b/cataloguing/value_builder/marc21_leader_video.pl
index 62e98da..3e72ad9 100755
--- a/cataloguing/value_builder/marc21_leader_video.pl
+++ b/cataloguing/value_builder/marc21_leader_video.pl
@@ -32,6 +32,7 @@ use C4::Output;
 plugin_parameters : other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 return "";
diff --git a/cataloguing/value_builder/stocknumber.pl b/cataloguing/value_builder/stocknumber.pl
index 88e726a..005f011 100755
--- a/cataloguing/value_builder/stocknumber.pl
+++ b/cataloguing/value_builder/stocknumber.pl
@@ -21,19 +21,20 @@
 #use warnings; FIXME - Bug 2505
 use C4::Context;
 
-=head1
+=head1 plugin_parameters
 
-plugin_parameters : other parameters added when the plugin is called by the dopop function
+other parameters added when the plugin is called by the dopop function
 
 =cut
+
 sub plugin_parameters {
 #   my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
     return "";
 }
 
-=head1
+=head1 plugin_javascript
 
-plugin_javascript : the javascript function called when the user enters the subfield.
+The javascript function called when the user enters the subfield.
 contain 3 javascript functions :
 * one called when the field is entered (OnFocus). Named FocusXXX
 * one called when the field is leaved (onBlur). Named BlurXXX
@@ -45,6 +46,7 @@ returns :
 the 3 scripts are inserted after the <input> in the html code
 
 =cut
+
 sub plugin_javascript {
 	my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 	my $function_name= "inventory".(int(rand(100000))+1);
diff --git a/installer/data/mysql/update22to30.pl b/installer/data/mysql/update22to30.pl
index 6d5b1cc..76bb3c2 100755
--- a/installer/data/mysql/update22to30.pl
+++ b/installer/data/mysql/update22to30.pl
@@ -3538,12 +3538,12 @@ my $DBversion = "3.00.00.000";
     print "upgrade to Koha 3.0 done\n";
     SetVersion ($DBversion);
 
-
-=item GetDefaultClause
+=head1 GetDefaultClause
 
 Generate a default clause (for an ALTER TABLE command)
 
 =cut
+
 sub GetDefaultClause {
     my $default = shift;
 
@@ -3554,11 +3554,11 @@ sub GetDefaultClause {
     return "default " . $dbh->quote($default);
 }
 
-=item TransformToNum
+=head1 TransformToNum
+
+Transform the Koha version from a 4 parts string
+to a number, with just 1.
 
-  Transform the Koha version from a 4 parts string
-  to a number, with just 1 .
-  
 =cut
 
 sub TransformToNum {
@@ -3568,8 +3568,10 @@ sub TransformToNum {
     return $version;
 }
 
-=item SetVersion
-    set the DBversion in the systempreferences
+=head1 SetVersion
+
+set the DBversion in the systempreferences
+
 =cut
 
 sub SetVersion {
diff --git a/kohaversion.pl b/kohaversion.pl
index 0ddf98e..1c409f3 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -1,11 +1,17 @@
 # the next koha public release version number;
-# the kohaversion is divided in 4 parts :
-# - #1 : the major number. 3 atm
-# - #2 : the functionnal release. 00 atm
-# - #3 : the subnumber, moves only on a public release
-# - #4 : the developer version. The 4th number is the database subversion.
-#        used by developers when the database changes. updatedatabase take care of the changes itself
-#        and is automatically called by Auth.pm when needed.
+
+=head1 FUNCTIONS
+
+=head2 kohaversion
+
+the kohaversion is divided in 4 parts :
+ - #1 : the major number. 3 atm
+ - #2 : the functionnal release. 00 atm
+ - #3 : the subnumber, moves only on a public release
+ - #4 : the developer version. The 4th number is the database subversion.
+        used by developers when the database changes. updatedatabase take care of the changes itself
+        and is automatically called by Auth.pm when needed.
+=cut
 
 use strict;
 
diff --git a/labels/label-create-csv.pl b/labels/label-create-csv.pl
index c053842..50262df 100755
--- a/labels/label-create-csv.pl
+++ b/labels/label-create-csv.pl
@@ -11,10 +11,6 @@ use C4::Debug;
 use C4::Creators 1.000000;
 use C4::Labels 1.000000;
 
-=head
-
-=cut
-
 my $cgi = new CGI;
 
 my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
diff --git a/labels/label-create-xml.pl b/labels/label-create-xml.pl
index 85e4136..a6c5808 100755
--- a/labels/label-create-xml.pl
+++ b/labels/label-create-xml.pl
@@ -11,10 +11,6 @@ use C4::Debug;
 use C4::Creators 1.000000;
 use C4::Labels 1.000000;
 
-=head
-
-=cut
-
 my $cgi = new CGI;
 
 my $batch_id    = $cgi->param('batch_id') if $cgi->param('batch_id');
diff --git a/members/patronimage.pl b/members/patronimage.pl
index c5e061a..e76d117 100755
--- a/members/patronimage.pl
+++ b/members/patronimage.pl
@@ -76,8 +76,6 @@ if ($imagedata) {
 
 exit;
 
-=back
-
 =head1 AUTHOR
 
 Chris Nighswonger cnighswonger <at> foundations <dot> edu
diff --git a/misc/cronjobs/check-url.pl b/misc/cronjobs/check-url.pl
index 063eb7e..3936b49 100755
--- a/misc/cronjobs/check-url.pl
+++ b/misc/cronjobs/check-url.pl
@@ -38,7 +38,7 @@ C4::URL::Checker - base object for checking URL stored in Koha DB
            "is_success: ", $url->{ is_success }, "\n",
            "status:     ", $url->{ status     }, "\n";
  }
- 
+
 =head1 FUNCTIONS
 
 =head2 new
diff --git a/tools/letter.pl b/tools/letter.pl
index 0f5113d..4416c3f 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -36,6 +36,7 @@
 	- we delete the designated record
 
 =cut
+
 # TODO This script drives the CRUD operations on the letter table
 # The DB interaction should be handled by calls to C4/Letters.pm
 
-- 
1.7.0


From gmcharlt at gmail.com  Thu Nov 11 14:30:13 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 08:30:13 -0500
Subject: [Koha-patches] [PATCH] bug 5386: remove dep on Path::Class from
	t/00-load.t
Message-ID: <1289482213-22978-1-git-send-email-gmcharlt@gmail.com>

File::Spec is a core module, Path::Class isn't; not yet
worth adding a new dependency.

Also some minor whitepace cleanup.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 t/00-load.t |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/t/00-load.t b/t/00-load.t
index 6b3172c..b5c7181 100644
--- a/t/00-load.t
+++ b/t/00-load.t
@@ -3,23 +3,22 @@
 use strict;
 use warnings;
 use Test::More;
-use Path::Class;
+use File::Spec;
 use File::Find;
 
-my $lib = dir('C4')->absolute->resolve;
+my $lib = File::Spec->rel2abs('C4');
 find({
     bydepth => 1,
     no_chdir => 1,
     wanted => sub {
         my $m = $_;
-	return unless $m =~ s/[.]pm$//;
-	return if $m =~ /Auth_with_ldap/; # Dont test this, it will fail on use
-	return if $m =~ /Cache/; # Cache modules are a WIP, add the tests back when we are using them more
-	return if $m =~ /SIP/; # SIP modules will not load clean
-	$m =~ s{^.*/C4/}{C4/};	
-	$m =~ s{/}{::}g;
-	use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
+	    return unless $m =~ s/[.]pm$//;
+	    return if $m =~ /Auth_with_ldap/; # Dont test this, it will fail on use
+	    return if $m =~ /Cache/; # Cache modules are a WIP, add the tests back when we are using them more
+	    return if $m =~ /SIP/; # SIP modules will not load clean
+	    $m =~ s{^.*/C4/}{C4/};	
+	    $m =~ s{/}{::}g;
+	    use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
     },
 }, $lib);
 done_testing();
-   
-- 
1.7.0


From colin.campbell at ptfs-europe.com  Thu Nov 11 14:32:32 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu, 11 Nov 2010 13:32:32 +0000
Subject: [Koha-patches] [PATCH] Bug 4305 Improve code flow
Message-ID: <1289482352-20067-1-git-send-email-colin.campbell@ptfs-europe.com>

Use the ISBN Object's method to format the string
rather than add extra code to do it
Clean up the code flow for clarity
Benchmarking shows its a bit faster too
Don't add to the number of Test::Perl::Critic warnings
 for no benefit
---
 C4/Koha.pm |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index e746f83..a63a3a5 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1350,14 +1350,15 @@ sub _normalize_match_point {
     return $normalized_match_point;
 }
 
-sub _isbn_cleanup ($) {
-    my $isbn = Business::ISBN->new( shift );
-    return undef unless $isbn;
-    $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
-    return undef unless $isbn;
-    $isbn = $isbn->as_string;
-    $isbn =~ s/-//g;
-    return $isbn;
+sub _isbn_cleanup {
+    my $isbn = Business::ISBN->new( $_[0] );
+    if ( $isbn ) {
+        $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
+        if (defined $isbn) {
+            return $isbn->as_string([]);
+        }
+    }
+    return;
 }
 
 1;
-- 
1.7.3.2


From gmcharlt at gmail.com  Thu Nov 11 14:37:55 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 08:37:55 -0500
Subject: [Koha-patches] [PATCH] Ability to link to items belong to host
 records from a analytical record
In-Reply-To: <20101110221914.GC4325@rorohiko>
References: <1289413324-3877-1-git-send-email-savitra.sirohi@osslabs.biz>
	<20101110221914.GC4325@rorohiko>
Message-ID: <AANLkTikuPo5Wve2Rhvjio1Vq2tCfTRUsVcTOUyLK5oz=@mail.gmail.com>

Hi,

On Wed, Nov 10, 2010 at 5:19 PM, Chris Cormack <chrisc at catalyst.net.nz> wrote:
> * savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz) wrote:
>> From: Amit Gupta <amit.gupta at osslabs.biz>
>>
>> ---
>> ?cataloguing/linkitem.pl ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 98 ++++++++++++++++++++
>> ?.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | ? ?1 +
>> ?.../prog/en/modules/cataloguing/linkitem.tmpl ? ? ?| ? 57 +++++++++++
>> ?3 files changed, 156 insertions(+), 0 deletions(-)
>> ?create mode 100755 cataloguing/linkitem.pl
>> ?create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl
>>
>> diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
>> new file mode 100755
>> index 0000000..bff001e
>> --- /dev/null
>> +++ b/cataloguing/linkitem.pl
>> @@ -0,0 +1,98 @@
>> +#!/usr/bin/perl
>> +
>> +# Move an item from a biblio to another
>> +#
>> +# Copyright 2009 BibLibre
>
> Can you please fix the copyright statement here, and resend
>
> (You might want to check the other patches too, if we want to get into
> debian we need correct copyright (or at least a lot more correct than we
> have now) statements

linkitem.pl is clearly a copy-and-paste of moveitem.pl with a few changes, so

"Copyright 2009 BibLibre
Copyright 2010 OSSLabs"

(or something like that) is probably the correct copyright statement.

Also, a note on the patch itself - it's not ideal to have the MARC21
773 field be referenced directly in the script - that really should be
wrapped in a C4 routine so that it is easier to maintain (and for Zeno
to add the UNIMARC support).

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From cnighswonger at foundations.edu  Thu Nov 11 14:50:14 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 11 Nov 2010 08:50:14 -0500
Subject: [Koha-patches] [PATCH] Script to test modules compile,
 when used with a pre-commit hook this can test before a commit
In-Reply-To: <1289460801-15278-1-git-send-email-chrisc@catalyst.net.nz>
References: <1289460801-15278-1-git-send-email-chrisc@catalyst.net.nz>
Message-ID: <AANLkTimP1p82st=kg8hVC5ir3-H2=Vbxu1BK5jd_maa+@mail.gmail.com>

It looks like this adds a new dependency in Class::Path which causes
the test to fail if not installed. Shouldn't this be added to the list
of perl dependencies for Koha?

Kind Regards,
Chris

On Thu, Nov 11, 2010 at 2:33 AM, Chris Cormack <chrisc at catalyst.net.nz> wrote:
> ---
> ?t/00-load.t | ? 25 +++++++++++++++++++++++++
> ?1 files changed, 25 insertions(+), 0 deletions(-)
> ?create mode 100644 t/00-load.t
>
> diff --git a/t/00-load.t b/t/00-load.t
> new file mode 100644
> index 0000000..6b3172c
> --- /dev/null
> +++ b/t/00-load.t
> @@ -0,0 +1,25 @@
> +# This script is called by the pre-commit git hook to test modules compile
> +
> +use strict;
> +use warnings;
> +use Test::More;
> +use Path::Class;
> +use File::Find;
> +
> +my $lib = dir('C4')->absolute->resolve;
> +find({
> + ? ?bydepth => 1,
> + ? ?no_chdir => 1,
> + ? ?wanted => sub {
> + ? ? ? ?my $m = $_;
> + ? ? ? return unless $m =~ s/[.]pm$//;
> + ? ? ? return if $m =~ /Auth_with_ldap/; # Dont test this, it will fail on use
> + ? ? ? return if $m =~ /Cache/; # Cache modules are a WIP, add the tests back when we are using them more
> + ? ? ? return if $m =~ /SIP/; # SIP modules will not load clean
> + ? ? ? $m =~ s{^.*/C4/}{C4/};
> + ? ? ? $m =~ s{/}{::}g;
> + ? ? ? use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
> + ? ?},
> +}, $lib);
> +done_testing();
> +
> --
> 1.7.0.4
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>

From gmcharlt at gmail.com  Thu Nov 11 14:55:50 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 08:55:50 -0500
Subject: [Koha-patches] [PATCH 1/2] bug 4305: add a couple test cases for
	_sibn_cleanup
Message-ID: <1289483751-24097-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 t/Koha.t |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/t/Koha.t b/t/Koha.t
index a042f47..1742ddd 100755
--- a/t/Koha.t
+++ b/t/Koha.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 5;
+use Test::More tests => 7;
 
 use_ok('C4::Koha');
 
@@ -19,3 +19,6 @@ is(xml_escape($undef), '', 'xml_escape() returns empty string on undef input');
 my $str = q{'"&<>'};
 is(xml_escape($str), '&apos;&quot;&amp;&lt;&gt;&apos;', 'xml_escape() works as expected');
 is($str, q{'"&<>'}, '... and does not change input in place');
+
+is(C4::Koha::_isbn_cleanup('0-590-35340-3'), '0590353403', '_isbn_cleanup removes hyphens');
+is(C4::Koha::_isbn_cleanup('0590353403 (pbk.)'), '0590353403', '_isbn_cleanup removes parenthetical');
-- 
1.7.0


From gmcharlt at gmail.com  Thu Nov 11 14:55:51 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 08:55:51 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 4305 Improve code flow
In-Reply-To: <1289483751-24097-1-git-send-email-gmcharlt@gmail.com>
References: <1289483751-24097-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289483751-24097-2-git-send-email-gmcharlt@gmail.com>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

Use the ISBN Object's method to format the string
rather than add extra code to do it
Clean up the code flow for clarity
Benchmarking shows its a bit faster too
Don't add to the number of Test::Perl::Critic warnings
 for no benefit

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Koha.pm |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index e746f83..a63a3a5 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1350,14 +1350,15 @@ sub _normalize_match_point {
     return $normalized_match_point;
 }
 
-sub _isbn_cleanup ($) {
-    my $isbn = Business::ISBN->new( shift );
-    return undef unless $isbn;
-    $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
-    return undef unless $isbn;
-    $isbn = $isbn->as_string;
-    $isbn =~ s/-//g;
-    return $isbn;
+sub _isbn_cleanup {
+    my $isbn = Business::ISBN->new( $_[0] );
+    if ( $isbn ) {
+        $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
+        if (defined $isbn) {
+            return $isbn->as_string([]);
+        }
+    }
+    return;
 }
 
 1;
-- 
1.7.0


From gmcharlt at gmail.com  Thu Nov 11 15:01:03 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 09:01:03 -0500
Subject: [Koha-patches] [PATCH] Script to test modules compile,
 when used with a pre-commit hook this can test before a commit
In-Reply-To: <AANLkTimP1p82st=kg8hVC5ir3-H2=Vbxu1BK5jd_maa+@mail.gmail.com>
References: <1289460801-15278-1-git-send-email-chrisc@catalyst.net.nz>
	<AANLkTimP1p82st=kg8hVC5ir3-H2=Vbxu1BK5jd_maa+@mail.gmail.com>
Message-ID: <AANLkTikJQWiz-fRZsycu+D9U4qgSxygmUKi7nOCh7UsS@mail.gmail.com>

Hi,

On Thu, Nov 11, 2010 at 8:50 AM, Chris Nighswonger
<cnighswonger at foundations.edu> wrote:
> It looks like this adds a new dependency in Class::Path which causes
> the test to fail if not installed. Shouldn't this be added to the list
> of perl dependencies for Koha?

Or just remove the dependency, as my patch for bug 5386 does. :)

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From gmcharlt at gmail.com  Thu Nov 11 15:02:13 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 09:02:13 -0500
Subject: [Koha-patches] [PATCH 2/2] [SIGNED-OFF] Bug 4305 Improve code flow
In-Reply-To: <1289484133-24400-1-git-send-email-gmcharlt@gmail.com>
References: <1289484133-24400-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289484133-24400-2-git-send-email-gmcharlt@gmail.com>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

Use the ISBN Object's method to format the string
rather than add extra code to do it
Clean up the code flow for clarity
Benchmarking shows its a bit faster too
Don't add to the number of Test::Perl::Critic warnings
 for no benefit

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Koha.pm |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index e746f83..a63a3a5 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1350,14 +1350,15 @@ sub _normalize_match_point {
     return $normalized_match_point;
 }
 
-sub _isbn_cleanup ($) {
-    my $isbn = Business::ISBN->new( shift );
-    return undef unless $isbn;
-    $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
-    return undef unless $isbn;
-    $isbn = $isbn->as_string;
-    $isbn =~ s/-//g;
-    return $isbn;
+sub _isbn_cleanup {
+    my $isbn = Business::ISBN->new( $_[0] );
+    if ( $isbn ) {
+        $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
+        if (defined $isbn) {
+            return $isbn->as_string([]);
+        }
+    }
+    return;
 }
 
 1;
-- 
1.7.0


From gmcharlt at gmail.com  Thu Nov 11 15:02:12 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 09:02:12 -0500
Subject: [Koha-patches] [PATCH 1/2] bug 4305: add a couple test cases for
	_isbn_cleanup
Message-ID: <1289484133-24400-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 t/Koha.t |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/t/Koha.t b/t/Koha.t
index a042f47..1742ddd 100755
--- a/t/Koha.t
+++ b/t/Koha.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 5;
+use Test::More tests => 7;
 
 use_ok('C4::Koha');
 
@@ -19,3 +19,6 @@ is(xml_escape($undef), '', 'xml_escape() returns empty string on undef input');
 my $str = q{'"&<>'};
 is(xml_escape($str), '&apos;&quot;&amp;&lt;&gt;&apos;', 'xml_escape() works as expected');
 is($str, q{'"&<>'}, '... and does not change input in place');
+
+is(C4::Koha::_isbn_cleanup('0-590-35340-3'), '0590353403', '_isbn_cleanup removes hyphens');
+is(C4::Koha::_isbn_cleanup('0590353403 (pbk.)'), '0590353403', '_isbn_cleanup removes parenthetical');
-- 
1.7.0


From tajoli at cilea.it  Thu Nov 11 15:10:17 2010
From: tajoli at cilea.it (tajoli at cilea.it)
Date: 11 Nov 2010 15:10:17 +0100
Subject: [Koha-patches] [bug 5204] Unimarc XSLT, from French to English
Message-ID: <20101111140800.43E6046F38@eliot.biblibre.com>

A non-text attachment was scrubbed...
Name: not available
Type: application/octet-stream
Size: 26382 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101111/cee9e1ab/attachment-0001.obj>

From cnighswonger at foundations.edu  Thu Nov 11 15:23:47 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 11 Nov 2010 09:23:47 -0500
Subject: [Koha-patches] [PATCH] bug 5386: remove dep on Path::Class from
	t/00-load.t
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289485427-27431-1-git-send-email-cnighswonger@foundations.edu>

From: Galen Charlton <gmcharlt at gmail.com>

File::Spec is a core module, Path::Class isn't; not yet
worth adding a new dependency.

Also some minor whitepace cleanup.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 t/00-load.t |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/t/00-load.t b/t/00-load.t
index 6b3172c..b5c7181 100644
--- a/t/00-load.t
+++ b/t/00-load.t
@@ -3,23 +3,22 @@
 use strict;
 use warnings;
 use Test::More;
-use Path::Class;
+use File::Spec;
 use File::Find;
 
-my $lib = dir('C4')->absolute->resolve;
+my $lib = File::Spec->rel2abs('C4');
 find({
     bydepth => 1,
     no_chdir => 1,
     wanted => sub {
         my $m = $_;
-	return unless $m =~ s/[.]pm$//;
-	return if $m =~ /Auth_with_ldap/; # Dont test this, it will fail on use
-	return if $m =~ /Cache/; # Cache modules are a WIP, add the tests back when we are using them more
-	return if $m =~ /SIP/; # SIP modules will not load clean
-	$m =~ s{^.*/C4/}{C4/};	
-	$m =~ s{/}{::}g;
-	use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
+	    return unless $m =~ s/[.]pm$//;
+	    return if $m =~ /Auth_with_ldap/; # Dont test this, it will fail on use
+	    return if $m =~ /Cache/; # Cache modules are a WIP, add the tests back when we are using them more
+	    return if $m =~ /SIP/; # SIP modules will not load clean
+	    $m =~ s{^.*/C4/}{C4/};	
+	    $m =~ s{/}{::}g;
+	    use_ok($m) || BAIL_OUT("***** PROBLEMS LOADING FILE '$m'");
     },
 }, $lib);
 done_testing();
-   
-- 
1.7.0.4


From gmcharlt at gmail.com  Thu Nov 11 15:43:43 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 09:43:43 -0500
Subject: [Koha-patches] [bug 5204] Unimarc XSLT, from French to English
In-Reply-To: <20101111140800.43E6046F38@eliot.biblibre.com>
References: <20101111140800.43E6046F38@eliot.biblibre.com>
Message-ID: <AANLkTi=wkgtAtwVTJg__WXuNxCwpKaKt93CakfFd1Ze7@mail.gmail.com>

Hi,

This patch introduces an XML parsing error in
UNIMARCslim2intranetDetail.xsl and would break XSLT bib details
display in the staff interface:

$ xmllint --noout
koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl:364:
parser error : Opening and ending tag mismatch: call-template line 361
and call-templat
  </xsl:call-templat>
                     ^

Regards,

Galen

On Thu, Nov 11, 2010 at 9:10 AM,  <tajoli at cilea.it> wrote:
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>



-- 
Galen Charlton
gmcharlt at gmail.com

From cnighswonger at foundations.edu  Thu Nov 11 15:43:47 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 11 Nov 2010 09:43:47 -0500
Subject: [Koha-patches] [PATCH] bug 4305: add a couple test cases for
	_isbn_cleanup
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289486627-28022-1-git-send-email-cnighswonger@foundations.edu>

From: Galen Charlton <gmcharlt at gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 t/Koha.t |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/t/Koha.t b/t/Koha.t
index a042f47..1742ddd 100755
--- a/t/Koha.t
+++ b/t/Koha.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 5;
+use Test::More tests => 7;
 
 use_ok('C4::Koha');
 
@@ -19,3 +19,6 @@ is(xml_escape($undef), '', 'xml_escape() returns empty string on undef input');
 my $str = q{'"&<>'};
 is(xml_escape($str), '&apos;&quot;&amp;&lt;&gt;&apos;', 'xml_escape() works as expected');
 is($str, q{'"&<>'}, '... and does not change input in place');
+
+is(C4::Koha::_isbn_cleanup('0-590-35340-3'), '0590353403', '_isbn_cleanup removes hyphens');
+is(C4::Koha::_isbn_cleanup('0590353403 (pbk.)'), '0590353403', '_isbn_cleanup removes parenthetical');
-- 
1.7.0.4


From gmcharlt at gmail.com  Thu Nov 11 16:05:34 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 10:05:34 -0500
Subject: [Koha-patches] [PATCH] bug 5389: mark Business::ISBN as a required
	dependency
Message-ID: <1289487934-25063-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Installer/PerlDependencies.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index 3ac49dc..eadc569 100644
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -466,7 +466,7 @@ our $PERL_DEPS = {
     },
     'Business::ISBN' => {
         'usage'    => 'Core',
-        'required' => '0',
+        'required' => '1',
         'min_ver'  => '2.05',
     },
 };
-- 
1.7.0


From cnighswonger at foundations.edu  Thu Nov 11 16:26:16 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 11 Nov 2010 10:26:16 -0500
Subject: [Koha-patches] [PATCH] bug 5389: mark Business::ISBN as a required
	dependency
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289489176-28566-1-git-send-email-cnighswonger@foundations.edu>

From: Galen Charlton <gmcharlt at gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 C4/Installer/PerlDependencies.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index 3ac49dc..eadc569 100644
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -466,7 +466,7 @@ our $PERL_DEPS = {
     },
     'Business::ISBN' => {
         'usage'    => 'Core',
-        'required' => '0',
+        'required' => '1',
         'min_ver'  => '2.05',
     },
 };
-- 
1.7.0.4


From cnighswonger at foundations.edu  Thu Nov 11 17:08:46 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 11 Nov 2010 11:08:46 -0500
Subject: [Koha-patches] [Bug 5379] Pull Request
In-Reply-To: <AANLkTin4dCBVaGKcL25Y=mTeT_QaEGry=zxUhy50dfLb@mail.gmail.com>
References: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>
	<AANLkTin4dCBVaGKcL25Y=mTeT_QaEGry=zxUhy50dfLb@mail.gmail.com>
Message-ID: <AANLkTi=57TO+cfjp7o96hVHfi2sJujrm2AE=Tv0RKDV7@mail.gmail.com>

 Hey Galen,

On Tue, Nov 9, 2010 at 11:32 PM, Galen Charlton <gmcharlt at gmail.com> wrote:

> Hi,
>
> I have the following comments on the patch:
>
> [1] To bail out of SetBorrowerAttributes, just do a return, not return
> 0 - at present, nothing is looking for a return value for that
> function, so a plain 'return' would do what the consumers expect and
> return undef.
>

I disagree since an undef return is a de facto indicator of success at
present, doing a return only on a db error and then throwing an error to the
interface based on that value results in an inconsistency with some of the
consumers reading the undef return as success and others as failure. Grep
seems to think that no present consumer looks at the return value of this
sub, so setting it to something to differentiate an error would not appear
to hurt any present calls to it and would give a positive indication of an
error.



> [2] Bailing out of AddMember should be done before invoking
> manualinvoice.  I also suggest using a plain return; having AddMember
> return undef (but note, I don't mean doing 'return undef;', I mean
> 'return;') would both signify the error condition *and* force
> consumers to not blithely charge along trying to work with a patron
> whose borrowernumber is 0.  I'm thinking of memberentry.pl in
> particular.  Also, changing the return of AddMember is definitely
> cause to update the POD.
>

I agree with moving where we bail so that no further code is executed after
the db error.

I disagree, however, with an undef return. Again, grep shows that returning
0 on a db error will not cause any worse problems than are presently cause
then an undef is returned. It will, however, permit positive confirmation of
an error for the consumer. And in any case, current calls to this sub should
be fixed up to handle an undef return. There are not many.

Kind Regards,
Chris



> On Tue, Nov 9, 2010 at 10:42 AM, Chris Nighswonger
> <cnighswonger at foundations.edu> wrote:
> > The following changes since commit
> 1aef81c354eb17c2cf2d557cac78d4e37c30a046:
> >  Chris Cormack (1):
> >        Ukranian and Russian syspref language updates
> >
> > are available in the git repository at:
> >
> >  git://git.koha-community.org/wip/koha-fbc.git k_bug_5379
> >
> > Chris Nighswonger (1):
> >      Bug 5379 - import_borrowers.pl fails with db insert/update errors
> >
> >  C4/Members.pm                                      |    5 +++++
> >  C4/Members/Attributes.pm                           |    6 ++++++
> >  .../prog/en/modules/tools/import_borrowers.tmpl    |    6 ++++--
> >  tools/import_borrowers.pl                          |   16
> ++++++++++++++--
> >  4 files changed, 29 insertions(+), 4 deletions(-)
> > _______________________________________________
> > Koha-patches mailing list
> > Koha-patches at lists.koha-community.org
> > http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> > website : http://www.koha-community.org/
> > git : http://git.koha-community.org/
> > bugs : http://bugs.koha-community.org/
> >
>
>
>
> --
> Galen Charlton
> gmcharlt at gmail.com
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101111/e83eceae/attachment.htm>

From cnighswonger at foundations.edu  Thu Nov 11 17:25:32 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 11 Nov 2010 11:25:32 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug 5326 fix link to old pres
	editor on patron attributes
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289492732-29682-1-git-send-email-cnighswonger@foundations.edu>

From: Nicole Engard <nengard at bywatersolutions.com>

on the patron attributes page if you have ExtendedPatronAttributes
turned off the error points you to the old sys prefs editor - this
patch fixes that

Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 .../prog/en/modules/admin/patron-attr-types.tmpl   |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
index 27c82c5..b445c41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
@@ -68,10 +68,7 @@ function CheckAttributeTypeForm(f) {
     <div class="yui-b">
 
 <!-- TMPL_IF name="WARNING_extended_attributes_off" -->
-<div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently OFF, extended patron attributes 
-cannot be given to patron records.  Go 
-<a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&amp;searchfield=ExtendedPatronAttributes">here</a> if you wish to turn 
-this feature on.</div>
+<div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently not enabled, extended patron attributes cannot be given to patron records.  Go <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ExtendedPatronAttributes">here</a> if you wish to enable this feature.</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="attribute_type_form" -->
-- 
1.7.0.4


From gmcharlt at gmail.com  Thu Nov 11 17:44:39 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 11:44:39 -0500
Subject: [Koha-patches] [Bug 5379] Pull Request
In-Reply-To: <AANLkTi=57TO+cfjp7o96hVHfi2sJujrm2AE=Tv0RKDV7@mail.gmail.com>
References: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>
	<AANLkTin4dCBVaGKcL25Y=mTeT_QaEGry=zxUhy50dfLb@mail.gmail.com>
	<AANLkTi=57TO+cfjp7o96hVHfi2sJujrm2AE=Tv0RKDV7@mail.gmail.com>
Message-ID: <AANLkTik0ix4wLm5KYYtejaOY89fUooDxGY6=j5z1B=8_@mail.gmail.com>

Hi,

On Thu, Nov 11, 2010 at 11:08 AM, Chris Nighswonger
<cnighswonger at foundations.edu> wrote:
> I disagree since an undef return is a de facto indicator of success at
> present, doing a return only on a db error and then throwing an error to the
> interface based on that value results in an inconsistency with some of the
> consumers reading the undef return as success and others as failure. Grep
> seems to think that no present consumer looks at the return value of this
> sub, so setting it to something to differentiate an error would not appear
> to hurt any present calls to it and would give a positive indication of an
> error.

Then there's no current reason not to do just a plain 'return;' rather
than add a magic value. :) More on that below.

Of course, there is a broader discussion to be have about how to
handle errors.  Throwing exceptions would be option for us to
consider.

>> [2] Bailing out of AddMember should be done before invoking
[snip]
> I disagree, however, with an undef return.

An undefined value is a clear indication that something went wrong; 0
in this context would be just another magic value.  Magic values are
to be avoided, even if the magic value in question is 0.

Consider

$borrowernum = AddMember(...);

If the warnings stricture is turned on, you're much more likely to get
warnings about using an undefined $borrowernum.  Database updates that
try to use an undefined $borrowernum value will try to look up a
patron by a null ID or try to insert it and will fail safely, whereas
0 as a $borrowernum is not inherently wrong -- it's unlikely that a
patron would have a borrowernumber of 0 in a real Koha database, but
there's nothing that actually enforces that.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From gmcharlt at gmail.com  Thu Nov 11 17:47:21 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 11:47:21 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug 5326 fix link to old
 pres editor on patron attributes
In-Reply-To: <1289492732-29682-1-git-send-email-cnighswonger@foundations.edu>
References: <koha-patches@lists.koha-community.org>
	<1289492732-29682-1-git-send-email-cnighswonger@foundations.edu>
Message-ID: <AANLkTik+y2JSi4ZwDOLNA29HgORvP1s-Q1rwXY=RMhhu@mail.gmail.com>

Hi,

This patch is already in master.

Regards,

Galen

On Thu, Nov 11, 2010 at 11:25 AM, Chris Nighswonger
<cnighswonger at foundations.edu> wrote:
> From: Nicole Engard <nengard at bywatersolutions.com>
>
> on the patron attributes page if you have ExtendedPatronAttributes
> turned off the error points you to the old sys prefs editor - this
> patch fixes that
>
> Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
> ---
> ?.../prog/en/modules/admin/patron-attr-types.tmpl ? | ? ?5 +----
> ?1 files changed, 1 insertions(+), 4 deletions(-)
>
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
> index 27c82c5..b445c41 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
> @@ -68,10 +68,7 @@ function CheckAttributeTypeForm(f) {
> ? ? <div class="yui-b">
>
> ?<!-- TMPL_IF name="WARNING_extended_attributes_off" -->
> -<div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently OFF, extended patron attributes
> -cannot be given to patron records. ?Go
> -<a href="/cgi-bin/koha/admin/systempreferences.pl?op=add_form&amp;searchfield=ExtendedPatronAttributes">here</a> if you wish to turn
> -this feature on.</div>
> +<div class="dialog message">Because the 'ExtendedPatronAttributes` system preference is currently not enabled, extended patron attributes cannot be given to patron records. ?Go <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ExtendedPatronAttributes">here</a> if you wish to enable this feature.</div>
> ?<!-- /TMPL_IF -->
>
> ?<!-- TMPL_IF name="attribute_type_form" -->
> --
> 1.7.0.4
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>



-- 
Galen Charlton
gmcharlt at gmail.com

From colin.campbell at ptfs-europe.com  Thu Nov 11 18:03:15 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu, 11 Nov 2010 17:03:15 +0000
Subject: [Koha-patches] [Bug 5379] Pull Request
In-Reply-To: <AANLkTik0ix4wLm5KYYtejaOY89fUooDxGY6=j5z1B=8_@mail.gmail.com>
References: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>	<AANLkTin4dCBVaGKcL25Y=mTeT_QaEGry=zxUhy50dfLb@mail.gmail.com>	<AANLkTi=57TO+cfjp7o96hVHfi2sJujrm2AE=Tv0RKDV7@mail.gmail.com>
	<AANLkTik0ix4wLm5KYYtejaOY89fUooDxGY6=j5z1B=8_@mail.gmail.com>
Message-ID: <4CDC21D3.1090803@ptfs-europe.com>

On 11/11/10 16:44, Galen Charlton wrote:

> An undefined value is a clear indication that something went wrong; 0
> in this context would be just another magic value.  Magic values are
> to be avoided, even if the magic value in question is 0.
> 
> Consider
> 
> $borrowernum = AddMember(...);
> 
To reinforce the point 0 could be passed back as valid data. (You can
make mysql start its serial assignments from 0. Why you would want to I
dunno ). Using undef to return an error leads to the route of least
surprise and identifying and rectifying any code that is trying to use
that as a value is usually straightforward.

Colin

-- 
Colin Campbell
Chief Software Engineer,
PTFS Europe Limited
Content Management and Library Solutions
+44 (0) 208 366 1295 (phone)
+44 (0) 7759 633626  (mobile)
colin.campbell at ptfs-europe.com
skype: colin_campbell2

http://www.ptfs-europe.com

From cnighswonger at foundations.edu  Thu Nov 11 18:20:01 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 11 Nov 2010 12:20:01 -0500
Subject: [Koha-patches] [Bug 5379] Pull Request
In-Reply-To: <4CDC21D3.1090803@ptfs-europe.com>
References: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>
	<AANLkTin4dCBVaGKcL25Y=mTeT_QaEGry=zxUhy50dfLb@mail.gmail.com>
	<AANLkTi=57TO+cfjp7o96hVHfi2sJujrm2AE=Tv0RKDV7@mail.gmail.com>
	<AANLkTik0ix4wLm5KYYtejaOY89fUooDxGY6=j5z1B=8_@mail.gmail.com>
	<4CDC21D3.1090803@ptfs-europe.com>
Message-ID: <AANLkTino9KTy_qfK_xs-AzHHw3d5ffqaqs1Hn-R0qg91@mail.gmail.com>

 On Thu, Nov 11, 2010 at 12:03 PM, Colin Campbell <
colin.campbell at ptfs-europe.com> wrote:

> On 11/11/10 16:44, Galen Charlton wrote:
>
> > An undefined value is a clear indication that something went wrong; 0
> > in this context would be just another magic value.  Magic values are
> > to be avoided, even if the magic value in question is 0.
> >
> > Consider
> >
> > $borrowernum = AddMember(...);
> >
> To reinforce the point 0 could be passed back as valid data. (You can
> make mysql start its serial assignments from 0. Why you would want to I
> dunno ). Using undef to return an error leads to the route of least
> surprise and identifying and rectifying any code that is trying to use
> that as a value is usually straightforward.
>

So then to correct the discrepancy introduced by now interpreting undef as
an error, the current callers should be corrected to understand an undef
return as a "problem?" (ie. add error-handing)

As an aside: This discussion leads me to wonder where the wisdom of
returning error/exit "codes" is if we are saying we have a dislike for
"magic" numbers?

Kind Regards,
Chris
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101111/549e4402/attachment.htm>

From jcamins at cpbibliography.com  Thu Nov 11 18:25:20 2010
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Thu, 11 Nov 2010 12:25:20 -0500
Subject: [Koha-patches] [PATCH] Analytical records support
In-Reply-To: <1288525758-1085-1-git-send-email-amit.gupta@osslabs.biz>
References: <1288525758-1085-1-git-send-email-amit.gupta@osslabs.biz>
Message-ID: <AANLkTikthxSnjEdRxWKia2rxbGT9a7YVcos6=E6SahPj@mail.gmail.com>

Amit,

[ ... snipped a long patch ...]

I am concerned about the impact of the way you are using subfield 'w' and
subfield 'o'... those subfields may be used by other libraries, which could
lead to incorrect linkages when sharing records. The standard usage for
subfield 'w' is to include the library's MARC Organizational Code in
parentheses to indicate the source. For example "$w(NNAN)12345" indicates
that the record control number is from the American Numismatic Society. To
use subfield 'w' for LCCN, one would use "$w(DLC)##2010000034#". Could I
suggest that rather than assuming every subfield 'w' and subfield 'o'
contains correct and relevant analytic coding that the linking take into
account both biblionumber/001 and 003? So rather than just looking for a
record with biblionumber/001 of '12345' (in my example), we'd need to look
for a record with that in the biblionumber/001 and 'NNAN' in the 003.

One of the nice side effects of this is that one could then easily extend
the analytic support to handle LCCNs, ISBNs, and other standard numbers
stored in 0XX fields in MARC21.

I suspect this probably also applies to UNIMARC... perhaps the subfield '5'
should be taken into account here? I'm a little confused by hdl's follow-up
patch because it seems to equate the contents of the 001 field with the
biblionumber, and I'm pretty sure that there isn't any guaranteed
relationship. Actually, on second thought, this is a problem with the entire
concept. Biblionumber is not a robust identifier, and using it will break,
for example, union catalog situations (this seems to be the case with
BSZ-BW).

Following on the discussion about this currently taking place, perhaps it
would make sense to store the biblionumber in $0 or $9, reserving $w for 001
identifiers, and adjusting import/cataloging to automatically convert robust
$w links to local $0 or $9 links.

Regards,
Jared Camins-Esakov

-- 
Jared Camins-Esakov
Freelance bibliographer, C & P Bibliography Services, LLC
(phone) +1 (917) 727-3445
(e-mail) jcamins at cpbibliography.com
(web) http://www.cpbibliography.com/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101111/dacc3617/attachment.htm>

From gmcharlt at gmail.com  Thu Nov 11 18:37:14 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 11 Nov 2010 12:37:14 -0500
Subject: [Koha-patches] [Bug 5379] Pull Request
In-Reply-To: <AANLkTino9KTy_qfK_xs-AzHHw3d5ffqaqs1Hn-R0qg91@mail.gmail.com>
References: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>
	<AANLkTin4dCBVaGKcL25Y=mTeT_QaEGry=zxUhy50dfLb@mail.gmail.com>
	<AANLkTi=57TO+cfjp7o96hVHfi2sJujrm2AE=Tv0RKDV7@mail.gmail.com>
	<AANLkTik0ix4wLm5KYYtejaOY89fUooDxGY6=j5z1B=8_@mail.gmail.com>
	<4CDC21D3.1090803@ptfs-europe.com>
	<AANLkTino9KTy_qfK_xs-AzHHw3d5ffqaqs1Hn-R0qg91@mail.gmail.com>
Message-ID: <AANLkTikJbOjrkQs8UFv0QKXh1kuL6WCggbmBTVbDzb9j@mail.gmail.com>

Hi,

On Thu, Nov 11, 2010 at 12:20 PM, Chris Nighswonger
<cnighswonger at foundations.edu> wrote:
> So then to correct the discrepancy introduced by now interpreting undef as
> an error, the current callers should be corrected to understand an undef
> return as a "problem?" (ie. add error-handing)

Adding error-handling would be a good idea in any event.  You wouldn't
have to do it right away for the purpose of this patch, but if you're
offering ... :)

> As an aside: This discussion leads me to wonder where the wisdom of
> returning error/exit "codes" is if we are saying we have a dislike for
> "magic" numbers?

The difference is that (ideally) any routines that return an error
code would also be defining named constants; callers would not be
testing the error code's value directly.  Throwing exceptions
(particularly in the case of failures in the database layer) would be
better yet, but would take more work.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From robin at catalyst.net.nz  Thu Nov 11 22:41:21 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Fri, 12 Nov 2010 10:41:21 +1300
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 4305 Improve code flow
Message-ID: <1289511681-23741-1-git-send-email-robin@catalyst.net.nz>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

Use the ISBN Object's method to format the string
rather than add extra code to do it
Clean up the code flow for clarity
Benchmarking shows its a bit faster too
Don't add to the number of Test::Perl::Critic warnings
 for no benefit

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
---
 C4/Koha.pm |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index e746f83..a63a3a5 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1350,14 +1350,15 @@ sub _normalize_match_point {
     return $normalized_match_point;
 }
 
-sub _isbn_cleanup ($) {
-    my $isbn = Business::ISBN->new( shift );
-    return undef unless $isbn;
-    $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
-    return undef unless $isbn;
-    $isbn = $isbn->as_string;
-    $isbn =~ s/-//g;
-    return $isbn;
+sub _isbn_cleanup {
+    my $isbn = Business::ISBN->new( $_[0] );
+    if ( $isbn ) {
+        $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
+        if (defined $isbn) {
+            return $isbn->as_string([]);
+        }
+    }
+    return;
 }
 
 1;
-- 
1.7.1


From cnighswonger at foundations.edu  Thu Nov 11 22:58:49 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 11 Nov 2010 16:58:49 -0500
Subject: [Koha-patches] [Bug 5379] Pull Request
In-Reply-To: <AANLkTikJbOjrkQs8UFv0QKXh1kuL6WCggbmBTVbDzb9j@mail.gmail.com>
References: <AANLkTimbThO8-bAMqhBwwP7duzE0ntDphCyi4aRO8vZW@mail.gmail.com>
	<AANLkTin4dCBVaGKcL25Y=mTeT_QaEGry=zxUhy50dfLb@mail.gmail.com>
	<AANLkTi=57TO+cfjp7o96hVHfi2sJujrm2AE=Tv0RKDV7@mail.gmail.com>
	<AANLkTik0ix4wLm5KYYtejaOY89fUooDxGY6=j5z1B=8_@mail.gmail.com>
	<4CDC21D3.1090803@ptfs-europe.com>
	<AANLkTino9KTy_qfK_xs-AzHHw3d5ffqaqs1Hn-R0qg91@mail.gmail.com>
	<AANLkTikJbOjrkQs8UFv0QKXh1kuL6WCggbmBTVbDzb9j@mail.gmail.com>
Message-ID: <AANLkTing+VM09o1UgwEovUR2G_DEbNNES2dX-_CEdcUR@mail.gmail.com>

Ok. Fixes have been pushed and are available for review. Note: the branch
was forcibly updated.

On Thu, Nov 11, 2010 at 12:37 PM, Galen Charlton <gmcharlt at gmail.com> wrote:

> Hi,
>
> On Thu, Nov 11, 2010 at 12:20 PM, Chris Nighswonger
> <cnighswonger at foundations.edu> wrote:
> > So then to correct the discrepancy introduced by now interpreting undef
> as
> > an error, the current callers should be corrected to understand an undef
> > return as a "problem?" (ie. add error-handing)
>
> Adding error-handling would be a good idea in any event.  You wouldn't
> have to do it right away for the purpose of this patch, but if you're
> offering ... :)
>
> > As an aside: This discussion leads me to wonder where the wisdom of
> > returning error/exit "codes" is if we are saying we have a dislike for
> > "magic" numbers?
>
> The difference is that (ideally) any routines that return an error
> code would also be defining named constants; callers would not be
> testing the error code's value directly.  Throwing exceptions
> (particularly in the case of failures in the database layer) would be
> better yet, but would take more work.
>
> Regards,
>
> Galen
> --
> Galen Charlton
> gmcharlt at gmail.com
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101111/f7efd9e3/attachment-0001.htm>

From robin at catalyst.net.nz  Fri Nov 12 04:27:44 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Fri, 12 Nov 2010 16:27:44 +1300
Subject: [Koha-patches] [PATCH] Bug 4222 - allow nonpublicnote to be a
	mapped DB column
Message-ID: <1289532464-27953-1-git-send-email-robin@catalyst.net.nz>

This means that it's possible (and easy) to put non-public notes
(usually 952$x) on a template, same as public notes. It creates a
mapping between the 952$x field and the new database column.

Note that when this is applied, it will only work on newly saved records.

It is possible this will need to be altered to allow for UNIMARC etc. if
they use 952 differently.
---
 catalogue/detail.pl                                |    9 +++++++++
 catalogue/moredetail.pl                            |    1 +
 installer/data/mysql/updatedatabase.pl             |    6 ++++++
 .../prog/en/modules/catalogue/detail.tmpl          |    4 ++++
 .../prog/en/modules/catalogue/moredetail.tmpl      |    2 ++
 5 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 4f6c23f..624a141 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -197,6 +197,13 @@ foreach my $item (@items) {
         $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
     }
 
+    foreach my $f (qw( itemnotes nonpublicnote )) {
+        if ($item->{$f}) {
+            $item->{$f} =~ s|\n|<br />|g;
+            $itemfields{$f} = 1;
+        }
+    }
+   
     push @itemloop, $item;
 }
 
@@ -213,6 +220,8 @@ $template->param(
 	itemdata_uri        => $itemfields{uri},
 	itemdata_copynumber => $itemfields{copynumber},
 	volinfo				=> $itemfields{enumchron},
+	itemdata_itemnotes  => $itemfields{itemnotes},
+	itemdata_nonpublicnote  => $itemfields{nonpublicnote},
 	z3950_search_params	=> C4::Search::z3950_search_args($dat),
 	C4::Search::enabled_staff_search_views,
 );
diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index d790c41..95598f7 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -119,6 +119,7 @@ foreach my $item (@items){
     } else {
         $item->{'issue'}= 0;
     }
+    $item->{nonpublicnote} =~ s|\n|<br />|g if $item->{nonpublicnote};
 }
 $template->param(count => $data->{'count'},
 	subscriptionsnumber => $subscriptionsnumber,
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 27daa38..84d5428 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3835,6 +3835,12 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = '3.03.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT");
+    $dbh->do("UPDATE marc_subfield_structure SET kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '') AND tagfield='952' AND tagsubfield='x'");
+    print "Upgrade to $DBversion done (Make nonpublicnote easier to use)\n";
+}
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 1861028..a391744 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -211,6 +211,8 @@ function verify_images() {
                 <th>Status</th>
                 <th>Last seen</th>
                 <th>Barcode</th>
+                <!-- TMPL_IF NAME="itemdata_itemnotes" --><th>Public Note</th><!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="itemdata_nonpublicnote" --><th>Non-public Note</th><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="volinfo" --><th>Publication Details</th><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="itemdata_uri" --><th>URL</th><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy No.</th><!-- /TMPL_IF -->
@@ -319,6 +321,8 @@ function verify_images() {
                     </td>
                     <td class="datelastseen"><!-- TMPL_VAR NAME="datelastseen" --></td>
                     <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber">"><!-- TMPL_VAR NAME="barcode" --></a></td>
+                    <!-- TMPL_IF NAME="itemdata_itemnotes" --><td class="itemnotes"><!-- TMPL_VAR NAME="itemnotes" --></td><!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="itemdata_nonpublicnote" --><td class="nonpublicnote"><!-- TMPL_VAR NAME="nonpublicnote" --></td><!-- /TMPL_IF -->
 				<!-- TMPL_IF NAME="volinfo" -->	<td class="enumchron">
 					<!-- TMPL_IF NAME="itemdata_enumchron" -->
 						<!-- TMPL_IF NAME="enumchron" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 55ca81f..f2a939b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -166,6 +166,8 @@
                 <!-- TMPL_IF NAME="card1" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower1" -->"><!-- TMPL_VAR NAME="card1" --></a>&nbsp;</li><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="card2" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower2" -->"><!-- TMPL_VAR NAME="card2" --></a>&nbsp;</li><!-- /TMPL_IF -->
                 <li><span class="label">Paid for?:</span> <!-- TMPL_VAR NAME="paidfor" -->&nbsp;</li>
+                <li><span class="label">Non-public Note:</span>
+                    <!-- TMPL_VAR NAME="nonpublicnote" -->&nbsp;</li>
             <li><span class="label">Public Note:</span>
                 <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
               <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-- 
1.7.1


From Katrin.Fischer.83 at web.de  Fri Nov 12 08:41:45 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 12 Nov 2010 08:41:45 +0100
Subject: [Koha-patches] [PATCH] Bug 4979: Acq: input fields for new record
	are too short
Message-ID: <1289547705-4694-1-git-send-email-Katrin.Fischer.83@web.de>

From: Katrin Fischer <katrin.fischer at bsz-bw.de>

Patch rebased to HEAD, should also apply to 3.2
---
 .../prog/en/modules/acqui/neworderempty.tmpl       |   24 ++++++++++----------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 9b6bb56..e53c7da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -140,55 +140,55 @@ ff.submit();
         <ol><li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Title</span>
-                <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="HTML" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></span>
+                <input type="hidden" size="50" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="HTML" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></span>
             <!-- TMPL_ELSE -->
             <label for="entertitle" class="required">Title: </label>
-                <input type="text" id="entertitle" size="20" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" />
+                <input type="text" id="entertitle" size="50" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Author: </span>
-                <input type="hidden" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
+                <input type="hidden" size="50" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
             <!-- TMPL_ELSE -->
             <label for="author">Author: </label>
-                <input type="text" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" />
+                <input type="text" size="50" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Publisher: </span>
-                <input type="hidden" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
+                <input type="hidden" size="50" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
             <!-- TMPL_ELSE -->
             <label for="publishercode"> Publisher: </label>
-                <input type="text" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
+                <input type="text" size="50" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Publication year: </span>
-                <input type="hidden" size="20" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" /><!-- TMPL_VAR NAME="publicationyear" -->
+                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" /><!-- TMPL_VAR NAME="publicationyear" -->
             <!-- TMPL_ELSE -->
             <label for="publicationyear">Publication year: </label>
-                <input type="text" size="20" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" />
+                <input type="text" size="10" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">ISBN: </span>
-                <input type="hidden" size="20" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
+                <input type="hidden" size="50" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
             <!-- TMPL_ELSE -->
             <label for="ISBN">ISBN: </label>
-                <input type="text" size="20" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+                <input type="text" size="50" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Series: </span>
-                <input type="hidden" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
+                <input type="hidden" size="50" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
             <!-- TMPL_ELSE -->
             <label for="series">Series: </label>
-                <input type="text" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
+                <input type="text" size="50" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
             <!-- /TMPL_IF -->
         </li>
         </ol>
-- 
1.7.1


From colin.campbell at ptfs-europe.com  Fri Nov 12 12:25:07 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 12 Nov 2010 11:25:07 +0000
Subject: [Koha-patches] [PATCH] Bug 4305: Add test case for ISBN-13 to
	ISBN-10 conversion
Message-ID: <1289561107-3114-1-git-send-email-colin.campbell@ptfs-europe.com>

---
 t/Koha.t |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/t/Koha.t b/t/Koha.t
index 1742ddd..be5a838 100755
--- a/t/Koha.t
+++ b/t/Koha.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 7;
+use Test::More tests => 8;
 
 use_ok('C4::Koha');
 
@@ -22,3 +22,4 @@ is($str, q{'"&<>'}, '... and does not change input in place');
 
 is(C4::Koha::_isbn_cleanup('0-590-35340-3'), '0590353403', '_isbn_cleanup removes hyphens');
 is(C4::Koha::_isbn_cleanup('0590353403 (pbk.)'), '0590353403', '_isbn_cleanup removes parenthetical');
+is(C4::Koha::_isbn_cleanup('978-0-321-49694-2'), '0321496949', '_isbn_cleanup converts ISBN-13 to ISBN-10');
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Fri Nov 12 12:45:47 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 12 Nov 2010 11:45:47 +0000
Subject: [Koha-patches] [PATCH] Bug 5392 Initialize vars used in building
	url strings
Message-ID: <1289562347-3208-1-git-send-email-colin.campbell@ptfs-europe.com>

If no failures are to be added to the to the strings for redirect
the corresponding variables are undefined causing warnings
to be logged. Initialize them so that the error log is not
being filled with trivia.
---
 reserve/renewscript.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
index 4444e7c..ad746c9 100755
--- a/reserve/renewscript.pl
+++ b/reserve/renewscript.pl
@@ -77,7 +77,7 @@ my $cardnumber = $input->param("cardnumber");
 my $borrowernumber = $input->param("borrowernumber");
 my $exemptfine = $input->param("exemptfine") || 0;
 my $override_limit = $input->param("override_limit") || 0;
-my $failedrenews;
+my $failedrenews = q{};
 foreach my $itemno (@data) {
     # check status before renewing issue
 	my ($renewokay,$error) = CanBookBeRenewed($borrowernumber,$itemno,$override_limit);
@@ -88,7 +88,7 @@ foreach my $itemno (@data) {
 		$failedrenews.="&failedrenew=$itemno";        
 	}
 }
-my $failedreturn;
+my $failedreturn = q{};
 foreach my $barcode (@barcodes) {
     # check status before renewing issue
    my ( $returned, $messages, $issueinformation, $borrower ) = 
-- 
1.7.3.2


From gmcharlt at gmail.com  Fri Nov 12 13:35:45 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 07:35:45 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF 1/3] Bug 4979: Acq: input fields
	for new record are too short
Message-ID: <1289565347-2570-1-git-send-email-gmcharlt@gmail.com>

From: Katrin Fischer <katrin.fischer at bsz-bw.de>

Patch rebased to HEAD, should also apply to 3.2

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/acqui/neworderempty.tmpl       |   24 ++++++++++----------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 9b6bb56..e53c7da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -140,55 +140,55 @@ ff.submit();
         <ol><li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Title</span>
-                <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="HTML" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></span>
+                <input type="hidden" size="50" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="HTML" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></span>
             <!-- TMPL_ELSE -->
             <label for="entertitle" class="required">Title: </label>
-                <input type="text" id="entertitle" size="20" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" />
+                <input type="text" id="entertitle" size="50" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Author: </span>
-                <input type="hidden" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
+                <input type="hidden" size="50" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
             <!-- TMPL_ELSE -->
             <label for="author">Author: </label>
-                <input type="text" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" />
+                <input type="text" size="50" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Publisher: </span>
-                <input type="hidden" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
+                <input type="hidden" size="50" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
             <!-- TMPL_ELSE -->
             <label for="publishercode"> Publisher: </label>
-                <input type="text" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
+                <input type="text" size="50" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Publication year: </span>
-                <input type="hidden" size="20" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" /><!-- TMPL_VAR NAME="publicationyear" -->
+                <input type="hidden" size="10" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" /><!-- TMPL_VAR NAME="publicationyear" -->
             <!-- TMPL_ELSE -->
             <label for="publicationyear">Publication year: </label>
-                <input type="text" size="20" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" />
+                <input type="text" size="10" name="publicationyear" id="publicationyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">ISBN: </span>
-                <input type="hidden" size="20" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
+                <input type="hidden" size="50" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
             <!-- TMPL_ELSE -->
             <label for="ISBN">ISBN: </label>
-                <input type="text" size="20" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+                <input type="text" size="50" name="isbn" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Series: </span>
-                <input type="hidden" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
+                <input type="hidden" size="50" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
             <!-- TMPL_ELSE -->
             <label for="series">Series: </label>
-                <input type="text" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
+                <input type="text" size="50" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
             <!-- /TMPL_IF -->
         </li>
         </ol>
-- 
1.7.0


From gmcharlt at gmail.com  Fri Nov 12 13:35:46 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 07:35:46 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF 2/3] Bug 4305: Add test case for
	ISBN-13 to ISBN-10 conversion
In-Reply-To: <1289565347-2570-1-git-send-email-gmcharlt@gmail.com>
References: <1289565347-2570-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289565347-2570-2-git-send-email-gmcharlt@gmail.com>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 t/Koha.t |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/t/Koha.t b/t/Koha.t
index 1742ddd..be5a838 100755
--- a/t/Koha.t
+++ b/t/Koha.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 7;
+use Test::More tests => 8;
 
 use_ok('C4::Koha');
 
@@ -22,3 +22,4 @@ is($str, q{'"&<>'}, '... and does not change input in place');
 
 is(C4::Koha::_isbn_cleanup('0-590-35340-3'), '0590353403', '_isbn_cleanup removes hyphens');
 is(C4::Koha::_isbn_cleanup('0590353403 (pbk.)'), '0590353403', '_isbn_cleanup removes parenthetical');
+is(C4::Koha::_isbn_cleanup('978-0-321-49694-2'), '0321496949', '_isbn_cleanup converts ISBN-13 to ISBN-10');
-- 
1.7.0


From gmcharlt at gmail.com  Fri Nov 12 13:35:47 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 07:35:47 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF 3/3] Bug 5392 Initialize vars
	used in building url strings
In-Reply-To: <1289565347-2570-2-git-send-email-gmcharlt@gmail.com>
References: <1289565347-2570-1-git-send-email-gmcharlt@gmail.com>
	<1289565347-2570-2-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289565347-2570-3-git-send-email-gmcharlt@gmail.com>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

If no failures are to be added to the to the strings for redirect
the corresponding variables are undefined causing warnings
to be logged. Initialize them so that the error log is not
being filled with trivia.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 reserve/renewscript.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
index 4444e7c..ad746c9 100755
--- a/reserve/renewscript.pl
+++ b/reserve/renewscript.pl
@@ -77,7 +77,7 @@ my $cardnumber = $input->param("cardnumber");
 my $borrowernumber = $input->param("borrowernumber");
 my $exemptfine = $input->param("exemptfine") || 0;
 my $override_limit = $input->param("override_limit") || 0;
-my $failedrenews;
+my $failedrenews = q{};
 foreach my $itemno (@data) {
     # check status before renewing issue
 	my ($renewokay,$error) = CanBookBeRenewed($borrowernumber,$itemno,$override_limit);
@@ -88,7 +88,7 @@ foreach my $itemno (@data) {
 		$failedrenews.="&failedrenew=$itemno";        
 	}
 }
-my $failedreturn;
+my $failedreturn = q{};
 foreach my $barcode (@barcodes) {
     # check status before renewing issue
    my ( $returned, $messages, $issueinformation, $borrower ) = 
-- 
1.7.0


From gmcharlt at gmail.com  Fri Nov 12 14:47:21 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 08:47:21 -0500
Subject: [Koha-patches] [PATCH] bug 5393: add test case to check
	well-formedness of XML/XSLT files
Message-ID: <1289569641-3873-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 t/00-valid-xml.t |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 t/00-valid-xml.t

diff --git a/t/00-valid-xml.t b/t/00-valid-xml.t
new file mode 100644
index 0000000..6e896ba
--- /dev/null
+++ b/t/00-valid-xml.t
@@ -0,0 +1,44 @@
+# Copyright 2010 Galen Charlton
+#
+# 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 Test::More;
+use File::Spec;
+use File::Find;
+use XML::LibXML;
+
+my $parser = XML::LibXML->new();
+
+find({
+    bydepth => 1,
+    no_chdir => 1,
+    wanted => sub {
+        my $file = $_;
+        return unless $file =~ /(\.xml|\.xsl|\.xslt)$/i;
+        my $dom;
+        eval { $dom = $parser->parse_file($file); };
+        if ($@) {
+            fail("$file parses");
+            diag($@);
+        } else {
+            pass("$file parses");
+        }
+    },
+}, File::Spec->curdir());
+done_testing();
-- 
1.7.0


From f.demians at tamil.fr  Fri Nov 12 15:10:37 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Fri, 12 Nov 2010 15:10:37 +0100
Subject: [Koha-patches] [PATCH] bug 5393 [SIGNED-OFF]: add test case to
	check well-formedness of XML/XSLT files
Message-ID: <1289571037-23025-1-git-send-email-f.demians@tamil.fr>

From: Galen Charlton <gmcharlt at gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 t/00-valid-xml.t |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 t/00-valid-xml.t

diff --git a/t/00-valid-xml.t b/t/00-valid-xml.t
new file mode 100644
index 0000000..6e896ba
--- /dev/null
+++ b/t/00-valid-xml.t
@@ -0,0 +1,44 @@
+# Copyright 2010 Galen Charlton
+#
+# 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 Test::More;
+use File::Spec;
+use File::Find;
+use XML::LibXML;
+
+my $parser = XML::LibXML->new();
+
+find({
+    bydepth => 1,
+    no_chdir => 1,
+    wanted => sub {
+        my $file = $_;
+        return unless $file =~ /(\.xml|\.xsl|\.xslt)$/i;
+        my $dom;
+        eval { $dom = $parser->parse_file($file); };
+        if ($@) {
+            fail("$file parses");
+            diag($@);
+        } else {
+            pass("$file parses");
+        }
+    },
+}, File::Spec->curdir());
+done_testing();
-- 
1.7.3.2


From cnighswonger at foundations.edu  Fri Nov 12 15:32:04 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 12 Nov 2010 09:32:04 -0500
Subject: [Koha-patches] [Bug 5366] Pull Request [New Work]
Message-ID: <AANLkTi=35FYk8ks-kJGkexw8oU8oM170QOoTZ4eh=Uxn@mail.gmail.com>

The following changes since commit 636ceef18a4e5af28306c07597573dc2d6b292a5:
  Chris Nighswonger (1):
        [2/2] Bug 5366 - Standing enh req for code changes enabling database
agnosticism

are available in the git repository at:

  git://git.koha-community.org/wip/koha-fbc.git k_bug_5366

Chris Nighswonger (1):
      [3/3] Bug 5366 - Standing enh req for code changes enabling database
agnosticism

 tools/import_borrowers.pl |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101112/71352d48/attachment.htm>

From cnighswonger at foundations.edu  Fri Nov 12 15:45:26 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 12 Nov 2010 09:45:26 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug 5393: add test case to
	check well-formedness of XML/XSLT files
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289573126-15550-1-git-send-email-cnighswonger@foundations.edu>

From: Galen Charlton <gmcharlt at gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 t/00-valid-xml.t |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 t/00-valid-xml.t

diff --git a/t/00-valid-xml.t b/t/00-valid-xml.t
new file mode 100644
index 0000000..6e896ba
--- /dev/null
+++ b/t/00-valid-xml.t
@@ -0,0 +1,44 @@
+# Copyright 2010 Galen Charlton
+#
+# 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 Test::More;
+use File::Spec;
+use File::Find;
+use XML::LibXML;
+
+my $parser = XML::LibXML->new();
+
+find({
+    bydepth => 1,
+    no_chdir => 1,
+    wanted => sub {
+        my $file = $_;
+        return unless $file =~ /(\.xml|\.xsl|\.xslt)$/i;
+        my $dom;
+        eval { $dom = $parser->parse_file($file); };
+        if ($@) {
+            fail("$file parses");
+            diag($@);
+        } else {
+            pass("$file parses");
+        }
+    },
+}, File::Spec->curdir());
+done_testing();
-- 
1.7.0.4


From katrin.fischer at bsz-bw.de  Fri Nov 12 16:30:45 2010
From: katrin.fischer at bsz-bw.de (Katrin Fischer)
Date: Fri, 12 Nov 2010 16:30:45 +0100
Subject: [Koha-patches] [PATCH] Bug 5381 - Fines in notices prints always
	0.00
Message-ID: <1289575845-1754-1-git-send-email-katrin.fischer@bsz-bw.de>

From: Chris Nighswonger <cnighswonger at foundations.edu>

This was due to passing off the biblionumber to GetFines rather than the itemnumber.

Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
---
 misc/cronjobs/overdue_notices.pl |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 761644a..92bc786 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -19,7 +19,6 @@
 
 use strict;
 use warnings;
-use utf8;
 
 BEGIN {
 
@@ -256,7 +255,7 @@ my $csvfilename;
 my $htmlfilename;
 my $triggered = 0;
 my $listall = 0;
-my $itemscontent = join( ',', qw( issuedate title barcode author biblionumber ) );
+my $itemscontent = join( ',', qw( issuedate title barcode author itemnumber ) );
 my @myborcat;
 my @myborcatout;
 
@@ -476,6 +475,7 @@ END_SQL
                     $verbose and warn "debarring $borrowernumber $firstname $lastname\n";
                 }
                 my @params = ($listall ? ( $borrowernumber , 1 , $MAX ) : ( $borrowernumber, $mindays, $maxdays ));
+                $verbose and warn "STH2 PARAMS: borrowernumber = $borrowernumber, mindays = $mindays, maxdays = $maxdays";
                 $sth2->execute(@params);
                 my $itemcount = 0;
                 my $titles = "";
@@ -492,14 +492,14 @@ END_SQL
                     my @item_info = map { $_ =~ /^date|date$/ ? format_date( $item_info->{$_} ) : $item_info->{$_} || '' } @item_content_fields;
                     $titles .= join("\t", @item_info) . "\n";
                     $itemcount++;
-                    push (@items, $item_info->{'biblionumber'});
+                    push @items, { itemnumber => $item_info->{'itemnumber'}, biblionumber => $item_info->{'biblionumber'} };
                 }
                 $sth2->finish;
                 $letter = parse_letter(
                     {   letter          => $letter,
                         borrowernumber  => $borrowernumber,
                         branchcode      => $branchcode,
-                        biblionumber    => \@items,
+                        items           => \@items,
                         substitute      => {    # this appears to be a hack to overcome incomplete features in this code.
                                             bib             => $branch_details->{'branchname'}, # maybe 'bib' is a typo for 'lib<rary>'?
                                             'items.content' => $titles
@@ -657,12 +657,12 @@ sub parse_letter { # FIXME: this code should probably be moved to C4::Letters:pa
         $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'branches', $params->{'branchcode'} );
     }
 
-    if ( $params->{'biblionumber'} ) {
+    if ( $params->{'items'} ) {
         my $item_format = '';
         PROCESS_ITEMS:
-        while (scalar(@{$params->{'biblionumber'}}) > 0) {
-            my $item = shift @{$params->{'biblionumber'}};
-            my $fine = GetFine($item, $params->{'borrowernumber'});
+        while (scalar(@{$params->{'items'}}) > 0) {
+            my $item = shift @{$params->{'items'}};
+            my $fine = GetFine($item->{'itemnumber'}, $params->{'borrowernumber'});
             if (!$item_format) {
                 $params->{'letter'}->{'content'} =~ m/(<item>.*<\/item>)/;
                 $item_format = $1;
@@ -671,10 +671,10 @@ sub parse_letter { # FIXME: this code should probably be moved to C4::Letters:pa
                 my $formatted_fine = currency_format("$1", "$fine", FMT_SYMBOL);
                 $params->{'letter'}->{'content'} =~ s/<fine>.*<\/fine>/$formatted_fine/;
             }
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $item );
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblioitems', $item );
-            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'items', $item );
-            $params->{'letter'}->{'content'} =~ s/(<item>.*<\/item>)/$1\n$item_format/ if scalar(@{$params->{'biblionumber'}} > 0);
+            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblio',      $item->{'biblionumber'} );
+            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'biblioitems', $item->{'biblionumber'} );
+            $params->{'letter'} = C4::Letters::parseletter( $params->{'letter'}, 'items', $item->{'itemnumber'} );
+            $params->{'letter'}->{'content'} =~ s/(<item>.*<\/item>)/$1\n$item_format/ if scalar(@{$params->{'items'}} > 0);
 
         }
     }
-- 
1.6.3.3



From mjr at phonecoop.coop  Fri Nov 12 18:00:19 2010
From: mjr at phonecoop.coop (MJ Ray)
Date: Fri, 12 Nov 2010 17:00:19 +0000 (GMT)
Subject: [Koha-patches] [3.0.x] [Bug 5394] Handle situation where bookseller
	is not found
Message-ID: <20101112170019.77AA0501D8@nail.towers.org.uk>

The following changes since commit dc7e0ecba7cd256ffab014ff6f6f658eaf561fb4:
  MJ Ray (1):
        [Bug 5394] Handle situation where bookseller is not found

are available in the git repository at:

  git at gitorious.org:koha/mainline.git for-3.0/bug_5394

Hope that helps,
-- 
MJ Ray (slef), member of www.software.coop, a for-more-than-profit co-op.
Past Koha Release Manager (2.0), LMS programmer, statistician, webmaster.
In My Opinion Only: see http://mjr.towers.org.uk/email.html
Available for hire for Koha work http://www.software.coop/products/koha

From Katrin.Fischer.83 at web.de  Fri Nov 12 20:53:00 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 12 Nov 2010 20:53:00 +0100
Subject: [Koha-patches] [PATCH] BUG 5058: small layout correction of vendor
	form
Message-ID: <1289591580-31191-1-git-send-email-Katrin.Fischer.83@web.de>

From: Katrin Fischer <Katrin.Fischer.bsz-bw.de>

Rebased to HEAD, should also apply to 3.2
---
 .../prog/en/modules/acqui/supplier.tmpl            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 83b8631..5528a8d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -135,8 +135,8 @@ if (f.company.value == "") {
             </ol>
             <ol>
             <li><label for="discount">Discount</label>
-                <input type="text" size="6" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
-            <!-- TMPL_IF NAME="GST" --><li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="gstrate" -->"/>%</li><!-- /TMPL_IF -->
+                <input type="text" size="5" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
+            <!-- TMPL_IF NAME="GST" --><li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="gstrate" -->"/> %</li><!-- /TMPL_IF -->
             <li><label for="notes">Notes</label>
                 <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>			
             <!-- TMPL_UNLESS NAME="GST" -->
-- 
1.7.1


From cnighswonger at foundations.edu  Fri Nov 12 21:24:04 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 12 Nov 2010 15:24:04 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] BUG 5058: small layout
	correction of vendor form
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289593444-20258-1-git-send-email-cnighswonger@foundations.edu>

From: Katrin Fischer <Katrin.Fischer.bsz-bw.de>

Rebased to HEAD, should also apply to 3.2

Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 .../prog/en/modules/acqui/supplier.tmpl            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 83b8631..5528a8d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -135,8 +135,8 @@ if (f.company.value == "") {
             </ol>
             <ol>
             <li><label for="discount">Discount</label>
-                <input type="text" size="6" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
-            <!-- TMPL_IF NAME="GST" --><li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="gstrate" -->"/>%</li><!-- /TMPL_IF -->
+                <input type="text" size="5" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
+            <!-- TMPL_IF NAME="GST" --><li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="gstrate" -->"/> %</li><!-- /TMPL_IF -->
             <li><label for="notes">Notes</label>
                 <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>			
             <!-- TMPL_UNLESS NAME="GST" -->
-- 
1.7.0.4


From Katrin.Fischer.83 at web.de  Fri Nov 12 21:32:19 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 12 Nov 2010 21:32:19 +0100
Subject: [Koha-patches] [PATCH] Bug 5059: Inconsistent use of ordering price
	and list price in vendor form
Message-ID: <1289593939-30619-1-git-send-email-Katrin.Fischer.83@web.de>

From: Katrin Fischer <Katrin.Fischer at bsz-bw.de>

Changes Ordering price to List price and make spelling more consistent.

Patch originally send for 3.2, still applied to HEAD without conflicts.
---
 .../prog/en/modules/acqui/supplier.tmpl            |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 83b8631..9d1ae18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -57,7 +57,7 @@ if (f.company.value == "") {
         </fieldset>
         <fieldset class="rows">
             <legend>Contact details</legend>
-        <ol> <li><label for="company_contact_name">Contact Name</label>
+        <ol> <li><label for="company_contact_name">Contact name</label>
                 <input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></li>
             <li><label for="company_contact_position">Position</label>
                 <input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></li>
@@ -86,7 +86,7 @@ if (f.company.value == "") {
                     <!-- /TMPL_IF --></li>
             </ol>
             <ol>
-            <li><label for="list_currency">List Prices are</label>
+            <li><label for="list_currency">List prices are</label>
                     <select name="list_currency" id="list_currency">
                     <!-- TMPL_LOOP NAME="loop_currency" -->
                         <option value="<!-- TMPL_VAR  NAME="currency" -->"
@@ -95,7 +95,7 @@ if (f.company.value == "") {
                     <!-- /TMPL_LOOP -->
                     </select>
             </li>
-            <li><label for="invoice_currency">Invoice Prices are</label>
+            <li><label for="invoice_currency">Invoice prices are</label>
                     <select name="invoice_currency" id="invoice_currency">
                     <!-- TMPL_LOOP NAME="loop_currency" -->
                         <option value="<!-- TMPL_VAR  NAME="currency" -->"
@@ -115,7 +115,7 @@ if (f.company.value == "") {
                     <label for="gstno">No</label> <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
                 <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
             
-            <!-- TMPL_IF NAME="GST" --><li><label for="list_gstyes" class="radio">Ordering prices:</label>
+            <!-- TMPL_IF NAME="GST" --><li><label for="list_gstyes" class="radio">List prices:</label>
                 <!-- TMPL_IF name="listincgst" -->
                     <label for="list_gstyes">Include tax</label> <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" />
                     <label for="list_gstno">Don't include tax</label> <input type="radio" id="list_gstno" name="list_gst" value="0" />
@@ -187,8 +187,8 @@ if (f.company.value == "") {
                     <!-- TMPL_ELSE -->
                         Inactive
                     <!-- /TMPL_IF --></p>
-            <p><strong>List Prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
-            <p><strong>Invoice Prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
+            <p><strong>List prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
+            <p><strong>Invoice prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
             <!-- TMPL_IF NAME="GST" --><p><strong>Tax Number Registered: </strong>
                     <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
             <p><strong>List Item Price Includes Tax: </strong>
-- 
1.7.1


From cnighswonger at foundations.edu  Fri Nov 12 21:41:51 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 12 Nov 2010 15:41:51 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5059: Inconsistent use of
	ordering price and list price in vendor form
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289594511-20608-1-git-send-email-cnighswonger@foundations.edu>

From: Katrin Fischer <Katrin.Fischer at bsz-bw.de>

Changes Ordering price to List price and make spelling more consistent.

Patch originally send for 3.2, still applied to HEAD without conflicts.

Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 .../prog/en/modules/acqui/supplier.tmpl            |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 83b8631..9d1ae18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -57,7 +57,7 @@ if (f.company.value == "") {
         </fieldset>
         <fieldset class="rows">
             <legend>Contact details</legend>
-        <ol> <li><label for="company_contact_name">Contact Name</label>
+        <ol> <li><label for="company_contact_name">Contact name</label>
                 <input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></li>
             <li><label for="company_contact_position">Position</label>
                 <input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></li>
@@ -86,7 +86,7 @@ if (f.company.value == "") {
                     <!-- /TMPL_IF --></li>
             </ol>
             <ol>
-            <li><label for="list_currency">List Prices are</label>
+            <li><label for="list_currency">List prices are</label>
                     <select name="list_currency" id="list_currency">
                     <!-- TMPL_LOOP NAME="loop_currency" -->
                         <option value="<!-- TMPL_VAR  NAME="currency" -->"
@@ -95,7 +95,7 @@ if (f.company.value == "") {
                     <!-- /TMPL_LOOP -->
                     </select>
             </li>
-            <li><label for="invoice_currency">Invoice Prices are</label>
+            <li><label for="invoice_currency">Invoice prices are</label>
                     <select name="invoice_currency" id="invoice_currency">
                     <!-- TMPL_LOOP NAME="loop_currency" -->
                         <option value="<!-- TMPL_VAR  NAME="currency" -->"
@@ -115,7 +115,7 @@ if (f.company.value == "") {
                     <label for="gstno">No</label> <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
                 <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
             
-            <!-- TMPL_IF NAME="GST" --><li><label for="list_gstyes" class="radio">Ordering prices:</label>
+            <!-- TMPL_IF NAME="GST" --><li><label for="list_gstyes" class="radio">List prices:</label>
                 <!-- TMPL_IF name="listincgst" -->
                     <label for="list_gstyes">Include tax</label> <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" />
                     <label for="list_gstno">Don't include tax</label> <input type="radio" id="list_gstno" name="list_gst" value="0" />
@@ -187,8 +187,8 @@ if (f.company.value == "") {
                     <!-- TMPL_ELSE -->
                         Inactive
                     <!-- /TMPL_IF --></p>
-            <p><strong>List Prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
-            <p><strong>Invoice Prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
+            <p><strong>List prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
+            <p><strong>Invoice prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
             <!-- TMPL_IF NAME="GST" --><p><strong>Tax Number Registered: </strong>
                     <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
             <p><strong>List Item Price Includes Tax: </strong>
-- 
1.7.0.4


From Katrin.Fischer.83 at web.de  Fri Nov 12 21:50:00 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 12 Nov 2010 21:50:00 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5175,
	XSL view doesn't link publisher name to search
Message-ID: <1289595000-11869-1-git-send-email-Katrin.Fischer.83@web.de>

From: Owen Leonard <oleonard at myacpl.org>

This patch fixes the bug in both the OPAC and staff client

Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    8 +++++++-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    6 ++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 9de39cf..c05024e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -222,6 +222,12 @@
         <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:{marc:subfield[@code='b']}">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">b</xsl:with-param>
+                    </xsl:call-template>
+               </a>
+               <xsl:text> </xsl:text>
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
@@ -231,7 +237,7 @@
                </xsl:call-template>
                     <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
             </xsl:for-each>
-        </span> 
+        </span>
         </xsl:if>
 
         <!-- Edition Statement: Alternate Graphic Representation (MARC 880) -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 2c6a1a8..9526de6 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -243,6 +243,12 @@
         <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <a href="/cgi-bin/koha/opac-search.pl?q=pb:{marc:subfield[@code='b']}">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">b</xsl:with-param>
+                    </xsl:call-template>
+               </a>
+               <xsl:text> </xsl:text>
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-- 
1.7.1


From ian.walls at bywatersolutions.com  Fri Nov 12 21:54:50 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Fri, 12 Nov 2010 15:54:50 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF]Bug 5396: New system preference
	UseTablesortForCirc
Message-ID: <1289595290-3270-1-git-send-email-ian.walls@bywatersolutions.com>

From: Owen Leonard <oleonard at myacpl.org>

This system preference allows the librarian to toggle on or off whether the JQuery tablesort is used on the
circ/circulation.pl page.  For patrons with many checkouts, this sort may cause very slow page loading (and
therefore slow circulation transaction time), depending on the browser and local machine used.  Staff can
still see a sortable list of current checkouts on the members/moremember.pl page.

My revision prevents the template from including *any* tablesorter code if the
preference is feature is turned off: both the circulation list and
the holds list will have no jQuery tablesorter.

Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
---
 circ/circulation.pl                                |    4 ++++
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 installer/data/mysql/updatedatabase.pl             |    8 ++++++++
 .../en/modules/admin/preferences/circulation.pref  |    6 ++++++
 .../prog/en/modules/circ/circulation.tmpl          |   11 +++++------
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 539b88c..7c4a0dc 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -109,6 +109,10 @@ if (C4::Context->preference("DisplayClearScreenButton")) {
     $template->param(DisplayClearScreenButton => 1);
 }
 
+if (C4::Context->preference("UseTablesortForCirc")) {
+    $template->param(UseTablesortForCirc => 1);
+}
+
 my $barcode        = $query->param('barcode') || '';
 $barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
 
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index caf1155..214d198 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -270,6 +270,7 @@ INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('A
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoSelfCheckID','','Staff ID with circulation rights to be used for automatic web-based self-check. Only applies if AutoSelfCheckAllowed syspref is turned on.','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoSelfCheckPass','','Password to be used for automatic web-based self-check. Only applies if AutoSelfCheckAllowed syspref is turned on.','','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('soundon','0','Enable circulation sounds during checkin and checkout in the staff interface.  Not supported by all web browsers yet.','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTablesortForCirc','0','If on, use the JQuery tablesort function on the list of current borrower checkouts on the circulation page.  Note that the use of this function may slow down circ for patrons with may checkouts.','','YesNo');
 INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'PrintNoticesMaxLines', '0', '', 'If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.', 'Integer' );
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI','0','Enables ILS-DI services at OPAC.','','YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:AuthorizedIPs','','.','Restricts usage of ILS-DI to some IPs','Free');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 27daa38..7fea87a 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3735,6 +3735,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+<<<<<<< HEAD:installer/data/mysql/updatedatabase.pl
 $DBversion = '3.01.00.999';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     print "Upgrade to $DBversion done (3.2.0 release candidate)\n";
@@ -3835,6 +3836,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = '3.03.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('UseTablesortForCirc','0','If on, use the JQuery tablesort function on the list of current borrower checkouts on the circulation page. Note that the use of this function may slow down circ for patrons with may checkouts.','','YesNo');");
+    print "Upgrade to $DBversion done (Add UseTablesortForCirc syspref)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 16b52ff..c4d4305 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -31,6 +31,12 @@ Circulation:
                   desc: latest to earliest
             - due date.
         -
+            - pref: UseTablesortForCirc
+              choices:
+                  yes: "Enable"
+                  no: "Don't enable"
+            - "the sorting of current patron checkouts on the circulation screen. <br/>NOTE: Enabling this function may slow down circulation time for patrons with many checkouts."
+        -
             - pref: soundon
               choices: 
                  yes: "Enable"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 0b4ac29..822de15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -5,20 +5,20 @@
 (<!-- TMPL_VAR NAME="cardnumber" -->)
 <!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
+<!-- TMPL_IF NAME="UseTablesortForCirc" --><script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script><!-- /TMPL_IF -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
-$.tablesorter.addParser({
+<!-- TMPL_IF NAME="UseTablesortForCirc" -->$.tablesorter.addParser({
     id: 'articles',
     is: function(s) {return false;  },
     format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
     type: 'text'
-});
+});<!-- /TMPL_IF -->
 <!-- TMPL_UNLESS NAME="borrowernumber" --><!-- TMPL_UNLESS NAME="CGIselectborrower" -->window.onload=function(){ $('#findborrower').focus(); };<!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
 	 $(document).ready(function() {
  		$('#patronlists > ul').tabs();
-		$.tablesorter.defaults.widgets = ['zebra'];
+		<!-- TMPL_IF NAME="UseTablesortForCirc" -->$.tablesorter.defaults.widgets = ['zebra'];
 		$("#issuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
 		dateFormat: 'uk',<!-- /TMPL_IF -->
 		headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
@@ -30,8 +30,7 @@ $.tablesorter.addParser({
 		dateFormat: 'uk',<!-- /TMPL_IF -->
 			sortList: [[0,0]],
 			headers: { 1: { sorter: 'articles' }}
-		});
-
+		});<!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="AllowRenewalLimitOverride" -->
         $( '#override_limit' ).click( function () {
             if ( this.checked ) {
-- 
1.5.6.5


From cnighswonger at foundations.edu  Fri Nov 12 21:59:47 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 12 Nov 2010 15:59:47 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5281,
	"Check in" then "Renew" checkboxes checked in the same time
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289595587-21050-1-git-send-email-cnighswonger@foundations.edu>

From: Owen Leonard <oleonard at myacpl.org>

This fix corrects the behavior of the checkboxes whether the user clicks the
checkbox itself or the <td> around it. Tested on a PC in Firefox 3.6, Chrome,
Safari 5, and IE 8.

Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 .../prog/en/modules/circ/circulation.tmpl          |   74 +++++++++-----------
 1 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 0b4ac29..cca0743 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -73,18 +73,28 @@ var allcheckboxes = $(".checkboxed");
     } ).attr( 'checked', false );
     <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
+    // Clicking the table cell checks the checkbox inside it
 	$("td").click(function(e){
 		if(e.target.tagName.toLowerCase() == 'td'){
-           $(this).find("input:checkbox").each( function() {
-               $(this).attr('checked', !$(this).attr('checked'));
-			   if($(this).attr('checked')){
-                    $(this).parent().siblings().find("input:checkbox").each(function(){
-                       if($(this).attr('checked')){ $(this).attr('checked',''); }
-                   });
-			   }
+           $(this).find("input:checkbox:visible").each( function() {
+                if($(this).attr("checked")){
+                    $(this).attr("checked",'');
+                } else {
+                    $(this).attr("checked","checked");
+                    radioCheckBox($(this));
+                }
            });
-		}
+        }
 	});
+    // prevent adjacent checkboxes from being checked simultaneously
+    function radioCheckBox(box){
+            box.parents("td").siblings().find("input:checkbox:visible").each(function(){
+                if($(this).attr("checked")){
+                    $(this).attr("checked",'');
+                }
+             });
+     }
+
 	$("#messages ul").after("<a href=\"#\" id=\"addmessage\">"+_("Add a new message")+"</a>");
 	$("#borrower_messages .cancel").click(function(){
 		$("#add_message_form").hide();
@@ -94,30 +104,12 @@ var allcheckboxes = $(".checkboxed");
         $(this).hide();
 		$("#add_message_form").show();
 	 });
+
+     $("input.radio").click(function(){
+        radioCheckBox($(this));
+     });
  });
-function uncheck_sibling(me){
-nodename=me.getAttribute("name");
-if (nodename =="barcodes[]"){
-    var Node=me.parentNode.previousSibling;
-    while (Node.nodeName!="TD"){Node=Node.previousSibling}
-    var Nodes=Node.childNodes;
-    for (var i=0;i<Nodes.length;i++){
-      if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
-        Nodes[i].checked=false;
-      }     
-   }   
-
-}else {
-    var Node=me.parentNode.nextSibling;
-    while (Node.nodeName!="TD"){Node=Node.nextSibling}
-    var Nodes=Node.childNodes;
-    for (var i=0;i<Nodes.length;i++){
-      if (Nodes[i].nodeName=="INPUT" && Nodes[i].getAttribute("type")=="checkbox"){
-        Nodes[i].checked=false;
-      }     
-   }   
-}
-}
+
 function validate1(date) {
     var today = new Date();
     if ( date < today ) {
@@ -694,17 +686,17 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <!-- TMPL_IF NAME="can_renew" -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         <!-- TMPL_IF NAME="od" -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
+            <input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
         <!-- TMPL_ELSE -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+            <input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
         <!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
             <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed" style="display: none">
                 <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
                 <!-- TMPL_IF NAME="od" -->
-                    <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
+                    <input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
                 <!-- TMPL_ELSE -->
-                    <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+                    <input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                 <!-- /TMPL_IF -->
                 </span>
                 <span class="renewals-disabled">
@@ -724,7 +716,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
   <!-- TMPL_IF NAME="return_failed" -->
             <td class="problem">Checkin Failed</td>
       <!--TMPL_ELSE-->
-            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
+            <td><input type="checkbox" class="radio" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" />
                 <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
             </td>
       <!-- /TMPL_IF -->
@@ -760,17 +752,17 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <!-- TMPL_IF NAME="can_renew" -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         <!-- TMPL_IF NAME="od" -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
+            <input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
         <!-- TMPL_ELSE -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+            <input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
         <!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
             <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed" style="display: none">
                 <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
                 <!-- TMPL_IF NAME="od" -->
-                    <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
+                    <input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
                 <!-- TMPL_ELSE -->
-                    <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+                    <input type="checkbox" class="radio" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                 <!-- /TMPL_IF -->
                 </span>
                 <span class="renewals-disabled">
@@ -790,7 +782,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 		  <!-- TMPL_IF NAME="return_failed" -->
             <td class="problem">Checkin Failed</td>
         <!--TMPL_ELSE-->
-            <td><input type="checkbox" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" onclick="uncheck_sibling(this);" />
+            <td><input type="checkbox" class="radio" name="barcodes[]"  value="<!-- TMPL_VAR NAME="barcode" -->" />
                 <input type="checkbox" name="all_barcodes[]" value="<!-- TMPL_VAR NAME="barcode" -->" checked="checked" style="display: none;" />
             </td>
       <!-- /TMPL_IF -->
-- 
1.7.0.4


From Katrin.Fischer.83 at web.de  Fri Nov 12 21:58:00 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 12 Nov 2010 21:58:00 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5210,
	back button on batch modification result page useless
Message-ID: <1289595480-18675-1-git-send-email-Katrin.Fischer.83@web.de>

From: Owen Leonard <oleonard at myacpl.org>

I can't see any good use for a back button here, so I'm taking it out.

An improvement might be to build in a method to resubmit the same batch
of barcodes/item numbers again so that you could make additional
changes to the same set.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
---
 .../prog/en/modules/tools/batchMod-edit.tmpl       |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
index 7793f04..f314c7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
@@ -151,8 +151,7 @@
 </div>
 <!-- TMPL_ELSE --> <!-- // show -->
 <fieldset class="action">
-  <input type="button" value="&lt;&lt; Back" onclick="window.history.back();return false;">
-  &nbsp; <a href="/cgi-bin/koha/tools/batchMod.pl">Done</a>
+  <a href="/cgi-bin/koha/tools/batchMod.pl">Done</a>
 </fieldset>
          
 <!-- /TMPL_IF -->
-- 
1.7.1


From cnighswonger at foundations.edu  Fri Nov 12 22:12:11 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Fri, 12 Nov 2010 16:12:11 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5269 - link to
	patron edit form when editing turned off
In-Reply-To: <koha-patches@lists.koha-community.org>
References: <koha-patches@lists.koha-community.org>
Message-ID: <1289596331-21379-1-git-send-email-cnighswonger@foundations.edu>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index 2b62407..001d947 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -102,13 +102,13 @@ $.tablesorter.addParser({
 		<div class="dialog alert">
         <ul>
             <!-- TMPL_IF NAME="debarred" -->
-                <li><strong>Please note:</strong> Your account has been frozen. Usually the reason for freezing an account is old overdues or damage fees.If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</li>
+                <li><strong>Please note:</strong> Your account has been frozen. Usually the reason for freezing an account is old overdues or damage fees.If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="gonenoaddress" -->
-                <li><strong>Please note:</strong> According to our records, we don't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.  Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</li>
+                <li><strong>Please note:</strong> According to our records, we don't have up-to-date <!-- TMPL_UNLESS NAME="OPACPatronDetails" --><a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a><!-- TMPL_ELSE -->contact information<!-- /TMPL_UNLESS --> on file.  Please contact the library<!-- TMPL_IF NAME="OPACPatronDetails" --> or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)<!-- /TMPL_IF -->.</li>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="lost" -->
-                <li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</li>
+                <li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please contact the library.</li>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="renewal_blocked_fines" -->
                 <li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">more than <!-- TMPL_VAR NAME="renewal_blocked_fines" --></a> in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li>
-- 
1.7.0.4


From gmcharlt at gmail.com  Fri Nov 12 22:14:43 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 16:14:43 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5175,
 XSL view doesn't link publisher name to search
In-Reply-To: <1289595000-11869-1-git-send-email-Katrin.Fischer.83@web.de>
References: <1289595000-11869-1-git-send-email-Katrin.Fischer.83@web.de>
Message-ID: <AANLkTi=iXqSoZFbG5pS9dqGH6cHS7Fig+0xXjxUSiiY-@mail.gmail.com>

Hi,

On Fri, Nov 12, 2010 at 3:50 PM, Katrin Fischer
<Katrin.Fischer.83 at web.de> wrote:
> ? ? ? ? <span class="results_summary"><span class="label">Publisher: </span>
> ? ? ? ? ? ? <xsl:for-each select="marc:datafield[@tag=260]">
> + ? ? ? ? ? ? ? ?<a href="/cgi-bin/koha/catalogue/search.pl?q=pb:{marc:subfield[@code='b']}">
> + ? ? ? ? ? ? ? ? ? ?<xsl:call-template name="subfieldSelect">
> + ? ? ? ? ? ? ? ? ? ? ? ?<xsl:with-param name="codes">b</xsl:with-param>
> + ? ? ? ? ? ? ? ? ? ?</xsl:call-template>
> + ? ? ? ? ? ? ? </a>
> + ? ? ? ? ? ? ? <xsl:text> </xsl:text>
> ? ? ? ? ? ? ? ? <xsl:call-template name="chopPunctuation">
> ? ? ? ? ? ? ? ? ? <xsl:with-param name="chopString">
> ? ? ? ? ? ? ? ? ? ? <xsl:call-template name="subfieldSelect">

This patch would have the effect of displaying the publisher twice,
which strikes me as not ideal.  For example, it might look something
like:

Harper Collins New York, N.Y. : Harper Collins,1984.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From Katrin.Fischer at bsz-bw.de  Fri Nov 12 22:31:34 2010
From: Katrin.Fischer at bsz-bw.de (Fischer, Katrin)
Date: Fri, 12 Nov 2010 22:31:34 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5175,
	XSL view doesn't link publisher name to search
References: <1289595000-11869-1-git-send-email-Katrin.Fischer.83@web.de>
	<AANLkTi=iXqSoZFbG5pS9dqGH6cHS7Fig+0xXjxUSiiY-@mail.gmail.com>
Message-ID: <028B1A54D03E7B4482CDCA4EC8F06BFD98ECFE@Bodensee.bsz-bw.de>

Galen, you are right. I missed that :(


-----Original Message-----
From: koha-patches-bounces at lists.koha-community.org on behalf of Galen Charlton
Sent: Fri 12.11.2010 22:14
To: Katrin Fischer
Cc: koha-patches at lists.koha-community.org
Subject: Re: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5175, XSL view doesn't link publisher name to search
 
Hi,

On Fri, Nov 12, 2010 at 3:50 PM, Katrin Fischer
<Katrin.Fischer.83 at web.de> wrote:
> ? ? ? ? <span class="results_summary"><span class="label">Publisher: </span>
> ? ? ? ? ? ? <xsl:for-each select="marc:datafield[@tag=260]">
> + ? ? ? ? ? ? ? ?<a href="/cgi-bin/koha/catalogue/search.pl?q=pb:{marc:subfield[@code='b']}">
> + ? ? ? ? ? ? ? ? ? ?<xsl:call-template name="subfieldSelect">
> + ? ? ? ? ? ? ? ? ? ? ? ?<xsl:with-param name="codes">b</xsl:with-param>
> + ? ? ? ? ? ? ? ? ? ?</xsl:call-template>
> + ? ? ? ? ? ? ? </a>
> + ? ? ? ? ? ? ? <xsl:text> </xsl:text>
> ? ? ? ? ? ? ? ? <xsl:call-template name="chopPunctuation">
> ? ? ? ? ? ? ? ? ? <xsl:with-param name="chopString">
> ? ? ? ? ? ? ? ? ? ? <xsl:call-template name="subfieldSelect">

This patch would have the effect of displaying the publisher twice,
which strikes me as not ideal.  For example, it might look something
like:

Harper Collins New York, N.Y. : Harper Collins,1984.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com
_______________________________________________
Koha-patches mailing list
Koha-patches at lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101112/5151f313/attachment.htm>

From Katrin.Fischer.83 at web.de  Fri Nov 12 23:03:42 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 12 Nov 2010 23:03:42 +0100
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5175,
	XSL view doesn't link publisher name to search
Message-ID: <1289599422-5441-1-git-send-email-Katrin.Fischer.83@web.de>

From: Owen Leonard <oleonard at myacpl.org>

Fixes the doubled up display of the publisher.

This patch fixes the bug in both the OPAC and staff client
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   10 ++++++++--
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 9de39cf..075472e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -222,16 +222,22 @@
         <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:{marc:subfield[@code='b']}">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">b</xsl:with-param>
+                    </xsl:call-template>
+               </a>
+               <xsl:text> </xsl:text>
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abcg</xsl:with-param>
+                        <xsl:with-param name="codes">acg</xsl:with-param>
                     </xsl:call-template>
                    </xsl:with-param>
                </xsl:call-template>
                     <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
             </xsl:for-each>
-        </span> 
+        </span>
         </xsl:if>
 
         <!-- Edition Statement: Alternate Graphic Representation (MARC 880) -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 2c6a1a8..e76b8df 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -243,10 +243,16 @@
         <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <a href="/cgi-bin/koha/opac-search.pl?q=pb:{marc:subfield[@code='b']}">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">b</xsl:with-param>
+                    </xsl:call-template>
+               </a>
+               <xsl:text> </xsl:text>
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">abcg</xsl:with-param>
+                        <xsl:with-param name="codes">acg</xsl:with-param>
                     </xsl:call-template>
                    </xsl:with-param>
                </xsl:call-template>
-- 
1.7.1


From gmcharlt at gmail.com  Sat Nov 13 04:00:27 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 22:00:27 -0500
Subject: [Koha-patches] [PATCH 2/2] bug 5397: display renew count
	consistently
In-Reply-To: <1289617227-8917-1-git-send-email-gmcharlt@gmail.com>
References: <1289617227-8917-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289617227-8917-2-git-send-email-gmcharlt@gmail.com>

Display the renewal count for loans consistently; in particular,
for loans that have never been renewed, display 0.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/circ/circulation.tmpl          |    2 +-
 .../prog/en/modules/members/moremember.tmpl        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 4e1dc1e..65243d8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -661,7 +661,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
       <!-- TMPL_IF NAME="renew_failed" -->
             <td class="problem">Renewal Failed</td>
       <!-- TMPL_ELSE -->
-        <td><span style="padding: 0 1em;"><!-- TMPL_VAR NAME="renewals" --></span>
+        <td><span style="padding: 0 1em;"><!-- TMPL_IF NAME="renewals" --><!-- TMPL_VAR NAME="renewals" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF --></span>
         <!-- TMPL_IF NAME="can_renew" -->
         <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         <!-- TMPL_IF NAME="od" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index d34fc62..030c78a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -437,7 +437,7 @@ function validate1(date) {
       <!-- TMPL_IF NAME="renew_failed" -->
             <td class="problem">Renewal Failed</td>
       <!-- TMPL_ELSE -->
-            <td><span style="padding: 0 1em;"><!-- TMPL_VAR NAME="renewals" --></span>
+            <td><span style="padding: 0 1em;"><!-- TMPL_IF NAME="renewals" --><!-- TMPL_VAR NAME="renewals" --><!-- TMPL_ELSE -->0<!-- /TMPL_IF --></span>
             <!-- TMPL_IF name="norenew" -->
                 <!-- TMPL_IF NAME="can_confirm" --><span class="renewals-allowed" style="display: none">
                     <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 04:00:26 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 22:00:26 -0500
Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] Fix for Bug 5051,
	Renewal due date doesn't always show on patron Checkout tab
Message-ID: <1289617227-8917-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Display of the renewal date footer in the template was conditional upon
the existence of checkouts from today.

In order to fix this bug it was necessary to repeat the markup for the
table footer twice in the template, so I created an include file for it.
The same include file can now be used in moremember.tmpl.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/includes/checkouts-table-footer.inc    |   25 ++++++++++++++
 .../prog/en/modules/circ/circulation.tmpl          |   36 ++-----------------
 .../prog/en/modules/members/moremember.tmpl        |   36 +++++---------------
 3 files changed, 38 insertions(+), 59 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
new file mode 100644
index 0000000..5d05b94
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
@@ -0,0 +1,25 @@
+<tfoot>
+	<tr>
+		<td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td>
+		<td><!-- TMPL_VAR NAME="totaldue" --></td>
+		<td><!-- TMPL_VAR NAME="totalprice" --></td>
+		<td colspan="2">
+			<p>Renewal due date: <input type="text" size="8" id="newduedate" name="newduedate" value="<!-- TMPL_VAR Name="newduedate" -->" />
+			<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" />
+			<script type="text/javascript"> //<![CDATA[
+			//#TODO - ADD syspref (AllowPostDatedCheckouts).
+			 Calendar.setup(
+			      {
+			         inputField : "newduedate",
+			         ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+			         button : "newduedate_button",
+			         disableFunc : validate1,
+			         dateStatusFunc : validate1,
+			       }
+			    );
+			//]]>
+			</script></p>
+			<p><label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label></p>
+		</td>
+	</tr>
+</tfoot>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 0b4ac29..4e1dc1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -176,7 +176,7 @@ function refocus(calendar) {
     </li>
     <!-- TMPL_IF NAME="canned_bor_notes_loop" -->
         <li>
-                <label for="canned_notes">Predefined notes: </label>
+                <label for="type">Predefined notes: </label>
                 <select name="type" id="type" onchange="this.form.borrower_message.value=this.options[this.selectedIndex].value;">
                     <option value="">Select Note</option>
                     <!-- TMPL_LOOP NAME="canned_bor_notes_loop" -->
@@ -193,7 +193,7 @@ function refocus(calendar) {
         <input type="submit" value="Save" /> <a href="#" class="cancel">Cancel</a>
     </fieldset>
 
-        <input type="hidden" name="borrowernumber" id="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
         <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branch" -->" />
 </fieldset>
 </form>
@@ -642,36 +642,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> | <a href="#" id="CheckNoreturns">none</a></p></th>
     </tr>
 <!-- TMPL_IF NAME="todayissues" --></thead>
-<tfoot>
-		<tr>
-            <td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td>
-			<td><!-- TMPL_VAR NAME="totaldue" --></td>
-            <td><!-- TMPL_VAR NAME="totalprice" --></td>
-            <td colspan="2">      
-                <p>
-                    Renewal due date: <input type="text" size="8" id="newduedate" name="newduedate" value="<!-- TMPL_VAR Name="newduedate" -->" />
-                    <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" />
- <script type="text/javascript"> //<![CDATA[
-				//#TODO - ADD syspref (AllowPostDatedCheckouts).
-                     Calendar.setup(
-                          {
-                             inputField : "newduedate",
-                             ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-                             button : "newduedate_button",
-                             disableFunc : validate1,
-                             dateStatusFunc : validate1,
-                             onClose : refocus
-                           }
-                        );
-				//]]>
-				 </script>
-                </p>
-                <p>
-                    <label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label>
-                </p>
-            </td>
-        </tr>
-		</tfoot>
+<!-- TMPL_INCLUDE NAME="checkouts-table-footer.inc" -->
 	<tbody>
 
     <!-- TMPL_LOOP NAME="todayissues" -->
@@ -734,6 +705,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <!-- TMPL_IF NAME="previssues" -->
 <!-- TMPL_IF NAME="todayissues" --><tr><th colspan="10"><a name="previous" id="previous"></a>Previous checkouts</th></tr><!-- TMPL_ELSE -->
 <tr><th class="{sorter: false}" colspan="10"><a name="previous" id="previous"></a>Previous checkouts</th></tr></thead>
+<!-- TMPL_INCLUDE NAME="checkouts-table-footer.inc" -->
 	<tbody>
 <!-- /TMPL_IF -->
     <!-- TMPL_LOOP NAME="previssues" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 5f3bbba..d34fc62 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -89,7 +89,14 @@ if (nodename =="barcodes[]"){
    }   
 }
 }
-
+function validate1(date) {
+    var today = new Date();
+    if ( date < today ) {
+        return true;
+     } else {
+        return false;
+     }
+};
 //]]>
 </script>
 
@@ -404,32 +411,7 @@ if (nodename =="barcodes[]"){
             <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
             <th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> | <a href="#" id="CheckNoreturns">none</a></p></th>
         </tr></thead>
-    	<tfoot>
-		<tr>
-            <td colspan="5" style="text-align: right; font-weight:bold;">Totals:</td>
-			<td><!-- TMPL_VAR NAME="totaldue" --></td>
-            <td><!-- TMPL_VAR NAME="totalprice" --></td>
-            <td colspan="2">      
-                <p>
-                    Renewal due date: <input type="text" size="8" id="newduedate" name="newduedate" value="<!-- TMPL_VAR Name="newduedate" -->" />
-                    <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="newduedate_button" alt="Show Calendar" />
-                    <script type="text/javascript">
-                        //<![CDATA[
-                        Calendar.setup({
-                            inputField : "newduedate",
-                            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-                            button : "newduedate_button"
-                        });
-                        //]]>
-                    </script>
-				<span style="display:block;color:#666;font-weight:normal;font-size:90%;"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
-                </p>
-                <p>
-                    <label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label>
-                </p>
-            </td>
-        </tr>
-		</tfoot>
+        <!-- TMPL_INCLUDE NAME="checkouts-table-footer.inc" -->
        <tbody>
        <!-- TMPL_LOOP name="issueloop" -->
 
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 04:41:31 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 22:41:31 -0500
Subject: [Koha-patches] [PATCH 2/4] bug 4359 follow-up: noItemTypeImages
	should just control image display
In-Reply-To: <1289619693-12316-1-git-send-email-gmcharlt@gmail.com>
References: <1289619693-12316-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289619693-12316-2-git-send-email-gmcharlt@gmail.com>

Tweaked so that the item type column is always displayed in the
checkout history in the OPAC; noItemTypeImages now just controls
whether the icon displays.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/opac-readingrecord.tmpl        |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index 5f55177..0b53ebd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -54,7 +54,7 @@ You have never borrowed anything from this library.
 <div class="ui-tabs-panel"><table id="readingrec">
 <tr>
 <th colspan="2">Title</th>
-<!-- TMPL_UNLESS NAME="noItemTypeImages" --><th>Item Type</th><!-- /TMPL_UNLESS -->
+<th>Item Type</th>
 <th>Call No.</th>
 <th>Date</th>
 </tr>
@@ -80,7 +80,7 @@ You have never borrowed anything from this library.
                     <span class="item-details">
                         <!-- TMPL_VAR NAME="author" -->
                     </span></td>
-<!-- TMPL_UNLESS NAME="noItemTypeImages" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
+<td><!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR name="description" --></td>
 <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 <td><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR NAME="returndate" --><!-- TMPL_ELSE --><em>(Checked out)</em><!-- /TMPL_IF --></td>
 </tr>
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 04:41:30 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 22:41:30 -0500
Subject: [Koha-patches] [PATCH 1/4] [SIGNED-OFF] Fix for Bug 4359,
	noItemTypeImages not active in OPAC
Message-ID: <1289619693-12316-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

- Auth.pm put the noItemTypeImages preference under "intranet only."
  Moved it to "OPAC or intranet."
- Added check for the preference on the OPAC advanced search page.
- Improved logic for displaying images on the reading history page.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Auth.pm                                         |    2 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |    2 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    2 +-
 .../prog/en/modules/opac-readingrecord.tmpl        |    4 ++--
 opac/opac-readingrecord.pl                         |    1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 6ba852d..c7477b1 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -339,6 +339,7 @@ sub get_template_and_user {
             XSLTResultsDisplay           => C4::Context->preference("XSLTResultsDisplay"),
             BranchesLoop                 => GetBranchesLoop(),
             using_https                  => $in->{'query'}->https() ? 1 : 0,
+            noItemTypeImages            => C4::Context->preference("noItemTypeImages"),
     );
 
     if ( $in->{'type'} eq "intranet" ) {
@@ -363,7 +364,6 @@ sub get_template_and_user {
             intranetstylesheet          => C4::Context->preference("intranetstylesheet"),
             intranetuserjs              => C4::Context->preference("intranetuserjs"),
             intranetbookbag             => C4::Context->preference("intranetbookbag"),
-            noItemTypeImages            => C4::Context->preference("noItemTypeImages"),
             suggestion                  => C4::Context->preference("suggestion"),
             virtualshelves              => C4::Context->preference("virtualshelves"),
             StaffSerialIssueDisplayCount => C4::Context->preference("StaffSerialIssueDisplayCount"),
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 1ee82d0..ec77493 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -135,7 +135,7 @@
     <table>
         <tr>
     <!--TMPL_LOOP Name="itemtypeloop"-->
-        <td><input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="mc-<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->"/><label for="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->"><!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->&nbsp;
+        <td><input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="mc-<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->"/><label for="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->"><!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->&nbsp;<!-- /TMPL_UNLESS -->
         <!--TMPL_VAR Name="description" --></label></td>
         <!-- TMPL_UNLESS name="count5" --><!-- TMPL_UNLESS name="__last__" --></tr><tr><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
     <!--/TMPL_LOOP-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 1e5e2b7..876ae81 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -395,7 +395,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 		<th>Date Due</th>
 	    </tr></thead>
 	    <tbody><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-	    <tr><!-- TMPL_IF NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR NAME="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_IF -->
+	    <tr><!-- TMPL_IF NAME="item-level_itypes" --><td><!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR NAME="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_IF -->
 		<td><!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_IF name="branchurl" --><a href="<!-- TMPL_VAR NAME="branchurl" -->"><!-- TMPL_VAR NAME="branchname" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="location_description" --> </td>
 		<!-- TMPL_IF NAME="itemdata_ccode" --><td><!-- TMPL_VAR NAME="ccode" --></td><!-- /TMPL_IF -->
 		<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- TMPL_IF NAME="OPACShelfBrowser" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index 250a77a..5f55177 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -54,7 +54,7 @@ You have never borrowed anything from this library.
 <div class="ui-tabs-panel"><table id="readingrec">
 <tr>
 <th colspan="2">Title</th>
-<!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="noItemTypeImages" --><th>Item Type</th><!-- /TMPL_UNLESS -->
 <th>Call No.</th>
 <th>Date</th>
 </tr>
@@ -80,7 +80,7 @@ You have never borrowed anything from this library.
                     <span class="item-details">
                         <!-- TMPL_VAR NAME="author" -->
                     </span></td>
-<!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="itypedescription" -->" alt="<!-- TMPL_VAR NAME="itypedescription" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="itypedescription" --></td><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="noItemTypeImages" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
 <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 <td><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR NAME="returndate" --><!-- TMPL_ELSE --><em>(Checked out)</em><!-- /TMPL_IF --></td>
 </tr>
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 7a77f59..c9d5819 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -95,6 +95,7 @@ foreach my $issue (@{$issues} ) {
     $line{date_due}        = format_date( $issue->{'date_due'} );
     $line{returndate}      = format_date( $issue->{'returndate'} );
     $line{volumeddesc}     = $issue->{'volumeddesc'};
+    $issue->{'itemtype'}   = C4::Context->preference('item-level_itypes') ? $issue->{'itype'} : $issue->{'itemtype'};
     if($issue->{'itemtype'}) {
         $line{'description'}   = $itemtypes->{ $issue->{'itemtype'} }->{'description'};
         $line{imageurl}        = getitemtypeimagelocation( 'opac', $itemtypes->{ $issue->{'itemtype'}  }->{'imageurl'} );
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 04:41:33 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 22:41:33 -0500
Subject: [Koha-patches] [PATCH 4/4] bug 5398: make additional pages in staff
	interface obey noItemTypeImages
In-Reply-To: <1289619693-12316-3-git-send-email-gmcharlt@gmail.com>
References: <1289619693-12316-1-git-send-email-gmcharlt@gmail.com>
	<1289619693-12316-2-git-send-email-gmcharlt@gmail.com>
	<1289619693-12316-3-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289619693-12316-4-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/catalogue/advsearch.tmpl       |    2 ++
 .../prog/en/modules/reserve/request.tmpl           |    5 ++++-
 .../prog/en/modules/suggestion/suggestion.tmpl     |    1 -
 .../prog/en/modules/virtualshelves/shelves.tmpl    |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index aeed108..d2334e0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -90,7 +90,9 @@
         <tr>
       <!--TMPL_LOOP Name="itemtypeloop"-->
         <td>
+        <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
         <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->
+        <!-- /TMPL_UNLESS -->
 		<input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="mc-<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->" />&nbsp;
         <label for="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->"><!--TMPL_VAR Name="description" --></label></td>
         <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 53f9138..225c4b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -405,7 +405,10 @@ function checkMultiHold() {
             </td>
             <!-- TMPL_IF NAME="item-level_itypes" -->
                 <td>
-                    <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR name="imageurl" -->" alt="" /> <br /> <!-- /TMPL_IF --><!-- TMPL_VAR NAME="itypename" -->
+                    <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
+                        <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR name="imageurl" -->" alt="" /> <br /> <!-- /TMPL_IF -->
+                    <!-- /TMPL_UNLESS -->
+                    <!-- TMPL_VAR NAME="itypename" -->
                 </td>
             <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
index 7489cb6..634ebdc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
@@ -111,7 +111,6 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
             <select id="itemtype" name="itemtype" >
             <!--TMPL_LOOP Name="itemtypeloop"-->
                 <!--TMPL_IF Name="selected"--><option selected="selected" value="<!--TMPL_VAR Name="code" -->"><!--TMPL_ELSE--><option value="<!--TMPL_VAR Name="code" -->"><!--/TMPL_IF-->
-                <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->
                 <!--TMPL_VAR Name="description" --></option>
             <!--/TMPL_LOOP-->
             </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 35c022b..d0bd49e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -193,7 +193,7 @@ function placeHold () {
 			</td>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_UNLESS NAME="item-level_itypes" --><td>
-                <img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- TMPL_VAR NAME="description" -->
+                <!-- TMPL_UNLESS NAME="noItemTypeImages" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="description" -->
 			</td><!-- /TMPL_UNLESS -->
 			<td>
 			<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 04:41:32 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 22:41:32 -0500
Subject: [Koha-patches] [PATCH 3/4] bug 4359: make other pages in the OPAC
	respect noItemTypeImages
In-Reply-To: <1289619693-12316-2-git-send-email-gmcharlt@gmail.com>
References: <1289619693-12316-1-git-send-email-gmcharlt@gmail.com>
	<1289619693-12316-2-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289619693-12316-3-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../opac-tmpl/prog/en/modules/opac-reserve.tmpl    |    4 ++++
 .../prog/en/modules/opac-results-grouped.tmpl      |    9 +++++----
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |    2 ++
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |    5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 812c91b..52ff4cd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -296,7 +296,9 @@
                     </td>
                     <!-- TMPL_UNLESS NAME="item-level_itypes" -->
                       <td>
+                        <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                         <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
+                        <!-- /TMPL_UNLESS -->
 						<!-- TMPL_VAR NAME="description" -->
                       </td>
                     <!-- /TMPL_UNLESS -->
@@ -472,7 +474,9 @@
                               </td>
                               <!-- TMPL_IF NAME="item-level_itypes" -->
                                 <td>
+                                  <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                                   <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
+                                  <!-- /TMPL_UNLESS -->
 								<!-- TMPL_VAR NAME="description" -->
                                 </td>
                               <!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
index 1d5e8f1..288392f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
@@ -200,12 +200,13 @@ function highlightOn() {
                         <a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.TZZZZZZZ.jpg" alt="" class="thumbnail" /><!-- TMPL_ELSE --><img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" class="thumbnail" /><!-- /TMPL_IF -->
                         </a>
                         <!-- TMPL_ELSE -->
-                        <!-- TMPL_IF name="imageurl" -->
-                        <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" />
-                        <!-- TMPL_ELSE -->
+                        <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
+                            <!-- TMPL_IF name="imageurl" -->
+                                <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" />
+                            <!-- /TMPL_IF -->
+                        <!-- /TMPL_UNLESS -->
                         <!-- TMPL_VAR name="description" -->
                         <!-- /TMPL_IF -->
-                        <!-- /TMPL_IF -->
                     </td>
                     <td><!-- TMPL_VAR NAME="result_number" -->. <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
                       <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 3d59dd1..aa39b9a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -373,12 +373,14 @@ $(document).ready(function(){
                 <td class="select selectcol"><!-- TMPL_VAR NAME="result_number" -->.</td>
 
 				<!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
 				<td class="itypecol">
                 <!-- TMPL_IF name="imageurl" -->
 				<img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" />
                 <!-- /TMPL_IF -->
 				</td>
                 <!-- /TMPL_UNLESS-->
+                <!-- /TMPL_UNLESS-->
 
 				<!-- TMPL_IF NAME="AuthorisedValueImages" -->
                 <td class="itypecol">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index b79ddab..8e84632 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -248,7 +248,10 @@ $(function() {
                                    value="<!-- TMPL_VAR NAME="biblionumber">" /></td>
                     <!-- TMPL_UNLESS NAME="item-level_itypes" -->
                         <td>
-                          <img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- TMPL_VAR NAME="description" -->
+                          <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
+                          <img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" />
+                          <!-- /TMPL_UNLESS -->
+                          <!-- TMPL_VAR NAME="description" -->
                         </td>
                     <!-- /TMPL_UNLESS -->
                         <td><!-- TMPL_IF NAME="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 04:48:41 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 22:48:41 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 4912 - After
	editing private list redirect to private lists
Message-ID: <1289620121-13271-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/virtualshelves/shelves.tmpl    |    6 +++++-
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    5 ++++-
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |    3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 35c022b..e6c8113 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -274,6 +274,7 @@ function placeHold () {
 
     <!-- TMPL_IF name="edit" -->
 		<input type="hidden" name="op" value="modifsave" />
+        <!-- TMPL_IF NAME="showprivateshelves" --><input type="hidden" name="display" value="privateshelves" /><!-- /TMPL_IF -->
 		<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" />
 		<legend>Edit List <i><!-- TMPL_VAR name="shelfname" --></i></legend>
 		<ol>
@@ -306,7 +307,9 @@ function placeHold () {
 	<!-- /TMPL_IF -->
 
 		</fieldset>
-		<fieldset class="action"><input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" /><a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a></fieldset>
+		<fieldset class="action"><input type="submit" onclick="Check(this.form); return false;" value="Save" class="submit" />
+        <!-- TMPL_IF NAME="showprivateshelves" --><a href="/cgi-bin/koha/virtualshelves/shelves.pl?display=privateshelves" class="cancel">Cancel</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/virtualshelves/shelves.pl" class="cancel">Cancel</a><!-- /TMPL_IF -->
+    </fieldset>
     </form>
     </div>
     <div class="yui-u">
@@ -360,6 +363,7 @@ function placeHold () {
 				<form action="shelves.pl" method="get">
 					<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelf" -->" />
 					<input type="hidden" name="op" value="modif" />
+                    <input type="hidden" name="display" value="privateshelves" />
 					<input type="submit" class="editshelf" value="Edit" />
 				</form>
 				<form action="shelves.pl" method="post">
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 21d580f..8f9b246 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -572,7 +572,10 @@ input.deleteshelf {
 }
 
 
-#toolbar input.editshelf:active,input.deleteshelf:active {
+#toolbar input.editshelf:active,
+input.editshelf:active,
+#toolbar input.deleteshelf:active,
+input.deleteshelf:active {
 	border : 0;
 }
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index b79ddab..66f88c7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -306,6 +306,7 @@ $(function() {
                 <h3><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->"><em><!-- TMPL_VAR NAME="shelfname" ESCAPE="html" --></em></a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Editing</h3>
                 <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
                   <input type="hidden" name="op" value="modifsave" />
+                   <!-- TMPL_IF NAME="showprivateshelves" --><input type="hidden" name="display" value="privateshelves" /><!-- /TMPL_IF -->
                   <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
                   <fieldset class="rows">
                     <ol>
@@ -327,7 +328,7 @@ $(function() {
                       </li>
                     </ol>
                   </fieldset>
-                  <fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->">Cancel</a></fieldset>
+                  <fieldset class="action"><input type="submit" value="Save" class="submit" /> <!-- TMPL_IF NAME="showprivateshelves" --><a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->&amp;display=privateshelves">Cancel</a><!-- TMPL_ELSE --><a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->">Cancel</a><!-- /TMPL_IF --></fieldset>
                 </form>
             <!-- /TMPL_IF --><!-- /edit -->
 
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 04:53:23 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 22:53:23 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 4913 - Budget pages
	should show currency name instead of symbol
Message-ID: <1289620403-14073-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

This patch adds a new include file to handle the display of the active
currency name and a warning if no currency is active.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 admin/aqbudgetperiods.pl                           |    4 +++-
 admin/aqbudgets.pl                                 |    4 +++-
 admin/aqplan.pl                                    |    5 +++--
 .../prog/en/includes/budgets-active-currency.inc   |    1 +
 .../prog/en/modules/admin/aqbudgetperiods.tmpl     |    4 +++-
 .../prog/en/modules/admin/aqbudgets.tmpl           |    6 +++---
 .../prog/en/modules/admin/aqplan.tmpl              |    2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc

diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index 62383f1..39f3cd0 100755
--- a/admin/aqbudgetperiods.pl
+++ b/admin/aqbudgetperiods.pl
@@ -82,7 +82,9 @@ my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
 
 
 my $cur = GetCurrency();
-$template->param( cur => $cur->{symbol} );
+$template->param( symbol => $cur->{symbol},
+                  currency => $cur->{currency}
+               );
 my $cur_format = C4::Context->preference("CurrencyFormat");
 my $num;
 
diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index 34a4021..d266727 100755
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -52,7 +52,9 @@ my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
 );
 
 my $cur = GetCurrency();
-$template->param( cur => $cur->{symbol} );
+$template->param( symbol => $cur->{symbol},
+                  currency => $cur->{currency}
+               );
 
 my $op = $input->param('op');
 
diff --git a/admin/aqplan.pl b/admin/aqplan.pl
index 8efa427..8b68d51 100755
--- a/admin/aqplan.pl
+++ b/admin/aqplan.pl
@@ -60,7 +60,9 @@ my $budget_period_id = $input->param('budget_period_id');
 my $period = GetBudgetPeriod($budget_period_id);
 my $count  = GetPeriodsCount();
 my $cur    = GetCurrency;
-
+$template->param( symbol => $cur->{symbol},
+                  currency => $cur->{currency}
+               );
 $template->param( period_button_only => 1 ) if $count == 0;
 
 
@@ -450,7 +452,6 @@ $template->param(
     show_actual               => $show_actual,
     show_percent              => $show_percent,
     show_mine                 => $show_mine,
-    cur                       => $cur->{symbol},
     cur_format                => $cur_format,
     CGIextChoice              => $CGIextChoice,
     CGIsepChoice              => $CGIsepChoice,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
new file mode 100644
index 0000000..a4571f9
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc
@@ -0,0 +1 @@
+<!-- TMPL_IF name="currency" --><p><b>Currency = <!-- TMPL_VAR NAME="currency" --></b></p><!-- TMPL_ELSE --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div><!-- /TMPL_IF -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index 78c51b8..523fd13 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -254,7 +254,9 @@
 <!--  DEFAULT  display budget periods list -->
 <!-- TMPL_IF name="else" -->
     <h2>Budgets administration</h2>
-    <!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR name="cur" --></b></p><!-- TMPL_ELSE --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div><!-- /TMPL_IF -->
+
+    <!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" -->
+
     <table id="periodsh">
     <thead>
 	    <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index 5e0db00..80d9156 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -157,9 +157,10 @@
 <!-- TMPL_UNLESS name="delete_confirm" --><!-- TMPL_INCLUDE NAME="budgets-admin-toolbar.inc" --><!-- /TMPL_UNLESS -->
 <!-- TMPL_IF name="else" -->
 
-<!-- TMPL_UNLESS NAME="cur" --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div><!-- /TMPL_UNLESS -->
-
 <h1>Funds for '<!-- TMPL_VAR name="budget_period_description" -->'</h1>
+
+<!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" -->
+
 <table id="budgeth">
     <thead>
         <tr>
@@ -240,7 +241,6 @@
     </tbody>
 </table>
 
-<!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR NAME="cur" --> <!-- TMPL_VAR NAME="cur_format" --></b></p><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF -->
 <!-- /TMPL_IF --> <!-- else -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index 170c7a0..2192178 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -139,7 +139,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
 
     <!-- TMPL_IF NAME="budget_lines" -->
 
-    <!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR name="cur" --></b></p><!-- TMPL_ELSE --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div><!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" -->
 
     <table id="plan" width="100%">
     <thead>
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 05:07:30 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 23:07:30 -0500
Subject: [Koha-patches] [PATCH 2/2] bug 3850 followup - tweaks
In-Reply-To: <1289621250-15093-1-git-send-email-gmcharlt@gmail.com>
References: <1289621250-15093-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289621250-15093-2-git-send-email-gmcharlt@gmail.com>

* fix type that would break translation
* moved acq menu back to left side

I wonder if the export box is better moved back
under the planning grid.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/admin/aqplan.tmpl              |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index b3dc6c1..c67e45e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -200,7 +200,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
         <!-- TMPL_ELSIF NAME="est_positive" -->
             <td width="50%" style="color: green;" id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->">
         <!-- TMPL_ELSE -->
-            <td width="50%"id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->">
+            <td width="50%" id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->">
         <!--/TMPL_IF -->
                 <!-- TMPL_VAR NAME="budget_est_remain"-->&nbsp;
             </td>
@@ -307,9 +307,6 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
 </form>
 <!-- /TMPL_IF -->
 
-</div>
-<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
-</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 05:07:29 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 23:07:29 -0500
Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] More comprehensive fixes
	for Bug 3850 - Budget Planning Pages Need Design Work
Message-ID: <1289621250-15093-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

- Filter moved to left-hand sidebar consistent with other pages
- Export option moved to left-hand sidebar to improve visibility
- Show/hide column controls moved to their own role with clear labels
- "Locked" icon added to replace indicating locked status by row color

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/admin/aqplan.tmpl              |  229 +++++++++++---------
 koha-tmpl/intranet-tmpl/prog/img/locked.png        |  Bin 0 -> 822 bytes
 2 files changed, 121 insertions(+), 108 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/locked.png

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index 170c7a0..b3dc6c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Budget planning</title>
+<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
-<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/acq.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/acq.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 // ---------------------------------------------------------------------
@@ -53,8 +53,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
 
     <!-- /TMPL_LOOP -->
     oMenu = new YAHOO.widget.Menu("basicmenu",
-            {  position: "dynamic", itemdata: itemData , clicktohide  : "true" , context:["popmenu","tl","tr"] }
-    );
+            {  position: "dynamic", itemdata: itemData , clicktohide  : "true" , context:["popmenu","tl","tr"] });
 
    oMenu.render("popmenu");
    YAHOO.util.Event.addListener("add_popmenu_item", "click", oMenu.show, null, oMenu);
@@ -64,7 +63,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
 });
 //]]>
 </script>
-
+<style type="text/css">td.locked { background-image: url('/intranet-tmpl/prog/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 4% 50%; } a.control { font-size:85%;text-decoration:none; }</style>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -74,8 +73,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
     <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
     <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
     <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> &rsaquo; 
-    <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Funds</a> &rsaquo;
-    <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Planning</a> &rsaquo;
+    <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Funds</a> &rsaquo; Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" -->
 </div>
 
 <div id="doc3" class="yui-t2">
@@ -86,60 +84,28 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
 
 <!-- TMPL_INCLUDE NAME="budgets-admin-toolbar.inc" -->
 
-<br />
+<form method="post" id="Aform" name="Aform"  action="/cgi-bin/koha/admin/aqplan.pl">
+<h3>Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --></h3>
 
-<form method="post" id='Aform' name="Aform"  action="/cgi-bin/koha/admin/aqplan.pl">
+<!-- Budget Lines -->
 
-<input type="hidden" id="budget_period_id" name="budget_period_id" value="<!-- TMPL_VAR NAME="budget_period_id" -->"/>
-<fieldset style=" border:2px solid #EEEEEE; " >
-<legend>Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --></legend>
-    <table class="invis" >
-    <tr><td>
-    <!-- TMPL_IF NAME="show_mine" -->
-        <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
+    <!-- TMPL_IF NAME="budget_lines" -->
+
+    <!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR name="cur" --></b>.
+    <!-- TMPL_IF NAME="show_actual" -->
+        <b>Each cell contain both actual and estimated values.</b>
     <!-- TMPL_ELSE -->
-        <input type="checkbox" id="show_mine"  name="show_mine" value="1"  />
+        <b>Cells contain estimated values only.</b>
     <!-- /TMPL_IF -->
-    <label for="show_mine">Show my funds only</label>
-    </td>
-    <td>
-        <label for="authcat"  > Select planning type:</label>
-        <!-- TMPL_VAR NAME="authcat_dropbox" -->
-        <input type="submit" name="option_submit" value="Select" />
-    </td>
-    </tr>
-
-    <tr><td>
-    <!-- TMPL_IF NAME="show_active" -->
-        <input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" />
+    </p><!-- TMPL_ELSE --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div>
+<!-- TMPL_IF NAME="show_actual" -->
+        <p><b>Each cell contain both actual and estimated values.</b></p>
     <!-- TMPL_ELSE -->
-        <input type="checkbox" id="show_active" name="show_active" value="1" />
-        <!-- /TMPL_IF -->
-    <label for="show_active">Show active funds only</label>
-    </td>
-    <td></td>
-    </tr>
-
-    <tr><td>
-        <!-- TMPL_IF NAME="show_actual" -->
-            <input type="checkbox"    id="show_actual"   name="show_actual" value="1"   checked="checked" />
-        <!-- TMPL_ELSE -->
-            <input type="checkbox" id="show_actual" name="show_actual" value="1"  />
-        <!-- /TMPL_IF -->
-        <label for="show_actual">Show actual/estimated values:</label>
-    </td>
-    <td></td>
-    </tr>
-    </table>
-</fieldset>
-
-<br />
-
-<!-- Budget Lines -->
+        <p><b>Cells contain estimated values only.</b></p>
+    <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="budget_lines" -->
 
-    <!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR name="cur" --></b></p><!-- TMPL_ELSE --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div><!-- /TMPL_IF -->
 
     <table id="plan" width="100%">
     <thead>
@@ -149,38 +115,43 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
 
     <!-- TMPL_LOOP NAME="authvals_row" -->
          <!-- TMPL_IF NAME="display" -->
-            <th id="<!-- TMPL_VAR NAME="code" -->"   style="text-align: center;"
-                        class="<!-- TMPL_VAR NAME='colnum' -->" >
+            <th id="col<!-- TMPL_VAR NAME="code" -->" class="<!-- TMPL_VAR NAME="colnum" -->">
         <!-- TMPL_ELSE -->
-            <th id="<!-- TMPL_VAR NAME="code" -->"   style="text-align: center;
-                            display:none;" 
-                        class="<!-- TMPL_VAR NAME='colnum' -->" >
+            <th id="col<!-- TMPL_VAR NAME="code" -->" styl="display:none;" class="<!-- TMPL_VAR NAME="colnum" -->">
         <!-- /TMPL_IF -->
 
-    <!-- TMPL_VAR NAME="code" -->&nbsp;<span class="buttonPlus" onclick="delColumn('<!-- TMPL_VAR NAME="colnum" -->', '<!-- TMPL_VAR NAME="code" -->')"  > - &nbsp;</span></th>
-
+    <!-- TMPL_VAR NAME="code" --></th>
     <!-- /TMPL_LOOP -->
 
-    <th>Fund remaining</th>
-
-    <th id='popmenu' style=" text-align: center;" >
-    <span id="add_popmenu_item" class="buttonPlus" > + </span></th>
+    <th>Fund remaining</th><th>&nbsp;</th>
     </tr>
+    <tr>
+    <th>&nbsp;</th><th>&nbsp;</th>
+    <!-- TMPL_LOOP NAME="authvals_row" -->
+         <!-- TMPL_IF NAME="display" -->
+            <th class="<!-- TMPL_VAR NAME="colnum" -->">
+        <!-- TMPL_ELSE -->
+            <th style="display:none;" class="<!-- TMPL_VAR NAME="colnum" -->">
+        <!-- /TMPL_IF -->
+
+    <a class="control" onclick="delColumn('<!-- TMPL_VAR NAME="colnum" -->', 'col<!-- TMPL_VAR NAME="code" -->')" href="#" title="Hide this column">[ hide ]</a></th>
+
+    <!-- /TMPL_LOOP -->
+    <th id="popmenu"><a style="font-size:85%;text-decoration:none;" id="add_popmenu_item" href="#" title="Show a hidden column">[ show a column ]</a></th><th>&nbsp;</th>
+     </tr>
     </thead>
 
     <tbody>
     <!-- TMPL_LOOP NAME="budget_lines" -->
-            <!-- TMPL_IF Name="budget_lock" -->
-        <tr  class="highlight"  > 
-            <!--TMPL_ELSE -->
-        <tr > 
-            <!--/TMPL_IF -->
+<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE
+--><tr><!-- /TMPL_UNLESS -->
 
-        <td align='left'><!-- TMPL_VAR NAME="budget_name_indent"--></td>
-        <td align='right'><span id='budget_tot_formatted_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount_formatted"-->&nbsp;</span>
+
+        <td align="left"<!-- TMPL_IF NAME="budget_lock" --> class="locked" title="Fund locked"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="budget_name_indent"--></td>
+        <td><span id="budget_tot_formatted_<!-- TMPL_VAR NAME="budget_id" -->"><!-- TMPL_VAR NAME="budget_amount_formatted"-->&nbsp;</span>
 
         <!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->
-        <div style="display:none;" id='budget_tot_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount"--></div></td>
+        <div style="display:none;" id="budget_tot_<!-- TMPL_VAR NAME="budget_id" -->"><!-- TMPL_VAR NAME="budget_amount"--></div></td>
 
         <!-- TMPL_LOOP NAME="lines"	-->
             <!-- TMPL_IF NAME="display" -->
@@ -191,15 +162,15 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
             <table class="invis" width="100%">
                 <tr>
                     <!-- TMPL_IF Name="show_actual" -->
-                        <td   width="50%"  align="right" ><!-- TMPL_VAR NAME="actual_amount" --></td>
+                        <td   width="50%"  ><!-- TMPL_VAR NAME="actual_amount" --></td>
                     <!--/TMPL_IF -->
-                <td align="right">
+                <td>
 
                 <!--TMPL_IF  Name="budget_lock" -->
                     <!-- TMPL_VAR NAME="estimated_amount" -->&nbsp;
-                    <input type="hidden" style="text-align: right;"  name='<!-- TMPL_VAR NAME="cell_name"-->' value="<!-- TMPL_VAR NAME="estimated_amount" -->"   />
+                    <input type="hidden" style="text-align: right;"  name="<!-- TMPL_VAR NAME="cell_name"-->" value="<!-- TMPL_VAR NAME="estimated_amount" -->"   />
                 <!--TMPL_ELSE -->
-                    <input type="text" style="text-align: right;  width:90%; " size='6' name='<!-- TMPL_VAR NAME="cell_name"-->'  value="<!-- TMPL_VAR NAME="estimated_amount" -->"  id='budget_<!-- TMPL_VAR NAME="budget_id"--><!-- TMPL_VAR NAME="colnum"-->' class='plan_entry_<!-- TMPL_VAR NAME="budget_id"-->' onchange="calcTotalRow(this);" />
+                    <input type="text" style="text-align: right;  width:90%; " size="6" name="<!-- TMPL_VAR NAME="cell_name"-->"  value="<!-- TMPL_VAR NAME="estimated_amount" -->"  id="budget_<!-- TMPL_VAR NAME="budget_id"--><!-- TMPL_VAR NAME="colnum"-->" class="plan_entry_<!-- TMPL_VAR NAME="budget_id"-->" onchange="calcTotalRow(this);" />
                 <!--/TMPL_IF -->
 
                 </td></tr>
@@ -212,32 +183,32 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
             <tr>
        <!-- TMPL_IF Name="show_actual" -->
             <!-- TMPL_IF NAME="act_negative" -->
-                <td width="50%" align="right" style="color: red;"> 
+                <td width="50%" style="color: red;">
             <!-- TMPL_ELSIF NAME="act_positive" -->
-                <td width="50%" align="right" style="color: green;"> 
+                <td width="50%" style="color: green;">
             <!-- TMPL_ELSE -->
-                <td width="50%" align="right">
+                <td width="50%">
             <!--/TMPL_IF -->
                     <!-- TMPL_VAR NAME="budget_act_remain"-->
         <!-- TMPL_ELSE -->
-            <td width="50%" align="right">
+            <td width="50%">
         <!-- /TMPL_IF -->
             </td>
 
         <!-- TMPL_IF NAME="est_negative" -->
-            <td width="50%"    align="right"  style="color: red;" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> 
+            <td width="50%" style="color: red;" id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->">
         <!-- TMPL_ELSIF NAME="est_positive" -->
-            <td width="50%"    align="right"  style="color: green;" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> 
+            <td width="50%" style="color: green;" id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->">
         <!-- TMPL_ELSE -->
-            <td width="50%"    align="right" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> 
-        <!--/TMPL_IF --> 
-                <!-- TMPL_VAR NAME="budget_est_remain"-->&nbsp;    
+            <td width="50%"id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->">
+        <!--/TMPL_IF -->
+                <!-- TMPL_VAR NAME="budget_est_remain"-->&nbsp;
             </td>
             </tr>
         </table>
         </td>
 
-        <td align="center">
+        <td>
              <!-- TMPL_UNLESS Name="budget_lock" -->
                     <input type="button"  onclick="autoFillRow('<!-- TMPL_VAR NAME="budget_id"-->')" value="Auto-fill row"/>
             <!-- TMPL_ELSE  -->
@@ -249,19 +220,14 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
     </tbody>
     </table>
 
-    <!-- TMPL_IF NAME="show_actual" -->
-        <span><b>Each cell contain both actual and estimated values.</b></span><br />
-    <!-- TMPL_ELSE -->
-        <span><b>Cells contain estimated values only.</b></span><br />
-    <!-- /TMPL_IF -->
     <!-- TMPL_IF name="budget_period_locked" -->
-        <!-- <input STYLE="background: gray;"   type="submit" value="Save" disabled='disabled'/> -->
+        <!-- <input STYLE="background: gray;"   type="submit" value="Save" disabled="disabled"/> -->
     <!-- TMPL_ELSE -->
-        <input type="button"  onclick="Check(this.form)" value="Save"/>
+        <fieldset class="action"><input type="button"  onclick="Check(this.form)" value="Save"/></fieldset>
     <!-- /TMPL_IF -->
 
 
-<div id='hide_div'>
+<div id="hide_div">
     <!-- TMPL_LOOP NAME="authvals_row" -->
 
      <!-- TMPL_UNLESS Name="display" -->
@@ -274,26 +240,73 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
 
 </form>
 
+        <!-- TMPL_ELSE 	-->
+<div class="dialog message">No funds to display for this search criteria</div>
+        <!-- /TMPL_IF 	-->
+
+
+</div>
+</div>
+<div class="yui-b">
+
+<form method="post" action="/cgi-bin/koha/admin/aqplan.pl">
+<fieldset class="brief">
+<h4>Filter</h4>
+
+<ol>
+    <li>
+        <label for="authcat"> Select planning type:</label>
+        <!-- TMPL_VAR NAME="authcat_dropbox" -->
+    </li>
+    <li class="radio">
+    <!-- TMPL_IF NAME="show_mine" -->
+        <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
+    <!-- TMPL_ELSE -->
+        <input type="checkbox" id="show_mine"  name="show_mine" value="1"  />
+    <!-- /TMPL_IF -->
+    <label for="show_mine">Show my funds only</label>
+    </li>
+
+    <li class="radio">
+    <!-- TMPL_IF NAME="show_active" -->
+        <input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" />
+    <!-- TMPL_ELSE -->
+        <input type="checkbox" id="show_active" name="show_active" value="1" />
+        <!-- /TMPL_IF -->
+    <label for="show_active">Show active funds only</label>
+    </li>
+
+
+    <li class="radio">
+        <!-- TMPL_IF NAME="show_actual" -->
+            <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" />
+        <!-- TMPL_ELSE -->
+            <input type="checkbox" id="show_actual" name="show_actual" value="1"  />
+        <!-- /TMPL_IF -->
+        <label for="show_actual">Show actual/estimated values</label>
+    </li>
+    </ol>
+<fieldset class="action">
+        <input type="submit" name="option_submit" value="Submit" /></fieldset>
+</fieldset>
+</form>
+<!-- TMPL_IF NAME="budget_lines" -->
 <form method="post" action="/cgi-bin/koha/admin/aqplan.pl">
-<fieldset class="rows">
+<h4>Export</h4>
+<fieldset class="brief">
     <ol>
-    <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" />
-    <label class="inline" for="MIME">Into an application
+    <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /></li>
+    <li><label class="inline" for="MIME">Into an application
     </label><!-- TMPL_VAR NAME="CGIextChoice" -->
-    <!-- TMPL_VAR NAME="CGIsepChoice" --> &nbsp;&nbsp;&nbsp;
-    <input type="submit" value="Output"/>
+    <!-- TMPL_VAR NAME="CGIsepChoice" --></li>
+    </ol>
+    <fieldset class="action">    <input type="submit" value="Submit"/>
     <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-    <input type="hidden" name="output" value="file" />
-    </li></ol>
+    <input type="hidden" name="output" value="file" /></fieldset>
     </fieldset>
 </form>
+<!-- /TMPL_IF -->
 
-        <!-- TMPL_ELSE 	-->
-No funds to display for this search criteria
-        <!-- /TMPL_IF 	-->
-
-
-</div>
 </div>
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/img/locked.png b/koha-tmpl/intranet-tmpl/prog/img/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..65eadeddf227d762c500ce1c39328c2f34db2ca5
GIT binary patch
literal 822
zcmeAS at N?(olHy`uVBq!ia0vp^AT~b-Gmw0xxXuPhv7|ftIx;Y<KVi<=^%BUJEOCt}
z3C>R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF13e?1y9pDq<`t<htOII%5y?5vInUk+x
zy?S<M)6?4<4=mGq`*il%^QSLfzHsUCr87H1etz0=cC-AYV->%C{rdOs-<w;mKR#|c
zyTfnSmYRF_?;cyLcjxY%{Rj8Gyl(N~)vmJ#<IWune|a<U;3}h&>*Wuxka>T{<IX9q
ztA|t$9NKs9V!@$9JC7b(_x}C67gx=XZ&N+ILjCpaz>n{4pW3MN>(ipA*P_mD(f#rB
z$G&ZqSFT?E^6}w^$5ofETzma=!;5Qn`*t>+-K=(eqs^{8J6^qhb#}Mvxve^9wgtYw
zZTR5f;}=(r9$$2O^!U-moys>4vtK)vdVHhjozs?QcJQ6wDs%0q<*}nX_b!(B^=bX_
z_2w^c#h%$9{_*9i6Q_<pxn6u^o8#k4o)6C`{r&s*&!0bM&YnKINAC35lc#q|pE!Nu
z+*ZRI$1M*ZIe31n!KIzDPcNHayMFckUFW-J+%D`_eSXFK(l(C68~N^^_x<qU!}F`2
z2bOEzxU&DuHop^_?9W{|`~Uy{mpiX*0LD#aNswPKkUJoNVQEO$8=xc3c)B=-RNP8h
zv7#gOVOO%zx)lr at 3T<5y<-3dAJpCHE8W at sRXoPHCzv6<A=xUG at 7w0oBg%dttWn95-
z0+Tgk1QZ%1w07t^_)K2{Qg6V0At5y(K|Am|Glv3OS)j0e{}-FOY+0a`z{V+J&v=bE
z9$#PwN~ss`<S^C0=^>d9l+rj|6ee`4_gly|R-i2jt9w at D)VJ5<R)TbuU)3u59Qe^!
zhYhI9Rr9XE;if5bemDT79t0YA`4w+@$gRuDVZcyYt})@syI1-^e=&Hv`njxgN at xNA
DWhCe<

literal 0
HcmV?d00001

-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 05:16:56 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 23:16:56 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 3271,
	Missing message when adding to a list with no items selected
Message-ID: <1289621816-15285-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

There is no visible Lists button to "attach" our warning to
as there is in the OPAC, so warning message is displayed via
a javascript alert.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
index 8a0bd20..0ab6711 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js
@@ -210,9 +210,7 @@ function showCartUpdate(msg){
 
 function showListsUpdate(msg){
        // set body of popup window
-       $("#listsDetails").html(msg);
-       showLists();
-       setTimeout("hideLists()",2000); 
+       alert(msg);
 }
 
 function selRecord(num, status) {
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 05:22:24 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 23:22:24 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Corrected patch for Bug 4520,
	facets "show more" doesn't work
Message-ID: <1289622144-16062-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Re-doing Nahuel's fix so that it applies to master

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 catalogue/search.pl                                |    1 +
 .../intranet-tmpl/prog/en/includes/facets.inc      |    2 +-
 .../opac-tmpl/prog/en/includes/opac-facets.inc     |    2 +-
 opac/opac-search.pl                                |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 485af67..ac2209a 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -543,6 +543,7 @@ for (my $i=0;$i<@servers;$i++) {
             $template->param(query_cgi => $query_cgi);
             $template->param(query_desc => $query_desc);
             $template->param(limit_desc => $limit_desc);
+            $template->param(offset     => $offset);
             $template->param(DisplayMultiPlaceHold => $DisplayMultiPlaceHold);
 			$template->param (z3950_search_params => C4::Search::z3950_search_args($query_desc));
             if ($query_desc || $limit_desc) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
index ff67047..c306c89 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -18,7 +18,7 @@
 <!-- TMPL_IF NAME="type_label_Libraries" -->Libraries<!-- /TMPL_IF -->
 <ul>
         <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
-        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
+        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
 <!-- /TMPL_IF -->
 </ul></li>
 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
index e272906..85719f3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -19,7 +19,7 @@
 <!-- /TMPL_UNLESS -->
 <ul>
         <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" ESCAPE="HTML" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
-        <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
+        <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
 <!-- /TMPL_IF -->
 </ul></li>
 <!-- /TMPL_LOOP -->
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index fda58b2..2bfcb6d 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -535,6 +535,7 @@ for (my $i=0;$i<@servers;$i++) {
             $template->param(query_cgi => $query_cgi);
             $template->param(query_desc => $query_desc);
             $template->param(limit_desc => $limit_desc);
+            $template->param(offset     => $offset);
             $template->param(DisplayMultiPlaceHold => $DisplayMultiPlaceHold);
             if ($query_desc || $limit_desc) {
                 $template->param(searchdesc => 1);
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 05:28:00 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 23:28:00 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Partial fix for Bug 4924,
	Public/Internal notes missing in staff normal view
Message-ID: <1289622480-16420-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

This fix adds only public notes. A div is added as a hook for styling

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 catalogue/detail.pl                                |    3 ++-
 .../prog/en/modules/catalogue/detail.tmpl          |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 4f6c23f..ebecd69 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -159,7 +159,7 @@ foreach my $item (@items) {
     $item->{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
     my $ccode = $item->{'ccode'};
     $item->{'ccode'} = $collections->{$ccode} if ( defined( $ccode ) && defined($collections) && exists( $collections->{$ccode} ) );
-    foreach (qw(ccode enumchron copynumber uri)) {
+    foreach (qw(ccode enumchron copynumber itemnotes uri)) {
         $itemfields{$_} = 1 if ( $item->{$_} );
     }
 
@@ -213,6 +213,7 @@ $template->param(
 	itemdata_uri        => $itemfields{uri},
 	itemdata_copynumber => $itemfields{copynumber},
 	volinfo				=> $itemfields{enumchron},
+    itemdata_itemnotes  => $itemfields{itemnotes},
 	z3950_search_params	=> C4::Search::z3950_search_args($dat),
 	C4::Search::enabled_staff_search_views,
 );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 1861028..547a36d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -214,6 +214,7 @@ function verify_images() {
                 <!-- TMPL_IF NAME="volinfo" --><th>Publication Details</th><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="itemdata_uri" --><th>URL</th><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy No.</th><!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="itemdata_itemnotes" --><th>Public notes</th><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="SpineLabelShowPrintOnBibDetails" --><th>Spine Label</th><!-- /TMPL_IF -->
             </tr>
             <!-- TMPL_LOOP NAME="itemloop" -->
@@ -333,6 +334,7 @@ function verify_images() {
 				<!-- TMPL_IF NAME="itemdata_copynumber" -->
 					<td class="copynumber"><!-- TMPL_VAR NAME="copynumber" --></td>
 				<!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="itemdata_itemnotes" --><td><div class="itemnotes"><!-- TMPL_VAR NAME="itemnotes" --></div></td><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="type" -->
                     <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a></td>
                 <!-- /TMPL_IF -->
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 05:33:54 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 12 Nov 2010 23:33:54 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 4933,
	Link to subfield's edit tab from subfield structure admin
Message-ID: <1289622834-17170-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

- Also corrects framework display in the case of the default

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../en/modules/admin/marc_subfields_structure.tmpl |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 2ea58de..7873296 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -165,7 +165,7 @@
 
 
 <!-- TMPL_IF NAME="else" -->
-<h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
+<h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="frameworkcode" -->(framework <!--TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
 <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
 <p>The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
 
@@ -174,6 +174,7 @@
     <th>Subfield</th>
     <th>Text</th>
     <th>Constraints</th>
+    <th>Edit</th>
     <th>Delete</th>
 </tr>
 <!-- TMPL_LOOP NAME="loop" -->
@@ -182,7 +183,7 @@
 <!-- TMPL_ELSE -->
 <tr>
 <!-- /TMPL_UNLESS -->
-    <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->#sub<!-- TMPL_VAR NAME="tagsubfield" -->field"><!-- TMPL_VAR NAME="tagsubfield" --></a></td>
     <td>
         <!-- TMPL_IF NAME="subfield_ignored" -->
             <i><!-- TMPL_VAR NAME="liblibrarian" --></i>
@@ -207,7 +208,8 @@
             <!-- TMPL_IF NAME="link" --> | Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
     </td>
-    <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->#sub<!-- TMPL_VAR NAME="tagsubfield" -->field">Edit</a></td>
+    <td><a class="" href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 06:10:18 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 00:10:18 -0500
Subject: [Koha-patches] [PATCH] bug 5399: remove useless eval 'use C4::Foo'
Message-ID: <1289625018-17827-1-git-send-email-gmcharlt@gmail.com>

Also add a couple FIXMEs

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 acqui/addorderiso2709.pl |    6 +-----
 acqui/basketgroup.pl     |    7 ++++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index 903d2db..25366b1 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -37,7 +37,7 @@ use C4::Biblio;
 use C4::Items;
 use C4::Koha qw/GetItemTypes/;
 use C4::Budgets qw/GetBudgets/;
-use C4::Acquisition qw/NewOrderItem/;
+use C4::Acquisition qw/NewOrderItem GetBasket/;
 use C4::Bookseller qw/GetBookSellerFromId/;
 
 my $input = new CGI;
@@ -145,8 +145,6 @@ if ($op eq ""){
               if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) {
                   $orderinfo{'listprice'} = $1;
                   $orderinfo{'listprice'} =~ s/,/\./;
-                  eval "use C4::Acquisition qw/GetBasket/;";
-                  eval "use C4::Bookseller qw/GetBookSellerFromId/;";
                   my $basket = GetBasket($orderinfo{basketno});
                   my $bookseller = GetBookSellerFromId($basket->{booksellerid});
                   my $gst = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
@@ -162,8 +160,6 @@ if ($op eq ""){
               if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) {
                   $orderinfo{'listprice'} = $1;
                   $orderinfo{'listprice'} =~ s/,/\./;
-                  eval "use C4::Acquisition qw/GetBasket/;";
-                  eval "use C4::Bookseller qw/GetBookSellerFromId/;";
                   my $basket = GetBasket($orderinfo{basketno});
                   my $bookseller = GetBookSellerFromId($basket->{booksellerid});
                   my $gst = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 69de099..613bbf6 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -183,8 +183,9 @@ sub printbasketgrouppdf{
     my ($basketgroupid) = @_;
     
     my $pdfformat = C4::Context->preference("OrderPdfFormat");
-    eval "use $pdfformat" ;
-    eval "use C4::Branch";
+    eval "use $pdfformat" ; 
+    # FIXME consider what would happen if $pdfformat does not
+    # contain the name of a valid Perl module. ??????????????, ???? ????????????????
     
     my $basketgroup = GetBasketgroup($basketgroupid);
     my $bookseller = GetBookSellerFromId($basketgroup->{'booksellerid'});
@@ -244,7 +245,7 @@ sub printbasketgrouppdf{
     );
     my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} || C4::Context->preference("gist")) || die "pdf generation failed";
     print $pdf;
-    exit;
+    exit; # FIXME bad form to exit out of a subroutine like this
 }
 
 my $op = $input->param('op');
-- 
1.7.0


From f.demians at tamil.fr  Sat Nov 13 14:48:15 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Sat, 13 Nov 2010 14:48:15 +0100
Subject: [Koha-patches] [PATCH] Bug 4440 Layout tweaking
Message-ID: <1289656095-793-1-git-send-email-f.demians@tamil.fr>

---
 .../prog/en/modules/members/printinvoice.tmpl      |   32 +++++++-------------
 1 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
index 3fc314e..1ff353d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
@@ -11,30 +11,20 @@
 <body>
 
 <div id="receipt">
+<h2>INVOICE</h2>
+<h3>
+<!-- TMPL_VAR name="LibraryName" -->
+<!-- TMPL_IF NAME="branchname" --><br/><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF -->
+</h3>
+<p>
+<u>Bill to:</u><br/>
+Name: <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+Card Number: <!-- TMPL_VAR NAME="cardnumber" -->
+</p>
+
 <!-- The table with the account items -->
 <table>
   <tr>
-	<th colspan=3 class="centerednames">
-		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
-	</th>
-  </tr>
-  <tr>
-	<th colspan=3 class="centerednames">
-		<h2><u>INVOICE</u></h2>
-	</th>
-  </tr>
-  <tr>
-	<th colspan=3 class="centerednames">
-		<!-- TMPL_IF NAME="branchname" --><h2><!-- TMPL_VAR NAME="branchname" --></h2><!-- /TMPL_IF -->
-	</th>
-  </tr>
-  <tr>
-	<th colspan=3 >
-		To,<br />  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
-		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
-	</th>
-  </tr>
-  <tr>
 	<th>Date</th>
     <th>Description of charges</th>
     <th>Amount</th>
-- 
1.7.3.2


From gmcharlt at gmail.com  Sat Nov 13 15:01:00 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 09:01:00 -0500
Subject: [Koha-patches] [PATCH] remove leftover merge conflict marker to
	breaks updatedatabase.pl
Message-ID: <1289656860-19667-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 installer/data/mysql/updatedatabase.pl |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 62e4cd0..bf7acb6 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3735,7 +3735,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
-<<<<<<< HEAD:installer/data/mysql/updatedatabase.pl
 $DBversion = '3.01.00.999';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     print "Upgrade to $DBversion done (3.2.0 release candidate)\n";
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 15:36:15 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 09:36:15 -0500
Subject: [Koha-patches] [PATCH] bug 5400: new test case to find files with
	merge conflict markers
Message-ID: <1289658975-20565-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 t/00-merge-conflict-markers.t |   59 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 deletions(-)
 create mode 100644 t/00-merge-conflict-markers.t

diff --git a/t/00-merge-conflict-markers.t b/t/00-merge-conflict-markers.t
new file mode 100644
index 0000000..24743ae
--- /dev/null
+++ b/t/00-merge-conflict-markers.t
@@ -0,0 +1,59 @@
+# Copyright 2010 Galen Charlton
+#
+# 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 Test::More;
+use File::Spec;
+use File::Find;
+use IO::File;
+
+find({
+    bydepth => 1,
+    no_chdir => 1,
+    wanted => sub {
+        my $file = $_;
+
+        return if $file =~ /\.(ico|jpg|gif|ogg|pdf|png|psd|swf|zip)$/;
+        return unless -f $file;
+
+        my @name_parts = File::Spec->splitpath($file);
+        my %dirs = map { $_ => 1 } File::Spec->splitdir($name_parts[1]);
+        return if exists $dirs{'.git'};
+
+        my $fh = IO::File->new($file, 'r');
+        my $marker_found = 0;
+        my $line = 0;
+        while (<$fh>) {
+            $line++;
+            if (/^<<<<<</ or /^>>>>>>/) {
+                # could check for ^=====, but that's often used in text files
+                $marker_found = 1;
+                last;
+            }
+        }
+        close $fh;
+        if ($marker_found) {
+            fail("$file has no merge conflict markers");
+            diag("marker found in line $line");
+        } else {
+            pass("$file has no merge conflict markers");
+        }
+    },
+}, File::Spec->curdir());
+done_testing();
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 15:39:47 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 09:39:47 -0500
Subject: [Koha-patches] [PATCH] remove leftover merge conflict marker which
	breaks updatedatabase.pl
Message-ID: <1289659187-20934-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 installer/data/mysql/updatedatabase.pl |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 62e4cd0..bf7acb6 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3735,7 +3735,6 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
-<<<<<<< HEAD:installer/data/mysql/updatedatabase.pl
 $DBversion = '3.01.00.999';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     print "Upgrade to $DBversion done (3.2.0 release candidate)\n";
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 17:50:04 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 11:50:04 -0500
Subject: [Koha-patches] [PATCH] bug 5066: log timestamp consistently in
	_session_log
Message-ID: <1289667004-21347-1-git-send-email-gmcharlt@gmail.com>

Alternative to Marcel de Rooy's patch of 4 November.  The
rest of C4/Auth.pm uses strftime("%c", localtime) to format
the timestamp, and in general,
strftime('%c', localtime) ne scalar(localtime).

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Auth.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index c7477b1..0e284b7 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -717,7 +717,7 @@ sub checkauth {
 		    ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
 		}
 		if ($return) {
-            	_session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},localtime);
+            	_session_log(sprintf "%20s from %16s logged in at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime));
             	if ( $flags = haspermission(  $userid, $flagsrequired ) ) {
 					$loggedin = 1;
             	}
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 17:50:53 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 11:50:53 -0500
Subject: [Koha-patches] [PATCH] Bug 5066 (Incorrect use of localtime
 function when calling _session_log)
In-Reply-To: <809BE39CD64BFD4EB9036172EBCCFA3119B52D@S-MAIL-1B.rijksmuseum.intra>
References: <AQHLfAJGJFs6qavFrUKSar7Xwo/5kJNhDJBw>
	<809BE39CD64BFD4EB9036172EBCCFA3119B52D@S-MAIL-1B.rijksmuseum.intra>
Message-ID: <AANLkTim5aG4oPfcrtGr17KYyRp0mTQcBvaNFRyVRTWMn@mail.gmail.com>

Hi,

I've submitted a counter-patch which formats the timestamp the same
way that the rest of the _session_log calls in C4::Auth do.  Please
take a look.

Regards,

Galen

On Thu, Nov 4, 2010 at 5:26 AM, Marcel de Rooy <M.de.Rooy at rijksmuseum.nl> wrote:
> ---
> ?C4/Auth.pm | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/C4/Auth.pm b/C4/Auth.pm
> index 6ba852d..58ce63e 100644
> --- a/C4/Auth.pm
> +++ b/C4/Auth.pm
> @@ -717,7 +717,7 @@ sub checkauth {
> ? ? ? ? ? ? ? ? ? ?( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
> ? ? ? ? ? ? ? ?}
> ? ? ? ? ? ? ? ?if ($return) {
> - ? ? ? ? ? ? ? _session_log(sprintf "%20s from %16s logged in ?at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},localtime);
> + ? ? ? ? ? ? ? _session_log(sprintf "%20s from %16s logged in ?at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},scalar localtime);
> ? ? ? ? ? ? ? ?if ( $flags = haspermission( ?$userid, $flagsrequired ) ) {
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?$loggedin = 1;
> ? ? ? ? ? ? ? ?}
> --
> 1.6.0.6
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>



-- 
Galen Charlton
gmcharlt at gmail.com

From gmcharlt at gmail.com  Sat Nov 13 18:05:47 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 12:05:47 -0500
Subject: [Koha-patches] [PATCH 2/2] bug 4866 follow-up - minor code
	formatting cleanup
In-Reply-To: <1289667947-21842-1-git-send-email-gmcharlt@gmail.com>
References: <1289667947-21842-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289667947-21842-2-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 cataloguing/additem.pl |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index b052cbc..6dc190a 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -532,10 +532,12 @@ foreach my $tag (sort keys %{$tagslib}) {
         if (do $plugin) {
             my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data );
             my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data );
-	    my $change= index($javascript, 'function Change')>-1?"return Change$function_name($subfield_data{random}, '$subfield_data{id}');": 'return 1;'; #enhancement 4866
+            my $change = index($javascript, 'function Change') > -1 ?
+                "return Change$function_name($subfield_data{random}, '$subfield_data{id}');" :
+                'return 1;';
             $subfield_data{marc_value} = qq[<input $attributes
                 onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
-		 onchange=" $change"
+                onchange=" $change"
                  onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
                 <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
                 $javascript];
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 18:05:46 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 12:05:46 -0500
Subject: [Koha-patches] [PATCH 1/2] Bug 4866 for master (Enable Change event
	for item plugins)
Message-ID: <1289667947-21842-1-git-send-email-gmcharlt@gmail.com>

From: Marcel de Rooy <M.de.Rooy at rijksmuseum.nl>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 cataloguing/additem.pl |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 9676fd6..b052cbc 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -532,8 +532,10 @@ foreach my $tag (sort keys %{$tagslib}) {
         if (do $plugin) {
             my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data );
             my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data );
+	    my $change= index($javascript, 'function Change')>-1?"return Change$function_name($subfield_data{random}, '$subfield_data{id}');": 'return 1;'; #enhancement 4866
             $subfield_data{marc_value} = qq[<input $attributes
                 onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
+		 onchange=" $change"
                  onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
                 <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
                 $javascript];
-- 
1.7.0


From ian.walls at bywatersolutions.com  Sat Nov 13 18:31:34 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Sat, 13 Nov 2010 12:31:34 -0500
Subject: [Koha-patches] [PATCH] Bug 4222 - allow nonpublicnote to be a
 mapped DB column
In-Reply-To: <1289532464-27953-1-git-send-email-robin@catalyst.net.nz>
References: <1289532464-27953-1-git-send-email-robin@catalyst.net.nz>
Message-ID: <AANLkTimTYVEpGu-sqHF4BsHjx-4VjHtotRuu7CJ2LVQZ@mail.gmail.com>

I believe that UNIMARC uses 995 as the items field, rather than 952.

This patch does not cleanly apply to master anymore; this seems to be
because of the recently-committed work on Bug 4924.  A duplicate entry for
Public Notes is found in the staff client.

I'm working on a revised version of this patch to address the above issues,
as well as to automatically update items.nonpublicnote with any pre-existing
non-public notes existing only in the MARC.

Depending on the number of biblios, this could cause the
updatedatabase.plscript to take a VERY long time to complete.  It
would also require the use
of C4::Biblio (or else rewriting the GetMarcBiblio subroutine within the
updatedatabase.pl script).  Is it worth making this part of
updatedatabase.pl, or should a separate cleanup script be written?


-Ian

On Thu, Nov 11, 2010 at 10:27 PM, Robin Sheat <robin at catalyst.net.nz> wrote:

> This means that it's possible (and easy) to put non-public notes
> (usually 952$x) on a template, same as public notes. It creates a
> mapping between the 952$x field and the new database column.
>
> Note that when this is applied, it will only work on newly saved records.
>
> It is possible this will need to be altered to allow for UNIMARC etc. if
> they use 952 differently.
> ---
>  catalogue/detail.pl                                |    9 +++++++++
>  catalogue/moredetail.pl                            |    1 +
>  installer/data/mysql/updatedatabase.pl             |    6 ++++++
>  .../prog/en/modules/catalogue/detail.tmpl          |    4 ++++
>  .../prog/en/modules/catalogue/moredetail.tmpl      |    2 ++
>  5 files changed, 22 insertions(+), 0 deletions(-)
>
> diff --git a/catalogue/detail.pl b/catalogue/detail.pl
> index 4f6c23f..624a141 100755
> --- a/catalogue/detail.pl
> +++ b/catalogue/detail.pl
> @@ -197,6 +197,13 @@ foreach my $item (@items) {
>         $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
>     }
>
> +    foreach my $f (qw( itemnotes nonpublicnote )) {
> +        if ($item->{$f}) {
> +            $item->{$f} =~ s|\n|<br />|g;
> +            $itemfields{$f} = 1;
> +        }
> +    }
> +
>     push @itemloop, $item;
>  }
>
> @@ -213,6 +220,8 @@ $template->param(
>        itemdata_uri        => $itemfields{uri},
>        itemdata_copynumber => $itemfields{copynumber},
>        volinfo                         => $itemfields{enumchron},
> +       itemdata_itemnotes  => $itemfields{itemnotes},
> +       itemdata_nonpublicnote  => $itemfields{nonpublicnote},
>        z3950_search_params     => C4::Search::z3950_search_args($dat),
>        C4::Search::enabled_staff_search_views,
>  );
> diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
> index d790c41..95598f7 100755
> --- a/catalogue/moredetail.pl
> +++ b/catalogue/moredetail.pl
> @@ -119,6 +119,7 @@ foreach my $item (@items){
>     } else {
>         $item->{'issue'}= 0;
>     }
> +    $item->{nonpublicnote} =~ s|\n|<br />|g if $item->{nonpublicnote};
>  }
>  $template->param(count => $data->{'count'},
>        subscriptionsnumber => $subscriptionsnumber,
> diff --git a/installer/data/mysql/updatedatabase.plb/installer/data/mysql/
> updatedatabase.pl
> index 27daa38..84d5428 100755
> --- a/installer/data/mysql/updatedatabase.pl
> +++ b/installer/data/mysql/updatedatabase.pl
> @@ -3835,6 +3835,12 @@ if (C4::Context->preference("Version") <
> TransformToNum($DBversion)) {
>     SetVersion ($DBversion);
>  }
>
> +$DBversion = '3.03.00.XXX';
> +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
> +    $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT");
> +    $dbh->do("UPDATE marc_subfield_structure SET
> kohafield='items.nonpublicnote' WHERE (kohafield IS NULL OR kohafield = '')
> AND tagfield='952' AND tagsubfield='x'");
> +    print "Upgrade to $DBversion done (Make nonpublicnote easier to
> use)\n";
> +}
>  =head1 FUNCTIONS
>
>  =head2 DropAllForeignKeys($table)
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
> b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
> index 1861028..a391744 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
> @@ -211,6 +211,8 @@ function verify_images() {
>                 <th>Status</th>
>                 <th>Last seen</th>
>                 <th>Barcode</th>
> +                <!-- TMPL_IF NAME="itemdata_itemnotes" --><th>Public
> Note</th><!-- /TMPL_IF -->
> +                <!-- TMPL_IF NAME="itemdata_nonpublicnote"
> --><th>Non-public Note</th><!-- /TMPL_IF -->
>                 <!-- TMPL_IF NAME="volinfo" --><th>Publication
> Details</th><!-- /TMPL_IF -->
>                 <!-- TMPL_IF NAME="itemdata_uri" --><th>URL</th><!--
> /TMPL_IF -->
>                 <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy
> No.</th><!-- /TMPL_IF -->
> @@ -319,6 +321,8 @@ function verify_images() {
>                     </td>
>                     <td class="datelastseen"><!-- TMPL_VAR
> NAME="datelastseen" --></td>
>                     <td><a href="/cgi-bin/koha/catalogue/
> moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!--
> TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR
> NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber"
> -->#item<!-- TMPL_VAR NAME="itemnumber">"><!-- TMPL_VAR NAME="barcode"
> --></a></td>
> +                    <!-- TMPL_IF NAME="itemdata_itemnotes" --><td
> class="itemnotes"><!-- TMPL_VAR NAME="itemnotes" --></td><!-- /TMPL_IF -->
> +                    <!-- TMPL_IF NAME="itemdata_nonpublicnote" --><td
> class="nonpublicnote"><!-- TMPL_VAR NAME="nonpublicnote" --></td><!--
> /TMPL_IF -->
>                                <!-- TMPL_IF NAME="volinfo" --> <td
> class="enumchron">
>                                        <!-- TMPL_IF
> NAME="itemdata_enumchron" -->
>                                                <!-- TMPL_IF
> NAME="enumchron" -->
> diff --git
> a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
> b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
> index 55ca81f..f2a939b 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
> @@ -166,6 +166,8 @@
>                 <!-- TMPL_IF NAME="card1" --><li><span
> class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/
> circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower1" -->"><!--
> TMPL_VAR NAME="card1" --></a>&nbsp;</li><!-- /TMPL_IF -->
>                <!-- TMPL_IF NAME="card2" --><li><span
> class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/
> circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower2" -->"><!--
> TMPL_VAR NAME="card2" --></a>&nbsp;</li><!-- /TMPL_IF -->
>                 <li><span class="label">Paid for?:</span> <!-- TMPL_VAR
> NAME="paidfor" -->&nbsp;</li>
> +                <li><span class="label">Non-public Note:</span>
> +                    <!-- TMPL_VAR NAME="nonpublicnote" -->&nbsp;</li>
>             <li><span class="label">Public Note:</span>
>                 <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
>               <form class="inline" action="updateitem.pl"
> method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
> Name="biblionumber" -->" />
> --
> 1.7.1
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>



-- 
Ian Walls
Lead Development Specialist
ByWater Solutions
Phone # (888) 900-8944
http://bywatersolutions.com
ian.walls at bywatersolutions.com
Twitter: @sekjal
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101113/4bb1d62c/attachment-0001.htm>

From gmcharlt at gmail.com  Sat Nov 13 18:39:50 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 12:39:50 -0500
Subject: [Koha-patches] [PATCH] Bug 4222 - allow nonpublicnote to be a
 mapped DB column
In-Reply-To: <AANLkTimTYVEpGu-sqHF4BsHjx-4VjHtotRuu7CJ2LVQZ@mail.gmail.com>
References: <1289532464-27953-1-git-send-email-robin@catalyst.net.nz>
	<AANLkTimTYVEpGu-sqHF4BsHjx-4VjHtotRuu7CJ2LVQZ@mail.gmail.com>
Message-ID: <AANLkTi=MVFKXwWnNkvNKh=AOvKPuZx1z=DY30Q=5NnoJ@mail.gmail.com>

Hi,

On Sat, Nov 13, 2010 at 12:31 PM, Ian Walls
<ian.walls at bywatersolutions.com> wrote:
> Depending on the number of biblios, this could cause the updatedatabase.pl
> script to take a VERY long time to complete.? It would also require the use
> of C4::Biblio (or else rewriting the GetMarcBiblio subroutine within the
> updatedatabase.pl script).? Is it worth making this part of
> updatedatabase.pl, or should a separate cleanup script be written?

Actually, it wouldn't require use of C4::Biblio.  If non-public notes
exist but are not mapped to a field in the items table, they will end
up in items.more_subfields_xml.  An upgrade script can simply munge
items.more_subfields_xml and items.nonpublicnote, but would not need
to touch the bib MARC.  For example, if the note is embedded in the
952$x, as far as the bib record is concerned it will remain there;
only two columns in items would change.

For a database with a large number of item records, it could still
take a while to complete, so a separate script may still be justified,
but it wouldn't need to touch the bib records.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From gmcharlt at gmail.com  Sat Nov 13 18:55:02 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 12:55:02 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 4981,
	Tweak style of item listing on MARC display
Message-ID: <1289670902-23588-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css |   63 ++++++++++++++++++------------
 1 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 21d580f..24f6503 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -25,8 +25,9 @@ body {
 
 caption {
 	font-size : 140%;
-	text-align : left;
 	font-weight : bold;
+	line-height : 144%;
+	text-align : left;
 }
 
 fieldset {
@@ -53,7 +54,7 @@ fieldset.rows legend {
 	font-size : 110%;
 }
 
-fieldset.rows label, fieldset.rows span.label {  
+fieldset.rows label, fieldset.rows span.label {
 	float: left;  
 	font-weight : bold;
 	width: 9em;  
@@ -863,14 +864,47 @@ em {
 	font-style : italic;
 }
 
-#catalogue_detail_biblio p span.label {  
+
+table#marc,
+table#marc td,
+table#marc th {
+	background-color : transparent;
+	border : 0;
+}
+
+table#marc p span.label {
 	font-weight : bold;
 }
 
-#catalogue_detail_biblio p, #catalogue_detail_biblio ul {  
+table#marc p,
+table#marc ul {
 	padding-bottom: .6em;
 }
 
+table#items,
+table#items td
+table#items th {
+	border-width : 1px solid #EEE;
+	font-size : 90%;
+}
+
+
+table#marc div.results_summary {
+	clear :  left;
+}
+table#marc div.results_summary ul {
+	display : inline;
+	float :  none;
+	clear :  none;
+	margin: 0;
+	padding: 0;
+	list-style : none;
+}
+
+table#marc div.results_summary ul li {
+	display : inline;
+}
+
 #basketcount {
 	display : inline;
 }
@@ -1179,11 +1213,6 @@ div.tab-container {
 	width : 90%;
 }
 
-#catalogue_detail_biblio table, #catalogue_detail_biblio td, #catalogue_detail_biblio th {
-	background-color : transparent;
-	border : 0;
-}
-
 tr.overdue td {
 	background-color : #ffcccc;
 	border-bottom : 1px solid #ffaeae;
@@ -1291,22 +1320,6 @@ padding-left : .4em;
 	padding-left : 13px;
 }
 
-#catalogue_detail_biblio div.results_summary {
-	clear :  left;
-}
-#catalogue_detail_biblio div.results_summary ul {
-	display : inline;
-	float :  none;
-	clear :  none;
-	margin: 0;
-	padding: 0;
-	list-style : none;
-}
-
-#catalogue_detail_biblio div.results_summary ul li {
-	display : inline;
-}
-
 .dialog {
   border: 1px solid #bcbcbc;
 	padding : .5em;
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 18:58:54 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 12:58:54 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF 1/2] Fix for Bug 4451 Batch item
	tool can't process file with Windows line endings
Message-ID: <1289671135-23771-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 tools/batchMod.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 7c03812..84d1ae1 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -169,7 +169,7 @@ if ($op eq "show"){
     my @contentlist;
     if ($filefh){
         while (my $content=<$filefh>){
-            chomp $content;
+            $content =~ s/[\r\n]*$//g;
             push @contentlist, $content if $content;
         }
 
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 18:58:55 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 12:58:55 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF 2/2] bug 4451 followup - don't
	need /g for this replace
In-Reply-To: <1289671135-23771-1-git-send-email-gmcharlt@gmail.com>
References: <1289671135-23771-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289671135-23771-2-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 tools/batchMod.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 84d1ae1..9982e2d 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -169,7 +169,7 @@ if ($op eq "show"){
     my @contentlist;
     if ($filefh){
         while (my $content=<$filefh>){
-            $content =~ s/[\r\n]*$//g;
+            $content =~ s/[\r\n]*$//;
             push @contentlist, $content if $content;
         }
 
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 19:06:50 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 13:06:50 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 4983 - Add edit
	record / edit item links to search results
Message-ID: <1289671610-24599-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    5 +++--
 .../prog/en/modules/catalogue/results.tmpl         |   18 ++++++++++++------
 2 files changed, 15 insertions(+), 8 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 7803604..d4b2b4f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1339,9 +1339,10 @@ li.email {
 	font-size : 105%;
 }
 
-.reserve {
+.hold {
 	float : right;
-	font-weight : bold;
+	font-size: 90%;
+	margin: 0;
 }
 
 .thumbnail {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index 916ee31..f833f33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -439,7 +439,7 @@ function GetZ3950Terms(){
                                         <!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="cn_class" -->[<a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="cn_class" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="cn_class" --></a>]<!-- /TMPL_IF -->
                                     </p>
-                                    <p class="searchhighlightblob"><!-- TMPL_VAR NAME="searchhighlightblob" --></p>
+                                    <!-- TMPL_IF NAME="searchhighlightblob" --><p class="searchhighlightblob"><!-- TMPL_VAR NAME="searchhighlightblob" --></p><!-- /TMPL_IF -->
 
                                     <!-- TMPL_IF NAME="authorised_value_images" -->
                                 <p>
@@ -450,11 +450,17 @@ function GetZ3950Terms(){
                                 <!-- /TMPL_IF -->
 
                                 <!-- /TMPL_IF -->
-                                  <!-- TMPL_IF NAME="norequests" -->
-                                        <span class="noholdstext">No holds allowed</span>
-                                    <!-- TMPL_ELSE -->
-                                        <a class="reserve" id="reserve_<!-- TMPL_VAR NAME="biblionumber" -->" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a>
-                                    <!-- /TMPL_IF -->
+                                  <p class="hold"><!-- TMPL_IF NAME="norequests" -->
+                                  <span class="noholdstext">No holds allowed</span>
+                              <!-- TMPL_ELSE -->
+                                  <a id="reserve_<!-- TMPL_VAR NAME="biblionumber" -->" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a>
+                              <!-- /TMPL_IF -->
+                          <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
+                          | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit record</a>
+                          <!-- /TMPL_IF -->
+                          <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
+                          | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit items</a>
+                          <!-- /TMPL_IF --></p>
                                 </td>
 
                                 <td><div class="availability">
-- 
1.7.0


From kmkale at anantcorp.com  Sat Nov 13 19:08:35 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Sat, 13 Nov 2010 23:38:35 +0530
Subject: [Koha-patches] Bug 5401: WYSWYG for Koha News
Message-ID: <AANLkTik3Um7QT9rE85Sj_s7q23=bk5WrMts2jNkmOn5F@mail.gmail.com>

This patch adds WYSWYG editor functionality to Koha news in staff
client using elRTE editor from elrte.org which is BSD style licensed.
Had to tweak its default css file a little for it to play with Koha.


Regards,
Koustubha Kale
Anant Corporation

Contact Details :
Address? : 103, Armaan Residency, R. W Sawant Road, Nr. Golden Dyes
Naka, Thane (w),
? ? ? ? ??? ? ? Maharashtra, India, Pin : 400601.
TeleFax? : +91-22-21720108, +91-22-21720109
Mobile? ?? : +919820715876
Website? : http://www.anantcorp.com
Blog : http://www.anantcorp.com/blog/?author=2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5401-WYSWYG-for-Koha-News.patch
Type: text/x-patch
Size: 1435694 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101113/9d7d5e3e/attachment-0001.bin>

From gmcharlt at gmail.com  Sat Nov 13 19:29:52 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 13:29:52 -0500
Subject: [Koha-patches] Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTik3Um7QT9rE85Sj_s7q23=bk5WrMts2jNkmOn5F@mail.gmail.com>
References: <AANLkTik3Um7QT9rE85Sj_s7q23=bk5WrMts2jNkmOn5F@mail.gmail.com>
Message-ID: <AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>

Hi,

On Sat, Nov 13, 2010 at 1:08 PM, Koustubha Kale <kmkale at anantcorp.com> wrote:
> This patch adds WYSWYG editor functionality to Koha news in staff
> client using elRTE editor from elrte.org which is BSD style licensed.
> Had to tweak its default css file a little for it to play with Koha.

I have a question - there is already one such editor used by Koha,
TinyMCE.  Which one should we prefer?  I don't have much of an opinion
either way (beyond a strong opinion that we shouldn't be using
*both*), but here's what some Googling turned up:

elRTE
--------------
- built on and uses jQuery and jQuery/UI; since we're considering
jQuery/UI to replace YUI, there's some possible synchronicity here
- not yet packaged for Debian
- fairly young project

TinyMCE
--------------
- packaged for Debian
- there's a supported jQuery variant
- been around for years

Since TinyMCE is used by only one page, if we decide to switch to
elRTE (or to something else entirely), it won't be a big deal.  Has
anybody done a direct comparison?

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From gmcharlt at gmail.com  Sat Nov 13 19:42:35 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 13:42:35 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 4851 - Batch delete
	shouldn't show delete button if no items were found
Message-ID: <1289673755-26090-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

- Adding template flag to indicate valid results (hidden or not)
 - Clarifying warning messages based on various outcomes

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/tools/batchMod-del.tmpl        |   22 ++++++++++++-------
 tools/batchMod.pl                                  |    3 ++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
index c6f82b9..441f4c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
@@ -52,7 +52,9 @@
     <!-- TMPL_UNLESS name="action" -->
 
     <!-- TMPL_IF name="notfoundbarcodes" -->
-	    <div class="dialog alert"><p>Warning, the following barcodes were not found :</p></div>
+	    <div class="dialog alert">
+	    <!-- TMPL_IF NAME="itemresults" --><p>Warning, the following barcodes were not found:</p><!-- TMPL_ELSE --><p>Warning: no barcodes were found</p><!-- /TMPL_IF -->
+		</div>
 	    <table style="margin:auto;">
 		<thead>
 		    <tr>
@@ -66,7 +68,7 @@
 		</tbody>
 	    </table>
 	    <!-- TMPL_UNLESS name="too_many_items" -->
-	    <h4>The following barcodes were found: </h4>
+	    <!-- TMPL_IF name="item_loop" --><h4>The following barcodes were found: </h4><!-- /TMPL_IF -->
 	    <!-- /TMPL_UNLESS -->
 	<!-- /TMPL_IF -->
 
@@ -77,7 +79,7 @@
      <input type="hidden" name="completedJobID" id="completedJobID" value="" />
 
 <!-- TMPL_IF name="item_loop" -->
-	<!-- TMPL_IF NAME="show" --><div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div><!-- TMPL_ELSE --><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="show" --><div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div><!-- /TMPL_IF -->
 	<div id="cataloguing_additem_itemlist">
 		<div style="overflow:auto">
 		<table id="itemst">
@@ -111,17 +113,16 @@
 <!-- /TMPL_IF -->
 
 
-
-	<!-- TMPL_IF name="show" -->
+<!-- TMPL_IF name="show" -->
 
 <!-- TMPL_IF name="too_many_items" -->
-    <p>Too many items (<!-- TMPL_VAR NAME="too_many_items" -->): not displaying each one individually.</p>
+    <p>Too many items (<!-- TMPL_VAR NAME="too_many_items" -->) to display individually.</p>
     <!-- TMPL_LOOP name="itemnumbers_hashref" -->
   <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
     <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->   
 
-
+<!-- TMPL_IF NAME="itemresults" -->
 		<div id="cataloguing_additem_newitem">
 	     <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
 	     <p>This will delete <!-- TMPL_IF NAME="too_many_items" -->all the<!-- TMPL_ELSE -->the selected<!-- /TMPL_IF --> items.</p>
@@ -131,10 +132,15 @@
 		    <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
 		    <div id="jobfailed"></div>
 		</div>
-		<input type="submit" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" />
+		<!-- TMPL_IF NAME="too_many_items" --><input type="submit" name="mainformsubmit" value="Delete ALL submitted items" onclick="return submitBackgroundJob(this.form);" /><!-- TMPL_ELSE -->
+		<input type="submit" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" /><!-- /TMPL_IF -->
+
 		<a href="/cgi-bin/koha/tools/batchMod.pl?del=1" class="cancel">Cancel</a>
 	    </fieldset>
 	</div>
+	<!-- TMPL_ELSE -->
+	<p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a></p>
+	<!-- /TMPL_IF -->
 	<!-- /TMPL_IF -->
     <!-- /TMPL_UNLESS -->
 
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 7c03812..912bd0d 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -203,6 +203,9 @@ if ($op eq "show"){
 
         }
     }
+
+    # Flag to tell the template there are valid results, hidden or not
+    if(scalar(@itemnumbers) > 0){ $template->param("itemresults" => 1); }
     # Only display the items if there are no more than 1000
     if (scalar(@itemnumbers) <= 1000) {
         $items_display_hashref=BuildItemsData(@itemnumbers);
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 20:08:58 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 14:08:58 -0500
Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] Fix for Bug 4908 - OPAC
	patron details page doesn't show patron's home library
Message-ID: <1289675339-28494-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |    1 +
 opac/opac-userupdate.pl                            |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index 64c81f2..db9c416 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -73,6 +73,7 @@
 <legend>Library Use:</legend>
 <ol>
 	<li><label for="cardnumber">Card number:</label><input type="text" id="cardnumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="cardnumber" -->" /></li>
+    <li><label for="branchcode">Home library:</label><input type="text" id="branchcode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="branchcode" -->" /></li>
 	<li><label for="borrowernumber">Patron Number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></li>
 	<li><label for="categorycode">Patron Category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="description" --> (<!-- TMPL_VAR NAME="categorycode" -->)" /></li>
 	<li><label for="dateenrolled">Joined: </label><input type="text" id="dateenrolled" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="dateenrolled" -->" /></li>
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index b38a477..a9d0101 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -147,9 +147,10 @@ EOF
 }
 
 $borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
-$borr->{'dateexpiry'}       = format_date( $borr->{'dateexpiry'} );
+$borr->{'dateexpiry'}   = format_date( $borr->{'dateexpiry'} );
 $borr->{'dateofbirth'}  = format_date( $borr->{'dateofbirth'} );
 $borr->{'ethnicity'}    = fixEthnicity( $borr->{'ethnicity'} );
+$borr->{'branchcode'}   = GetBranchName($borr->{'branchcode'});
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac');
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 20:08:59 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 14:08:59 -0500
Subject: [Koha-patches] [PATCH 2/2] bug 4908: rename temlate variable to
	branchname
In-Reply-To: <1289675339-28494-1-git-send-email-gmcharlt@gmail.com>
References: <1289675339-28494-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1289675339-28494-2-git-send-email-gmcharlt@gmail.com>

Using branchname is more accurate and could avoid
a bug if/when the patron update function is made more
sophisticated.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |    2 +-
 opac/opac-userupdate.pl                            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index db9c416..73f5c21 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -73,7 +73,7 @@
 <legend>Library Use:</legend>
 <ol>
 	<li><label for="cardnumber">Card number:</label><input type="text" id="cardnumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="cardnumber" -->" /></li>
-    <li><label for="branchcode">Home library:</label><input type="text" id="branchcode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="branchcode" -->" /></li>
+    <li><label for="branchname">Home library:</label><input type="text" id="branchname" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="branchname" -->" /></li>
 	<li><label for="borrowernumber">Patron Number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></li>
 	<li><label for="categorycode">Patron Category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="description" --> (<!-- TMPL_VAR NAME="categorycode" -->)" /></li>
 	<li><label for="dateenrolled">Joined: </label><input type="text" id="dateenrolled" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="dateenrolled" -->" /></li>
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index a9d0101..ab2e15d 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -150,7 +150,7 @@ $borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
 $borr->{'dateexpiry'}   = format_date( $borr->{'dateexpiry'} );
 $borr->{'dateofbirth'}  = format_date( $borr->{'dateofbirth'} );
 $borr->{'ethnicity'}    = fixEthnicity( $borr->{'ethnicity'} );
-$borr->{'branchcode'}   = GetBranchName($borr->{'branchcode'});
+$borr->{'branchname'}   = GetBranchName($borr->{'branchcode'});
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac');
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 20:14:39 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 14:14:39 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5048,
	Error in menu/submenu for select language in intranet
Message-ID: <1289675679-28745-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Patch for HEAD. This issue was apparently solved quite a while
ago in the OPAC. This patch copies that solution over to the staff client.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/includes/intranet-bottom.inc           |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |   55 ++++++++++----------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index 78334b2..839c176 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -7,7 +7,7 @@
         <!-- TMPL_LOOP NAME="languages_loop" -->
             <!-- TMPL_IF NAME="group_enabled" -->
             <!-- TMPL_IF NAME="plural" -->
-            <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sublangs">
+            <li class="more"><a class="sublangs" id="show<!-- TMPL_VAR NAME="rfc4646_subtag" -->" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sub<!-- TMPL_VAR NAME="rfc4646_subtag" -->">
             <div class="bd"><ul>
             <!-- TMPL_LOOP NAME="sublanguages_loop" -->
 		<!-- TMPL_IF NAME="enabled" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index c2e6fba..047bfa0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -43,35 +43,34 @@ function _(s) { return s } // dummy function for gettext
                 YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMoremenu);
             });
 
+// build Change Language menus
 YAHOO.util.Event.onContentReady("changelanguage", function () {
-                var oMenu = new YAHOO.widget.Menu("sublangs", { zindex: 2 });
-
-	            function positionoMenu() {
-                    oMenu.align("bl", "tl");
-                }
-
-                oMenu.subscribe("beforeShow", function () {
-                    if (this.getRoot() == this) {
-						positionoMenu();
-                    }
-                });
-
-                oMenu.render();
-
-				oMenu.cfg.setProperty("context", ["showlang", "bl", "tl"]);
-
-				function onYahooClick(p_oEvent) {
-                    // Position and display the menu        
-                    positionoMenu();
-                    oMenu.show();
-                    // Stop propagation and prevent the default "click" behavior
-                    YAHOO.util.Event.stopEvent(p_oEvent);
-                }
-
-				YAHOO.util.Event.addListener("showlang", "click", onYahooClick);
-
-				YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
-            });
+	$(".sublangs").each(function(){
+		var menuid = $(this).attr("id");
+		var menuid = menuid.replace("show","");
+
+		var oMenu = new YAHOO.widget.Menu("sub"+menuid, { zindex: 2 });
+		function positionoMenu() {
+			oMenu.align("bl", "tl");
+		}
+		oMenu.subscribe("beforeShow", function () {
+		if (this.getRoot() == this) {
+			positionoMenu();
+		}
+		});
+		oMenu.render();
+		oMenu.cfg.setProperty("context", ["show"+menuid, "bl", "tl"]);
+		function onYahooClick(p_oEvent) {
+			// Position and display the menu
+			positionoMenu();
+			oMenu.show();
+			// Stop propagation and prevent the default "click" behavior
+			YAHOO.util.Event.stopEvent(p_oEvent);
+		}
+		YAHOO.util.Event.addListener("show"+menuid, "click", onYahooClick);
+		YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
+	});
+});
 			
 // http://jennifermadden.com/javascript/stringEnterKeyDetector.html
 function checkEnter(e){ //e is event object passed from function invocation
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 20:34:42 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 14:34:42 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5030 - Improve
	handling of duplicate patrons
Message-ID: <1289676882-30159-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

- Making duplicate patron warning dialog simpler but more explicit
- Pointing duplicate patron preview window to new brief version
  of moremember.pl to display more patron details than the previous
  version.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |   17 +++-
 .../prog/en/modules/members/borrowers_details.tmpl |   63 -------------
 .../prog/en/modules/members/memberentrygen.tmpl    |   25 ++---
 .../prog/en/modules/members/moremember-brief.tmpl  |   97 ++++++++++++++++++++
 koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png   |  Bin 0 -> 205 bytes
 members/borrowers_details.pl                       |   75 ---------------
 members/moremember.pl                              |    3 +
 7 files changed, 125 insertions(+), 155 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png
 delete mode 100755 members/borrowers_details.pl

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 7803604..a0d87ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -21,6 +21,11 @@ a.overdue,.overdue {
 	color : #cc0000;
 }
 
+a.popup {
+	background : transparent url("../../img/pop-up-link.png") center right no-repeat;
+	padding-right : 15px;
+}
+
 body {
 	text-align : left;
   	padding:0 0 2.5em 0;
@@ -1130,11 +1135,21 @@ td input.approve {
 	color:black;
 	padding: .4em .4em .4em 34px;
 }
- 
+
 .dialog input.edit {
 	background: #fff url(../../img/toolbar-edit.gif) no-repeat 4px center;
 	color:black;
+	max-width : 13em;
+	padding: .4em .4em .4em 34px;
+	white-space: normal;
+}
+
+.dialog input.new {
+	background: #fff url(../../img/toolbar-new.gif) no-repeat 4px center;
+	color:black;
+	max-width : 13em;
 	padding: .4em .4em .4em 34px;
+	white-space: normal;
 }
 
 .dialog input.print {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
deleted file mode 100644
index 763cf66..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Patron Details</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-
-<div id="doc" class="yui-t7">
-   <div id="bd">
-
-	<h1>Patron Details</h1>
-	
-	<form name="form" method="post" action="/cgi-bin/members/borrowers_details.pl">
-	<!-- TMPL_IF NAME="Institution"-->	
-		
-		<p>
-		
-			<label for="description">Patron category</label>		
-			<input  type="text" id="description" name="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
-		</p>
-		<p>
-			
-			<label for="surname">Organization name</label>
-			<input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
-		</p>
-		
-	<!-- TMPL_ELSE -->	
-
-		<p>
-			<label for="description">Patron category</label>
-			<input  type="text" name="description" id="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
-			</p>
-		<p>
-			<label for="title">Title</label>
-			<input  type="text" name="title" id="title" size="20" value="<!-- TMPL_VAR NAME="title" -->" />
-			
-		</p>
-		<p>
-			<label for="surname">Surname</label>
-			<input  style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
-		</p>
-			
-		<p>	
-			
-			<label for="firstname">Firstname</label>
-			<input  style="text-transform:capitalize;" type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
-		</p>
-		<p>
-			<label for="dateofbirth">Date of birth </label>
-			<input  type="text" name="dateofbirth" id="dateofbirth" size="20" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
-		</p>		
-		
-		
-			
-		
-	<!-- /TMPL_IF -->
-	<p>
-		<a href="#" onclick="window.close()">Close Window</a>
-	</p>
-	
-	</form>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 5fa4f82..0af5f69 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -93,22 +93,15 @@
 	<!-- /TMPL_IF -->
   
 	<!-- TMPL_IF NAME="check_member" -->
-		<p>
-		<form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 			<div class="dialog alert">
-				<h3>Duplicate suspected</h3>
-				<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" >Detail</a>
-				Duplicate ?
-				<a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!--TMPL_VAR NAME="check_member"-->&amp;category_type=<!--TMPL_VAR NAME="check_categorytype"-->">Yes</a>
-				&nbsp;&nbsp;&nbsp; No, it is not
-				<!-- TMPL_IF NAME="checked"-->
-					<input type="checkbox" checked="checked" name="answernodouble" >
-				<!-- TMPL_ELSE -->
-					<input type="checkbox" name="answernodouble" />
-				<!-- /TMPL_IF -->
+				<h3>Duplicate patron record?</h3>
+				<p><a class="popup" href="javascript:Dopop('moremember.pl?print=brief&amp;borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" >View existing record</a></p>
+				<form action="/cgi-bin/koha/members/memberentry.pl" method="get"><input type="hidden" name="op" value="modify" /><input type="hidden" name="borrowernumber" value="<!--TMPL_VAR NAME="check_member"-->" /><input type="hidden" name="category_type" value="<!--TMPL_VAR NAME="check_categorytype"-->" /><input class="edit" type="submit" value="It is a duplicate. Edit existing record" /></form>
+
+				<form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post">
+				<input type="hidden" name="nodouble" value="1" />
+				<input class="new" type="submit" value="Not a duplicate. Save as new record" />
 			</div>
-		</form>
-		</p>
 	<!--/TMPL_IF-->
 
 	<!-- TMPL_IF Name="debug" -->
@@ -154,7 +147,8 @@
 	<!-- /TMPL_IF -->
 	
   
-<form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
+<!-- TMPL_UNLESS NAME="check_member" --><form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post">
+<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" /> <!-- /TMPL_UNLESS -->
 <!--    field always hidden in different form (1,2,3) -->
 <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
 <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
@@ -163,7 +157,6 @@
 <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 <!--TMPL_IF Name="step"--><input type="hidden" name="step"  value="<!-- TMPL_VAR NAME="step" -->" /><!--/TMPL_IF-->
 <!-- TMPL_IF NAME="opadd" --><input type="hidden" name="op" value="insert" /><!-- TMPL_ELSE --><input type="hidden" name="op" value="save" /><!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl
new file mode 100644
index 0000000..9dd5ed3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl
@@ -0,0 +1,97 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Check duplicate patron</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+	<style type="text/css">
+		#custom-doc { width:44.23em;*width:43.12em;min-width:491px; margin:auto; text-align:left; } 
+	</style>
+</head>
+<body style="padding:.5em;">
+<div id="custom-doc" class="yui-t7">
+   <div id="bd">
+	<h3><!-- TMPL_UNLESS NAME="I" -->
+   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
+<div class="yui-g">
+<div class="yui-u first">
+	<div id="patron-information" style="padding: .5em;">
+
+     <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->&ldquo;<!-- TMPL_VAR NAME="othernames" -->&rdquo;<!-- /TMPL_IF -->
+
+	<p class="address"><!-- TMPL_VAR NAME="streetnumber" -->
+        <!--TMPL_IF NAME="roaddetails"-->
+         <!-- TMPL_VAR NAME="roaddetails" -->,
+        <!-- /TMPL_IF -->
+        <!-- TMPL_VAR NAME="address" --><br />
+        <!-- TMPL_IF NAME="address2" --><!-- TMPL_VAR NAME="address2"--><br /><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="city" --><!-- TMPL_VAR NAME="city" --><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="zipcode" --><!-- TMPL_VAR NAME="zipcode" --><br /><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="country" --><!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF --></p>
+
+	<div class="rows">
+		<ol>
+        <!-- TMPL_IF NAME="I" -->
+            <!-- TMPL_IF NAME="phonepro" --><li><span class="label">Organization phone: </span><!-- TMPL_VAR NAME="phonepro" --></li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="emailpro" --><li><span class="label">Organization email: </span><!-- TMPL_VAR NAME="emailpro" --></li><!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <!-- TMPL_IF NAME="phone"    --><li><span class="label">Home: </span><!-- TMPL_VAR NAME="phone" --></li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="mobile"   --><li><span class="label">Mobile: </span><!-- TMPL_VAR NAME="mobile" --></li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="phonepro" --><li><span class="label">Work: </span><!-- TMPL_VAR NAME="phonepro" --></li><!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+
+    <!-- TMPL_IF NAME="P"-->
+        <!-- TMPL_IF NAME="phone"  --><li><span class="label">Professional phone: </span><!-- TMPL_VAR NAME="phone" --></li><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="mobile" --><li><span class="label">Professional mobile: </span><!-- TMPL_VAR NAME="mobile" --></li><!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="fax" --><li><span class="label">Fax: </span><!-- TMPL_VAR NAME="fax" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_UNLESS NAME="I"-->
+        <!-- TMPL_IF Name="email" --><li><span class="label">Email (home):</span><a href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a></li><!-- /TMPL_IF -->
+        <!-- TMPL_IF Name="emailpro" --><li><span class="label">Email (work): </span><a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a></li><!--/TMPL_IF-->
+    <!-- /TMPL_UNLESS -->
+    <li><span class="label">Initials: </span><!-- TMPL_VAR NAME="initials" --></li>
+    <li><span class="label">Date of birth:</span><!-- TMPL_VAR NAME="dateofbirth" --></li>
+    <li><span class="label">Sex:</span><!-- TMPL_VAR NAME="sex" --></li><!-- /TMPL_UNLESS -->
+    <!-- TMPL_IF NAME="printethnicityline" -->
+    <li><span class="label">Ethnicity:</span><!-- TMPL_VAR NAME="ethnicity" --></li>
+    <li><span class="label">Ethnicity notes: </span><!-- TMPL_VAR NAME="ethnotes" --></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="isguarantee" -->
+        <!-- TMPL_IF NAME="guaranteeloop" -->
+            <li><span class="label">Guarantees:</span><ul><!-- TMPL_LOOP NAME="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" -->  </a></li><!-- /tmpl_loop --></ul></li>
+        <!-- /TMPL_IF -->
+    <!-- TMPL_ELSE -->
+        <!-- TMPL_IF name="guarantorborrowernumber" -->
+            <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorsurname" -->, <!-- TMPL_VAR NAME="guarantorfirstname" --></a></li>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_IF  -->
+	</ol>
+	</div>
+	</div>
+	</div>
+	<div class="yui-u">
+	<div id="patron-library-details">
+	<h3>Library use</h3>
+	<div class="rows">
+	<ol>
+    <li><span class="label">Card number: </span><!-- TMPL_VAR NAME="cardnumber" --></li>
+	<li><span class="label">Borrowernumber: </span> <!-- TMPL_VAR NAME="borrowernumber" --></li>
+    <li><span class="label">Category: </span><!-- TMPL_VAR NAME="description" --> (<!-- TMPL_VAR NAME="categorycode" -->)</li>
+    <li><span class="label">Registration date: </span><!-- TMPL_VAR NAME="dateenrolled" --></li>
+    <li><span class="label">Expiration date: </span>
+    <!-- TMPL_IF NAME="reregistration" -->
+            <strong class="reregistrinfo"><!-- TMPL_VAR NAME="dateexpiry" --></span>
+    <!-- TMPL_ELSE -->
+            <!-- TMPL_VAR NAME="dateexpiry" -->
+    <!-- /TMPL_IF -->
+    </li>
+    <li><span class="label">Library: </span><!-- TMPL_VAR NAME="branchname" --></li>
+
+    <!-- TMPL_IF NAME="sort1" --><li><span class="label">Sort field 1:</span><!-- TMPL_VAR NAME="lib1" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="sort2" --><li><span class="label">Sort field 2:</span><!-- TMPL_VAR NAME="lib2" --></li><!-- /TMPL_IF -->
+	</ol>
+	</div>
+	</div>
+	<fieldset class="action"><input type="button" class="submit" value="Close window" onclick="window.close();" /></fieldset>
+	</div>
+	</div>
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png b/koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png
new file mode 100644
index 0000000000000000000000000000000000000000..77ffc75e040d8c27f8ba21b010c19a47a1b15792
GIT binary patch
literal 205
zcmeAS at N?(olHy`uVBq!ia0vp^+(699!3-oX?^2ToQY`6?zK#qG>ra at ocD)4hB}-f*
zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%u?6^qxH2%D`Tzg_Os8|nKoO>r
zAiv=M3{STkcma9#o-U3d6}OTSQc_YHm>L+87&b~CY+zJqm~fMUk!3RTMn)!%BMl((
tOdC+TNt+?5fx#(_nMGiei9-V;1J4x(>!kFQJwT%vJYD@<);T3K0Ra1$I)nfK

literal 0
HcmV?d00001

diff --git a/members/borrowers_details.pl b/members/borrowers_details.pl
deleted file mode 100755
index c861ad4..0000000
--- a/members/borrowers_details.pl
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/perl
-# NOTE: This file uses standard 8-space tabs
-#       DO NOT SET TAB SIZE TO 4
-
-
-#script to set up screen for modification of borrower details
-#written 20/12/99 by chris at katipo.co.nz
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-#use warnings; FIXME - Bug 2505
-use CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Members;
-use C4::Koha;
-use C4::Dates qw(format_date);
-use C4::Input;
-use C4::Log;
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-my %data;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/borrowers_details.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-my $data;
-my $categorycode=$input->param('categorycode');
-my $borrowernumber=$input->param('borrowernumber');
-my $description=$input->param('description');
-my $category_type=$input->param('category_type');
-
-$data=GetMember('borrowernumber' => $borrowernumber);
-
-$template->param(		borrowernumber  => $borrowernumber,#register number
-				#transform value  in capital or capital for first letter of the word
- 				firstname       => ucfirst($data->{'firstname'}),
- 				surname         => uc($data->{'surname'}),
- 				categorycode 	=> $data->{'categorycode'},
-				title 		=> $data->{'title'},
-				category_type	=> $data->{'category_type'},
- 				"title_".$data->{'title'} 	    => " SELECTED ",			
- 				dateofbirth	=> format_date($data->{'dateofbirth'}),
- 				description	=> $data->{'description'}
-		);
-$template->param(Institution => 1) if ($category_type eq "I");
-output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 8
-# End:
diff --git a/members/moremember.pl b/members/moremember.pl
index 3fffb54..beec293 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -89,6 +89,9 @@ if ($print eq "page") {
     $template_name = "members/moremember-receipt.tmpl";
     $quickslip = 1;
     $flagsrequired =  { circulate => "circulate_remaining_permissions" };
+} elsif ($print eq "brief") {
+    $template_name = "members/moremember-brief.tmpl";
+    $flagsrequired = { borrowers => 1 };
 } else {
     $template_name = "members/moremember.tmpl";
     $flagsrequired = { borrowers => 1 };
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 20:42:05 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 14:42:05 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5029 - Update
	patron deletion error page
Message-ID: <1289677325-31146-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

- Styling error message with "dialog alert" class
- Adding sidebar patron details to match other patron pages

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/members/deletemem.tmpl         |   10 +++++---
 members/deletemem.pl                               |   24 +++++++++++++++++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
index b69fe6c..f0b1d46 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
@@ -12,7 +12,9 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-toolbar.inc" --><h3>Cannot Delete Patron</h3>
+	<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
+	<div class="dialog alert">
+	<h3>Cannot Delete Patron</h3>
 		<ul><!-- TMPL_IF name="ItemsOnIssues" -->
 			<li>Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.</li>
 		<!-- /TMPL_IF -->
@@ -22,12 +24,12 @@
 		<!-- TMPL_IF name="guarantees" -->
 			<li>Patron's record has guaranteed accounts attached.</li>
 		<!-- /TMPL_IF --></ul>
-
+	</div>
 </div>
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/members/deletemem.pl b/members/deletemem.pl
index 53297a3..b1ba709 100755
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -29,6 +29,7 @@ use C4::Context;
 use C4::Output;
 use C4::Auth;
 use C4::Members;
+use C4::Branch; # GetBranches
 
 my $input = new CGI;
 
@@ -80,7 +81,28 @@ $sth->execute($member);
 my $data=$sth->fetchrow_hashref;
 if ($countissues > 0 or $flags->{'CHARGES'}  or $data->{'borrowernumber'}){
     #   print $input->header;
-    $template->param(borrowernumber => $member);
+
+    my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
+    $template->param( picture => 1 ) if $picture;
+
+    $template->param(borrowernumber => $member,
+        surname => $bor->{'surname'},
+        title => $bor->{'title'},
+        cardnumber => $bor->{'cardnumber'},
+        firstname => $bor->{'firstname'},
+        categorycode => $bor->{'categorycode'},
+        category_type => $bor->{'category_type'},
+        categoryname  => $bor->{'description'},
+        address => $bor->{'address'},
+        address2 => $bor->{'address2'},
+        city => $bor->{'city'},
+        zipcode => $bor->{'zipcode'},
+        country => $bor->{'country'},
+        phone => $bor->{'phone'},
+        email => $bor->{'email'},
+        branchcode => $bor->{'branchcode'},
+        branchname => GetBranchName($bor->{'branchcode'}),
+    );
     if ($countissues >0) {
         $template->param(ItemsOnIssues => $countissues);
     }
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 21:00:22 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 15:00:22 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Additional fix for Bug 4423 -
	Staff Client XSLT is just a copy of the OPAC one
Message-ID: <1289678422-32278-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

- Adding "Lists that include this title" links
 - Also correcting minor XHTML error in the same section of opac-detail.tmpl

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/catalogue/detail.tmpl          |   12 +++++++++++-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 547a36d..e3391ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -71,8 +71,18 @@ function verify_images() {
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
 
-        <!-- TMPL_IF NAME="XSLTDetailsDisplay" -->
+    <!-- TMPL_IF NAME="XSLTDetailsDisplay" -->
         <!-- TMPL_VAR NAME="XSLTBloc" -->
+
+        <!-- TMPL_IF NAME="GetShelves" -->
+            <span class="results_summary"><span class="label">Lists that include this title: </span>
+            <!-- TMPL_LOOP NAME="GetShelves" -->
+                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->"><!-- TMPL_VAR NAME="shelfname" --></a>
+                <!-- TMPL_IF NAME="__LAST__" --><!-- TMPL_ELSE -->|<!-- /TMPL_IF -->
+            <!-- /TMPL_LOOP -->
+            </span>
+        <!-- /TMPL_IF -->
+
         <!-- TMPL_IF NAME="AmazonEnabled" --><!-- TMPL_IF NAME="AmazonCoverImages" --></div><div class="yui-u" id="bookcoverimg">
         <a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="" /></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 876ae81..084c484 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -228,7 +228,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <!-- TMPL_IF NAME="GetShelves" -->
 	<span class="results_summary"><span class="label">List(s) this item appears in: </span>
 	<!-- TMPL_LOOP NAME="GetShelves" -->
-		<a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->&sortfield=title"><!-- TMPL_VAR NAME="shelfname" --></a> 
+		<a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->"><!-- TMPL_VAR NAME="shelfname" --></a>
 		<!-- TMPL_IF NAME="__LAST__" --><!-- TMPL_ELSE -->|<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
 	</span>
-- 
1.7.0


From gmcharlt at gmail.com  Sat Nov 13 22:54:54 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 16:54:54 -0500
Subject: [Koha-patches] Pull requst -
	git://git.librarypolice.com/git/koha-galen.git
	suggestion-notification-fixes
Message-ID: <1289685294-2848-1-git-send-email-gmcharlt@gmail.com>

Consolidated patches for getting purchase suggestion status change
notifications working.  Candidate for both master and 3.2.x.

The following changes since commit 1edf825fa1e439b2ced523e22174ad1e6d8971bc:
  Chris Cormack (1):
        Merge remote branch 'kc/new/bug_4498' into kcmaster

are available in the git repository at:

  git://git.librarypolice.com/git/koha-galen.git suggestion-notification-fixes

Chris Cormack (1):
      Bug 4211: This patch should provide a working way to send out mail from suggestions

Galen Charlton (4):
      bug 4211: more fixes to suggestion letter template handling
      bug 4211: ensure that suggestion emails have full details
      bug 5127: sample notice templates for suggestions
      bug 5127: database update to add the suggestion notification templates

 C4/Letters.pm                                      |    3 +-
 C4/Suggestions.pm                                  |   28 ++++++----
 .../data/mysql/de-DE/mandatory/sample_notices.sql  |    6 ++-
 .../data/mysql/en/mandatory/sample_notices.sql     |    6 ++-
 .../mysql/fr-FR/1-Obligatoire/sample_notices.sql   |    6 ++-
 installer/data/mysql/it-IT/necessari/notices.sql   |    6 ++-
 .../data/mysql/pl-PL/mandatory/sample_notices.sql  |    6 ++-
 .../data/mysql/ru-RU/mandatory/sample_notices.sql  |    6 ++-
 .../data/mysql/uk-UA/mandatory/sample_notices.sql  |    6 ++-
 installer/data/mysql/updatedatabase.pl             |   34 +++++++++++
 .../suggestion/mail_suggestion_ACCEPTED.tmpl       |   11 ----
 .../suggestion/mail_suggestion_AVAILABLE.tmpl      |   11 ----
 .../suggestion/mail_suggestion_ORDERED.tmpl        |   13 ----
 .../suggestion/mail_suggestion_REJECTED.tmpl       |   13 ----
 .../prog/en/modules/tools/letter.tmpl              |   23 +++++---
 tools/letter.pl                                    |   59 +------------------
 16 files changed, 105 insertions(+), 132 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl

From ian.walls at bywatersolutions.com  Sat Nov 13 23:40:03 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Sat, 13 Nov 2010 17:40:03 -0500
Subject: [Koha-patches] [PATCH] Bug 4222 - allow nonpublicnote to be a
 mapped DB column
In-Reply-To: <AANLkTi=MVFKXwWnNkvNKh=AOvKPuZx1z=DY30Q=5NnoJ@mail.gmail.com>
References: <1289532464-27953-1-git-send-email-robin@catalyst.net.nz>
	<AANLkTimTYVEpGu-sqHF4BsHjx-4VjHtotRuu7CJ2LVQZ@mail.gmail.com>
	<AANLkTi=MVFKXwWnNkvNKh=AOvKPuZx1z=DY30Q=5NnoJ@mail.gmail.com>
Message-ID: <AANLkTineX=9j0WGQczUwDY=4SQxayTaJrM-2w0HgJR2K@mail.gmail.com>

Galen,


Excellent, yes, removing the dependence on C4::Biblio greatly increases the
speed; not only does it process faster, but it makes it easier to only
select items that something in more_subfields_xml in the first place.  I'm
going to make it part of the script, since my initial tests show that the
wait time for a medium/large catalog is only a few seconds.


-Ian

On Sat, Nov 13, 2010 at 12:39 PM, Galen Charlton <gmcharlt at gmail.com> wrote:

> Hi,
>
> On Sat, Nov 13, 2010 at 12:31 PM, Ian Walls
> <ian.walls at bywatersolutions.com> wrote:
> > Depending on the number of biblios, this could cause the
> updatedatabase.pl
> > script to take a VERY long time to complete.  It would also require the
> use
> > of C4::Biblio (or else rewriting the GetMarcBiblio subroutine within the
> > updatedatabase.pl script).  Is it worth making this part of
> > updatedatabase.pl, or should a separate cleanup script be written?
>
> Actually, it wouldn't require use of C4::Biblio.  If non-public notes
> exist but are not mapped to a field in the items table, they will end
> up in items.more_subfields_xml.  An upgrade script can simply munge
> items.more_subfields_xml and items.nonpublicnote, but would not need
> to touch the bib MARC.  For example, if the note is embedded in the
> 952$x, as far as the bib record is concerned it will remain there;
> only two columns in items would change.
>
> For a database with a large number of item records, it could still
> take a while to complete, so a separate script may still be justified,
> but it wouldn't need to touch the bib records.
>
> Regards,
>
> Galen
> --
> Galen Charlton
> gmcharlt at gmail.com
>



-- 
Ian Walls
Lead Development Specialist
ByWater Solutions
Phone # (888) 900-8944
http://bywatersolutions.com
ian.walls at bywatersolutions.com
Twitter: @sekjal
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101113/aaa7802c/attachment.htm>

From gmcharlt at gmail.com  Sun Nov 14 04:37:10 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sat, 13 Nov 2010 22:37:10 -0500
Subject: [Koha-patches] [PATCH] bug 5405: remove disused script
	catalogue/suggest.pl
Message-ID: <1289705830-5792-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 catalogue/suggest.pl                               |   59 --------------------
 .../prog/en/modules/catalogue/suggest.tmpl         |   51 -----------------
 2 files changed, 0 insertions(+), 110 deletions(-)
 delete mode 100755 catalogue/suggest.pl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl

diff --git a/catalogue/suggest.pl b/catalogue/suggest.pl
deleted file mode 100755
index c348c76..0000000
--- a/catalogue/suggest.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/perl
-# WARNING: 4-character tab stops here
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-#use warnings; FIXME - Bug 2505
-
-use CGI;
-use C4::Auth;
-
-use C4::Context;
-use C4::Auth;
-use C4::Output;
-use C4::Biblio;
-use C4::Acquisition;
-use C4::Koha; # XXX subfield_is_koha_internal_p
-
-# Creates the list of active tags using the active MARC configuration
-my $query=new CGI;
-my $Q=$query->param('Q');
-my @words = split / /,$Q;
-my $dbh = C4::Context->dbh;
-
-my $suggestions = findsuggestion($dbh,\@words);
-my @loop_suggests;
-foreach my $line (@$suggestions) {
-    my ($word,$suggestion,$count) = split /\|/,$line;
-    push @loop_suggests, { word => $word, suggestion =>$suggestion, count => $count };
-}
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "catalogue/suggest.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {editcatalogue => 'edit_catalogue'},
-                 debug => 1,
-                 });
-$template->param("loop" => \@loop_suggests,
-        );
-
-output_html_with_http_headers $query, $cookie, $template->output;
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl
deleted file mode 100644
index ac1ae2b..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Suggestions</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
-
-        <table>
-        <caption>Catalog Search</caption>
-            <tr>
-                <th>Initial word</th>
-                <th>Suggested</th>
-                <th>Used X times</th>
-            </tr>
-        <!-- TMPL_LOOP NAME="loop" -->
-            <tr>
-                <td><!-- TMPL_VAR NAME="word" --></td>
-                <td><a href="javascript:Import('<!-- TMPL_VAR NAME="word" -->','<!-- TMPL_VAR NAME="suggestion" -->')">
-                        <!-- TMPL_VAR NAME="suggestion" -->
-                    </a></td>
-                <td><!-- TMPL_VAR NAME="count" --></td>
-            </tr>
-        <!-- /TMPL_LOOP -->
-        </table>
-
-<script language="javascript" type="text/javascript">
-    function Import(Replaced,ReplaceBy) {
-        for (i=0 ; i<opener.document.f.value.length ; i++) {
-                opener.document.forms['f'].value[i].value = opener.document.forms['f'].value[i].value.replace(Replaced,ReplaceBy);
-//            if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
-//                strQuery += "&isbn="+document.forms[0].field_value[i].value;
-//            }
-//            opener.document.location= "../cataloguing/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
-//            self.close();
-//            return false;
-        }
-    }
-</script>
-
-</div>
-</div>
-</div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
-- 
1.7.0


From f.demians at tamil.fr  Sun Nov 14 10:51:31 2010
From: f.demians at tamil.fr (=?ISO-8859-1?Q?Fr=E9d=E9ric_DEMIANS?=)
Date: Sun, 14 Nov 2010 10:51:31 +0100
Subject: [Koha-patches] [PATCH] bug 5400: new test case to find files
 with	merge conflict markers
In-Reply-To: <1289658975-20565-1-git-send-email-gmcharlt@gmail.com>
References: <1289658975-20565-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <4CDFB123.3090304@tamil.fr>


> Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
> ---
> t/00-merge-conflict-markers.t | 59 
> +++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 59 insertions(+), 0 deletions(-)
> create mode 100644 t/00-merge-conflict-markers.t

This patch will add 3733 new tests for a total of 4445, ie 84% of all 
tests. Shouldn't it be better if merge conflict markers tests count as 
one unique test?



From gmcharlt at gmail.com  Sun Nov 14 16:43:25 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sun, 14 Nov 2010 10:43:25 -0500
Subject: [Koha-patches] [PATCH] bug 5400: new test case to find files
 with merge conflict markers
In-Reply-To: <4CDFB123.3090304@tamil.fr>
References: <1289658975-20565-1-git-send-email-gmcharlt@gmail.com>
	<4CDFB123.3090304@tamil.fr>
Message-ID: <AANLkTikfbScZtE7+MYf3GoQ2JvKm1rD4jyrW_98y71js@mail.gmail.com>

Hi,

2010/11/14 Fr?d?ric DEMIANS <f.demians at tamil.fr>:
> This patch will add 3733 new tests for a total of 4445, ie 84% of all tests.
> Shouldn't it be better if merge conflict markers tests count as one unique
> test?

I don't see that it makes a difference either way -- ultimately each
file is tested anyway, and the test case would have to do more work to
artificially run as a single test.

Here is what really matters -- increasing the test case coverage of the code:

http://bugs.koha-community.org:8080/job/Koha_Master/HTML_Report/?

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From savitra.sirohi at osslabs.biz  Sun Nov 14 17:49:44 2010
From: savitra.sirohi at osslabs.biz (savitra sirohi)
Date: Sun, 14 Nov 2010 22:19:44 +0530
Subject: [Koha-patches] [PATCH] Analytical records support
In-Reply-To: <AANLkTikthxSnjEdRxWKia2rxbGT9a7YVcos6=E6SahPj@mail.gmail.com>
References: <1288525758-1085-1-git-send-email-amit.gupta@osslabs.biz>
	<AANLkTikthxSnjEdRxWKia2rxbGT9a7YVcos6=E6SahPj@mail.gmail.com>
Message-ID: <AANLkTikckPwfFYXw+VTvC-2SBTBNTSkq0CXAjy2oeYE3@mail.gmail.com>

Hi Jared, we have known that our use of 'w' and 'o' are far from
ideal. I think what you suggest is great and we would like to
implement this.

Couple of questions:

1. Can you please expand on how we could "extend analytical support to
ISBN and other standard identifiers". For instance, what would $w
contain if one were using ISBN as a host record identifier. And which
field in the host record would we look in to find the ISBN - 001 or in
020?

2. What about the item identifier? We were planning on recording
barcode (952$p) in $o, and not referring to the itemnumber in the MARC
record at all.

Thanks,
Savitra



On Thu, Nov 11, 2010 at 10:55 PM, Jared Camins-Esakov
<jcamins at cpbibliography.com> wrote:
> Amit,
> [ ... snipped a long patch ...]
>
> I am concerned about the impact of the way you are using subfield 'w' and
> subfield 'o'... those subfields may be used by other libraries, which could
> lead to incorrect linkages when sharing records. The standard usage for
> subfield 'w' is to include the library's MARC Organizational Code in
> parentheses to indicate the source. For example "$w(NNAN)12345" indicates
> that the record control number is from the American Numismatic Society. To
> use subfield 'w' for LCCN, one would use "$w(DLC)##2010000034#". Could I
> suggest that rather than assuming every subfield 'w' and subfield 'o'
> contains correct and relevant analytic coding that the linking take into
> account both biblionumber/001 and 003? So rather than just looking for a
> record with biblionumber/001 of '12345' (in my example), we'd need to look
> for a record with that in the biblionumber/001 and 'NNAN' in the 003.
> One of the nice side effects of this is that one could then easily extend
> the analytic support to handle LCCNs, ISBNs, and other standard numbers
> stored in 0XX fields in MARC21.
> I suspect this probably also applies to UNIMARC... perhaps the subfield '5'
> should be taken into account here? I'm a little confused by hdl's follow-up
> patch because it seems to equate the contents of the 001 field with the
> biblionumber, and I'm pretty sure that there isn't any guaranteed
> relationship. Actually, on second thought, this is a problem with the entire
> concept. Biblionumber is not a robust identifier, and using it will break,
> for example, union catalog situations (this seems to be the case with
> BSZ-BW).
> Following on the discussion about this currently taking place, perhaps it
> would make sense to store the biblionumber in $0 or $9, reserving $w for 001
> identifiers, and adjusting import/cataloging to automatically convert robust
> $w links to local $0 or $9 links.
> Regards,
> Jared Camins-Esakov
> --
> Jared Camins-Esakov
> Freelance bibliographer, C & P Bibliography Services, LLC
> (phone) +1 (917) 727-3445
> (e-mail) jcamins at cpbibliography.com
> (web) http://www.cpbibliography.com/
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>

From savitra.sirohi at osslabs.biz  Sun Nov 14 17:56:21 2010
From: savitra.sirohi at osslabs.biz (savitra sirohi)
Date: Sun, 14 Nov 2010 22:26:21 +0530
Subject: [Koha-patches] [PATCH] Ability to link to items belong to host
 records from a analytical record
In-Reply-To: <AANLkTikuPo5Wve2Rhvjio1Vq2tCfTRUsVcTOUyLK5oz=@mail.gmail.com>
References: <1289413324-3877-1-git-send-email-savitra.sirohi@osslabs.biz>
	<20101110221914.GC4325@rorohiko>
	<AANLkTikuPo5Wve2Rhvjio1Vq2tCfTRUsVcTOUyLK5oz=@mail.gmail.com>
Message-ID: <AANLkTinG-DY+QgysyT8dQZzR2hkL5ice6fJU8Xw4g3kO@mail.gmail.com>

Hi Chris, can you please go ahead and apply this one, I will update
the copyright per Galen's suggestion in a subsequent patch this week.

Hi Galen, on moving the code to C4, will do. Thanks for the suggestions.

- Savitra

On Thu, Nov 11, 2010 at 7:07 PM, Galen Charlton <gmcharlt at gmail.com> wrote:
> Hi,
>
> On Wed, Nov 10, 2010 at 5:19 PM, Chris Cormack <chrisc at catalyst.net.nz> wrote:
>> * savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz) wrote:
>>> From: Amit Gupta <amit.gupta at osslabs.biz>
>>>
>>> ---
>>> ?cataloguing/linkitem.pl ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 98 ++++++++++++++++++++
>>> ?.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | ? ?1 +
>>> ?.../prog/en/modules/cataloguing/linkitem.tmpl ? ? ?| ? 57 +++++++++++
>>> ?3 files changed, 156 insertions(+), 0 deletions(-)
>>> ?create mode 100755 cataloguing/linkitem.pl
>>> ?create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl
>>>
>>> diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
>>> new file mode 100755
>>> index 0000000..bff001e
>>> --- /dev/null
>>> +++ b/cataloguing/linkitem.pl
>>> @@ -0,0 +1,98 @@
>>> +#!/usr/bin/perl
>>> +
>>> +# Move an item from a biblio to another
>>> +#
>>> +# Copyright 2009 BibLibre
>>
>> Can you please fix the copyright statement here, and resend
>>
>> (You might want to check the other patches too, if we want to get into
>> debian we need correct copyright (or at least a lot more correct than we
>> have now) statements
>
> linkitem.pl is clearly a copy-and-paste of moveitem.pl with a few changes, so
>
> "Copyright 2009 BibLibre
> Copyright 2010 OSSLabs"
>
> (or something like that) is probably the correct copyright statement.
>
> Also, a note on the patch itself - it's not ideal to have the MARC21
> 773 field be referenced directly in the script - that really should be
> wrapped in a C4 routine so that it is easier to maintain (and for Zeno
> to add the UNIMARC support).
>
> Regards,
>
> Galen
> --
> Galen Charlton
> gmcharlt at gmail.com
>

From mjr at phonecoop.coop  Sun Nov 14 19:18:05 2010
From: mjr at phonecoop.coop (MJ Ray)
Date: Sun, 14 Nov 2010 18:18:05 +0000 (GMT)
Subject: [Koha-patches] Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
Message-ID: <20101114181805.9B88FF7474@nail.towers.org.uk>

Galen Charlton wrote:
> Since TinyMCE is used by only one page, if we decide to switch to
> elRTE (or to something else entirely), it won't be a big deal.  Has
> anybody done a direct comparison?

I've used TinyMCE and haven't used elRTE, but wouldn't this question
get better answers if asked on koha-devel?

Thanks
-- 
MJ Ray (slef), member of www.software.coop, a for-more-than-profit co-op.
Past Koha Release Manager (2.0), LMS programmer, statistician, webmaster.
In My Opinion Only: see http://mjr.towers.org.uk/email.html
Available for hire for Koha work http://www.software.coop/products/koha

From jcamins at cpbibliography.com  Sun Nov 14 19:25:54 2010
From: jcamins at cpbibliography.com (Jared Camins-Esakov)
Date: Sun, 14 Nov 2010 13:25:54 -0500
Subject: [Koha-patches] [PATCH] Analytical records support
In-Reply-To: <AANLkTikckPwfFYXw+VTvC-2SBTBNTSkq0CXAjy2oeYE3@mail.gmail.com>
References: <1288525758-1085-1-git-send-email-amit.gupta@osslabs.biz>
	<AANLkTikthxSnjEdRxWKia2rxbGT9a7YVcos6=E6SahPj@mail.gmail.com>
	<AANLkTikckPwfFYXw+VTvC-2SBTBNTSkq0CXAjy2oeYE3@mail.gmail.com>
Message-ID: <AANLkTikMfKt6a_BUB0gzdJz62vtYXp=aRusQQc3==POQ@mail.gmail.com>

Savitra,

1. Can you please expand on how we could "extend analytical support to
> ISBN and other standard identifiers". For instance, what would $w
> contain if one were using ISBN as a host record identifier. And which
> field in the host record would we look in to find the ISBN - 001 or in
> 020?
>

Analytic links could be specified in a number of different ways if we
eliminate the built-in assumptions about biblionumber:
773$w->001/003
773$z->020
773$x->022
773$u->027
773$y->030
773$w(DLC)->010

In the case of linking by ISBN (or anything other than 001 or LCCN),
probably we wouldn't put anything in 773$w. Every type of link could be
established at cataloging/import and a biblionumber stored in $9 in order to
save on computation time at display.

2. What about the item identifier? We were planning on recording
> barcode (952$p) in $o, and not referring to the itemnumber in the MARC
> record at all.
>

I am still troubled about this one. The problem with using barcodes is that
not all libraries will have barcodes, particularly for recent issues of
journals (which might be indexed on receipt). Of course, using item number
(or barcode) still leaves the problem that if you've analyzed all the
articles in a particular book and have two copies of the book, you really
want both items to show up, preferably without needing multiple 773 fields.
I don't have a solution for this.

There is also a problem if you modify the host item's record- the child item
might get out-of-date. The only way I can see to deal with this is to add a
cron job to run nightly that checks whether each host record has changed
and, if it has, updates any dependent analytics.

I'll think about these issues a bit more this afternoon and overnight, and
try to send a follow-up message tomorrow when I'm at work.

Regards,
Jared

-- 
Jared Camins-Esakov
Freelance bibliographer, C & P Bibliography Services, LLC
(phone) +1 (917) 727-3445
(e-mail) jcamins at cpbibliography.com
(web) http://www.cpbibliography.com/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101114/729a872c/attachment.htm>

From gmcharlt at gmail.com  Sun Nov 14 20:12:18 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sun, 14 Nov 2010 14:12:18 -0500
Subject: [Koha-patches] Bug 5401: WYSWYG for Koha News
In-Reply-To: <20101114181805.9B88FF7474@nail.towers.org.uk>
References: <AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
	<20101114181805.9B88FF7474@nail.towers.org.uk>
Message-ID: <AANLkTi=5-q2Z=ztrPum=793r6kYE=R2onjnBfTRN_T7U@mail.gmail.com>

Hi,

On Sun, Nov 14, 2010 at 1:18 PM, MJ Ray <mjr at phonecoop.coop> wrote:
> Galen Charlton wrote:
>> Since TinyMCE is used by only one page, if we decide to switch to
>> elRTE (or to something else entirely), it won't be a big deal. ?Has
>> anybody done a direct comparison?
>
> I've used TinyMCE and haven't used elRTE, but wouldn't this question
> get better answers if asked on koha-devel?

As the question was stated, yes, although if it turned out that
Koustubha was just unaware that Koha was already using TinyMCE, a
replacement patch using it instead of elRTE may have sufficed.

There is a long standing practice of discussion of individual patches
on koha-commits, however, so while koha-devel is certainly a valid
choice for discussing this issue, I do want to point out and remind
people that some relevant discussion does take place on the
koha-commits list.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From chris at bigballofwax.co.nz  Sun Nov 14 20:24:51 2010
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Mon, 15 Nov 2010 08:24:51 +1300
Subject: [Koha-patches] [Koha-devel]  Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTi=5-q2Z=ztrPum=793r6kYE=R2onjnBfTRN_T7U@mail.gmail.com>
References: <AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
	<20101114181805.9B88FF7474@nail.towers.org.uk>
	<AANLkTi=5-q2Z=ztrPum=793r6kYE=R2onjnBfTRN_T7U@mail.gmail.com>
Message-ID: <AANLkTikD=NRqsHiNdJoKCsbisywFj2wbvqoaH7KD1TWc@mail.gmail.com>

On 15 November 2010 08:12, Galen Charlton <gmcharlt at gmail.com> wrote:
> Hi,
>
> On Sun, Nov 14, 2010 at 1:18 PM, MJ Ray <mjr at phonecoop.coop> wrote:
>> Galen Charlton wrote:
>>> Since TinyMCE is used by only one page, if we decide to switch to
>>> elRTE (or to something else entirely), it won't be a big deal. ?Has
>>> anybody done a direct comparison?
>>
>> I've used TinyMCE and haven't used elRTE, but wouldn't this question
>> get better answers if asked on koha-devel?
>
> As the question was stated, yes, although if it turned out that
> Koustubha was just unaware that Koha was already using TinyMCE, a
> replacement patch using it instead of elRTE may have sufficed.
>
> There is a long standing practice of discussion of individual patches
> on koha-commits, however, so while koha-devel is certainly a valid
> choice for discussing this issue, I do want to point out and remind
> people that some relevant discussion does take place on the
> koha-commits list.
>
And on the koha-patches list too :)

Chris

From gmcharlt at gmail.com  Sun Nov 14 20:31:36 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Sun, 14 Nov 2010 14:31:36 -0500
Subject: [Koha-patches] [Koha-devel]  Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTikD=NRqsHiNdJoKCsbisywFj2wbvqoaH7KD1TWc@mail.gmail.com>
References: <AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
	<20101114181805.9B88FF7474@nail.towers.org.uk>
	<AANLkTi=5-q2Z=ztrPum=793r6kYE=R2onjnBfTRN_T7U@mail.gmail.com>
	<AANLkTikD=NRqsHiNdJoKCsbisywFj2wbvqoaH7KD1TWc@mail.gmail.com>
Message-ID: <AANLkTinSXcNK9DovKMN8Fbb745JzAuey0Zj3+f_X9a-=@mail.gmail.com>

Hi,

On Sun, Nov 14, 2010 at 2:24 PM, Chris Cormack <chris at bigballofwax.co.nz> wrote:
> And on the koha-patches list too :)

Indeed.  To understand my previous email correctly, please replace
every use of "koha-commits" with "koha-patches". :)

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From chrisc at catalyst.net.nz  Sun Nov 14 23:06:27 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 15 Nov 2010 11:06:27 +1300
Subject: [Koha-patches] [PATCH] Ability to link to items belong to host
 records from a analytical record
In-Reply-To: <AANLkTinG-DY+QgysyT8dQZzR2hkL5ice6fJU8Xw4g3kO@mail.gmail.com>
References: <1289413324-3877-1-git-send-email-savitra.sirohi@osslabs.biz>
	<20101110221914.GC4325@rorohiko>
	<AANLkTikuPo5Wve2Rhvjio1Vq2tCfTRUsVcTOUyLK5oz=@mail.gmail.com>
	<AANLkTinG-DY+QgysyT8dQZzR2hkL5ice6fJU8Xw4g3kO@mail.gmail.com>
Message-ID: <20101114220627.GP4325@rorohiko>

* savitra sirohi (savitra.sirohi at osslabs.biz) wrote:
> Hi Chris, can you please go ahead and apply this one, I will update
> the copyright per Galen's suggestion in a subsequent patch this week.

Done, its at new/awaiting_qa/analytical_records
on git.koha-community.org/koha.git

Chris
> 
> Hi Galen, on moving the code to C4, will do. Thanks for the suggestions.
> 
> - Savitra
> 
> On Thu, Nov 11, 2010 at 7:07 PM, Galen Charlton <gmcharlt at gmail.com> wrote:
> > Hi,
> >
> > On Wed, Nov 10, 2010 at 5:19 PM, Chris Cormack <chrisc at catalyst.net.nz> wrote:
> >> * savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz) wrote:
> >>> From: Amit Gupta <amit.gupta at osslabs.biz>
> >>>
> >>> ---
> >>> ?cataloguing/linkitem.pl ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 98 ++++++++++++++++++++
> >>> ?.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | ? ?1 +
> >>> ?.../prog/en/modules/cataloguing/linkitem.tmpl ? ? ?| ? 57 +++++++++++
> >>> ?3 files changed, 156 insertions(+), 0 deletions(-)
> >>> ?create mode 100755 cataloguing/linkitem.pl
> >>> ?create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tmpl
> >>>
> >>> diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
> >>> new file mode 100755
> >>> index 0000000..bff001e
> >>> --- /dev/null
> >>> +++ b/cataloguing/linkitem.pl
> >>> @@ -0,0 +1,98 @@
> >>> +#!/usr/bin/perl
> >>> +
> >>> +# Move an item from a biblio to another
> >>> +#
> >>> +# Copyright 2009 BibLibre
> >>
> >> Can you please fix the copyright statement here, and resend
> >>
> >> (You might want to check the other patches too, if we want to get into
> >> debian we need correct copyright (or at least a lot more correct than we
> >> have now) statements
> >
> > linkitem.pl is clearly a copy-and-paste of moveitem.pl with a few changes, so
> >
> > "Copyright 2009 BibLibre
> > Copyright 2010 OSSLabs"
> >
> > (or something like that) is probably the correct copyright statement.
> >
> > Also, a note on the patch itself - it's not ideal to have the MARC21
> > 773 field be referenced directly in the script - that really should be
> > wrapped in a C4 routine so that it is easier to maintain (and for Zeno
> > to add the UNIMARC support).
> >
> > Regards,
> >
> > Galen
> > --
> > Galen Charlton
> > gmcharlt at gmail.com
> >

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101115/ae62353c/attachment.pgp>

From robin at catalyst.net.nz  Sun Nov 14 23:15:31 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 15 Nov 2010 11:15:31 +1300
Subject: [Koha-patches] [PATCH] Bug 4222 - allow nonpublicnote to be a
 mapped DB column
In-Reply-To: <AANLkTineX=9j0WGQczUwDY=4SQxayTaJrM-2w0HgJR2K@mail.gmail.com>
References: <1289532464-27953-1-git-send-email-robin@catalyst.net.nz>
	<AANLkTimTYVEpGu-sqHF4BsHjx-4VjHtotRuu7CJ2LVQZ@mail.gmail.com>
	<AANLkTi=MVFKXwWnNkvNKh=AOvKPuZx1z=DY30Q=5NnoJ@mail.gmail.com>
	<AANLkTineX=9j0WGQczUwDY=4SQxayTaJrM-2w0HgJR2K@mail.gmail.com>
Message-ID: <1289772931.11078.81.camel@zarathud>

Ian Walls schreef op za 13-11-2010 om 17:40 [-0500]:
> Excellent, yes, removing the dependence on C4::Biblio greatly
> increases the speed; not only does it process faster, but it makes it
> easier to only select items that something in more_subfields_xml in
> the first place.  I'm going to make it part of the script, since my
> initial tests show that the wait time for a medium/large catalog is
> only a few seconds.

Hi Ian, feel free to send me any updated versions of this patch to test,
I'm hoping to set it up for a client some time in the next few days, and
would much rather it was the version that goes into master that I gave
them :)

-- 
Robin Sheat
Catalyst IT Ltd.
? +64 4 803 2204
GPG: 5957 6D23 8B16 EFAB FEF8  7175 14D3 6485 A99C EB6D
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: </pipermail/koha-patches/attachments/20101115/f6ef98cd/attachment.pgp>

From chrisc at catalyst.net.nz  Mon Nov 15 03:38:11 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 15 Nov 2010 15:38:11 +1300
Subject: [Koha-patches] [PATCH] Brooke caught my april fools trick,
	its not 20004 yet!
Message-ID: <1289788691-18769-1-git-send-email-chrisc@catalyst.net.nz>

Ok it wasn't an april fools trick, but just a typo, april fools trick
sounds better though right?
---
 docs/history.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index 2dd63e0..dfc4b4c 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -172,7 +172,7 @@ Feb 11 2004	 Paul Poulain announces release of 2.0.0rc4
 Feb 19 2004	 Stephen Hedges provides his migrating to Koha documentation to the community
 Mar 7 2004	 Installation guide improved and released in pdf format
 Mar 30 2004	 Baiju M provides a neat migrating from CDS/ISIS to Koha document
-April 1 20004	 Koha 2.0.0 released
+April 1 2004	 Koha 2.0.0 released
 April 17 2004	 Nicholas S. Rosasco resurrects and updates the FAQ
 April 17 2004	 Seminar on Koha at Cairo University, Egypt
 May 13-16 2004	 Zeki Celikbas presents Koha at a linux festival in Ankara, Turkey
-- 
1.7.0.4


From kmkale at anantcorp.com  Mon Nov 15 04:56:02 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Mon, 15 Nov 2010 09:26:02 +0530
Subject: [Koha-patches] Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTi=5-q2Z=ztrPum=793r6kYE=R2onjnBfTRN_T7U@mail.gmail.com>
References: <AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
	<20101114181805.9B88FF7474@nail.towers.org.uk>
	<AANLkTi=5-q2Z=ztrPum=793r6kYE=R2onjnBfTRN_T7U@mail.gmail.com>
Message-ID: <AANLkTi=XM1-x3sDcTtEbSxvsmQHYpsf67n6j3LwiSHSh@mail.gmail.com>

On Mon, Nov 15, 2010 at 12:42 AM, Galen Charlton <gmcharlt at gmail.com> wrote:
> Hi,
>
> On Sun, Nov 14, 2010 at 1:18 PM, MJ Ray <mjr at phonecoop.coop> wrote:
>> Galen Charlton wrote:
>>> Since TinyMCE is used by only one page, if we decide to switch to
>>> elRTE (or to something else entirely), it won't be a big deal. ?Has
>>> anybody done a direct comparison?
>>
>> I've used TinyMCE and haven't used elRTE, but wouldn't this question
>> get better answers if asked on koha-devel?
>
> As the question was stated, yes, although if it turned out that
> Koustubha was just unaware that Koha was already using TinyMCE, a
> replacement patch using it instead of elRTE may have sufficed.

As it happens I am aware of TinyMCE being already in Koha. But try as
I might I could not get it to play nice ( read - at all ) with the
News page. I tried the jquery varient of TinyMCE too and no go.
Also I dont like the fact that the imagemanager etc of TinyMCE are
only for paid customers.

elRTE worked pretty well. Had to do some tweaks to its css etc.

I have cleaned up the patch. Divided it into two separate patches. One
for the elRTE library and one for the Koha changes I did.
Now both apply squeaky clean. Got all features like image, media
insert etc working now.

Attaching both the patches here. Will also upload in bugzilla.

Regards,
Koustubha Kale
Anant Corporation

Contact Details :
Address  : 103, Armaan Residency, R. W Sawant Road, Nr. Golden Dyes
Naka, Thane (w),
                Maharashtra, India, Pin : 400601.
TeleFax  : +91-22-21720108, +91-22-21720109
Mobile     : +919820715876
Website  : http://www.anantcorp.com
Blog : http://www.anantcorp.com/blog/?author=2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5401-WYSWYG-for-Koha-News-Patch-1-eltre-1.1-libr.patch
Type: application/octet-stream
Size: 874527 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101115/9cda9c05/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Bug-5401-WYSWYG-for-Koha-News-Patch-2-Koha-files.patch
Type: application/octet-stream
Size: 4999 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101115/9cda9c05/attachment-0003.obj>

From cfouts at liblime.com  Mon Nov 15 09:17:20 2010
From: cfouts at liblime.com (Clay Fouts)
Date: Mon, 15 Nov 2010 08:17:20 +0000
Subject: [Koha-patches] [PATCH] Bug 5408 - Refactor GetIssuingRule and
	GetLoanLength
Message-ID: <1289809040-1427-1-git-send-email-cfouts@liblime.com>

This collapses the series of queries within GetIssuingRule into a single query,
the result of which is cached for future uses. Also refactors GetLoanLength to
call GetIssuingRule instead of submitting its own queries. The purpose of this
is to simplify and optimize the code. The API and behavior remain unchanged.
---
 C4/Circulation.pm |  139 ++++++--------------
 t/Circulation.t   |  385 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 425 insertions(+), 99 deletions(-)
 create mode 100755 t/Circulation.t

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 10c3c11..9081c8e 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1071,121 +1071,62 @@ sub AddIssue {
   return ($datedue);	# not necessarily the same as when it came in!
 }
 
-=head2 GetLoanLength
-
-  my $loanlength = &GetLoanLength($borrowertype,$itemtype,branchcode)
-
-Get loan length for an itemtype, a borrower type and a branch
-
-=cut
-
-sub GetLoanLength {
-    my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-"select issuelength from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"
-      );
-# warn "in get loan lenght $borrowertype $itemtype $branchcode ";
-# try to find issuelength & return the 1st available.
-# check with borrowertype, itemtype and branchcode, then without one of those parameters
-    $sth->execute( $borrowertype, $itemtype, $branchcode );
-    my $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", "*", $branchcode );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( $borrowertype, "*", "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", $itemtype, "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    $sth->execute( "*", "*", "*" );
-    $loanlength = $sth->fetchrow_hashref;
-    return $loanlength->{issuelength}
-      if defined($loanlength) && $loanlength->{issuelength} ne 'NULL';
-
-    # if no rule is set => 21 days (hardcoded)
-    return 21;
-}
-
 =head2 GetIssuingRule
 
-  my $irule = &GetIssuingRule($borrowertype,$itemtype,branchcode)
-
-FIXME - This is a copy-paste of GetLoanLength
-as a stop-gap.  Do not wish to change API for GetLoanLength 
-this close to release, however, Overdues::GetIssuingRules is broken.
-
 Get the issuing rule for an itemtype, a borrower type and a branch
 Returns a hashref from the issuingrules table.
 
+my $irule = &GetIssuingRule($categorycode, $itemtype, $branchcode)
+
 =cut
 
-sub GetIssuingRule {
-    my ( $borrowertype, $itemtype, $branchcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth =  $dbh->prepare( "select * from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null"  );
-    my $irule;
+our $irule_cache = undef;
+
+sub _populate_irule_cache() {
+    $irule_cache = C4::Context->dbh->selectall_hashref(
+        'SELECT * FROM issuingrules WHERE issuelength IS NOT NULL',
+        ['categorycode', 'itemtype', 'branchcode']) or
+        die sprintf "Cannot get issuingrules: %s\n", $!;
+
+    return $irule_cache;
+}
 
-	$sth->execute( $borrowertype, $itemtype, $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+sub _clear_irule_cache {
+    return $irule_cache = undef;
+}
 
-    $sth->execute( $borrowertype, "*", $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+sub GetIssuingRule($$$) {
+    my ($categorycode, $itemtype, $branchcode) = @_;
+
+    $irule_cache //= _populate_irule_cache();
+    my $irule = $irule_cache->{$categorycode}{$itemtype}{$branchcode} //
+        $irule_cache->{$categorycode}{'*'}{$branchcode} //
+        $irule_cache->{'*'}{$itemtype}{$branchcode} //
+        $irule_cache->{'*'}{'*'}{$branchcode} //
+        $irule_cache->{$categorycode}{$itemtype}{'*'} //
+        $irule_cache->{$categorycode}{'*'}{'*'} //
+        $irule_cache->{'*'}{$itemtype}{'*'} //
+        $irule_cache->{'*'}{'*'}{'*'} //
+        undef;
+
+    return $irule;
+}
 
-    $sth->execute( "*", $itemtype, $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+=head2 GetLoanLength
 
-    $sth->execute( "*", "*", $branchcode );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+Get loan length for an itemtype, a borrower type and a branch
 
-    $sth->execute( $borrowertype, $itemtype, "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+my $loanlength = &GetLoanLength($categorycode, $itemtype, $branchcode)
 
-    $sth->execute( $borrowertype, "*", "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+=cut
 
-    $sth->execute( "*", $itemtype, "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+sub GetLoanLength($$$) {
+    my ($categorycode, $itemtype, $branchcode) = @_;
 
-    $sth->execute( "*", "*", "*" );
-    $irule = $sth->fetchrow_hashref;
-    return $irule if defined($irule) ;
+    my $irule = GetIssuingRule($categorycode, $itemtype, $branchcode);
+    my $loanlength = ($irule) ? $irule->{issuelength} : 21;
 
-    # if no rule matches,
-    return undef;
+    return $loanlength;
 }
 
 =head2 GetBranchBorrowerCircRule
diff --git a/t/Circulation.t b/t/Circulation.t
new file mode 100755
index 0000000..cd431d0
--- /dev/null
+++ b/t/Circulation.t
@@ -0,0 +1,385 @@
+#!/usr/bin/perl
+
+use vars qw($C4::Circulation::irule_cache);
+
+use strict;
+use warnings;
+
+use Test::More tests => 9;
+use YAML;
+
+use_ok('C4::Circulation');
+
+my $irules_yaml = q{
+---
+'':
+  '': {}
+  '*': {}
+'*':
+  '': {}
+  '*':
+    '*':
+      accountsent: ~
+      branchcode: '*'
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.000000
+      firstremind: 1
+      holdallowed: 2
+      issuelength: 21
+      itemtype: '*'
+      max_fine: 0.000000
+      max_holds: ~
+      maxissueqty: 25
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    APL:
+      accountsent: ~
+      branchcode: APL
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.100000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 21
+      itemtype: '*'
+      max_fine: 5.000000
+      max_holds: ~
+      maxissueqty: 999
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    LML:
+      accountsent: ~
+      branchcode: LML
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.000000
+      firstremind: 1
+      holdallowed: 2
+      issuelength: 14
+      itemtype: '*'
+      max_fine: 500.000000
+      max_holds: ~
+      maxissueqty: 500
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    MSPL:
+      accountsent: ~
+      branchcode: MSPL
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.100000
+      firstremind: 2
+      holdallowed: 2
+      issuelength: 21
+      itemtype: '*'
+      max_fine: 5.000000
+      max_holds: ~
+      maxissueqty: 20
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    MVS:
+      accountsent: ~
+      branchcode: MVS
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.000000
+      firstremind: 1
+      holdallowed: 2
+      issuelength: 14
+      itemtype: '*'
+      max_fine: 20.000000
+      max_holds: ~
+      maxissueqty: 5
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+  DVD:
+    APL:
+      accountsent: ~
+      branchcode: APL
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.250000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 7
+      itemtype: DVD
+      max_fine: 5.000000
+      max_holds: ~
+      maxissueqty: 999
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+  VHS:
+    APL:
+      accountsent: ~
+      branchcode: APL
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.250000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 7
+      itemtype: VHS
+      max_fine: 5.000000
+      max_holds: ~
+      maxissueqty: 999
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    BPL:
+      accountsent: ~
+      branchcode: BPL
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.500000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 3
+      itemtype: VHS
+      max_fine: 500.000000
+      max_holds: ~
+      maxissueqty: 2
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    MSPL:
+      accountsent: ~
+      branchcode: MSPL
+      categorycode: '*'
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.500000
+      firstremind: 2
+      holdallowed: 2
+      issuelength: 5
+      itemtype: VHS
+      max_fine: 5.000000
+      max_holds: ~
+      maxissueqty: 5
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+STUD:
+  '*':
+    LML:
+      accountsent: ~
+      branchcode: LML
+      categorycode: STUD
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.000000
+      firstremind: 1
+      holdallowed: 2
+      issuelength: 28
+      itemtype: '*'
+      max_fine: 500.000000
+      max_holds: ~
+      maxissueqty: 500
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    MVS:
+      accountsent: ~
+      branchcode: MVS
+      categorycode: STUD
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.000000
+      firstremind: 1
+      holdallowed: 2
+      issuelength: 7
+      itemtype: '*'
+      max_fine: 20.000000
+      max_holds: ~
+      maxissueqty: 2
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    WELD:
+      accountsent: ~
+      branchcode: WELD
+      categorycode: STUD
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.000000
+      firstremind: 3
+      holdallowed: 2
+      issuelength: 7
+      itemtype: '*'
+      max_fine: 50.000000
+      max_holds: ~
+      maxissueqty: 2
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+    YPL:
+      accountsent: ~
+      branchcode: YPL
+      categorycode: STUD
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.150000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 21
+      itemtype: '*'
+      max_fine: 500.000000
+      max_holds: ~
+      maxissueqty: 6
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+  DVD:
+    YPL:
+      accountsent: ~
+      branchcode: YPL
+      categorycode: STUD
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 1.000000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 7
+      itemtype: DVD
+      max_fine: 500.000000
+      max_holds: ~
+      maxissueqty: 2
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+  PERIODICAL:
+    YPL:
+      accountsent: ~
+      branchcode: YPL
+      categorycode: STUD
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.150000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 7
+      itemtype: PERIODICAL
+      max_fine: 500.000000
+      max_holds: ~
+      maxissueqty: 5
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+  VHS:
+    YPL:
+      accountsent: ~
+      branchcode: YPL
+      categorycode: STUD
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 1.000000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 7
+      itemtype: VHS
+      max_fine: 500.000000
+      max_holds: ~
+      maxissueqty: 2
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+VISITOR:
+  '*':
+    MSPL:
+      accountsent: ~
+      branchcode: MSPL
+      categorycode: VISITOR
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.100000
+      firstremind: 2
+      holdallowed: 2
+      issuelength: 21
+      itemtype: '*'
+      max_fine: 5.000000
+      max_holds: ~
+      maxissueqty: 3
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+  DVD:
+    MSPL:
+      accountsent: ~
+      branchcode: MSPL
+      categorycode: VISITOR
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.500000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 5
+      itemtype: DVD
+      max_fine: 5.000000
+      max_holds: ~
+      maxissueqty: 1
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+  VHS:
+    MSPL:
+      accountsent: ~
+      branchcode: MSPL
+      categorycode: VISITOR
+      chargename: ~
+      chargeperiod: 1
+      circ_termsets_id: ~
+      fine: 0.500000
+      firstremind: 0
+      holdallowed: 2
+      issuelength: 5
+      itemtype: VHS
+      max_fine: 5.000000
+      max_holds: ~
+      maxissueqty: 1
+      rentaldiscount: ~
+      reservecharge: ~
+      restrictedtype: ~
+};
+
+$C4::Circulation::irule_cache = Load($irules_yaml);
+
+is(C4::Circulation::GetLoanLength('VISITOR', 'DVD', 'MSPL'), 5, 'GetLoanLength 1');
+is(C4::Circulation::GetLoanLength('VISITOR', 'VHS', undef), 21, 'GetLoanLength 2');
+is(C4::Circulation::GetLoanLength('STUD', 'invalid', 'MVS'), 7, 'GetLoanLength 3');
+is(C4::Circulation::GetLoanLength('STUD', undef, 'MVS'), 7, 'GetLoanLength 4');
+is(C4::Circulation::GetLoanLength(undef, undef, 'APL'), 21, 'GetLoanLength 5');
+is(C4::Circulation::GetLoanLength(undef, 'DVD', 'APL'), 7, 'GetLoanLength 6');
+is(C4::Circulation::GetLoanLength(undef, undef, 'LML'), 14, 'GetLoanLength 7');
+is(C4::Circulation::GetLoanLength(undef, undef, undef), 21, 'GetLoanLength 8');
-- 
1.5.6.5


From chrisc at catalyst.net.nz  Mon Nov 15 10:23:55 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 15 Nov 2010 22:23:55 +1300
Subject: [Koha-patches] [PATCH] Bug 5408 - Refactor GetIssuingRule and
 GetLoanLength
In-Reply-To: <1289809040-1427-1-git-send-email-cfouts@liblime.com>
References: <1289809040-1427-1-git-send-email-cfouts@liblime.com>
Message-ID: <20101115092355.GV4325@rorohiko>

* Clay Fouts (cfouts at liblime.com) wrote:
> This collapses the series of queries within GetIssuingRule into a single query,
> the result of which is cached for future uses. Also refactors GetLoanLength to
> call GetIssuingRule instead of submitting its own queries. The purpose of this
> is to simplify and optimize the code. The API and behavior remain unchanged.
Hi Clay

I like the idea, is the plan to send a follow up patch so that when an
issuing rule is changed, we clear the cached data?


Chris

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101115/16838262/attachment.pgp>

From mjr at phonecoop.coop  Mon Nov 15 11:10:29 2010
From: mjr at phonecoop.coop (MJ Ray)
Date: Mon, 15 Nov 2010 10:10:29 +0000 (GMT)
Subject: [Koha-patches] Discussion of development topics,
	was: Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTi=5-q2Z=ztrPum=793r6kYE=R2onjnBfTRN_T7U@mail.gmail.com>
Message-ID: <20101115101029.EBBE4F7477@nail.towers.org.uk>

Galen Charlton wrote:
> There is a long standing practice of discussion of individual patches
> on koha-commits, however, so while koha-devel is certainly a valid
> choice for discussing this issue, I do want to point out and remind
> people that some relevant discussion does take place on the
> koha-commits list.

I don't like that practice because:-

1. the list description "Patches submitted to Koha" gives no
indication it occurs and it's different from other projects' -commit
mailing lists;

2. developers have to subscribe to receive all patches even if they're
only interested in their fields of activity and the occasional
discussions, contributing to information overload;

3. I think the patches are carried in only one of the web forum
versions of our discussions http://koha-community.org/support/forums/

4. usually the patches relate to a bug and email discussion isn't
automatically attached to the bug report - I have started work to
address this, but it's still going to have some delay between
the discussion and posting to the bug report, which may mean the
discussion is irrelevant by the time the bug is told;

5. most importantly, many topics are wider than a single patch,
such as this one about what rich editor to adopt.

Can we overcome these problems, or state clearly that
wider-than-one-patch discussions should be on -devel?

Thanks,
-- 
MJ Ray (slef), member of www.software.coop, a for-more-than-profit co-op.
Past Koha Release Manager (2.0), LMS programmer, statistician, webmaster.
In My Opinion Only: see http://mjr.towers.org.uk/email.html
Available for hire for Koha work http://www.software.coop/products/koha

From amit.gupta at osslabs.biz  Mon Nov 15 06:28:46 2010
From: amit.gupta at osslabs.biz (Amit Gupta)
Date: Mon, 15 Nov 2010 10:58:46 +0530
Subject: [Koha-patches] [PATCH] Bug 5409 - Fix call number not shown on opac
	search result page
In-Reply-To: <amit.gupta@osslabs.biz>
References: <amit.gupta@osslabs.biz>
Message-ID: <1289798926-9971-1-git-send-email-amit.gupta@osslabs.biz>

---
 opac/opac-search.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 2bfcb6d..6ac8090 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -543,7 +543,7 @@ for (my $i=0;$i<@servers;$i++) {
             $template->param(stopwords_removed => "@$stopwords_removed") if $stopwords_removed;
             $template->param(results_per_page =>  $results_per_page);
             $template->param(SEARCH_RESULTS => \@newresults,
-                                OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay") eq "itemdetails"?1:0),
+                                OPACItemsResultsDisplay => (C4::Context->preference("OPACItemsResultsDisplay")),
                             );
             ## Build the page numbers on the bottom of the page
             my @page_numbers;
-- 
1.5.4.5


From gmcharlt at gmail.com  Mon Nov 15 13:55:43 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 07:55:43 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Brooke caught my april fools
	trick, its not 20004 yet!
Message-ID: <1289825743-24934-1-git-send-email-gmcharlt@gmail.com>

From: Chris Cormack <chrisc at catalyst.net.nz>

Ok it wasn't an april fools trick, but just a typo, april fools trick
sounds better though right?

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 docs/history.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index 2dd63e0..dfc4b4c 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -172,7 +172,7 @@ Feb 11 2004	 Paul Poulain announces release of 2.0.0rc4
 Feb 19 2004	 Stephen Hedges provides his migrating to Koha documentation to the community
 Mar 7 2004	 Installation guide improved and released in pdf format
 Mar 30 2004	 Baiju M provides a neat migrating from CDS/ISIS to Koha document
-April 1 20004	 Koha 2.0.0 released
+April 1 2004	 Koha 2.0.0 released
 April 17 2004	 Nicholas S. Rosasco resurrects and updates the FAQ
 April 17 2004	 Seminar on Koha at Cairo University, Egypt
 May 13-16 2004	 Zeki Celikbas presents Koha at a linux festival in Ankara, Turkey
-- 
1.7.0


From M.de.Rooy at rijksmuseum.nl  Mon Nov 15 14:02:19 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 15 Nov 2010 13:02:19 +0000
Subject: [Koha-patches] [PATCH] Bug 3735 (Wrong search results for a few
 fields in ccl.properties)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA311A21E6@S-MAIL-1B.rijksmuseum.intra>

Eliminating syntax errors from ccl.properties. Adding four indexes to Search.pm, commenting out the remaining bath atts. 
---
 C4/Search.pm               |    4 ++++
 etc/zebradb/ccl.properties |   27 ++++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index d36459a..3247d31 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -855,7 +855,9 @@ sub getIndexes{
                     'id-other',
                     'Illustration-code',
                     'ISBN',
+                    'isbn',
                     'ISSN',
+                    'issn',
                     'itemtype',
                     'kw',
                     'Koha-Auth-Number',
@@ -874,12 +876,14 @@ sub getIndexes{
                     'mc-itemtype',
                     'mc-rtype',
                     'mus',
+                    'name',
                     'Name-geographic',
                     'Name-geographic-heading',
                     'Name-geographic-see',
                     'Name-geographic-seealso',
                     'nb',
                     'Note',
+                    'notes',
                     'ns',
                     'nt',
                     'pb',
diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index 4bca55e..18c3b69 100644
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -1115,19 +1115,20 @@ sort3 7=3
 
 ###################################################
 # Rules for a few bath atts
-keyTitle         = 1=33
-possessingInstitution    = 1=1044
-name             = 1=1002
-personalName     = 1=1
-corporateName    = 1=2
-conferenceName   = 1=3
-uniformTitle     = 1=6
-isbn             = 1=7
-issn             = 1=8
-geographicName   = 1=58
-notes            = 1=63
-topicalSubject   = 1=1079
-genreForm        = 1=1075
+# For recent changes in this section, see Bugzilla #3735
+#keyTitle 1=33
+#possessingInstitution 1=1044
+name 1=1002
+#personalName 1=1
+#corporateName 1=2
+#conferenceName 1=3
+#uniformTitle 1=6
+isbn 1=7
+issn 1=8
+#geographicName 1=58
+notes 1=63
+#topicalSubject 1=1079
+#genreForm 1=1075
 
 ###################################################
 # Rules for a few GILS fields
-- 
1.6.0.6


From gmcharlt at gmail.com  Mon Nov 15 14:02:48 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 08:02:48 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 2122,
	Grayed out Fields not always visible
Message-ID: <1289826168-25215-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

- Adding "readonly" class to readonly fields to guarantee
  that readonly state is indicated visually
- Adding "locked" icon to the background of readonly
  fields for additional visual feedback

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 cataloguing/addbiblio.pl                          |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css |    3 ++-
 koha-tmpl/intranet-tmpl/prog/img/locked.png       |  Bin 0 -> 230 bytes
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/locked.png

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 86c049e..2c0c63d 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -366,7 +366,7 @@ sub create_input {
                     id=\"".$subfield_data{id}."\"
                     name=\"".$subfield_data{id}."\"
                     value=\"$value\"
-                    class=\"input_marceditor\"
+                    class=\"input_marceditor readonly\"
                     tabindex=\"1\"
                     size=\"5\"
                     maxlength=\"$max_length\"
@@ -382,7 +382,7 @@ sub create_input {
                     id=\"".$subfield_data{id}."\"
                     name=\"".$subfield_data{id}."\"
                     value=\"$value\"
-                    class=\"input_marceditor\"
+                    class=\"input_marceditor readonly\"
                     tabindex=\"1\"
                     size=\"67\"
                     maxlength=\"$max_length\"
@@ -396,7 +396,7 @@ sub create_input {
                     id=\"".$subfield_data{id}."\"
                     name=\"".$subfield_data{id}."\"
                     value=\"$value\"
-                    class=\"input_marceditor\"
+                    class=\"input_marceditor readonly\"
                     tabindex=\"1\"
                     size=\"67\"
                     maxlength=\"$max_length\"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
index f763ad2..26a8066 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
@@ -132,4 +132,5 @@ a.tagnum {
 .linktools a {margin:0 2px;padding:2px;background-color:#FFF;text-align:center; }
 .linktools a:first-child { border-bottom: 1px solid #DDD; }
 .linktools a:hover { background-color: #FFC; }
-.subfield_controls { margin : 0 .5em; }
\ No newline at end of file
+.subfield_controls { margin : 0 .5em; }
+.readonly { border-width : 1px; border-style: inset; padding-left : 15px; background: #EEE url(../../img/locked.png) center left no-repeat; width:29em; }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/img/locked.png b/koha-tmpl/intranet-tmpl/prog/img/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd1b95cdf0cafa8c59e372ef9753d2c5026ca56e
GIT binary patch
literal 230
zcmeAS at N?(olHy`uVBq!ia0vp^JRr=$3?vg*uel1OSkfJR9T^zbpD<_bdI{u9mbgZg
z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-&P4DbnYojG%6T3Xuw|NkqWC4L7A
zGM5DT1^@rgaQzf7&_IR|PZ!6Kid#tuPD~7pM;gvBawu at LPZacFWD%Hgn8VG-hk>!>
z5Kxe9gOUJ)5d#y)nM4LA0d|E3i5UyL99SF}7M@^W5$KX at U~t+fqR<dv!NADI;K#u5
UQ>$ps7ohnJp00i_>zopr0PN*KegFUf

literal 0
HcmV?d00001

-- 
1.7.0


From gmcharlt at gmail.com  Mon Nov 15 14:09:11 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 08:09:11 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5004,
	Don't block deletion of cities when instances exist in borrowers
	table
Message-ID: <1289826551-26037-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 admin/cities.pl                                    |    9 ++-------
 .../prog/en/modules/admin/cities.tmpl              |   10 ----------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/admin/cities.pl b/admin/cities.pl
index 3e33a71..58e33ae 100755
--- a/admin/cities.pl
+++ b/admin/cities.pl
@@ -86,15 +86,10 @@ if ($op eq 'add_form') {
 # called by default form, used to confirm deletion of data in DB
 } elsif ($op eq 'delete_confirm') {
 	$template->param(delete_confirm => 1);
-	my $sth=$dbh->prepare("select count(*) as total from borrowers,cities where borrowers.city=cities.city_name and cityid=?");
-    # FIXME: this check used to pretend there was a FK "select_city" in borrowers.
+	my $sth=$dbh->prepare("select cityid,city_name,city_zipcode from cities where  cityid=?");
 	$sth->execute($cityid);
-	my $total = $sth->fetchrow_hashref;
-	my $sth2=$dbh->prepare("select cityid,city_name,city_zipcode from cities where  cityid=?");
-	$sth2->execute($cityid);
-	my $data=$sth2->fetchrow_hashref;
+	my $data=$sth->fetchrow_hashref;
     $template->param(
-        total        => $total->{'total'},
         city_name    =>	$data->{'city_name'},
         city_zipcode => $data->{'city_zipcode'},
     );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
index 62055da..203d19b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
@@ -69,14 +69,8 @@
 
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->
-    <!-- TMPL_IF NAME="total" -->
-    <div class="dialog message">
-    <h3>Cannot Delete City "<!-- TMPL_VAR NAME="city_name" -->"</h3>
-    <p>This record is used <!-- TMPL_VAR NAME="total" --> times. Impossible to delete it</p>
-    <!-- TMPL_ELSE -->
     <div class="dialog alert">
     <h3>Delete City "<!-- TMPL_VAR NAME="city_name" -->?"</h3>
-    <!-- /TMPL_IF -->
     <table>
         <tr><th>City id</th>
             <td><!-- TMPL_VAR NAME="cityid" --></td>
@@ -89,16 +83,12 @@
         </tr>
     </table>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-    <!-- TMPL_IF NAME="total" -->
-        <input type="submit" class="approv" value="OK" />
-    <!-- TMPL_ELSE -->
         <input type="hidden" name="op" value="delete_confirmed" />
         <input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" />
         <input type="submit" class="approve" value="Yes, Delete" />
     </form>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
         <input type="submit" class="deny" value="No, do not Delete" />
-    <!-- /TMPL_IF -->
     </form>
 </div>
 <!-- /TMPL_IF -->
-- 
1.7.0


From oleonard at myacpl.org  Mon Nov 15 15:55:48 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 15 Nov 2010 09:55:48 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 2122 follow-up for authorities editor
Message-ID: <1289832948-15805-1-git-send-email-oleonard@myacpl.org>

---
 authorities/authorities.pl |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 491aed6..9429a58 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -191,13 +191,13 @@ sub create_input {
     elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
         $subfield_data{marc_value} =
     "<input type=\"text\"
-                        id=\"".$subfield_data{id}."\"
-                        name=\"".$subfield_data{id}."\"
-    value=\"$value\"
-    class=\"input_marceditor\"
-    tabindex=\"1\"                     
-        readonly=\"readonly\" \/>
-    <a href=\"#\" class=\"buttonDot\"
+            id=\"".$subfield_data{id}."\"
+            name=\"".$subfield_data{id}."\"
+            value=\"$value\"
+            class=\"input_marceditor readonly\"
+            tabindex=\"1\"
+            readonly=\"readonly\" \/>
+        <a href=\"#\" class=\"buttonDot\"
         onclick=\"openAuth(this.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">...</a>
     ";
     # it's a plugin field
-- 
1.7.1


From tajoli at cilea.it  Mon Nov 15 16:13:41 2010
From: tajoli at cilea.it (tajoli at cilea.it)
Date: 15 Nov 2010 16:13:41 +0100
Subject: [Koha-patches] [bug 5204] Unimarc XSLT,
 from French to English. 2nd version. This is the second version of
 the patch. Discard the first. This patch will be signed-off by Frederic
 DEMIANS.
Message-ID: <20101115151120.1803A46EAD@eliot.biblibre.com>

A non-text attachment was scrubbed...
Name: not available
Type: application/octet-stream
Size: 27950 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101115/38d3ceff/attachment-0001.obj>

From oleonard at myacpl.org  Mon Nov 15 16:14:11 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 15 Nov 2010 10:14:11 -0500
Subject: [Koha-patches] [PATCH] Another bug 5004 fix,
	this time for road types
Message-ID: <1289834051-15943-1-git-send-email-oleonard@myacpl.org>

The road types interface didn't block deletion of road
types in use, but the script included the same queries
that cities.pl did, as if it intended to.
---
 admin/roadtype.pl |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/admin/roadtype.pl b/admin/roadtype.pl
index 544d488..a756594 100755
--- a/admin/roadtype.pl
+++ b/admin/roadtype.pl
@@ -98,18 +98,10 @@ if ($op eq 'add_form') {
 } elsif ($op eq 'delete_confirm') {
 	$template->param(delete_confirm => 1);
 	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select count(*) as total from borrowers,roadtype where borrowers.streettype=roadtype.road_type and roadtypeid=?");
-	$sth->execute($roadtypeid);
-	my $total = $sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(total => $total->{'total'});	
 	my $sth2=$dbh->prepare("select roadtypeid,road_type from roadtype where  roadtypeid=?");
 	$sth2->execute($roadtypeid);
 	my $data=$sth2->fetchrow_hashref;
 	$sth2->finish;
-	if ($total->{'total'} >0) {
-		$template->param(totalgtzero => 1);
-	}
 
         $template->param(	
 				road_type       =>	( $data->{'road_type'}),
-- 
1.7.1


From gmcharlt at gmail.com  Mon Nov 15 17:04:00 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 11:04:00 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Unimarc XSLT,
	from French to English.
Message-ID: <1289837040-27428-1-git-send-email-gmcharlt@gmail.com>

From: Zeno0 Tajoli <tajoli at cilea.it>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/xslt/UNIMARCslim2OAIDC.xsl             |   59 ++++++++---------
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |   70 ++++++++++----------
 .../prog/en/xslt/UNIMARCslimUtils.xsl              |    4 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |   68 ++++++++++----------
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl       |    6 +-
 .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl    |    4 +-
 6 files changed, 104 insertions(+), 107 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
index 27c78ed..0e5a80d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
@@ -49,37 +49,34 @@
     		   <xsl:value-of select="marc:subfield[@code='b']"/>
     		</xsl:if>
 			<xsl:choose>
-    		  <xsl:when test="marc:subfield[@code='4']='010'">, adaptateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='020'">, annotatateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='075'">, postfacier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='080'">, pr??facier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='100'">, auteur ??uvre adapt??</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='205'">, collaborateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='212'">, commentaire</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='220'">, compilateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='230'">, compositeur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='245'">, concepteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='295'">, donneur de grades</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='340'">, ??diteur scientifique</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='370'">, r??alisateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='395'">, fondateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='440'">, illustrateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='520'">, parolier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='557'">, organisateur congr??s</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='570'">, autre</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='573'">, diffuseur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='574'">, pr??sentateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='575'">, responsable</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='600'">, photographe</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='605'">, pr??sentateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='650'">, ??diteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='651'">, directeur de la publication</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='673'">, directeur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='675'">, critique</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='710'">, r??dacteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='723'">, commenditaire</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='727'">, directeur de th??se</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='730'">, traducteur</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='010'">, adapter</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='020'">, annotator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='075'">, author of afterword</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='080'">, prefacer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='100'">, bibliographic antecedent</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='205'">, collaborator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='212'">, commentator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='220'">, compiler</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='230'">, composer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='245'">, conceptor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='295'">, degree-grantor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='340'">, editor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='370'">, film editor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='395'">, founder</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='440'">, illustrator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='520'">, lyricist</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='557'">, organiser of meeting</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='570'">, other</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='600'">, photographer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='605'">, presenter</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='650'">, publisher</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='651'">, publishing director</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='673'">, research team head</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='675'">, reviewer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='710'">, redactor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='723'">, sponsor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='727'">, thesis advisor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='730'">, translator</xsl:when>
     		</xsl:choose>
 		  </dc:creator>
 		</xsl:for-each>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
index 38c6124..130e1c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -55,49 +55,49 @@
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">700</xsl:with-param>
-    <xsl:with-param name="label">Auteur principal</xsl:with-param>
+    <xsl:with-param name="label">Main Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">710</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? principale</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Main)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">701</xsl:with-param>
-    <xsl:with-param name="label">Co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Coauthor</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">702</xsl:with-param>
-    <xsl:with-param name="label">Auteur</xsl:with-param>
+    <xsl:with-param name="label">Secondary Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">711</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Coauthor)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">712</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? secondaire</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Secondary)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=101]">
     <li>
-      <strong>Langue: </strong>
+      <strong>Language: </strong>
       <xsl:for-each select="marc:datafield[@tag=101]">
         <xsl:for-each select="marc:subfield">
           <xsl:choose>
-            <xsl:when test="@code='b'">de la trad. interm??diaire, </xsl:when>
-            <xsl:when test="@code='c'">de l'??uvre originale, </xsl:when>
-            <xsl:when test="@code='d'">du r??sum??, </xsl:when>
-            <xsl:when test="@code='e'">de la table des mati??res, </xsl:when>
-            <xsl:when test="@code='f'">de la page de titre, </xsl:when>
-            <xsl:when test="@code='g'">du titre propre, </xsl:when>
-            <xsl:when test="@code='h'">d'un livret, </xsl:when>
-            <xsl:when test="@code='i'">des textes d'accompagnement, </xsl:when>
-            <xsl:when test="@code='j'">des sous-titres, </xsl:when>
+            <xsl:when test="@code='b'">of intermediate text, </xsl:when>
+            <xsl:when test="@code='c'">of original work, </xsl:when>
+            <xsl:when test="@code='d'">of summary, </xsl:when>
+            <xsl:when test="@code='e'">of contents page, </xsl:when>
+            <xsl:when test="@code='f'">of title page, </xsl:when>
+            <xsl:when test="@code='g'">of title proper, </xsl:when>
+            <xsl:when test="@code='h'">of libretto, </xsl:when>
+            <xsl:when test="@code='i'">of accompanying material, </xsl:when>
+            <xsl:when test="@code='j'">of subtitles, </xsl:when>n>
           </xsl:choose>
           <xsl:value-of select="text()"/>
           <xsl:choose>
@@ -115,7 +115,7 @@
 
   <xsl:if test="marc:datafield[@tag=102]">
     <li>
-      <strong>Pays: </strong>
+      <strong>Country: </strong>
       <xsl:for-each select="marc:datafield[@tag=102]">
         <xsl:for-each select="marc:subfield">
           <xsl:value-of select="text()"/>
@@ -136,7 +136,7 @@
   <xsl:call-template name="tag_215" />
 
 <xsl:if test="marc:controlfield[@tag=009]">
-    <li><strong>PPN: </strong>
+    <li><strong>Tag 009: </strong>
       <xsl:value-of select="marc:controlfield[@tag=009]"/>
     </li>
   </xsl:if>
@@ -177,7 +177,7 @@
 
   <xsl:call-template name="tag_title">
     <xsl:with-param name="tag">225</xsl:with-param>
-    <xsl:with-param name="label">Collection</xsl:with-param>
+    <xsl:with-param name="label">Series</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=676]">
@@ -220,7 +220,7 @@
 
   <xsl:if test="marc:datafield[@tag=327]">
     <li>
-      <strong>Note de contenu: </strong>
+      <strong>Contents note: </strong>
       <xsl:for-each select="marc:datafield[@tag=327]">
         <xsl:call-template name="chopPunctuation">
           <xsl:with-param name="chopString">
@@ -237,7 +237,7 @@
 
   <xsl:if test="marc:datafield[@tag=330]">
     <li>
-      <strong>R??sum??: </strong>
+      <strong>Abstract: </strong>
       <xsl:for-each select="marc:datafield[@tag=330]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose>
@@ -254,7 +254,7 @@
 
   <xsl:if test="marc:datafield[@tag=317]">
     <li>
-      <strong>Note sur la provenance: </strong>
+      <strong>Provenance note: </strong>
       <xsl:for-each select="marc:datafield[@tag=317]">
           <xsl:value-of select="marc:subfield[@code='a']"/>
       </xsl:for-each>
@@ -263,7 +263,7 @@
 
   <xsl:if test="marc:datafield[@tag=320]">
     <li>
-      <strong>Bibliographie: </strong>
+      <strong>Bibliography: </strong>
       <xsl:for-each select="marc:datafield[@tag=320]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -273,7 +273,7 @@
 
   <xsl:if test="marc:datafield[@tag=328]">
     <li>
-      <strong>Th??se: </strong>
+      <strong>Thesis: </strong>
       <xsl:for-each select="marc:datafield[@tag=328]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -283,7 +283,7 @@
 
   <xsl:if test="marc:datafield[@tag=333]">
     <li>
-      <strong>Public: </strong>
+      <strong>Audience: </strong>
       <xsl:for-each select="marc:datafield[@tag=333]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -315,52 +315,52 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom de personne</xsl:with-param>
+    <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">601</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Collectivit??</xsl:with-param>
+    <xsl:with-param name="label">Subject - Corporate Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">602</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Famille</xsl:with-param>
+    <xsl:with-param name="label">Subject - Family</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">604</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Auteur/titre</xsl:with-param>
+    <xsl:with-param name="label">Subject - Author/Title</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom commun</xsl:with-param>
+    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">607</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom g??ographique</xsl:with-param>
+    <xsl:with-param name="label">Subject - Geographical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">608</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Forme</xsl:with-param>
+    <xsl:with-param name="label">Subject - Form</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">610</xsl:with-param>
-    <xsl:with-param name="label">Sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">615</xsl:with-param>
-    <xsl:with-param name="label">Cat??gorie sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject Category</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">616</xsl:with-param>
-    <xsl:with-param name="label">Marque d??pos??e</xsl:with-param>
+    <xsl:with-param name="label">Trademark</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=856]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index 85d1faf..c04a8e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -25,7 +25,7 @@
 
   <xsl:template name="tag_210">
     <li>
-      <strong>??dition: </strong>
+      <strong>Publication: </strong>
       <xsl:for-each select="marc:datafield[@tag=210]">
         <span>
           <xsl:call-template name="addClassRtl" />
@@ -85,7 +85,7 @@
 	<xsl:template name="tag_4xx">
     <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
         <li>
-        <strong>Extrait de: </strong>
+        <strong>Linked with: </strong>
         <span>
           <xsl:call-template name="addClassRtl" />
           <xsl:if test="marc:subfield[@code='t']">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 2ef828f..887bab6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -71,49 +71,49 @@
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">700</xsl:with-param>
-    <xsl:with-param name="label">Auteur principal</xsl:with-param>
+    <xsl:with-param name="label">Main Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">710</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? principale</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Main)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">701</xsl:with-param>
-    <xsl:with-param name="label">Co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Coauthor</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">702</xsl:with-param>
-    <xsl:with-param name="label">Auteur</xsl:with-param>
+    <xsl:with-param name="label">Secondary Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">711</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Coauthor)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">712</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? secondaire</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Secondary)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=101]">
 	  <span class="results_summary">
-      <span class="label">Langue: </span>
+      <span class="label">Language: </span>
       <xsl:for-each select="marc:datafield[@tag=101]">
         <xsl:for-each select="marc:subfield">
           <xsl:choose>
-            <xsl:when test="@code='b'">de la trad. interm??diaire, </xsl:when>
-            <xsl:when test="@code='c'">de l'??uvre originale, </xsl:when>
-            <xsl:when test="@code='d'">du r??sum??, </xsl:when>
-            <xsl:when test="@code='e'">de la table des mati??res, </xsl:when>
-            <xsl:when test="@code='f'">de la page de titre, </xsl:when>
-            <xsl:when test="@code='g'">du titre propre, </xsl:when>
-            <xsl:when test="@code='h'">d'un livret, </xsl:when>
-            <xsl:when test="@code='i'">des textes d'accompagnement, </xsl:when>
-            <xsl:when test="@code='j'">des sous-titres, </xsl:when>
+            <xsl:when test="@code='b'">of intermediate text, </xsl:when>
+            <xsl:when test="@code='c'">of original work, </xsl:when>
+            <xsl:when test="@code='d'">of summary, </xsl:when>
+            <xsl:when test="@code='e'">of contents page, </xsl:when>
+            <xsl:when test="@code='f'">of title page, </xsl:when>
+            <xsl:when test="@code='g'">of title proper, </xsl:when>
+            <xsl:when test="@code='h'">of libretto, </xsl:when>
+            <xsl:when test="@code='i'">of accompanying material, </xsl:when>
+            <xsl:when test="@code='j'">of subtitles, </xsl:when>
           </xsl:choose>
           <xsl:value-of select="text()"/>
           <xsl:choose>
@@ -131,7 +131,7 @@
 
   <xsl:if test="marc:datafield[@tag=102]">
 	  <span class="results_summary">
-      <span class="label">Pays: </span>
+      <span class="label">Country: </span>
       <xsl:for-each select="marc:datafield[@tag=102]">
         <xsl:for-each select="marc:subfield">
           <xsl:value-of select="text()"/>
@@ -187,7 +187,7 @@
 
   <xsl:call-template name="tag_title">
     <xsl:with-param name="tag">225</xsl:with-param>
-    <xsl:with-param name="label">Collection</xsl:with-param>
+    <xsl:with-param name="label">Series</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=676]">
@@ -230,7 +230,7 @@
 
   <xsl:if test="marc:datafield[@tag=327]">
     <span class="results_summary">
-      <span class="label">Note de contenu: </span>
+      <span class="label">Contents note: </span>
       <xsl:for-each select="marc:datafield[@tag=327]">
         <xsl:call-template name="chopPunctuation">
           <xsl:with-param name="chopString">
@@ -247,7 +247,7 @@
 
   <xsl:if test="marc:datafield[@tag=330]">
     <span class="results_summary">
-      <span class="label">R??sum??: </span>
+      <span class="label">Abstract: </span>
       <xsl:for-each select="marc:datafield[@tag=330]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose>
@@ -264,7 +264,7 @@
 
   <xsl:if test="marc:datafield[@tag=317]">
     <span class="results_summary">
-      <span class="label">Note sur la provenance: </span>
+      <span class="label">Provenance note: </span>
       <xsl:for-each select="marc:datafield[@tag=317]">
           <xsl:value-of select="marc:subfield[@code='a']"/>
       </xsl:for-each>
@@ -273,7 +273,7 @@
 
   <xsl:if test="marc:datafield[@tag=320]">
     <span class="results_summary">
-      <span class="label">Bibliographie: </span>
+      <span class="label">Bibliography: </span>
       <xsl:for-each select="marc:datafield[@tag=320]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -283,7 +283,7 @@
 
   <xsl:if test="marc:datafield[@tag=328]">
     <span class="results_summary">
-      <span class="label">Th??se: </span>
+      <span class="label">Thesis: </span>
       <xsl:for-each select="marc:datafield[@tag=328]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -293,7 +293,7 @@
 
   <xsl:if test="marc:datafield[@tag=333]">
     <span class="results_summary">
-      <span class="label">Public: </span>
+      <span class="label">Audience: </span>
       <xsl:for-each select="marc:datafield[@tag=333]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -325,52 +325,52 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom de personne</xsl:with-param>
+    <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">601</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Collectivit??</xsl:with-param>
+    <xsl:with-param name="label">Subject - Corporate Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">602</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Famille</xsl:with-param>
+    <xsl:with-param name="label">Subject - Family</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">604</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Auteur/titre</xsl:with-param>
+    <xsl:with-param name="label">Subject - Author/Title</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom commun</xsl:with-param>
+    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">607</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom g??ographique</xsl:with-param>
+    <xsl:with-param name="label">Subject - Geographical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">608</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Forme</xsl:with-param>
+    <xsl:with-param name="label">Subject - Form</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">610</xsl:with-param>
-    <xsl:with-param name="label">Sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">615</xsl:with-param>
-    <xsl:with-param name="label">Cat??gorie sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject Category</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">616</xsl:with-param>
-    <xsl:with-param name="label">Marque d??pos??e</xsl:with-param>
+    <xsl:with-param name="label">Trademark</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=856]">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
index 66c41c0..19b6745 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -70,7 +70,7 @@
   <xsl:call-template name="tag_215" />
 
   <span class="results_summary">
-    <span class="label">Disponibilit??: </span>
+    <span class="label">Availability: </span>
     <xsl:choose>
       <xsl:when test="marc:datafield[@tag=856]">
         <xsl:for-each select="marc:datafield[@tag=856]">
@@ -100,11 +100,11 @@
         </xsl:for-each>
       </xsl:when>
       <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
-        Pas de copie disponible
+        No copies available
       </xsl:when>
       <xsl:when test="count(key('item-by-status', 'available'))>0">
         <span class="available">
-          <b><xsl:text>pour le pr??t: </xsl:text></b>
+          <b><xsl:text>Copies available for loan: </xsl:text></b>
           <xsl:variable name="available_items" select="key('item-by-status', 'available')"/>
           <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
             <xsl:value-of select="items:homebranch"/>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index f5cf99f..8eec0fd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -25,7 +25,7 @@
 
   <xsl:template name="tag_210">
     <span class="results_summary">
-      <span class="label">??dition: </span>
+      <span class="label">Publication: </span>
       <xsl:for-each select="marc:datafield[@tag=210]">
         <span>
           <xsl:call-template name="addClassRtl" />
@@ -85,7 +85,7 @@
 	<xsl:template name="tag_4xx">
     <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
     	  <span class="results_summary">
-        <span class="label">Extrait de: </span>
+        <span class="label">Linked with: </span>
         <span>
           <xsl:call-template name="addClassRtl" />
           <xsl:if test="marc:subfield[@code='t']">
-- 
1.7.0


From gmcharlt at gmail.com  Mon Nov 15 17:05:05 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 11:05:05 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug 5204: Unimarc XSLT,
	from French to English.
Message-ID: <1289837105-27493-1-git-send-email-gmcharlt@gmail.com>

From: Zeno0 Tajoli <tajoli at cilea.it>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/xslt/UNIMARCslim2OAIDC.xsl             |   59 ++++++++---------
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |   70 ++++++++++----------
 .../prog/en/xslt/UNIMARCslimUtils.xsl              |    4 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |   68 ++++++++++----------
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl       |    6 +-
 .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl    |    4 +-
 6 files changed, 104 insertions(+), 107 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
index 27c78ed..0e5a80d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
@@ -49,37 +49,34 @@
     		   <xsl:value-of select="marc:subfield[@code='b']"/>
     		</xsl:if>
 			<xsl:choose>
-    		  <xsl:when test="marc:subfield[@code='4']='010'">, adaptateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='020'">, annotatateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='075'">, postfacier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='080'">, pr??facier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='100'">, auteur ??uvre adapt??</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='205'">, collaborateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='212'">, commentaire</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='220'">, compilateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='230'">, compositeur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='245'">, concepteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='295'">, donneur de grades</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='340'">, ??diteur scientifique</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='370'">, r??alisateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='395'">, fondateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='440'">, illustrateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='520'">, parolier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='557'">, organisateur congr??s</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='570'">, autre</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='573'">, diffuseur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='574'">, pr??sentateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='575'">, responsable</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='600'">, photographe</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='605'">, pr??sentateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='650'">, ??diteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='651'">, directeur de la publication</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='673'">, directeur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='675'">, critique</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='710'">, r??dacteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='723'">, commenditaire</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='727'">, directeur de th??se</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='730'">, traducteur</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='010'">, adapter</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='020'">, annotator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='075'">, author of afterword</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='080'">, prefacer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='100'">, bibliographic antecedent</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='205'">, collaborator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='212'">, commentator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='220'">, compiler</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='230'">, composer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='245'">, conceptor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='295'">, degree-grantor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='340'">, editor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='370'">, film editor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='395'">, founder</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='440'">, illustrator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='520'">, lyricist</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='557'">, organiser of meeting</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='570'">, other</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='600'">, photographer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='605'">, presenter</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='650'">, publisher</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='651'">, publishing director</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='673'">, research team head</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='675'">, reviewer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='710'">, redactor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='723'">, sponsor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='727'">, thesis advisor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='730'">, translator</xsl:when>
     		</xsl:choose>
 		  </dc:creator>
 		</xsl:for-each>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
index 38c6124..130e1c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -55,49 +55,49 @@
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">700</xsl:with-param>
-    <xsl:with-param name="label">Auteur principal</xsl:with-param>
+    <xsl:with-param name="label">Main Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">710</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? principale</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Main)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">701</xsl:with-param>
-    <xsl:with-param name="label">Co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Coauthor</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">702</xsl:with-param>
-    <xsl:with-param name="label">Auteur</xsl:with-param>
+    <xsl:with-param name="label">Secondary Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">711</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Coauthor)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">712</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? secondaire</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Secondary)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=101]">
     <li>
-      <strong>Langue: </strong>
+      <strong>Language: </strong>
       <xsl:for-each select="marc:datafield[@tag=101]">
         <xsl:for-each select="marc:subfield">
           <xsl:choose>
-            <xsl:when test="@code='b'">de la trad. interm??diaire, </xsl:when>
-            <xsl:when test="@code='c'">de l'??uvre originale, </xsl:when>
-            <xsl:when test="@code='d'">du r??sum??, </xsl:when>
-            <xsl:when test="@code='e'">de la table des mati??res, </xsl:when>
-            <xsl:when test="@code='f'">de la page de titre, </xsl:when>
-            <xsl:when test="@code='g'">du titre propre, </xsl:when>
-            <xsl:when test="@code='h'">d'un livret, </xsl:when>
-            <xsl:when test="@code='i'">des textes d'accompagnement, </xsl:when>
-            <xsl:when test="@code='j'">des sous-titres, </xsl:when>
+            <xsl:when test="@code='b'">of intermediate text, </xsl:when>
+            <xsl:when test="@code='c'">of original work, </xsl:when>
+            <xsl:when test="@code='d'">of summary, </xsl:when>
+            <xsl:when test="@code='e'">of contents page, </xsl:when>
+            <xsl:when test="@code='f'">of title page, </xsl:when>
+            <xsl:when test="@code='g'">of title proper, </xsl:when>
+            <xsl:when test="@code='h'">of libretto, </xsl:when>
+            <xsl:when test="@code='i'">of accompanying material, </xsl:when>
+            <xsl:when test="@code='j'">of subtitles, </xsl:when>n>
           </xsl:choose>
           <xsl:value-of select="text()"/>
           <xsl:choose>
@@ -115,7 +115,7 @@
 
   <xsl:if test="marc:datafield[@tag=102]">
     <li>
-      <strong>Pays: </strong>
+      <strong>Country: </strong>
       <xsl:for-each select="marc:datafield[@tag=102]">
         <xsl:for-each select="marc:subfield">
           <xsl:value-of select="text()"/>
@@ -136,7 +136,7 @@
   <xsl:call-template name="tag_215" />
 
 <xsl:if test="marc:controlfield[@tag=009]">
-    <li><strong>PPN: </strong>
+    <li><strong>Tag 009: </strong>
       <xsl:value-of select="marc:controlfield[@tag=009]"/>
     </li>
   </xsl:if>
@@ -177,7 +177,7 @@
 
   <xsl:call-template name="tag_title">
     <xsl:with-param name="tag">225</xsl:with-param>
-    <xsl:with-param name="label">Collection</xsl:with-param>
+    <xsl:with-param name="label">Series</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=676]">
@@ -220,7 +220,7 @@
 
   <xsl:if test="marc:datafield[@tag=327]">
     <li>
-      <strong>Note de contenu: </strong>
+      <strong>Contents note: </strong>
       <xsl:for-each select="marc:datafield[@tag=327]">
         <xsl:call-template name="chopPunctuation">
           <xsl:with-param name="chopString">
@@ -237,7 +237,7 @@
 
   <xsl:if test="marc:datafield[@tag=330]">
     <li>
-      <strong>R??sum??: </strong>
+      <strong>Abstract: </strong>
       <xsl:for-each select="marc:datafield[@tag=330]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose>
@@ -254,7 +254,7 @@
 
   <xsl:if test="marc:datafield[@tag=317]">
     <li>
-      <strong>Note sur la provenance: </strong>
+      <strong>Provenance note: </strong>
       <xsl:for-each select="marc:datafield[@tag=317]">
           <xsl:value-of select="marc:subfield[@code='a']"/>
       </xsl:for-each>
@@ -263,7 +263,7 @@
 
   <xsl:if test="marc:datafield[@tag=320]">
     <li>
-      <strong>Bibliographie: </strong>
+      <strong>Bibliography: </strong>
       <xsl:for-each select="marc:datafield[@tag=320]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -273,7 +273,7 @@
 
   <xsl:if test="marc:datafield[@tag=328]">
     <li>
-      <strong>Th??se: </strong>
+      <strong>Thesis: </strong>
       <xsl:for-each select="marc:datafield[@tag=328]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -283,7 +283,7 @@
 
   <xsl:if test="marc:datafield[@tag=333]">
     <li>
-      <strong>Public: </strong>
+      <strong>Audience: </strong>
       <xsl:for-each select="marc:datafield[@tag=333]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -315,52 +315,52 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom de personne</xsl:with-param>
+    <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">601</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Collectivit??</xsl:with-param>
+    <xsl:with-param name="label">Subject - Corporate Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">602</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Famille</xsl:with-param>
+    <xsl:with-param name="label">Subject - Family</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">604</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Auteur/titre</xsl:with-param>
+    <xsl:with-param name="label">Subject - Author/Title</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom commun</xsl:with-param>
+    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">607</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom g??ographique</xsl:with-param>
+    <xsl:with-param name="label">Subject - Geographical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">608</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Forme</xsl:with-param>
+    <xsl:with-param name="label">Subject - Form</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">610</xsl:with-param>
-    <xsl:with-param name="label">Sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">615</xsl:with-param>
-    <xsl:with-param name="label">Cat??gorie sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject Category</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">616</xsl:with-param>
-    <xsl:with-param name="label">Marque d??pos??e</xsl:with-param>
+    <xsl:with-param name="label">Trademark</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=856]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index 85d1faf..c04a8e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -25,7 +25,7 @@
 
   <xsl:template name="tag_210">
     <li>
-      <strong>??dition: </strong>
+      <strong>Publication: </strong>
       <xsl:for-each select="marc:datafield[@tag=210]">
         <span>
           <xsl:call-template name="addClassRtl" />
@@ -85,7 +85,7 @@
 	<xsl:template name="tag_4xx">
     <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
         <li>
-        <strong>Extrait de: </strong>
+        <strong>Linked with: </strong>
         <span>
           <xsl:call-template name="addClassRtl" />
           <xsl:if test="marc:subfield[@code='t']">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 2ef828f..887bab6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -71,49 +71,49 @@
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">700</xsl:with-param>
-    <xsl:with-param name="label">Auteur principal</xsl:with-param>
+    <xsl:with-param name="label">Main Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">710</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? principale</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Main)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">701</xsl:with-param>
-    <xsl:with-param name="label">Co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Coauthor</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">702</xsl:with-param>
-    <xsl:with-param name="label">Auteur</xsl:with-param>
+    <xsl:with-param name="label">Secondary Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">711</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Coauthor)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">712</xsl:with-param>
-    <xsl:with-param name="label">Collectivit?? secondaire</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Secondary)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=101]">
 	  <span class="results_summary">
-      <span class="label">Langue: </span>
+      <span class="label">Language: </span>
       <xsl:for-each select="marc:datafield[@tag=101]">
         <xsl:for-each select="marc:subfield">
           <xsl:choose>
-            <xsl:when test="@code='b'">de la trad. interm??diaire, </xsl:when>
-            <xsl:when test="@code='c'">de l'??uvre originale, </xsl:when>
-            <xsl:when test="@code='d'">du r??sum??, </xsl:when>
-            <xsl:when test="@code='e'">de la table des mati??res, </xsl:when>
-            <xsl:when test="@code='f'">de la page de titre, </xsl:when>
-            <xsl:when test="@code='g'">du titre propre, </xsl:when>
-            <xsl:when test="@code='h'">d'un livret, </xsl:when>
-            <xsl:when test="@code='i'">des textes d'accompagnement, </xsl:when>
-            <xsl:when test="@code='j'">des sous-titres, </xsl:when>
+            <xsl:when test="@code='b'">of intermediate text, </xsl:when>
+            <xsl:when test="@code='c'">of original work, </xsl:when>
+            <xsl:when test="@code='d'">of summary, </xsl:when>
+            <xsl:when test="@code='e'">of contents page, </xsl:when>
+            <xsl:when test="@code='f'">of title page, </xsl:when>
+            <xsl:when test="@code='g'">of title proper, </xsl:when>
+            <xsl:when test="@code='h'">of libretto, </xsl:when>
+            <xsl:when test="@code='i'">of accompanying material, </xsl:when>
+            <xsl:when test="@code='j'">of subtitles, </xsl:when>
           </xsl:choose>
           <xsl:value-of select="text()"/>
           <xsl:choose>
@@ -131,7 +131,7 @@
 
   <xsl:if test="marc:datafield[@tag=102]">
 	  <span class="results_summary">
-      <span class="label">Pays: </span>
+      <span class="label">Country: </span>
       <xsl:for-each select="marc:datafield[@tag=102]">
         <xsl:for-each select="marc:subfield">
           <xsl:value-of select="text()"/>
@@ -187,7 +187,7 @@
 
   <xsl:call-template name="tag_title">
     <xsl:with-param name="tag">225</xsl:with-param>
-    <xsl:with-param name="label">Collection</xsl:with-param>
+    <xsl:with-param name="label">Series</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=676]">
@@ -230,7 +230,7 @@
 
   <xsl:if test="marc:datafield[@tag=327]">
     <span class="results_summary">
-      <span class="label">Note de contenu: </span>
+      <span class="label">Contents note: </span>
       <xsl:for-each select="marc:datafield[@tag=327]">
         <xsl:call-template name="chopPunctuation">
           <xsl:with-param name="chopString">
@@ -247,7 +247,7 @@
 
   <xsl:if test="marc:datafield[@tag=330]">
     <span class="results_summary">
-      <span class="label">R??sum??: </span>
+      <span class="label">Abstract: </span>
       <xsl:for-each select="marc:datafield[@tag=330]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose>
@@ -264,7 +264,7 @@
 
   <xsl:if test="marc:datafield[@tag=317]">
     <span class="results_summary">
-      <span class="label">Note sur la provenance: </span>
+      <span class="label">Provenance note: </span>
       <xsl:for-each select="marc:datafield[@tag=317]">
           <xsl:value-of select="marc:subfield[@code='a']"/>
       </xsl:for-each>
@@ -273,7 +273,7 @@
 
   <xsl:if test="marc:datafield[@tag=320]">
     <span class="results_summary">
-      <span class="label">Bibliographie: </span>
+      <span class="label">Bibliography: </span>
       <xsl:for-each select="marc:datafield[@tag=320]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -283,7 +283,7 @@
 
   <xsl:if test="marc:datafield[@tag=328]">
     <span class="results_summary">
-      <span class="label">Th??se: </span>
+      <span class="label">Thesis: </span>
       <xsl:for-each select="marc:datafield[@tag=328]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -293,7 +293,7 @@
 
   <xsl:if test="marc:datafield[@tag=333]">
     <span class="results_summary">
-      <span class="label">Public: </span>
+      <span class="label">Audience: </span>
       <xsl:for-each select="marc:datafield[@tag=333]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -325,52 +325,52 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom de personne</xsl:with-param>
+    <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">601</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Collectivit??</xsl:with-param>
+    <xsl:with-param name="label">Subject - Corporate Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">602</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Famille</xsl:with-param>
+    <xsl:with-param name="label">Subject - Family</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">604</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Auteur/titre</xsl:with-param>
+    <xsl:with-param name="label">Subject - Author/Title</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom commun</xsl:with-param>
+    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">607</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom g??ographique</xsl:with-param>
+    <xsl:with-param name="label">Subject - Geographical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">608</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Forme</xsl:with-param>
+    <xsl:with-param name="label">Subject - Form</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">610</xsl:with-param>
-    <xsl:with-param name="label">Sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">615</xsl:with-param>
-    <xsl:with-param name="label">Cat??gorie sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject Category</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">616</xsl:with-param>
-    <xsl:with-param name="label">Marque d??pos??e</xsl:with-param>
+    <xsl:with-param name="label">Trademark</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=856]">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
index 66c41c0..19b6745 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -70,7 +70,7 @@
   <xsl:call-template name="tag_215" />
 
   <span class="results_summary">
-    <span class="label">Disponibilit??: </span>
+    <span class="label">Availability: </span>
     <xsl:choose>
       <xsl:when test="marc:datafield[@tag=856]">
         <xsl:for-each select="marc:datafield[@tag=856]">
@@ -100,11 +100,11 @@
         </xsl:for-each>
       </xsl:when>
       <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
-        Pas de copie disponible
+        No copies available
       </xsl:when>
       <xsl:when test="count(key('item-by-status', 'available'))>0">
         <span class="available">
-          <b><xsl:text>pour le pr??t: </xsl:text></b>
+          <b><xsl:text>Copies available for loan: </xsl:text></b>
           <xsl:variable name="available_items" select="key('item-by-status', 'available')"/>
           <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
             <xsl:value-of select="items:homebranch"/>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index f5cf99f..8eec0fd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -25,7 +25,7 @@
 
   <xsl:template name="tag_210">
     <span class="results_summary">
-      <span class="label">??dition: </span>
+      <span class="label">Publication: </span>
       <xsl:for-each select="marc:datafield[@tag=210]">
         <span>
           <xsl:call-template name="addClassRtl" />
@@ -85,7 +85,7 @@
 	<xsl:template name="tag_4xx">
     <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
     	  <span class="results_summary">
-        <span class="label">Extrait de: </span>
+        <span class="label">Linked with: </span>
         <span>
           <xsl:call-template name="addClassRtl" />
           <xsl:if test="marc:subfield[@code='t']">
-- 
1.7.0


From gmcharlt at gmail.com  Mon Nov 15 17:10:38 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 11:10:38 -0500
Subject: [Koha-patches] [bug 5204] Unimarc XSLT,
 from French to English. 2nd version. This is the second version of
 the patch. Discard the first. This patch will be signed-off by Frederic
 DEMIANS.
In-Reply-To: <20101115151120.1803A46EAD@eliot.biblibre.com>
References: <20101115151120.1803A46EAD@eliot.biblibre.com>
Message-ID: <AANLkTi=SyNORvMM1mOD60geYayPqZ5Y7pWx2ihtAq7id@mail.gmail.com>

Hi,

On Mon, Nov 15, 2010 at 10:13 AM,  <tajoli at cilea.it> wrote:
[a patch]

I've signed off on the patch -- it addresses the XML parsing problem I
was concerned about with the previous version and seems to do what it
claims.  However, for a substantive sign-off, I suggest that the RM
indeed wait for Fr?d?ric or another UNIMARC user to test first as
suggested by Zeno.

Please note that I've tweaked the wording of the commit message:

* The bug number will no longer be stripped by git-am.  git-am strips
off all leading text in the subject line that is surrounded by square
brackets, so when you are commiting, you should not cite the bug
number like this:

[Bug 1234] Fix the foo module

Instead, do something like this:

Bug 1234: Fix the foo module

or

bug 1234 fix the foo module

or so on.

* I've removed the bit about this being the second revision of the
patch -- that isn't going to be relevant once this is pushed to
master.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From cfouts at liblime.com  Mon Nov 15 17:45:08 2010
From: cfouts at liblime.com (Clay Fouts)
Date: Mon, 15 Nov 2010 08:45:08 -0800
Subject: [Koha-patches] [PATCH] Bug 5408 - Refactor GetIssuingRule and
	GetLoanLength
In-Reply-To: <20101115092355.GV4325@rorohiko>
References: <1289809040-1427-1-git-send-email-cfouts@liblime.com>
	<20101115092355.GV4325@rorohiko>
Message-ID: <AANLkTinjs185VPgsiSQ0JU+OYp9P1YusHRKZc-fUicEv@mail.gmail.com>

Well, that's a much larger project since AFAICT all the issuingrules table
mutations come from directly within smart-rules.pl. So all that code needs
to me moved into C4::Circ.

As is, there's no actual freshness issue since the cache-enabled functions
are not used from within any script that also mutates the data. That
cache-reset function is there as a reminder to use it when there's further
normalization to the data layer.

Clay


On Mon, Nov 15, 2010 at 1:23 AM, Chris Cormack <chrisc at catalyst.net.nz>wrote:

> * Clay Fouts (cfouts at liblime.com) wrote:
> > This collapses the series of queries within GetIssuingRule into a single
> query,
> > the result of which is cached for future uses. Also refactors
> GetLoanLength to
> > call GetIssuingRule instead of submitting its own queries. The purpose of
> this
> > is to simplify and optimize the code. The API and behavior remain
> unchanged.
> Hi Clay
>
> I like the idea, is the plan to send a follow up patch so that when an
> issuing rule is changed, we clear the cached data?
>
>
> Chris
>
> --
> Chris Cormack
> Catalyst IT Ltd.
> +64 4 803 2238
> PO Box 11-053, Manners St, Wellington 6142, New Zealand
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
>
> iEYEARECAAYFAkzg/CsACgkQZgbcHEvgMLNJfwCgngNUhONZdWqksqDGmTPZWwXx
> SCsAmwWEsfutnmbQoRTP6E5+UeTFpygm
> =UmAX
> -----END PGP SIGNATURE-----
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101115/2711f95d/attachment.htm>

From paul.poulain at biblibre.com  Mon Nov 15 17:51:39 2010
From: paul.poulain at biblibre.com (Paul Poulain)
Date: Mon, 15 Nov 2010 17:51:39 +0100
Subject: [Koha-patches] [PATCH] Bug 5408 - Refactor GetIssuingRule and
 GetLoanLength
In-Reply-To: <1289809040-1427-1-git-send-email-cfouts@liblime.com>
References: <1289809040-1427-1-git-send-email-cfouts@liblime.com>
Message-ID: <4CE1651B.2050601@biblibre.com>

Le 15/11/2010 09:17, Clay Fouts a ?crit :
> This collapses the series of queries within GetIssuingRule into a single query,
> the result of which is cached for future uses. Also refactors GetLoanLength to
> call GetIssuingRule instead of submitting its own queries. The purpose of this
> is to simplify and optimize the code. The API and behavior remain unchanged.
>   
Note: If I read this patch correctly, it is also addressed by some
changes in our branch where we have new circulation matrix (where holds
are at branch/itype/category level)

-- 
Paul POULAIN
http://www.biblibre.com
Expert en Logiciels Libres pour l'info-doc
Tel : (33) 4 91 81 35 08


From oleonard at myacpl.org  Mon Nov 15 17:58:12 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 15 Nov 2010 11:58:12 -0500
Subject: [Koha-patches] Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
References: <AANLkTik3Um7QT9rE85Sj_s7q23=bk5WrMts2jNkmOn5F@mail.gmail.com>
	<AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
Message-ID: <AANLkTikFNV1Ns3vVJjKUotruWrTB=S6-WHSFr=4eGc6Q@mail.gmail.com>

> elRTE
> --------------
> - built on and uses jQuery and jQuery/UI; since we're considering
> jQuery/UI to replace YUI, there's some possible synchronicity here

I think this is a plus.

> - not yet packaged for Debian

How much of a minus is this?

> - fairly young project

I think this is definitely a concern.

Koustubha Kale <kmkale at anantcorp.com> wrote:

> Also I dont like the fact that the imagemanager etc of TinyMCE are
> only for paid customers.

I agree. That's a big minus for TinyMCE as far as I'm concerned.

My quick first impression of elRTE is that it seems really nice. I'm
definitely going to do some testing.

  -- Owen

-- 
Web Developer
Athens County Public Libraries
http://www.myacpl.org

From f.demians at tamil.fr  Mon Nov 15 18:47:27 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Mon, 15 Nov 2010 18:47:27 +0100
Subject: [Koha-patches] [PATCH 1/2] [SIGNED-OFF] bug 5204: Unimarc XSLT,
	from French to English.
Message-ID: <1289843248-30303-1-git-send-email-f.demians@tamil.fr>

From: Zeno0 Tajoli <tajoli at cilea.it>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 .../prog/en/xslt/UNIMARCslim2OAIDC.xsl             |   59 ++++++++---------
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |   70 ++++++++++----------
 .../prog/en/xslt/UNIMARCslimUtils.xsl              |    4 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |   68 ++++++++++----------
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl       |    6 +-
 .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl    |    4 +-
 6 files changed, 104 insertions(+), 107 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
index 27c78ed..0e5a80d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
@@ -49,37 +49,34 @@
     		   <xsl:value-of select="marc:subfield[@code='b']"/>
     		</xsl:if>
 			<xsl:choose>
-    		  <xsl:when test="marc:subfield[@code='4']='010'">, adaptateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='020'">, annotatateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='075'">, postfacier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='080'">, pr?facier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='100'">, auteur ?uvre adapt?</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='205'">, collaborateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='212'">, commentaire</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='220'">, compilateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='230'">, compositeur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='245'">, concepteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='295'">, donneur de grades</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='340'">, ?diteur scientifique</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='370'">, r?alisateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='395'">, fondateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='440'">, illustrateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='520'">, parolier</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='557'">, organisateur congr?s</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='570'">, autre</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='573'">, diffuseur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='574'">, pr?sentateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='575'">, responsable</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='600'">, photographe</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='605'">, pr?sentateur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='650'">, ?diteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='651'">, directeur de la publication</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='673'">, directeur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='675'">, critique</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='710'">, r?dacteur</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='723'">, commenditaire</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='727'">, directeur de th?se</xsl:when>
-    		  <xsl:when test="marc:subfield[@code='4']='730'">, traducteur</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='010'">, adapter</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='020'">, annotator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='075'">, author of afterword</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='080'">, prefacer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='100'">, bibliographic antecedent</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='205'">, collaborator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='212'">, commentator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='220'">, compiler</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='230'">, composer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='245'">, conceptor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='295'">, degree-grantor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='340'">, editor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='370'">, film editor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='395'">, founder</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='440'">, illustrator</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='520'">, lyricist</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='557'">, organiser of meeting</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='570'">, other</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='600'">, photographer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='605'">, presenter</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='650'">, publisher</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='651'">, publishing director</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='673'">, research team head</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='675'">, reviewer</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='710'">, redactor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='723'">, sponsor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='727'">, thesis advisor</xsl:when>
+    		  <xsl:when test="marc:subfield[@code='4']='730'">, translator</xsl:when>
     		</xsl:choose>
 		  </dc:creator>
 		</xsl:for-each>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
index 38c6124..130e1c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -55,49 +55,49 @@
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">700</xsl:with-param>
-    <xsl:with-param name="label">Auteur principal</xsl:with-param>
+    <xsl:with-param name="label">Main Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">710</xsl:with-param>
-    <xsl:with-param name="label">Collectivit? principale</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Main)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">701</xsl:with-param>
-    <xsl:with-param name="label">Co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Coauthor</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">702</xsl:with-param>
-    <xsl:with-param name="label">Auteur</xsl:with-param>
+    <xsl:with-param name="label">Secondary Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">711</xsl:with-param>
-    <xsl:with-param name="label">Collectivit? co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Coauthor)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">712</xsl:with-param>
-    <xsl:with-param name="label">Collectivit? secondaire</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Secondary)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=101]">
     <li>
-      <strong>Langue: </strong>
+      <strong>Language: </strong>
       <xsl:for-each select="marc:datafield[@tag=101]">
         <xsl:for-each select="marc:subfield">
           <xsl:choose>
-            <xsl:when test="@code='b'">de la trad. interm?diaire, </xsl:when>
-            <xsl:when test="@code='c'">de l'?uvre originale, </xsl:when>
-            <xsl:when test="@code='d'">du r?sum?, </xsl:when>
-            <xsl:when test="@code='e'">de la table des mati?res, </xsl:when>
-            <xsl:when test="@code='f'">de la page de titre, </xsl:when>
-            <xsl:when test="@code='g'">du titre propre, </xsl:when>
-            <xsl:when test="@code='h'">d'un livret, </xsl:when>
-            <xsl:when test="@code='i'">des textes d'accompagnement, </xsl:when>
-            <xsl:when test="@code='j'">des sous-titres, </xsl:when>
+            <xsl:when test="@code='b'">of intermediate text, </xsl:when>
+            <xsl:when test="@code='c'">of original work, </xsl:when>
+            <xsl:when test="@code='d'">of summary, </xsl:when>
+            <xsl:when test="@code='e'">of contents page, </xsl:when>
+            <xsl:when test="@code='f'">of title page, </xsl:when>
+            <xsl:when test="@code='g'">of title proper, </xsl:when>
+            <xsl:when test="@code='h'">of libretto, </xsl:when>
+            <xsl:when test="@code='i'">of accompanying material, </xsl:when>
+            <xsl:when test="@code='j'">of subtitles, </xsl:when>n>
           </xsl:choose>
           <xsl:value-of select="text()"/>
           <xsl:choose>
@@ -115,7 +115,7 @@
 
   <xsl:if test="marc:datafield[@tag=102]">
     <li>
-      <strong>Pays: </strong>
+      <strong>Country: </strong>
       <xsl:for-each select="marc:datafield[@tag=102]">
         <xsl:for-each select="marc:subfield">
           <xsl:value-of select="text()"/>
@@ -136,7 +136,7 @@
   <xsl:call-template name="tag_215" />
 
 <xsl:if test="marc:controlfield[@tag=009]">
-    <li><strong>PPN: </strong>
+    <li><strong>Tag 009: </strong>
       <xsl:value-of select="marc:controlfield[@tag=009]"/>
     </li>
   </xsl:if>
@@ -177,7 +177,7 @@
 
   <xsl:call-template name="tag_title">
     <xsl:with-param name="tag">225</xsl:with-param>
-    <xsl:with-param name="label">Collection</xsl:with-param>
+    <xsl:with-param name="label">Series</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=676]">
@@ -220,7 +220,7 @@
 
   <xsl:if test="marc:datafield[@tag=327]">
     <li>
-      <strong>Note de contenu: </strong>
+      <strong>Contents note: </strong>
       <xsl:for-each select="marc:datafield[@tag=327]">
         <xsl:call-template name="chopPunctuation">
           <xsl:with-param name="chopString">
@@ -237,7 +237,7 @@
 
   <xsl:if test="marc:datafield[@tag=330]">
     <li>
-      <strong>R?sum?: </strong>
+      <strong>Abstract: </strong>
       <xsl:for-each select="marc:datafield[@tag=330]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose>
@@ -254,7 +254,7 @@
 
   <xsl:if test="marc:datafield[@tag=317]">
     <li>
-      <strong>Note sur la provenance: </strong>
+      <strong>Provenance note: </strong>
       <xsl:for-each select="marc:datafield[@tag=317]">
           <xsl:value-of select="marc:subfield[@code='a']"/>
       </xsl:for-each>
@@ -263,7 +263,7 @@
 
   <xsl:if test="marc:datafield[@tag=320]">
     <li>
-      <strong>Bibliographie: </strong>
+      <strong>Bibliography: </strong>
       <xsl:for-each select="marc:datafield[@tag=320]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -273,7 +273,7 @@
 
   <xsl:if test="marc:datafield[@tag=328]">
     <li>
-      <strong>Th?se: </strong>
+      <strong>Thesis: </strong>
       <xsl:for-each select="marc:datafield[@tag=328]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -283,7 +283,7 @@
 
   <xsl:if test="marc:datafield[@tag=333]">
     <li>
-      <strong>Public: </strong>
+      <strong>Audience: </strong>
       <xsl:for-each select="marc:datafield[@tag=333]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -315,52 +315,52 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom de personne</xsl:with-param>
+    <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">601</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Collectivit?</xsl:with-param>
+    <xsl:with-param name="label">Subject - Corporate Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">602</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Famille</xsl:with-param>
+    <xsl:with-param name="label">Subject - Family</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">604</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Auteur/titre</xsl:with-param>
+    <xsl:with-param name="label">Subject - Author/Title</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom commun</xsl:with-param>
+    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">607</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom g?ographique</xsl:with-param>
+    <xsl:with-param name="label">Subject - Geographical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">608</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Forme</xsl:with-param>
+    <xsl:with-param name="label">Subject - Form</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">610</xsl:with-param>
-    <xsl:with-param name="label">Sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">615</xsl:with-param>
-    <xsl:with-param name="label">Cat?gorie sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject Category</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">616</xsl:with-param>
-    <xsl:with-param name="label">Marque d?pos?e</xsl:with-param>
+    <xsl:with-param name="label">Trademark</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=856]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index 85d1faf..c04a8e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -25,7 +25,7 @@
 
   <xsl:template name="tag_210">
     <li>
-      <strong>?dition: </strong>
+      <strong>Publication: </strong>
       <xsl:for-each select="marc:datafield[@tag=210]">
         <span>
           <xsl:call-template name="addClassRtl" />
@@ -85,7 +85,7 @@
 	<xsl:template name="tag_4xx">
     <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
         <li>
-        <strong>Extrait de: </strong>
+        <strong>Linked with: </strong>
         <span>
           <xsl:call-template name="addClassRtl" />
           <xsl:if test="marc:subfield[@code='t']">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 2ef828f..887bab6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -71,49 +71,49 @@
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">700</xsl:with-param>
-    <xsl:with-param name="label">Auteur principal</xsl:with-param>
+    <xsl:with-param name="label">Main Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">710</xsl:with-param>
-    <xsl:with-param name="label">Collectivit? principale</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Main)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">701</xsl:with-param>
-    <xsl:with-param name="label">Co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Coauthor</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">702</xsl:with-param>
-    <xsl:with-param name="label">Auteur</xsl:with-param>
+    <xsl:with-param name="label">Secondary Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">711</xsl:with-param>
-    <xsl:with-param name="label">Collectivit? co-auteur</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Coauthor)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_7xx">
     <xsl:with-param name="tag">712</xsl:with-param>
-    <xsl:with-param name="label">Collectivit? secondaire</xsl:with-param>
+    <xsl:with-param name="label">Corporate Author (Secondary)</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=101]">
 	  <span class="results_summary">
-      <span class="label">Langue: </span>
+      <span class="label">Language: </span>
       <xsl:for-each select="marc:datafield[@tag=101]">
         <xsl:for-each select="marc:subfield">
           <xsl:choose>
-            <xsl:when test="@code='b'">de la trad. interm?diaire, </xsl:when>
-            <xsl:when test="@code='c'">de l'?uvre originale, </xsl:when>
-            <xsl:when test="@code='d'">du r?sum?, </xsl:when>
-            <xsl:when test="@code='e'">de la table des mati?res, </xsl:when>
-            <xsl:when test="@code='f'">de la page de titre, </xsl:when>
-            <xsl:when test="@code='g'">du titre propre, </xsl:when>
-            <xsl:when test="@code='h'">d'un livret, </xsl:when>
-            <xsl:when test="@code='i'">des textes d'accompagnement, </xsl:when>
-            <xsl:when test="@code='j'">des sous-titres, </xsl:when>
+            <xsl:when test="@code='b'">of intermediate text, </xsl:when>
+            <xsl:when test="@code='c'">of original work, </xsl:when>
+            <xsl:when test="@code='d'">of summary, </xsl:when>
+            <xsl:when test="@code='e'">of contents page, </xsl:when>
+            <xsl:when test="@code='f'">of title page, </xsl:when>
+            <xsl:when test="@code='g'">of title proper, </xsl:when>
+            <xsl:when test="@code='h'">of libretto, </xsl:when>
+            <xsl:when test="@code='i'">of accompanying material, </xsl:when>
+            <xsl:when test="@code='j'">of subtitles, </xsl:when>
           </xsl:choose>
           <xsl:value-of select="text()"/>
           <xsl:choose>
@@ -131,7 +131,7 @@
 
   <xsl:if test="marc:datafield[@tag=102]">
 	  <span class="results_summary">
-      <span class="label">Pays: </span>
+      <span class="label">Country: </span>
       <xsl:for-each select="marc:datafield[@tag=102]">
         <xsl:for-each select="marc:subfield">
           <xsl:value-of select="text()"/>
@@ -187,7 +187,7 @@
 
   <xsl:call-template name="tag_title">
     <xsl:with-param name="tag">225</xsl:with-param>
-    <xsl:with-param name="label">Collection</xsl:with-param>
+    <xsl:with-param name="label">Series</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=676]">
@@ -230,7 +230,7 @@
 
   <xsl:if test="marc:datafield[@tag=327]">
     <span class="results_summary">
-      <span class="label">Note de contenu: </span>
+      <span class="label">Contents note: </span>
       <xsl:for-each select="marc:datafield[@tag=327]">
         <xsl:call-template name="chopPunctuation">
           <xsl:with-param name="chopString">
@@ -247,7 +247,7 @@
 
   <xsl:if test="marc:datafield[@tag=330]">
     <span class="results_summary">
-      <span class="label">R?sum?: </span>
+      <span class="label">Abstract: </span>
       <xsl:for-each select="marc:datafield[@tag=330]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose>
@@ -264,7 +264,7 @@
 
   <xsl:if test="marc:datafield[@tag=317]">
     <span class="results_summary">
-      <span class="label">Note sur la provenance: </span>
+      <span class="label">Provenance note: </span>
       <xsl:for-each select="marc:datafield[@tag=317]">
           <xsl:value-of select="marc:subfield[@code='a']"/>
       </xsl:for-each>
@@ -273,7 +273,7 @@
 
   <xsl:if test="marc:datafield[@tag=320]">
     <span class="results_summary">
-      <span class="label">Bibliographie: </span>
+      <span class="label">Bibliography: </span>
       <xsl:for-each select="marc:datafield[@tag=320]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -283,7 +283,7 @@
 
   <xsl:if test="marc:datafield[@tag=328]">
     <span class="results_summary">
-      <span class="label">Th?se: </span>
+      <span class="label">Thesis: </span>
       <xsl:for-each select="marc:datafield[@tag=328]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -293,7 +293,7 @@
 
   <xsl:if test="marc:datafield[@tag=333]">
     <span class="results_summary">
-      <span class="label">Public: </span>
+      <span class="label">Audience: </span>
       <xsl:for-each select="marc:datafield[@tag=333]">
         <xsl:value-of select="marc:subfield[@code='a']"/>
         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
@@ -325,52 +325,52 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom de personne</xsl:with-param>
+    <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">601</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Collectivit?</xsl:with-param>
+    <xsl:with-param name="label">Subject - Corporate Author</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">602</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Famille</xsl:with-param>
+    <xsl:with-param name="label">Subject - Family</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">604</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Auteur/titre</xsl:with-param>
+    <xsl:with-param name="label">Subject - Author/Title</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom commun</xsl:with-param>
+    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">607</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Nom g?ographique</xsl:with-param>
+    <xsl:with-param name="label">Subject - Geographical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">608</xsl:with-param>
-    <xsl:with-param name="label">Sujet - Forme</xsl:with-param>
+    <xsl:with-param name="label">Subject - Form</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">610</xsl:with-param>
-    <xsl:with-param name="label">Sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">615</xsl:with-param>
-    <xsl:with-param name="label">Cat?gorie sujet</xsl:with-param>
+    <xsl:with-param name="label">Subject Category</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">616</xsl:with-param>
-    <xsl:with-param name="label">Marque d?pos?e</xsl:with-param>
+    <xsl:with-param name="label">Trademark</xsl:with-param>
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=856]">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
index 66c41c0..19b6745 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -70,7 +70,7 @@
   <xsl:call-template name="tag_215" />
 
   <span class="results_summary">
-    <span class="label">Disponibilit?: </span>
+    <span class="label">Availability: </span>
     <xsl:choose>
       <xsl:when test="marc:datafield[@tag=856]">
         <xsl:for-each select="marc:datafield[@tag=856]">
@@ -100,11 +100,11 @@
         </xsl:for-each>
       </xsl:when>
       <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
-        Pas de copie disponible
+        No copies available
       </xsl:when>
       <xsl:when test="count(key('item-by-status', 'available'))>0">
         <span class="available">
-          <b><xsl:text>pour le pr?t: </xsl:text></b>
+          <b><xsl:text>Copies available for loan: </xsl:text></b>
           <xsl:variable name="available_items" select="key('item-by-status', 'available')"/>
           <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
             <xsl:value-of select="items:homebranch"/>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index f5cf99f..8eec0fd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -25,7 +25,7 @@
 
   <xsl:template name="tag_210">
     <span class="results_summary">
-      <span class="label">?dition: </span>
+      <span class="label">Publication: </span>
       <xsl:for-each select="marc:datafield[@tag=210]">
         <span>
           <xsl:call-template name="addClassRtl" />
@@ -85,7 +85,7 @@
 	<xsl:template name="tag_4xx">
     <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
     	  <span class="results_summary">
-        <span class="label">Extrait de: </span>
+        <span class="label">Linked with: </span>
         <span>
           <xsl:call-template name="addClassRtl" />
           <xsl:if test="marc:subfield[@code='t']">
-- 
1.7.3.2


From f.demians at tamil.fr  Mon Nov 15 18:47:28 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Mon, 15 Nov 2010 18:47:28 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 5404 Followup
In-Reply-To: <1289843248-30303-1-git-send-email-f.demians@tamil.fr>
References: <1289843248-30303-1-git-send-email-f.demians@tamil.fr>
Message-ID: <1289843248-30303-2-git-send-email-f.demians@tamil.fr>

- Typo
- Duplicate 955 tag

Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |   13 +------------
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |   13 +------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
index 130e1c3..bb542bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -302,17 +302,6 @@
     </li>
   </xsl:if>
 
-  <xsl:if test="marc:datafield[@tag=955]">
-    <li>
-      <strong>SUDOC serial history: </strong>
-      <xsl:for-each select="marc:datafield[@tag=955]">
-        <xsl:value-of select="marc:subfield[@code='9']"/>:
-        <xsl:value-of select="marc:subfield[@code='r']"/>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-      </xsl:for-each>
-    </li>
-  </xsl:if>
-
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
     <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
@@ -335,7 +324,7 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
+    <xsl:with-param name="label">Subject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 887bab6..725c559 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -312,17 +312,6 @@
     </span>
   </xsl:if>
 
-  <xsl:if test="marc:datafield[@tag=955]">
-    <span class="results_summary">
-      <span class="label">SUDOC serial history: </span>
-      <xsl:for-each select="marc:datafield[@tag=955]">
-        <xsl:value-of select="marc:subfield[@code='9']"/>:
-        <xsl:value-of select="marc:subfield[@code='r']"/>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-      </xsl:for-each>
-    </span>
-  </xsl:if>
-
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
     <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
@@ -345,7 +334,7 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
+    <xsl:with-param name="label">Subject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
-- 
1.7.3.2


From henridamien.laurent at biblibre.com  Mon Nov 15 19:16:45 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Mon, 15 Nov 2010 19:16:45 +0100
Subject: [Koha-patches] [PATCH] Bug 5408 - Refactor GetIssuingRule and
 GetLoanLength
In-Reply-To: <AANLkTinjs185VPgsiSQ0JU+OYp9P1YusHRKZc-fUicEv@mail.gmail.com>
References: <1289809040-1427-1-git-send-email-cfouts@liblime.com>	<20101115092355.GV4325@rorohiko>
	<AANLkTinjs185VPgsiSQ0JU+OYp9P1YusHRKZc-fUicEv@mail.gmail.com>
Message-ID: <4CE1790D.2090007@biblibre.com>

Le 15/11/2010 17:45, Clay Fouts a ?crit :
> Well, that's a much larger project since AFAICT all the issuingrules
> table mutations come from directly within smart-rules.pl
> <http://smart-rules.pl>. So all that code needs to me moved into C4::Circ.
> 
> As is, there's no actual freshness issue since the cache-enabled
> functions are not used from within any script that also mutates the
> data. That cache-reset function is there as a reminder to use it when
> there's further normalization to the data layer.
In order to adress that concern, we created a Perl Module
C4::IssuingRules.pm
Due to the time we did it (at least 6 month ago)... It is not using
DBIx::Class but C4::SQLHelper.
But it does what you wanted to do.
And quite help improving the user interface...
See the smart-rules page on BibLibre-memb-circ-update
in wip/koha-biblibre.git in order to see the results of the development.

Feel free to test and comment on that.
If you donot want to create a test we can set one up as we did for other
branches, just ask.

-- 
Henri-Damien LAURENT

From gmcharlt at gmail.com  Mon Nov 15 20:08:07 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 14:08:07 -0500
Subject: [Koha-patches] Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTikFNV1Ns3vVJjKUotruWrTB=S6-WHSFr=4eGc6Q@mail.gmail.com>
References: <AANLkTik3Um7QT9rE85Sj_s7q23=bk5WrMts2jNkmOn5F@mail.gmail.com>
	<AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
	<AANLkTikFNV1Ns3vVJjKUotruWrTB=S6-WHSFr=4eGc6Q@mail.gmail.com>
Message-ID: <AANLkTimhacuLs5NUVcaW1z6MgGedJaVH+3pKvZMZda0N@mail.gmail.com>

Hi,

On Mon, Nov 15, 2010 at 11:58 AM, Owen Leonard <oleonard at myacpl.org> wrote:
>> elRTE
>> --------------
>> - not yet packaged for Debian
>
> How much of a minus is this?

Not a huge deal.  It would be nice in order to avoid sticking it in
the Koha Git tree or adding a manual tarball download step to the
installation instructions, but after all, we've been plugging away
with a copy of TinyMCE in the source tree for years.

> My quick first impression of elRTE is that it seems really nice. I'm
> definitely going to do some testing.

Thanks!

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From gmcharlt at gmail.com  Tue Nov 16 00:11:09 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 18:11:09 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5204 Followup
Message-ID: <1289862669-29306-1-git-send-email-gmcharlt@gmail.com>

From: Fr?d?ric Demians <f.demians at tamil.fr>

- Typo
- Duplicate 955 tag

Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |   13 +------------
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |   13 +------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
index 130e1c3..bb542bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -302,17 +302,6 @@
     </li>
   </xsl:if>
 
-  <xsl:if test="marc:datafield[@tag=955]">
-    <li>
-      <strong>SUDOC serial history: </strong>
-      <xsl:for-each select="marc:datafield[@tag=955]">
-        <xsl:value-of select="marc:subfield[@code='9']"/>:
-        <xsl:value-of select="marc:subfield[@code='r']"/>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-      </xsl:for-each>
-    </li>
-  </xsl:if>
-
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
     <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
@@ -335,7 +324,7 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
+    <xsl:with-param name="label">Subject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 887bab6..725c559 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -312,17 +312,6 @@
     </span>
   </xsl:if>
 
-  <xsl:if test="marc:datafield[@tag=955]">
-    <span class="results_summary">
-      <span class="label">SUDOC serial history: </span>
-      <xsl:for-each select="marc:datafield[@tag=955]">
-        <xsl:value-of select="marc:subfield[@code='9']"/>:
-        <xsl:value-of select="marc:subfield[@code='r']"/>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-      </xsl:for-each>
-    </span>
-  </xsl:if>
-
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">600</xsl:with-param>
     <xsl:with-param name="label">Subject - Personal Name</xsl:with-param>
@@ -345,7 +334,7 @@
 
   <xsl:call-template name="tag_subject">
     <xsl:with-param name="tag">606</xsl:with-param>
-    <xsl:with-param name="label">SSubject - Topical Name</xsl:with-param>
+    <xsl:with-param name="label">Subject - Topical Name</xsl:with-param>
   </xsl:call-template>
 
   <xsl:call-template name="tag_subject">
-- 
1.7.0


From gmcharlt at gmail.com  Tue Nov 16 00:13:32 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 18:13:32 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Another bug 5004 fix,
	this time for road types
Message-ID: <1289862812-29503-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

The road types interface didn't block deletion of road
types in use, but the script included the same queries
that cities.pl did, as if it intended to.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 admin/roadtype.pl |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/admin/roadtype.pl b/admin/roadtype.pl
index 544d488..a756594 100755
--- a/admin/roadtype.pl
+++ b/admin/roadtype.pl
@@ -98,18 +98,10 @@ if ($op eq 'add_form') {
 } elsif ($op eq 'delete_confirm') {
 	$template->param(delete_confirm => 1);
 	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select count(*) as total from borrowers,roadtype where borrowers.streettype=roadtype.road_type and roadtypeid=?");
-	$sth->execute($roadtypeid);
-	my $total = $sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(total => $total->{'total'});	
 	my $sth2=$dbh->prepare("select roadtypeid,road_type from roadtype where  roadtypeid=?");
 	$sth2->execute($roadtypeid);
 	my $data=$sth2->fetchrow_hashref;
 	$sth2->finish;
-	if ($total->{'total'} >0) {
-		$template->param(totalgtzero => 1);
-	}
 
         $template->param(	
 				road_type       =>	( $data->{'road_type'}),
-- 
1.7.0


From gmcharlt at gmail.com  Tue Nov 16 00:19:26 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Mon, 15 Nov 2010 18:19:26 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 2122 follow-up for
	authorities editor
Message-ID: <1289863166-29856-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 authorities/authorities.pl |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 491aed6..9429a58 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -191,13 +191,13 @@ sub create_input {
     elsif ( $tagslib->{$tag}->{$subfield}->{authtypecode} ) {
         $subfield_data{marc_value} =
     "<input type=\"text\"
-                        id=\"".$subfield_data{id}."\"
-                        name=\"".$subfield_data{id}."\"
-    value=\"$value\"
-    class=\"input_marceditor\"
-    tabindex=\"1\"                     
-        readonly=\"readonly\" \/>
-    <a href=\"#\" class=\"buttonDot\"
+            id=\"".$subfield_data{id}."\"
+            name=\"".$subfield_data{id}."\"
+            value=\"$value\"
+            class=\"input_marceditor readonly\"
+            tabindex=\"1\"
+            readonly=\"readonly\" \/>
+        <a href=\"#\" class=\"buttonDot\"
         onclick=\"openAuth(this.parentNode.getElementsByTagName('input')[1].id,'".$tagslib->{$tag}->{$subfield}->{authtypecode}."'); return false;\" tabindex=\"1\" title=\"Tag Editor\">...</a>
     ";
     # it's a plugin field
-- 
1.7.0


From kmkale at anantcorp.com  Tue Nov 16 05:33:10 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Tue, 16 Nov 2010 10:03:10 +0530
Subject: [Koha-patches] Bug 5401: WYSWYG for Koha News
In-Reply-To: <AANLkTikFNV1Ns3vVJjKUotruWrTB=S6-WHSFr=4eGc6Q@mail.gmail.com>
References: <AANLkTik3Um7QT9rE85Sj_s7q23=bk5WrMts2jNkmOn5F@mail.gmail.com>
	<AANLkTin=q_ahtDMdOYTgYzEx0_BowmPnfUTFQtN=6NnK@mail.gmail.com>
	<AANLkTikFNV1Ns3vVJjKUotruWrTB=S6-WHSFr=4eGc6Q@mail.gmail.com>
Message-ID: <AANLkTi=0DigarmqpRv1UbipsALDPemYQ-wubK-Jc7iT-@mail.gmail.com>

On Mon, Nov 15, 2010 at 10:28 PM, Owen Leonard <oleonard at myacpl.org> wrote:

>
> My quick first impression of elRTE is that it seems really nice. I'm
> definitely going to do some testing.

Thanks Owen.


Regards,
Koustubha Kale
Anant Corporation

Contact Details :
Address  : 103, Armaan Residency, R. W Sawant Road, Nr. Golden Dyes
Naka, Thane (w),
                Maharashtra, India, Pin : 400601.
TeleFax  : +91-22-21720108, +91-22-21720109
Mobile     : +919820715876
Website  : http://www.anantcorp.com
Blog : http://www.anantcorp.com/blog/?author=2

From kmkale at anantcorp.com  Tue Nov 16 06:13:06 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Tue, 16 Nov 2010 10:43:06 +0530
Subject: [Koha-patches] [PATCH 1/2] Bug 4440: Revised combined patch to
	print fee receipts and invoices
Message-ID: <1289884386-6553-1-git-send-email-kmkale@anantcorp.com>

 This patch adds a small enhancement to allow printing of Fees  / Fines receipts from the Fines
 page.
 Patch adds print links to the Fines page next to Fines or Receipts transactions.
 Clicking on the link will pop a new window and will print that with total outstanding as on date.
 You can edit koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css to better
 control printing this type of material.
18-Oct-2010
 Changed template and script names to match. Corrected invalid markup in the templates.

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 .../prog/en/css/printreceiptinvoice.css            |  353 ++++++++++++++++++++
 .../prog/en/modules/members/boraccount.tmpl        |   12 +-
 .../prog/en/modules/members/printfeercpt.tmpl      |   59 ++++
 .../prog/en/modules/members/printinvoice.tmpl      |   59 ++++
 members/printfeercpt.pl                            |  143 ++++++++
 members/printinvoice.pl                            |  142 ++++++++
 6 files changed, 766 insertions(+), 2 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
 create mode 100755 members/printfeercpt.pl
 create mode 100755 members/printinvoice.pl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
new file mode 100644
index 0000000..d8a675f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
@@ -0,0 +1,353 @@
+a:link {
+	color : #000066;
+	text-decoration: none;
+}
+
+a:visited {
+	color : #000066;
+	text-decoration: none;
+}
+
+a:hover {
+	color : #993300;
+	text-decoration: none;
+}
+
+body {
+	background-color : #FFF;
+	color : #333333;
+	font-family : arial, geneva, sans-serif;
+	font-size : 14px;
+	margin : 0px 0px 0px 0px;
+}
+
+caption {
+	color : #000066;
+	font-size : 18px;
+	font-weight : bold;
+	margin-top : 5px;
+	text-align : left;
+}
+
+form {
+	margin : 0px;
+	padding : 0px;
+}
+
+h1
+	{
+	color : #000066;
+	font-size : 22px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h1#logo {
+	display: none;
+}
+
+h2 {
+	color : #000066;
+	font-size : 20px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h3 {
+	color : #000066;
+	font-size : 18px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h4 {
+	color : #000066;
+	font-size : 16px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h5 {
+	color : #000066;
+	font-size : 15px;
+	font-weight : bold;
+	margin-bottom : 1px;
+	margin-top : 1px;
+}
+
+h6 {
+	color : #000066;
+	font-size : 14px;
+	font-weight : bold;
+	margin-bottom : 1px;
+	margin-top : 1px;
+}
+
+table {
+	background-color : #FFFFFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-collapse : collapse;
+	border-left : 1px solid #CCCCCC;
+	margin : 3px 0px 5px 0px;
+	padding : 0px;
+	width : 99%;
+}
+
+table.list {
+	background-color : #FFFFFF;
+	border : 0;
+	border-collapse : collapse;
+	margin : 3px 0px 5px 0px;
+	padding : 0px;
+	width : 99%;
+}
+
+td {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 12px;
+	padding : 5px 5px 5px 5px;
+}
+
+td:last-child {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 0px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 12px;
+	padding : 5px 5px 5px 5px;
+}
+
+table.list th {
+	background-color : #FFFFFF;
+	border-top : 0;
+	border-left : 0;
+	text-align: left;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 5px;
+	width : 25%;
+}
+
+th {
+	background-color : #E9E9E9;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 14px;
+	font-weight : bold;
+	padding : 5px 5px 5px 5px;
+}
+
+th:last-child {
+	background-color : #E9E9E9;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 0px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 14px;
+	font-weight : bold;
+	padding : 5px 5px 5px 5px;
+}
+
+td.input, div.form td, div.details td {
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+	color : #000000;
+	line-height : 1.5em;
+	padding : 4px;
+	text-align : left;
+}
+
+td.label, div.form th, div.details th {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 0px;
+	border-top : 0px;
+	color : #000088;
+	font-weight : bold;
+	line-height : 1.5em;
+	padding : 4px;
+	text-align : right;
+	vertical-align : top;
+}
+
+tr.highlight {
+	background-color: #CCCCCC;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+.error {
+	font-weight: bold;
+}
+
+.ex {
+	font-family : "Courier New", Courier, monospace;
+}
+.inline {
+	display : inline;
+}
+
+tr.overdue {
+	font-weight : bold;
+}
+
+tfoot {
+	font-weight : bold;
+}
+
+tfoot td, tfoot td:last-child {
+	background-color : #EEEEEE;
+	border-right : 1px solid #666666;
+	border-bottom : 1px solid #666666;
+}
+
+td.credit, td.debit, td.sum {
+	font-family : "Courier New", Courier, monospace;
+	text-align : right;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+td.debit {
+	color : #990000;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+#receipt {
+	background-color : #FFFFFF;
+	font-family : serif;
+	font-size : .9em;
+	margin : 0 0px 0px 0;
+	padding : 0px;
+	position : relative;
+}
+
+#receipt a:link {
+	color : #000066;
+	text-decoration: none;
+}
+
+#receipt a:visited {
+	color : #000066;
+	text-decoration: none;
+}
+
+#receipt a:hover {
+	color : #993300;
+	text-decoration: none;
+}
+
+#receipt caption {
+	color : #000000;
+	font-weight : bold;
+	margin-top : 5px;
+	text-align : left;
+}
+
+#receipt div.table {
+	background-color : transparent;
+	font-weight: normal;
+}
+
+#receipt h3, #receipt caption, #receipt h4 {
+	background-color : transparent;
+	color : #000000;
+	font-size : 1em;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+#receipt h2 {
+	background-color : transparent;
+	color : #000000;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+#receipt table {
+	background-color : transparent;
+	border : 0;
+	border-collapse : collapse;
+	width : auto;
+}
+
+#receipt td, #receipt th {
+	background-color : transparent;
+	border : 0;
+	font-size : 1em;
+	font-weight : normal;
+	padding : 1px;
+	border-bottom : 1px solid #000000;
+	border-left : 1px solid #000000;
+	border-right : 1px solid #000000;
+	border-top : 1px solid #000000;
+	}
+
+#receipt th {
+	font-weight : bold;
+	text-align : left;
+	}
+
+#receipt th.centerednames {
+	font-weight : bold;
+	text-align: center;
+	color: red;
+	border-top : 0px;
+	border-bottom : 0px;
+}
+
+div#breadcrumbs,
+div#toplevelnav,
+div#login,
+div#header_search,
+div#toolbar,
+div#changelanguage,
+div#menu,
+div.yui-b,
+.noprint,
+form#sortbyform,
+#cartDetails,
+fieldset.action,
+.list-actions,
+.print {
+    display: none;
+}
+
+div#yui-main div.yui-b {
+	display : block;
+}
+
+.yui-t1 #yui-main div.yui-b,
+.yui-t2 #yui-main div.yui-b,
+.yui-t7 #yui-main div.yui-b {
+	margin-left : 0;
+}
+fieldset {
+	border : 0;
+}
+#cataloguing_additem_itemlist {
+	overflow : visible !important;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index fce5a4d..ef59ad2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -35,6 +35,7 @@
     <!-- TMPL_IF NAME="reverse_col" -->
     <th>&nbsp;</th>
     <!-- /TMPL_IF -->
+    <th>Print</th>
   </tr>
 
 	<!-- FIXME: Shouldn't hardcode dollar signs, since Euro or Pound might be needed -->
@@ -48,18 +49,25 @@
     <!-- TMPL_IF NAME="reverse_col" -->
       <td>
 	<!-- TMPL_IF NAME="payment" -->
-		<a href="boraccount.pl?action=reverse&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&accountno=<!-- TMPL_VAR NAME="accountno" -->">Reverse</a>
+		<a href="boraccount.pl?action=reverse&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Reverse</a>
 	<!-- TMPL_ELSE -->
 		&nbsp;
 	<!-- /TMPL_IF -->
       </td>
 	<!-- /TMPL_IF -->
+<td>
+	<!-- TMPL_IF NAME="payment" -->
+		<a target="_blank" href="printfeercpt.pl?action=print&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Print</a>
+	<!-- TMPL_ELSE -->
+		<a target="_blank" href="printinvoice.pl?action=print&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Print</a>
+	<!-- /TMPL_IF -->
+      </td>
     </tr>
 
   <!-- /TMPL_LOOP -->
 <tfoot>
   <tr>
-    <td colspan="3">Total due</td>
+    <td colspan="4">Total due</td>
     <!-- TMPL_IF NAME="totalcredit" --><td colspan="2" class="credit"><!-- TMPL_ELSE --><td colspan="2" class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
   </tr>
   </tfoot>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
new file mode 100644
index 0000000..a53278f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
@@ -0,0 +1,59 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />
+<script language="javascript">
+        window.print();
+        window.close();
+</script>
+</head>
+<body>
+
+<div id="receipt">
+<!-- The table with the account items -->
+<table>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<h2><u>Fee Receipt</u></h2>
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<!-- TMPL_IF NAME="branchname" --><h2><!-- TMPL_VAR NAME="branchname" --></h2><!-- /TMPL_IF -->
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 >
+		Received with thanks from  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
+	</th>
+ </tr>
+  <tr>
+	<th>Date</th>
+    <th>Description of charges</th>
+    <th>Amount</th>
+ </tr>
+
+  <!-- TMPL_LOOP NAME="accounts" -->
+<tr class="highlight">
+      <td><!-- TMPL_VAR NAME="date" --></td>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
+    </tr>
+
+  <!-- /TMPL_LOOP -->
+<tfoot>
+  <tr>
+    <td colspan="2">Total outstanding dues as on date : </td>
+    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
+  </tr>
+  </tfoot>
+</table>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
new file mode 100644
index 0000000..3fc314e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
@@ -0,0 +1,59 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />
+<script language="javascript">
+        window.print();
+        window.close();
+</script>
+</head>
+<body>
+
+<div id="receipt">
+<!-- The table with the account items -->
+<table>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<h2><u>INVOICE</u></h2>
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<!-- TMPL_IF NAME="branchname" --><h2><!-- TMPL_VAR NAME="branchname" --></h2><!-- /TMPL_IF -->
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 >
+		To,<br />  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
+	</th>
+  </tr>
+  <tr>
+	<th>Date</th>
+    <th>Description of charges</th>
+    <th>Amount</th>
+ </tr>
+
+  <!-- TMPL_LOOP NAME="accounts" -->
+<tr class="highlight">
+      <td><!-- TMPL_VAR NAME="date" --></td>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
+    </tr>
+
+  <!-- /TMPL_LOOP -->
+<tfoot>
+  <tr>
+    <td colspan="2">Total outstanding dues as on date : </td>
+    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
+  </tr>
+  </tfoot>
+</table>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
new file mode 100755
index 0000000..59d5cb3
--- /dev/null
+++ b/members/printfeercpt.pl
@@ -0,0 +1,143 @@
+#!/usr/bin/perl
+
+
+#writen 3rd May 2010 by kmkale at anantcorp.com adapted from boraccount.pl by chris at katipo.oc.nz
+#script to print fee receipts
+
+
+# Copyright Koustubha Kale
+#
+# 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::Auth;
+use C4::Output;
+use C4::Dates qw/format_date/;
+use CGI;
+use C4::Members;
+use C4::Branch;
+use C4::Accounts;
+
+my $input=new CGI;
+
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/printfeercpt.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            debug => 1,
+                            });
+
+my $borrowernumber=$input->param('borrowernumber');
+my $action = $input->param('action') || '';
+my $accountno = $input->param('accountno');
+
+#get borrower details
+my $data=GetMember('borrowernumber' => $borrowernumber);
+
+if ( $action eq 'print' ) {
+#  ReversePayment( $borrowernumber, $input->param('accountno') );
+}
+
+if ( $data->{'category_type'} eq 'C') {
+   my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+   my $cnt = scalar(@$catcodes);
+   $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+   $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
+
+#get account details
+my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
+my $totalcredit;
+if($total <= 0){
+        $totalcredit = 1;
+}
+my @accountrows; # this is for the tmpl-loop
+
+my $toggle;
+for (my $i=0;$i<$numaccts;$i++){
+   next if ($accts->[$i]{'accountno'} ne $accountno);
+    if($i%2){
+            $toggle = 0;
+    } else {
+            $toggle = 1;
+    }
+    $accts->[$i]{'toggle'} = $toggle;
+    $accts->[$i]{'amount'}+=0.00;
+    if($accts->[$i]{'amount'} <= 0){
+        $accts->[$i]{'amountcredit'} = 1;
+	$accts->[$i]{'amount'}*=-1.00;
+    }
+    $accts->[$i]{'amountoutstanding'}+=0.00;
+    if($accts->[$i]{'amountoutstanding'} <= 0){
+        $accts->[$i]{'amountoutstandingcredit'} = 1;
+    }
+    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+                'amountcredit' => $accts->[$i]{'amountcredit'},
+                'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
+                'toggle' => $accts->[$i]{'toggle'},
+                'description'       => $accts->[$i]{'description'},
+				'itemnumber'       => $accts->[$i]{'itemnumber'},
+				'biblionumber'       => $accts->[$i]{'biblionumber'},
+                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
+                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
+                'accountno' => $accts->[$i]{'accountno'},
+                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
+
+                );
+
+    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
+        $row{'printtitle'}=1;
+        $row{'title'} = $accts->[$i]{'title'};
+    }
+
+    push(@accountrows, \%row);
+}
+
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+$template->param(
+    finesview           => 1,
+    firstname           => $data->{'firstname'},
+    surname             => $data->{'surname'},
+    borrowernumber      => $borrowernumber,
+    cardnumber          => $data->{'cardnumber'},
+    categorycode        => $data->{'categorycode'},
+    category_type       => $data->{'category_type'},
+ #   category_description => $data->{'description'},
+    categoryname		 => $data->{'description'},
+    address             => $data->{'address'},
+    address2            => $data->{'address2'},
+    city                => $data->{'city'},
+    zipcode             => $data->{'zipcode'},
+    country             => $data->{'country'},
+    phone               => $data->{'phone'},
+    email               => $data->{'email'},
+    branchcode          => $data->{'branchcode'},
+	branchname			=> GetBranchName($data->{'branchcode'}),
+    total               => sprintf("%.2f",$total),
+    totalcredit         => $totalcredit,
+	is_child        => ($data->{'category_type'} eq 'C'),
+    accounts            => \@accountrows );
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/members/printinvoice.pl b/members/printinvoice.pl
new file mode 100755
index 0000000..039132f
--- /dev/null
+++ b/members/printinvoice.pl
@@ -0,0 +1,142 @@
+#!/usr/bin/perl
+
+
+#writen 3rd May 2010 by kmkale at anantcorp.com adapted from boraccount.pl by chris at katipo.oc.nz
+#script to print fee receipts
+
+
+# Copyright Koustubha Kale
+#
+# 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::Auth;
+use C4::Output;
+use C4::Dates qw/format_date/;
+use CGI;
+use C4::Members;
+use C4::Branch;
+use C4::Accounts;
+
+my $input=new CGI;
+
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/printinvoice.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            debug => 1,
+                            });
+
+my $borrowernumber=$input->param('borrowernumber');
+my $action = $input->param('action') || '';
+my $accountno = $input->param('accountno');
+
+#get borrower details
+my $data=GetMember('borrowernumber' => $borrowernumber);
+
+if ( $action eq 'print' ) {
+#  ReversePayment( $borrowernumber, $input->param('accountno') );
+}
+
+if ( $data->{'category_type'} eq 'C') {
+   my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+   my $cnt = scalar(@$catcodes);
+   $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+   $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
+
+#get account details
+my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
+my $totalcredit;
+if($total <= 0){
+        $totalcredit = 1;
+}
+my @accountrows; # this is for the tmpl-loop
+
+my $toggle;
+for (my $i=0;$i<$numaccts;$i++){
+   next if ($accts->[$i]{'accountno'} ne $accountno);
+    if($i%2){
+            $toggle = 0;
+    } else {
+            $toggle = 1;
+    }
+    $accts->[$i]{'toggle'} = $toggle;
+    $accts->[$i]{'amount'}+=0.00;
+    if($accts->[$i]{'amount'} <= 0){
+        $accts->[$i]{'amountcredit'} = 1;
+    }
+    $accts->[$i]{'amountoutstanding'}+=0.00;
+    if($accts->[$i]{'amountoutstanding'} <= 0){
+        $accts->[$i]{'amountoutstandingcredit'} = 1;
+    }
+    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+                'amountcredit' => $accts->[$i]{'amountcredit'},
+                'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
+                'toggle' => $accts->[$i]{'toggle'},
+                'description'       => $accts->[$i]{'description'},
+				'itemnumber'       => $accts->[$i]{'itemnumber'},
+				'biblionumber'       => $accts->[$i]{'biblionumber'},
+                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
+                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
+                'accountno' => $accts->[$i]{'accountno'},
+                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
+
+                );
+
+    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
+        $row{'printtitle'}=1;
+        $row{'title'} = $accts->[$i]{'title'};
+    }
+
+    push(@accountrows, \%row);
+}
+
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+$template->param(
+    finesview           => 1,
+    firstname           => $data->{'firstname'},
+    surname             => $data->{'surname'},
+    borrowernumber      => $borrowernumber,
+    cardnumber          => $data->{'cardnumber'},
+    categorycode        => $data->{'categorycode'},
+    category_type       => $data->{'category_type'},
+ #   category_description => $data->{'description'},
+    categoryname		 => $data->{'description'},
+    address             => $data->{'address'},
+    address2            => $data->{'address2'},
+    city                => $data->{'city'},
+    zipcode             => $data->{'zipcode'},
+    country             => $data->{'country'},
+    phone               => $data->{'phone'},
+    email               => $data->{'email'},
+    branchcode          => $data->{'branchcode'},
+	branchname			=> GetBranchName($data->{'branchcode'}),
+    total               => sprintf("%.2f",$total),
+    totalcredit         => $totalcredit,
+	is_child        => ($data->{'category_type'} eq 'C'),
+    accounts            => \@accountrows );
+
+output_html_with_http_headers $input, $cookie, $template->output;
-- 
1.7.0.4


From kmkale at anantcorp.com  Tue Nov 16 06:13:48 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Tue, 16 Nov 2010 10:43:48 +0530
Subject: [Koha-patches] [PATCH 2/2] Bug 4440 Layout tweaking follow-up patch
Message-ID: <1289884428-6588-1-git-send-email-kmkale@anantcorp.com>

Couple of tweaks to borders and Name.
---
 .../prog/en/css/printreceiptinvoice.css            |    2 +-
 .../prog/en/modules/members/printfeercpt.tmpl      |    2 ++
 .../prog/en/modules/members/printinvoice.tmpl      |    4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
index d8a675f..28754f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
@@ -315,7 +315,7 @@ td.debit {
 	font-weight : bold;
 	text-align: center;
 	color: red;
-	border-top : 0px;
+	border-top : 1px solid #000000;
 	border-bottom : 0px;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
index a53278f..6ab1933 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
@@ -13,11 +13,13 @@
 <div id="receipt">
 <!-- The table with the account items -->
 <table>
+<!-- TMPL_IF NAME="LibraryName -->
  <tr>
 	<th colspan=3 class="centerednames">
 		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
 	</th>
  </tr>
+<!-- /TMPL_IF -->
  <tr>
 	<th colspan=3 class="centerednames">
 		<h2><u>Fee Receipt</u></h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
index 3fc314e..e3b5057 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
@@ -13,11 +13,13 @@
 <div id="receipt">
 <!-- The table with the account items -->
 <table>
+<!-- TMPL_IF NAME="LibraryName -->
   <tr>
 	<th colspan=3 class="centerednames">
 		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
 	</th>
   </tr>
+<!-- /TMPL_IF -->
   <tr>
 	<th colspan=3 class="centerednames">
 		<h2><u>INVOICE</u></h2>
@@ -30,7 +32,7 @@
   </tr>
   <tr>
 	<th colspan=3 >
-		To,<br />  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+		Bill To: <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
 		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
 	</th>
   </tr>
-- 
1.7.0.4


From savitra.sirohi at osslabs.biz  Tue Nov 16 02:10:31 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Tue, 16 Nov 2010 06:40:31 +0530
Subject: [Koha-patches] [PATCH] Analytical records: display items belonging
	to host records in the moredetail page
Message-ID: <1289869831-31701-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 catalogue/moredetail.pl |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index d790c41..05a5a60 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -74,6 +74,23 @@ my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
 my @results;
 my $fw = GetFrameworkCode($biblionumber);
 my @items= GetItemsInfo($biblionumber);
+my $record=GetMarcBiblio($biblionumber);
+
+my $hostrecords;
+# adding items linked via host biblios
+   foreach my $hostfield ( $record->field('773')) {
+        my $hostbiblionumber = $hostfield->subfield("w");
+        my $linkeditemnumber = $hostfield->subfield("o");
+        my @hostitemInfos = GetItemsInfo($hostbiblionumber);
+        foreach my $hostitemInfo (@hostitemInfos){
+                if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
+                        $hostrecords =1;
+                        push(@items, $hostitemInfo);
+                }
+         }
+    }
+
+
 my $count=@items;
 $data->{'count'}=$count;
 
-- 
1.5.4.5


From savitra.sirohi at osslabs.biz  Tue Nov 16 02:10:59 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Tue, 16 Nov 2010 06:40:59 +0530
Subject: [Koha-patches] [PATCH] Analytical records: ability to edit items
	belonging to host records, also ability ito delink from them
Message-ID: <1289869859-31792-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 cataloguing/additem.pl                             |   32 ++++++++++++++++++++
 .../prog/en/modules/cataloguing/additem.tmpl       |    2 +-
 2 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 9676fd6..db82d54 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -96,6 +96,7 @@ my $error        = $input->param('error');
 my $biblionumber = $input->param('biblionumber');
 my $itemnumber   = $input->param('itemnumber');
 my $op           = $input->param('op');
+my $hostitemnumber = $input->param('hostitemnumber');
 
 my $frameworkcode = &GetFrameworkCode($biblionumber);
 
@@ -300,6 +301,14 @@ if ($op eq "additem") {
         $itemnumber="";
     }
     $nextop="additem";
+} elsif ($op eq "delinkitem"){
+	foreach my $field ($record->field('773')){
+		if ($field->subfield('o') eq $hostitemnumber){
+			$record->delete_field($field);
+			last;
+		}
+	}
+	my $modbibresult = ModBiblio($record, $biblionumber,'');
 }
 
 #
@@ -311,6 +320,20 @@ if ($op eq "additem") {
 my $temp = GetMarcBiblio( $biblionumber );
 my @fields = $temp->fields();
 #my @fields = $record->fields();
+
+my @hostitemnumbers;
+foreach my $hostfield ($temp->field('773')){
+	if ($hostfield->subfield('w')){
+		my $hostrecord = GetMarcBiblio($hostfield->subfield('w'));
+		foreach my $hostitem ($hostrecord->field('952')){
+			if ($hostitem->subfield('9') eq $hostfield->subfield('o')){
+				push (@fields, $hostitem);
+				push (@hostitemnumbers, $hostfield->subfield('o'));
+			}
+		}
+	}
+}
+
 my %witness; #---- stores the list of subfields used at least once, with the "meaning" of the code
 my @big_array;
 #---- finds where items.itemnumber is stored
@@ -342,6 +365,13 @@ foreach my $field (@fields) {
             }
         }
         $this_row{itemnumber} = $subf[$i][1] if ($field->tag() eq $itemtagfield && $subf[$i][0] eq $itemtagsubfield);
+	foreach my $hostitemnumber (@hostitemnumbers){
+		if ($this_row{itemnumber} eq $hostitemnumber){
+			$this_row{hostitemflag} = 1;
+			$this_row{hostbiblionumber}= GetBiblionumberFromItemnumber($hostitemnumber);
+			last;
+		}
+	}
     }
     if (%this_row) {
         push(@big_array, \%this_row);
@@ -362,6 +392,8 @@ for my $row ( @big_array ) {
     $row_data{itemnumber} = $row->{itemnumber};
     #reporting this_row values
     $row_data{'nomod'} = $row->{'nomod'};
+    $row_data{'hostitemflag'} = $row->{'hostitemflag'};
+    $row_data{'hostbiblionumber'} = $row->{'hostbiblionumber'};
     push(@item_value_loop,\%row_data);
 }
 foreach my $subfield_code (sort keys(%witness)) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index d0be875..2145ddb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -206,7 +206,7 @@ function set_to_today(id, force) {
             </tr>
                 <!-- TMPL_LOOP NAME="item_loop" -->
                 <tr id="row<!-- TMPL_VAR NAME="itemnumber" -->">
-                    <!-- TMPL_IF Name="nomod"--> <td colspan="2">&nbsp;</td><!--TMPL_ELSE--><td><a href="additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#edititem">Edit</a></td>
+                    <!-- TMPL_IF Name="nomod"--> <td colspan="2">&nbsp;</td><!--TMPL_ELSIF Name ="hostitemflag"--><td><a href="additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR NAME="hostbiblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#edititem">Edit in Host</a></td><td><a href="additem.pl?op=delinkitem&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&hostitemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Delink</a></td><!--TMPL_ELSE--><td><a href="additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#edititem">Edit</a></td>
                     <td><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->" onclick="confirm_deletion(<!-- TMPL_VAR NAME="biblionumber" -->,<!-- TMPL_VAR NAME="itemnumber" -->); return false;">Delete</a></td><!--/TMPL_IF-->
                 <!-- TMPL_LOOP NAME="item_value" -->
                     <td><!-- TMPL_VAR ESCAPE=HTML NAME="field" --></td>
-- 
1.5.4.5


From f.demians at tamil.fr  Tue Nov 16 08:33:08 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Tue, 16 Nov 2010 08:33:08 +0100
Subject: [Koha-patches] [PATCH 1/3] [SIGNED-OFF] Bug 4440: Revised combined
	patch to print fee receipts and invoices
Message-ID: <1289892790-5341-1-git-send-email-f.demians@tamil.fr>

From: Koustubha Kale <kmkale at anantcorp.com>

This patch adds a small enhancement to allow printing of Fees  / Fines
receipts from the Fines page.

Patch adds print links to the Fines page next to Fines or Receipts
transactions.

Clicking on the link will pop a new window and will print that with
total outstanding as on date.

You can edit koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
to better control printing this type of material.

18-Oct-2010 Changed template and script names to match. Corrected
invalid markup in the templates.

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 .../prog/en/css/printreceiptinvoice.css            |  353 ++++++++++++++++++++
 .../prog/en/modules/members/boraccount.tmpl        |   12 +-
 .../prog/en/modules/members/printfeercpt.tmpl      |   59 ++++
 .../prog/en/modules/members/printinvoice.tmpl      |   59 ++++
 members/printfeercpt.pl                            |  143 ++++++++
 members/printinvoice.pl                            |  142 ++++++++
 6 files changed, 766 insertions(+), 2 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
 create mode 100755 members/printfeercpt.pl
 create mode 100755 members/printinvoice.pl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
new file mode 100644
index 0000000..d8a675f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
@@ -0,0 +1,353 @@
+a:link {
+	color : #000066;
+	text-decoration: none;
+}
+
+a:visited {
+	color : #000066;
+	text-decoration: none;
+}
+
+a:hover {
+	color : #993300;
+	text-decoration: none;
+}
+
+body {
+	background-color : #FFF;
+	color : #333333;
+	font-family : arial, geneva, sans-serif;
+	font-size : 14px;
+	margin : 0px 0px 0px 0px;
+}
+
+caption {
+	color : #000066;
+	font-size : 18px;
+	font-weight : bold;
+	margin-top : 5px;
+	text-align : left;
+}
+
+form {
+	margin : 0px;
+	padding : 0px;
+}
+
+h1
+	{
+	color : #000066;
+	font-size : 22px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h1#logo {
+	display: none;
+}
+
+h2 {
+	color : #000066;
+	font-size : 20px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h3 {
+	color : #000066;
+	font-size : 18px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h4 {
+	color : #000066;
+	font-size : 16px;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+h5 {
+	color : #000066;
+	font-size : 15px;
+	font-weight : bold;
+	margin-bottom : 1px;
+	margin-top : 1px;
+}
+
+h6 {
+	color : #000066;
+	font-size : 14px;
+	font-weight : bold;
+	margin-bottom : 1px;
+	margin-top : 1px;
+}
+
+table {
+	background-color : #FFFFFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-collapse : collapse;
+	border-left : 1px solid #CCCCCC;
+	margin : 3px 0px 5px 0px;
+	padding : 0px;
+	width : 99%;
+}
+
+table.list {
+	background-color : #FFFFFF;
+	border : 0;
+	border-collapse : collapse;
+	margin : 3px 0px 5px 0px;
+	padding : 0px;
+	width : 99%;
+}
+
+td {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 12px;
+	padding : 5px 5px 5px 5px;
+}
+
+td:last-child {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 0px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 12px;
+	padding : 5px 5px 5px 5px;
+}
+
+table.list th {
+	background-color : #FFFFFF;
+	border-top : 0;
+	border-left : 0;
+	text-align: left;
+	font-size: 12px;
+	font-weight: bold;
+	padding: 5px;
+	width : 25%;
+}
+
+th {
+	background-color : #E9E9E9;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 14px;
+	font-weight : bold;
+	padding : 5px 5px 5px 5px;
+}
+
+th:last-child {
+	background-color : #E9E9E9;
+	border-bottom : 1px solid #CCCCCC;
+	border-right : 0px solid #CCCCCC;
+	border-top : 0;
+	border-left : 0;
+	font-size : 14px;
+	font-weight : bold;
+	padding : 5px 5px 5px 5px;
+}
+
+td.input, div.form td, div.details td {
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+	color : #000000;
+	line-height : 1.5em;
+	padding : 4px;
+	text-align : left;
+}
+
+td.label, div.form th, div.details th {
+	background-color : #FFF;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 0px;
+	border-top : 0px;
+	color : #000088;
+	font-weight : bold;
+	line-height : 1.5em;
+	padding : 4px;
+	text-align : right;
+	vertical-align : top;
+}
+
+tr.highlight {
+	background-color: #CCCCCC;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+.error {
+	font-weight: bold;
+}
+
+.ex {
+	font-family : "Courier New", Courier, monospace;
+}
+.inline {
+	display : inline;
+}
+
+tr.overdue {
+	font-weight : bold;
+}
+
+tfoot {
+	font-weight : bold;
+}
+
+tfoot td, tfoot td:last-child {
+	background-color : #EEEEEE;
+	border-right : 1px solid #666666;
+	border-bottom : 1px solid #666666;
+}
+
+td.credit, td.debit, td.sum {
+	font-family : "Courier New", Courier, monospace;
+	text-align : right;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+td.debit {
+	color : #990000;
+	border-bottom : 1px solid #CCCCCC;
+	border-left : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	border-top : 1px solid #CCCCCC;
+}
+
+#receipt {
+	background-color : #FFFFFF;
+	font-family : serif;
+	font-size : .9em;
+	margin : 0 0px 0px 0;
+	padding : 0px;
+	position : relative;
+}
+
+#receipt a:link {
+	color : #000066;
+	text-decoration: none;
+}
+
+#receipt a:visited {
+	color : #000066;
+	text-decoration: none;
+}
+
+#receipt a:hover {
+	color : #993300;
+	text-decoration: none;
+}
+
+#receipt caption {
+	color : #000000;
+	font-weight : bold;
+	margin-top : 5px;
+	text-align : left;
+}
+
+#receipt div.table {
+	background-color : transparent;
+	font-weight: normal;
+}
+
+#receipt h3, #receipt caption, #receipt h4 {
+	background-color : transparent;
+	color : #000000;
+	font-size : 1em;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+#receipt h2 {
+	background-color : transparent;
+	color : #000000;
+	font-weight : bold;
+	margin-bottom : 3px;
+	margin-top : 3px;
+}
+
+#receipt table {
+	background-color : transparent;
+	border : 0;
+	border-collapse : collapse;
+	width : auto;
+}
+
+#receipt td, #receipt th {
+	background-color : transparent;
+	border : 0;
+	font-size : 1em;
+	font-weight : normal;
+	padding : 1px;
+	border-bottom : 1px solid #000000;
+	border-left : 1px solid #000000;
+	border-right : 1px solid #000000;
+	border-top : 1px solid #000000;
+	}
+
+#receipt th {
+	font-weight : bold;
+	text-align : left;
+	}
+
+#receipt th.centerednames {
+	font-weight : bold;
+	text-align: center;
+	color: red;
+	border-top : 0px;
+	border-bottom : 0px;
+}
+
+div#breadcrumbs,
+div#toplevelnav,
+div#login,
+div#header_search,
+div#toolbar,
+div#changelanguage,
+div#menu,
+div.yui-b,
+.noprint,
+form#sortbyform,
+#cartDetails,
+fieldset.action,
+.list-actions,
+.print {
+    display: none;
+}
+
+div#yui-main div.yui-b {
+	display : block;
+}
+
+.yui-t1 #yui-main div.yui-b,
+.yui-t2 #yui-main div.yui-b,
+.yui-t7 #yui-main div.yui-b {
+	margin-left : 0;
+}
+fieldset {
+	border : 0;
+}
+#cataloguing_additem_itemlist {
+	overflow : visible !important;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index fce5a4d..ef59ad2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -35,6 +35,7 @@
     <!-- TMPL_IF NAME="reverse_col" -->
     <th>&nbsp;</th>
     <!-- /TMPL_IF -->
+    <th>Print</th>
   </tr>
 
 	<!-- FIXME: Shouldn't hardcode dollar signs, since Euro or Pound might be needed -->
@@ -48,18 +49,25 @@
     <!-- TMPL_IF NAME="reverse_col" -->
       <td>
 	<!-- TMPL_IF NAME="payment" -->
-		<a href="boraccount.pl?action=reverse&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&accountno=<!-- TMPL_VAR NAME="accountno" -->">Reverse</a>
+		<a href="boraccount.pl?action=reverse&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Reverse</a>
 	<!-- TMPL_ELSE -->
 		&nbsp;
 	<!-- /TMPL_IF -->
       </td>
 	<!-- /TMPL_IF -->
+<td>
+	<!-- TMPL_IF NAME="payment" -->
+		<a target="_blank" href="printfeercpt.pl?action=print&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Print</a>
+	<!-- TMPL_ELSE -->
+		<a target="_blank" href="printinvoice.pl?action=print&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;accountno=<!-- TMPL_VAR NAME="accountno" -->">Print</a>
+	<!-- /TMPL_IF -->
+      </td>
     </tr>
 
   <!-- /TMPL_LOOP -->
 <tfoot>
   <tr>
-    <td colspan="3">Total due</td>
+    <td colspan="4">Total due</td>
     <!-- TMPL_IF NAME="totalcredit" --><td colspan="2" class="credit"><!-- TMPL_ELSE --><td colspan="2" class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
   </tr>
   </tfoot>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
new file mode 100644
index 0000000..a53278f
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
@@ -0,0 +1,59 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />
+<script language="javascript">
+        window.print();
+        window.close();
+</script>
+</head>
+<body>
+
+<div id="receipt">
+<!-- The table with the account items -->
+<table>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<h2><u>Fee Receipt</u></h2>
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 class="centerednames">
+		<!-- TMPL_IF NAME="branchname" --><h2><!-- TMPL_VAR NAME="branchname" --></h2><!-- /TMPL_IF -->
+	</th>
+ </tr>
+ <tr>
+	<th colspan=3 >
+		Received with thanks from  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
+	</th>
+ </tr>
+  <tr>
+	<th>Date</th>
+    <th>Description of charges</th>
+    <th>Amount</th>
+ </tr>
+
+  <!-- TMPL_LOOP NAME="accounts" -->
+<tr class="highlight">
+      <td><!-- TMPL_VAR NAME="date" --></td>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
+    </tr>
+
+  <!-- /TMPL_LOOP -->
+<tfoot>
+  <tr>
+    <td colspan="2">Total outstanding dues as on date : </td>
+    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
+  </tr>
+  </tfoot>
+</table>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
new file mode 100644
index 0000000..3fc314e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
@@ -0,0 +1,59 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/printreceiptinvoice.css" />
+<script language="javascript">
+        window.print();
+        window.close();
+</script>
+</head>
+<body>
+
+<div id="receipt">
+<!-- The table with the account items -->
+<table>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<h2><u>INVOICE</u></h2>
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 class="centerednames">
+		<!-- TMPL_IF NAME="branchname" --><h2><!-- TMPL_VAR NAME="branchname" --></h2><!-- /TMPL_IF -->
+	</th>
+  </tr>
+  <tr>
+	<th colspan=3 >
+		To,<br />  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
+	</th>
+  </tr>
+  <tr>
+	<th>Date</th>
+    <th>Description of charges</th>
+    <th>Amount</th>
+ </tr>
+
+  <!-- TMPL_LOOP NAME="accounts" -->
+<tr class="highlight">
+      <td><!-- TMPL_VAR NAME="date" --></td>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
+    </tr>
+
+  <!-- /TMPL_LOOP -->
+<tfoot>
+  <tr>
+    <td colspan="2">Total outstanding dues as on date : </td>
+    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
+  </tr>
+  </tfoot>
+</table>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
new file mode 100755
index 0000000..59d5cb3
--- /dev/null
+++ b/members/printfeercpt.pl
@@ -0,0 +1,143 @@
+#!/usr/bin/perl
+
+
+#writen 3rd May 2010 by kmkale at anantcorp.com adapted from boraccount.pl by chris at katipo.oc.nz
+#script to print fee receipts
+
+
+# Copyright Koustubha Kale
+#
+# 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::Auth;
+use C4::Output;
+use C4::Dates qw/format_date/;
+use CGI;
+use C4::Members;
+use C4::Branch;
+use C4::Accounts;
+
+my $input=new CGI;
+
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/printfeercpt.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            debug => 1,
+                            });
+
+my $borrowernumber=$input->param('borrowernumber');
+my $action = $input->param('action') || '';
+my $accountno = $input->param('accountno');
+
+#get borrower details
+my $data=GetMember('borrowernumber' => $borrowernumber);
+
+if ( $action eq 'print' ) {
+#  ReversePayment( $borrowernumber, $input->param('accountno') );
+}
+
+if ( $data->{'category_type'} eq 'C') {
+   my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+   my $cnt = scalar(@$catcodes);
+   $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+   $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
+
+#get account details
+my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
+my $totalcredit;
+if($total <= 0){
+        $totalcredit = 1;
+}
+my @accountrows; # this is for the tmpl-loop
+
+my $toggle;
+for (my $i=0;$i<$numaccts;$i++){
+   next if ($accts->[$i]{'accountno'} ne $accountno);
+    if($i%2){
+            $toggle = 0;
+    } else {
+            $toggle = 1;
+    }
+    $accts->[$i]{'toggle'} = $toggle;
+    $accts->[$i]{'amount'}+=0.00;
+    if($accts->[$i]{'amount'} <= 0){
+        $accts->[$i]{'amountcredit'} = 1;
+	$accts->[$i]{'amount'}*=-1.00;
+    }
+    $accts->[$i]{'amountoutstanding'}+=0.00;
+    if($accts->[$i]{'amountoutstanding'} <= 0){
+        $accts->[$i]{'amountoutstandingcredit'} = 1;
+    }
+    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+                'amountcredit' => $accts->[$i]{'amountcredit'},
+                'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
+                'toggle' => $accts->[$i]{'toggle'},
+                'description'       => $accts->[$i]{'description'},
+				'itemnumber'       => $accts->[$i]{'itemnumber'},
+				'biblionumber'       => $accts->[$i]{'biblionumber'},
+                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
+                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
+                'accountno' => $accts->[$i]{'accountno'},
+                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
+
+                );
+
+    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
+        $row{'printtitle'}=1;
+        $row{'title'} = $accts->[$i]{'title'};
+    }
+
+    push(@accountrows, \%row);
+}
+
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+$template->param(
+    finesview           => 1,
+    firstname           => $data->{'firstname'},
+    surname             => $data->{'surname'},
+    borrowernumber      => $borrowernumber,
+    cardnumber          => $data->{'cardnumber'},
+    categorycode        => $data->{'categorycode'},
+    category_type       => $data->{'category_type'},
+ #   category_description => $data->{'description'},
+    categoryname		 => $data->{'description'},
+    address             => $data->{'address'},
+    address2            => $data->{'address2'},
+    city                => $data->{'city'},
+    zipcode             => $data->{'zipcode'},
+    country             => $data->{'country'},
+    phone               => $data->{'phone'},
+    email               => $data->{'email'},
+    branchcode          => $data->{'branchcode'},
+	branchname			=> GetBranchName($data->{'branchcode'}),
+    total               => sprintf("%.2f",$total),
+    totalcredit         => $totalcredit,
+	is_child        => ($data->{'category_type'} eq 'C'),
+    accounts            => \@accountrows );
+
+output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/members/printinvoice.pl b/members/printinvoice.pl
new file mode 100755
index 0000000..039132f
--- /dev/null
+++ b/members/printinvoice.pl
@@ -0,0 +1,142 @@
+#!/usr/bin/perl
+
+
+#writen 3rd May 2010 by kmkale at anantcorp.com adapted from boraccount.pl by chris at katipo.oc.nz
+#script to print fee receipts
+
+
+# Copyright Koustubha Kale
+#
+# 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::Auth;
+use C4::Output;
+use C4::Dates qw/format_date/;
+use CGI;
+use C4::Members;
+use C4::Branch;
+use C4::Accounts;
+
+my $input=new CGI;
+
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/printinvoice.tmpl",
+                            query => $input,
+                            type => "intranet",
+                            authnotrequired => 0,
+                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            debug => 1,
+                            });
+
+my $borrowernumber=$input->param('borrowernumber');
+my $action = $input->param('action') || '';
+my $accountno = $input->param('accountno');
+
+#get borrower details
+my $data=GetMember('borrowernumber' => $borrowernumber);
+
+if ( $action eq 'print' ) {
+#  ReversePayment( $borrowernumber, $input->param('accountno') );
+}
+
+if ( $data->{'category_type'} eq 'C') {
+   my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+   my $cnt = scalar(@$catcodes);
+   $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+   $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+}
+
+#get account details
+my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
+my $totalcredit;
+if($total <= 0){
+        $totalcredit = 1;
+}
+my @accountrows; # this is for the tmpl-loop
+
+my $toggle;
+for (my $i=0;$i<$numaccts;$i++){
+   next if ($accts->[$i]{'accountno'} ne $accountno);
+    if($i%2){
+            $toggle = 0;
+    } else {
+            $toggle = 1;
+    }
+    $accts->[$i]{'toggle'} = $toggle;
+    $accts->[$i]{'amount'}+=0.00;
+    if($accts->[$i]{'amount'} <= 0){
+        $accts->[$i]{'amountcredit'} = 1;
+    }
+    $accts->[$i]{'amountoutstanding'}+=0.00;
+    if($accts->[$i]{'amountoutstanding'} <= 0){
+        $accts->[$i]{'amountoutstandingcredit'} = 1;
+    }
+    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+                'amountcredit' => $accts->[$i]{'amountcredit'},
+                'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
+                'toggle' => $accts->[$i]{'toggle'},
+                'description'       => $accts->[$i]{'description'},
+				'itemnumber'       => $accts->[$i]{'itemnumber'},
+				'biblionumber'       => $accts->[$i]{'biblionumber'},
+                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
+                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
+                'accountno' => $accts->[$i]{'accountno'},
+                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
+
+                );
+
+    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
+        $row{'printtitle'}=1;
+        $row{'title'} = $accts->[$i]{'title'};
+    }
+
+    push(@accountrows, \%row);
+}
+
+$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
+
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+$template->param(
+    finesview           => 1,
+    firstname           => $data->{'firstname'},
+    surname             => $data->{'surname'},
+    borrowernumber      => $borrowernumber,
+    cardnumber          => $data->{'cardnumber'},
+    categorycode        => $data->{'categorycode'},
+    category_type       => $data->{'category_type'},
+ #   category_description => $data->{'description'},
+    categoryname		 => $data->{'description'},
+    address             => $data->{'address'},
+    address2            => $data->{'address2'},
+    city                => $data->{'city'},
+    zipcode             => $data->{'zipcode'},
+    country             => $data->{'country'},
+    phone               => $data->{'phone'},
+    email               => $data->{'email'},
+    branchcode          => $data->{'branchcode'},
+	branchname			=> GetBranchName($data->{'branchcode'}),
+    total               => sprintf("%.2f",$total),
+    totalcredit         => $totalcredit,
+	is_child        => ($data->{'category_type'} eq 'C'),
+    accounts            => \@accountrows );
+
+output_html_with_http_headers $input, $cookie, $template->output;
-- 
1.7.3.2


From f.demians at tamil.fr  Tue Nov 16 08:33:09 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Tue, 16 Nov 2010 08:33:09 +0100
Subject: [Koha-patches] [PATCH 2/3] [SIGNED-OFF] Bug 4440 Layout tweaking
	follow-up patch
In-Reply-To: <1289892790-5341-1-git-send-email-f.demians@tamil.fr>
References: <1289892790-5341-1-git-send-email-f.demians@tamil.fr>
Message-ID: <1289892790-5341-2-git-send-email-f.demians@tamil.fr>

From: Koustubha Kale <kmkale at anantcorp.com>

Couple of tweaks to borders and Name.

Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 .../prog/en/css/printreceiptinvoice.css            |    2 +-
 .../prog/en/modules/members/printfeercpt.tmpl      |    2 ++
 .../prog/en/modules/members/printinvoice.tmpl      |    4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
index d8a675f..28754f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/printreceiptinvoice.css
@@ -315,7 +315,7 @@ td.debit {
 	font-weight : bold;
 	text-align: center;
 	color: red;
-	border-top : 0px;
+	border-top : 1px solid #000000;
 	border-bottom : 0px;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
index a53278f..6ab1933 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tmpl
@@ -13,11 +13,13 @@
 <div id="receipt">
 <!-- The table with the account items -->
 <table>
+<!-- TMPL_IF NAME="LibraryName -->
  <tr>
 	<th colspan=3 class="centerednames">
 		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
 	</th>
  </tr>
+<!-- /TMPL_IF -->
  <tr>
 	<th colspan=3 class="centerednames">
 		<h2><u>Fee Receipt</u></h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
index 3fc314e..e3b5057 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
@@ -13,11 +13,13 @@
 <div id="receipt">
 <!-- The table with the account items -->
 <table>
+<!-- TMPL_IF NAME="LibraryName -->
   <tr>
 	<th colspan=3 class="centerednames">
 		<h3><!-- TMPL_VAR name="LibraryName" --></h3>
 	</th>
   </tr>
+<!-- /TMPL_IF -->
   <tr>
 	<th colspan=3 class="centerednames">
 		<h2><u>INVOICE</u></h2>
@@ -30,7 +32,7 @@
   </tr>
   <tr>
 	<th colspan=3 >
-		To,<br />  <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
+		Bill To: <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
 		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
 	</th>
   </tr>
-- 
1.7.3.2


From f.demians at tamil.fr  Tue Nov 16 08:33:10 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Tue, 16 Nov 2010 08:33:10 +0100
Subject: [Koha-patches] [PATCH 3/3] Bug 4440 Follow-up for English
	typography and alignment
In-Reply-To: <1289892790-5341-1-git-send-email-f.demians@tamil.fr>
References: <1289892790-5341-1-git-send-email-f.demians@tamil.fr>
Message-ID: <1289892790-5341-3-git-send-email-f.demians@tamil.fr>


Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
---
 .../prog/en/modules/members/printinvoice.tmpl      |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
index e3b5057..e3f2174 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tmpl
@@ -33,13 +33,13 @@
   <tr>
 	<th colspan=3 >
 		Bill To: <!-- TMPL_VAR NAME="firstname"> <!-- TMPL_VAR NAME="surname"> <br />
-		Card Number : <!-- TMPL_VAR NAME="cardnumber" --><br />
+		Card Number: <!-- TMPL_VAR NAME="cardnumber" --><br />
 	</th>
   </tr>
   <tr>
 	<th>Date</th>
     <th>Description of charges</th>
-    <th>Amount</th>
+    <th style="text-align:right;">Amount</th>
  </tr>
 
   <!-- TMPL_LOOP NAME="accounts" -->
@@ -52,7 +52,7 @@
   <!-- /TMPL_LOOP -->
 <tfoot>
   <tr>
-    <td colspan="2">Total outstanding dues as on date : </td>
+    <td colspan="2">Total outstanding dues as on date: </td>
     <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --></td>
   </tr>
   </tfoot>
-- 
1.7.3.2


From savitra.sirohi at osslabs.biz  Tue Nov 16 07:02:07 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Tue, 16 Nov 2010 11:32:07 +0530
Subject: [Koha-patches] [PATCH] Analytical records - move host field
	population to a C4 routine,
	all changes in pl files to call new routine
Message-ID: <1289887327-15842-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 C4/Biblio.pm             |   25 +++++++++++++++++++++++++
 cataloguing/addbiblio.pl |   11 ++---------
 cataloguing/linkitem.pl  |    9 +--------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index eb0b248..eb6ea42 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -84,6 +84,7 @@ BEGIN {
       &GetFrameworkCode
       &GetPublisherNameFromIsbn
       &TransformKohaToMarc
+      &PrepHostMarcField
 
       &CountItemsIssued
     );
@@ -1663,6 +1664,30 @@ sub TransformKohaToMarc {
     return $record;
 }
 
+=head2 PrepHostMarcField
+
+    $hostfield = PrepHostMarcField ( $hostbiblionumber )
+
+This function returns a host field populated with data from the host record, the field can then be added to an analytical record
+
+=cut
+
+sub PrepHostMarcField {
+	my ($hostbiblionumber,$hostitemnumber) = @_;
+        my $hostrecord = GetMarcBiblio($hostbiblionumber);
+
+	my $hostmarcfield = MARC::Field->new(
+			773, '', '',
+			'w' => $hostbiblionumber,
+                        'o' => $hostitemnumber,
+                        'a' => $hostrecord->subfield('245','a'),
+                        'x' => $hostrecord->subfield('245','x')
+                );
+
+    return $hostmarcfield;
+}
+
+
 =head2 TransformKohaToMarcOneField
 
     $record = TransformKohaToMarcOneField( $sth, $record, $kohafieldname, $value, $frameworkcode );
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 28aad1f..f0c94e0 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -890,18 +890,11 @@ if (($biblionumber) && !($breedingid)){
 if ($breedingid) {
     ( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;
 }
-#populate 773 if hostbiblionumber is available
+#populate hostfield if hostbiblionumber is available
 if ($hostbiblionumber){
-        my $hostrecord = &GetMarcBiblio($hostbiblionumber);
 	$record=MARC::Record->new();
 	$record->leader('');
-	my $field = MARC::Field->new(
-              773, '', '',
-              'w' => $hostbiblionumber,
-              'o' => $hostitemnumber,
-		'a' => $hostrecord->subfield('245','a'),
-		'x' => $hostrecord->subfield('245','x')
-		);
+        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
 	$record->append_fields($field);
 }
 
diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
index bff001e..1504875 100755
--- a/cataloguing/linkitem.pl
+++ b/cataloguing/linkitem.pl
@@ -55,16 +55,9 @@ if ($barcode && $biblionumber) {
 
     if ($hostitemnumber) {
 	my $hostbiblionumber = GetBiblionumberFromItemnumber($hostitemnumber);
-	my $hostrecord = GetMarcBiblio($hostbiblionumber);
 
 	if ($hostbiblionumber) {
-	        my $field = MARC::Field->new(
-			773, '', '',
-			'w' => $hostbiblionumber,
-			'o' => $hostitemnumber,
-               		'a' => $hostrecord->subfield('245','a'),
-	                'x' => $hostrecord->subfield('245','x')
-                );
+	        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
 		$biblio->append_fields($field);
 
 		my $modresult = ModBiblio($biblio, $biblionumber, ''); 
-- 
1.5.4.5


From savitra.sirohi at osslabs.biz  Tue Nov 16 07:02:44 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Tue, 16 Nov 2010 11:32:44 +0530
Subject: [Koha-patches] [PATCH] Analytical records: Moving get host items
	code into a C4 routine,
	also calling the new routine in related perl scripts
Message-ID: <1289887364-16107-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 C4/Items.pm             |   30 ++++++++++++++++++++++++++++++
 catalogue/detail.pl     |   17 +++++------------
 catalogue/moredetail.pl |   17 +++++------------
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 264fa5b..c0c223a 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -64,6 +64,7 @@ BEGIN {
         GetItemInfosOf
         GetItemsByBiblioitemnumber
         GetItemsInfo
+	GetHostItemsInfo
         get_itemnumbers_of
         GetItemnumberFromBarcode
         GetBarcodeFromItemnumber
@@ -1317,6 +1318,35 @@ sub GetItemsInfo {
 	}
 }
 
+
+=head2 GetHostItemsInfo
+
+	$hostiteminfo = GetHostItemsInfo($hostfield);
+
+	Returns the iteminfo for items linked to records via a host field
+
+=cut
+
+sub GetHostItemsInfo {
+	my ($record) = @_;
+	my @returnitemsInfo;
+
+	#MARC21 mapping, UNIMARC to be added
+	foreach my $hostfield ( $record->field('773') ) {
+        	my $hostbiblionumber = $hostfield->subfield("w");
+	        my $linkeditemnumber = $hostfield->subfield("o");
+        	my @hostitemInfos = GetItemsInfo($hostbiblionumber);
+	        foreach my $hostitemInfo (@hostitemInfos){
+        	        if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
+                	        push (@returnitemsInfo,$hostitemInfo);
+				last;
+                	}
+        	}
+	}
+	return @returnitemsInfo;
+}
+
+
 =head2 GetLastAcquisitions
 
   my $lastacq = GetLastAcquisitions({'branches' => ('branch1','branch2'), 
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 4dd5ddf..72324de 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -105,18 +105,11 @@ my @items = &GetItemsInfo( $biblionumber, 'intra' );
 # flag indicating existence of at least one item linked via a host record
 my $hostrecords;
 # adding items linked via host biblios
-   foreach my $hostfield ( $record->field('773')) {
-        my $hostbiblionumber = $hostfield->subfield("w");
-        my $linkeditemnumber = $hostfield->subfield("o");
-        my @hostitemInfos = GetItemsInfo($hostbiblionumber);
-        foreach my $hostitemInfo (@hostitemInfos){
-                if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
-                        $hostrecords =1;
-                        push(@items, $hostitemInfo);
-                }
-         }
-    }
-
+my @hostitems = GetHostItemsInfo($record);
+if (@hostitems){
+	$hostrecords =1;
+	push (@items, at hostitems);
+}
 
 my $dat = &GetBiblioData($biblionumber);
 
diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 05a5a60..097d1ff 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -78,18 +78,11 @@ my $record=GetMarcBiblio($biblionumber);
 
 my $hostrecords;
 # adding items linked via host biblios
-   foreach my $hostfield ( $record->field('773')) {
-        my $hostbiblionumber = $hostfield->subfield("w");
-        my $linkeditemnumber = $hostfield->subfield("o");
-        my @hostitemInfos = GetItemsInfo($hostbiblionumber);
-        foreach my $hostitemInfo (@hostitemInfos){
-                if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
-                        $hostrecords =1;
-                        push(@items, $hostitemInfo);
-                }
-         }
-    }
-
+my @hostitems = GetHostItemsInfo($record);
+if (@hostitems){
+        $hostrecords =1;
+        push (@items, at hostitems);
+}
 
 my $count=@items;
 $data->{'count'}=$count;
-- 
1.5.4.5


From savitra.sirohi at osslabs.biz  Tue Nov 16 07:03:14 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Tue, 16 Nov 2010 11:33:14 +0530
Subject: [Koha-patches] [PATCH] Analytical records: fix copyright line in
	linkitem.pl
Message-ID: <1289887394-16835-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 cataloguing/linkitem.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
index 1504875..d4959ad 100755
--- a/cataloguing/linkitem.pl
+++ b/cataloguing/linkitem.pl
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
-# Move an item from a biblio to another
+# Link an item belonging to an analytical record, the item barcode needs to be provided
 #
-# Copyright 2009 BibLibre
+# Copyright 2009 BibLibre, 2010 Nucsoft OSS Labs
 #
 # This file is part of Koha.
 #
-- 
1.5.4.5


From M.de.Rooy at rijksmuseum.nl  Tue Nov 16 14:19:43 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Tue, 16 Nov 2010 13:19:43 +0000
Subject: [Koha-patches] [PATCH] bug 5066: log timestamp consistently in
	_session_log
In-Reply-To: <1289913435-13341-1-git-send-email-m.de.rooy@rijksmuseum.nl>
References: <1289913435-13341-1-git-send-email-m.de.rooy@rijksmuseum.nl>
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA311A24B9@S-MAIL-1B.rijksmuseum.intra>

From: Galen Charlton <gmcharlt at gmail.com>

Alternative to Marcel de Rooy's patch of 4 November.  The
rest of C4/Auth.pm uses strftime("%c", localtime) to format
the timestamp, and in general,
strftime('%c', localtime) ne scalar(localtime).

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
---
 C4/Auth.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index c7477b1..7404f96 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -717,7 +717,7 @@ sub checkauth {
                    ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
                }
                if ($return) {
-               _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},localtime);
+               _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime));
                if ( $flags = haspermission(  $userid, $flagsrequired ) ) {
                                        $loggedin = 1;
                }
--
1.6.0.6

From colin.campbell at ptfs-europe.com  Tue Nov 16 18:34:27 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 16 Nov 2010 17:34:27 +0000
Subject: [Koha-patches] [PATCH] Bug 4074 Fix fail to parse simple qualified
	search
Message-ID: <1289928867-23621-1-git-send-email-colin.campbell@ptfs-europe.com>

Searches such as au,phr and kw,wrdl were passing through the regexes
that should replace colon with equals
add wrdl and phr
use trn so not just rtrn is spotted
Where we were checking for multiple spaces specify that in the
regex not just two spaces
---
 C4/Search.pm |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index d36459a..93999bb 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1308,10 +1308,11 @@ sub buildQuery {
     # if user wants to do ccl or cql, start the query with that
 #    $query =~ s/:/=/g;
     $query =~ s/(?<=(ti|au|pb|su|an|kw|mc)):/=/g;
-    $query =~ s/(?<=rtrn):/=/g;
+    $query =~ s/(?<=(wrdl)):/=/g;
+    $query =~ s/(?<=(trn|phr)):/=/g;
     $limit =~ s/:/=/g;
     for ( $query, $query_desc, $limit, $limit_desc ) {
-        s/  / /g;    # remove extra spaces
+        s/  +/ /g;    # remove extra spaces
         s/^ //g;     # remove any beginning spaces
         s/ $//g;     # remove any ending spaces
         s/==/=/g;    # remove double == from query
-- 
1.7.3.2


From cfouts at liblime.com  Tue Nov 16 19:20:18 2010
From: cfouts at liblime.com (Clay Fouts)
Date: Tue, 16 Nov 2010 10:20:18 -0800
Subject: [Koha-patches] [PATCH] Bug 5408 - Refactor GetIssuingRule and
	GetLoanLength
In-Reply-To: <4CE1790D.2090007@biblibre.com>
References: <1289809040-1427-1-git-send-email-cfouts@liblime.com>
	<20101115092355.GV4325@rorohiko>
	<AANLkTinjs185VPgsiSQ0JU+OYp9P1YusHRKZc-fUicEv@mail.gmail.com>
	<4CE1790D.2090007@biblibre.com>
Message-ID: <AANLkTimJk0Y+TSRFVUjONb6xua=eoJ6jwH6eub70-qkq@mail.gmail.com>

What's the status of merging this development? Is anyone working on it? My
implementation of that particular function is more readable (and less DB
intensive in many cases), but your branch has the advantage in terms of
being more complete and fully separating out the issuing rules concerns into
their own module. What remains to be done?

Clay


On Mon, Nov 15, 2010 at 10:16 AM, LAURENT Henri-Damien <
henridamien.laurent at biblibre.com> wrote:

> Le 15/11/2010 17:45, Clay Fouts a ?crit :
> > Well, that's a much larger project since AFAICT all the issuingrules
> > table mutations come from directly within smart-rules.pl
> > <http://smart-rules.pl>. So all that code needs to me moved into
> C4::Circ.
> >
> > As is, there's no actual freshness issue since the cache-enabled
> > functions are not used from within any script that also mutates the
> > data. That cache-reset function is there as a reminder to use it when
> > there's further normalization to the data layer.
> In order to adress that concern, we created a Perl Module
> C4::IssuingRules.pm
> Due to the time we did it (at least 6 month ago)... It is not using
> DBIx::Class but C4::SQLHelper.
> But it does what you wanted to do.
> And quite help improving the user interface...
> See the smart-rules page on BibLibre-memb-circ-update
> in wip/koha-biblibre.git in order to see the results of the development.
>
> Feel free to test and comment on that.
> If you donot want to create a test we can set one up as we did for other
> branches, just ask.
>
> --
> Henri-Damien LAURENT
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101116/7bff550e/attachment.htm>

From chrisc at catalyst.net.nz  Tue Nov 16 20:07:33 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 17 Nov 2010 08:07:33 +1300
Subject: [Koha-patches] [PATCH] Bug 5408 - Refactor GetIssuingRule and
 GetLoanLength
In-Reply-To: <AANLkTimJk0Y+TSRFVUjONb6xua=eoJ6jwH6eub70-qkq@mail.gmail.com>
References: <1289809040-1427-1-git-send-email-cfouts@liblime.com>
	<20101115092355.GV4325@rorohiko>
	<AANLkTinjs185VPgsiSQ0JU+OYp9P1YusHRKZc-fUicEv@mail.gmail.com>
	<4CE1790D.2090007@biblibre.com>
	<AANLkTimJk0Y+TSRFVUjONb6xua=eoJ6jwH6eub70-qkq@mail.gmail.com>
Message-ID: <20101116190733.GW4325@rorohiko>

* Clay Fouts (cfouts at liblime.com) wrote:
>    What's the status of merging this development? Is anyone working on it? My
>    implementation of that particular function is more readable (and less DB
>    intensive in many cases), but your branch has the advantage in terms of
>    being more complete and fully separating out the issuing rules concerns
>    into their own module. What remains to be done?
>    Clay

Biblibres branches are all published, and they have spent considerable
time rebasing them all so they apply on master.

They are currently working their way through qa, the reports branch is
very close to merging.

But anyone can take any of the branches and work on signoff on patches,
or provide feedback, or in your case, merge your patch with that branch
and submit a pull request for that new branch.

Thats the great thing we distributed version control.

Chris

> 
>    On Mon, Nov 15, 2010 at 10:16 AM, LAURENT Henri-Damien
>    <henridamien.laurent at biblibre.com> wrote:
> 
>      Le 15/11/2010 17:45, Clay Fouts a ecrit :
>      > Well, that's a much larger project since AFAICT all the issuingrules
>      > table mutations come from directly within smart-rules.pl
>      > <http://smart-rules.pl>. So all that code needs to me moved into
>      C4::Circ.
>      >
>      > As is, there's no actual freshness issue since the cache-enabled
>      > functions are not used from within any script that also mutates the
>      > data. That cache-reset function is there as a reminder to use it when
>      > there's further normalization to the data layer.
>      In order to adress that concern, we created a Perl Module
>      C4::IssuingRules.pm
>      Due to the time we did it (at least 6 month ago)... It is not using
>      DBIx::Class but C4::SQLHelper.
>      But it does what you wanted to do.
>      And quite help improving the user interface...
>      See the smart-rules page on BibLibre-memb-circ-update
>      in wip/koha-biblibre.git in order to see the results of the development.
> 
>      Feel free to test and comment on that.
>      If you donot want to create a test we can set one up as we did for other
>      branches, just ask.
> 
>      --
>      Henri-Damien LAURENT
>      _______________________________________________
>      Koha-patches mailing list
>      Koha-patches at lists.koha-community.org
>      http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
>      website : http://www.koha-community.org/
>      git : http://git.koha-community.org/
>      bugs : http://bugs.koha-community.org/

> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/


-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101117/d9705513/attachment-0001.pgp>

From gmcharlt at gmail.com  Wed Nov 17 00:33:49 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue, 16 Nov 2010 18:33:49 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5152 - confirm
	buttons different styles on lists
Message-ID: <1289950429-2091-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/virtualshelves/shelves.tmpl    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index e6c8113..ddd895c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -419,7 +419,7 @@ function placeHold () {
 					<input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" value="1" />
 					<!-- TMPL_IF NAME="confirm" -->
 					<input type="hidden" name="CONFIRM-<!-- TMPL_VAR NAME="confirm" -->" value="1" />
-					<input type="submit" class="confirm" value="Confirm" />
+					<input type="submit" class="approve" value="Confirm" />
 					<!-- TMPL_ELSE -->
 					<input type="submit" class="deleteshelf" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));" value="Delete" />
 					<!-- /TMPL_IF -->
-- 
1.7.0


From gmcharlt at gmail.com  Wed Nov 17 00:43:43 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue, 16 Nov 2010 18:43:43 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5037 - If patron
	category is empty it shouldn't show
Message-ID: <1289951023-2901-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/modules/members/memberentrygen.tmpl    |   26 +++++++++++--------
 members/memberentry.pl                             |    2 +
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 5fa4f82..806b43c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -742,22 +742,26 @@
         <label for="categorycode">Category: </label>
         <select id="categorycode" name="categorycode">
         <!-- TMPL_LOOP NAME="typeloop" -->
-		<!-- TMPL_IF EXPR="typename eq 'C'" --><optgroup label="Child"><!-- /TMPL_IF -->
-		<!-- TMPL_IF EXPR="typename eq 'A'" --><optgroup label="Adult"><!-- /TMPL_IF -->
-		<!-- TMPL_IF EXPR="typename eq 'S'" --><optgroup label="Staff"><!-- /TMPL_IF -->
-		<!-- TMPL_IF EXPR="typename eq 'I'" --><optgroup label="Organization"><!-- /TMPL_IF -->
-		<!-- TMPL_IF EXPR="typename eq 'P'" --><optgroup label="Professional"><!-- /TMPL_IF -->
-		<!-- TMPL_IF EXPR="typename eq 'X'" --><optgroup label="Statistical"><!-- /TMPL_IF -->
-                <!-- TMPL_LOOP NAME="categoryloop" -->
+			<!-- TMPL_LOOP NAME="categoryloop" -->
+				<!-- TMPL_IF NAME="__first__" -->
+					<!-- TMPL_IF NAME="typename_C" --><optgroup label="Child"><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="typename_A" --><optgroup label="Adult"><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="typename_S" --><optgroup label="Staff"><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="typename_I" --><optgroup label="Organization"><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="typename_P" --><optgroup label="Professional"><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="typename_X" --><optgroup label="Statistical"><!-- /TMPL_IF -->
+			    <!-- /TMPL_IF -->
 				<!-- TMPL_IF NAME="categorycodeselected" -->
                <option value="<!-- TMPL_VAR NAME="categorycode" -->" selected="selected"><!-- TMPL_VAR NAME="categoryname" --></option>
 				<!-- TMPL_ELSE -->
 <option value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="categoryname" --></option>
 				<!-- /TMPL_IF -->
-                <!-- /TMPL_LOOP -->
-        </optgroup>
-        <!-- /TMPL_LOOP -->
-		</select>
+				<!-- TMPL_IF NAME="__last__" -->
+			        </optgroup>
+				<!-- /TMPL_IF -->
+            <!-- /TMPL_LOOP -->
+       <!-- /TMPL_LOOP -->
+       </select>
     <!-- TMPL_ELSE -->
         <span class="problem">There is no category type to add <!--TMPL_IF Name="A"-->an Adult<!--/TMPL_IF--><!--TMPL_IF Name="C"-->a Child<!--/TMPL_IF--><!--TMPL_IF Name="I"-->an Institution<!--/TMPL_IF--><!--TMPL_IF Name="P"-->a Professional<!--/TMPL_IF--><!--TMPL_IF Name="S"-->a Staff Member<!--/TMPL_IF-->.</span>
               <a href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>
diff --git a/members/memberentry.pl b/members/memberentry.pl
index c25f7c9..fbd8538 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -429,8 +429,10 @@ foreach (qw(C A S P I X)) {
 	}
 	my %typehash;
 	$typehash{'typename'}=$_;
+    my $typedescription = "typename_".$typehash{'typename'};
 	$typehash{'categoryloop'}=\@categoryloop;
 	push @typeloop,{'typename' => $_,
+        $typedescription => 1,
 	  'categoryloop' => \@categoryloop};
 }  
 $template->param('typeloop' => \@typeloop);
-- 
1.7.0


From gmcharlt at gmail.com  Wed Nov 17 00:52:36 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue, 16 Nov 2010 18:52:36 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 3013,
	Value builder for 006 and 008 need choices for all format types
Message-ID: <1289951556-3141-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

This partial fix adds a complete list of values for 006/00, "Form of material,"
following the list found here: http://www.loc.gov/marc/bibliographic/bd006.html

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../value_builder/marc21_field_006.tmpl            |   86 +++++++++++++++++++-
 1 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
index 96110d8..ab2a079 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
@@ -17,12 +17,90 @@
                                 <option value="a">a- Language material</option>
                         <!-- /TMPL_IF -->
 
-                        <!-- TMPL_IF name="f0b" -->
-                                <option value="b" selected="selected">b- Manuscript language material</option>
+                        <!-- TMPL_IF name="f0c" -->
+                                <option value="c" selected="selected">c - Notated music</option>
                         <!-- TMPL_ELSE -->
-                                <option value="b">b- Manuscript language material</option>
+                                <option value="c">c - Notated music</option>
                         <!-- /TMPL_IF -->
-        		</select>
+
+                        <!-- TMPL_IF name="f0d" -->
+                                <option value="d" selected="selected">d - Manuscript notated music</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="d">d - Manuscript notated music</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0e" -->
+                                <option value="e" selected="selected">e - Cartographic material</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="e">e - Cartographic material</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0f" -->
+                                <option value="f" selected="selected">f - Manuscript cartographic material</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="f">f - Manuscript cartographic material</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0g" -->
+                                <option value="g" selected="selected">g - Projected medium</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="g">g - Projected medium</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0i" -->
+                                <option value="i" selected="selected">i - Nonmusical sound recording</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="i">i - Nonmusical sound recording</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0j" -->
+                                <option value="j" selected="selected">j - Musical sound recording</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="j">j - Musical sound recording</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0k" -->
+                                <option value="k" selected="selected">k - Two-dimensional nonprojectable graphic</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="k">k - Two-dimensional nonprojectable graphic</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0m" -->
+                                <option value="m" selected="selected">m - Computer file/Electronic resource</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="m">m - Computer file/Electronic resource</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0o" -->
+                                <option value="o" selected="selected">o - Kit</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="o">o - Kit</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0p" -->
+                                <option value="p" selected="selected">p - Mixed material</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="p">p - Mixed material</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0r" -->
+                                <option value="r" selected="selected">r - Three-dimensional artifact or naturally occurring object</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="r">r - Three-dimensional artifact or naturally occurring object</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0s" -->
+                                <option value="s" selected="selected">s - Serial/Integrating resource</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="s">s - Serial/Integrating resource</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f0t" -->
+                                <option value="t" selected="selected">t - Manuscript language material</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="t">t - Manuscript language material</option>
+                        <!-- /TMPL_IF -->
+                        </select>
 		</td>
 	</tr>
 	<tr>
-- 
1.7.0


From gmcharlt at gmail.com  Wed Nov 17 01:33:38 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Tue, 16 Nov 2010 19:33:38 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 4074 Fix fail to parse
	simple qualified search
Message-ID: <1289954018-3448-1-git-send-email-gmcharlt@gmail.com>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

Searches such as au,phr and kw,wrdl were passing through the regexes
that should replace colon with equals
add wrdl and phr
use trn so not just rtrn is spotted
Where we were checking for multiple spaces specify that in the
regex not just two spaces

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Search.pm |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index d36459a..93999bb 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1308,10 +1308,11 @@ sub buildQuery {
     # if user wants to do ccl or cql, start the query with that
 #    $query =~ s/:/=/g;
     $query =~ s/(?<=(ti|au|pb|su|an|kw|mc)):/=/g;
-    $query =~ s/(?<=rtrn):/=/g;
+    $query =~ s/(?<=(wrdl)):/=/g;
+    $query =~ s/(?<=(trn|phr)):/=/g;
     $limit =~ s/:/=/g;
     for ( $query, $query_desc, $limit, $limit_desc ) {
-        s/  / /g;    # remove extra spaces
+        s/  +/ /g;    # remove extra spaces
         s/^ //g;     # remove any beginning spaces
         s/ $//g;     # remove any ending spaces
         s/==/=/g;    # remove double == from query
-- 
1.7.0


From tomascohen at gmail.com  Wed Nov 17 02:02:39 2010
From: tomascohen at gmail.com (=?UTF-8?q?Tom=C3=A1s=20Cohen=20Arazi?=)
Date: Tue, 16 Nov 2010 22:02:39 -0300
Subject: [Koha-patches] [PATCH] Bug 5412 double quotes break coins and thus
	search results in some scenarios
Message-ID: <1289955759-22993-1-git-send-email-tomascohen@gmail.com>

---
 C4/Biblio.pm |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 81ccfbb..6a422be 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1198,6 +1198,7 @@ sub GetCOinSBiblio {
     my $coins_value =
 "ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3A$mtx$genre$title&amp;rft.isbn=$isbn&amp;rft.issn=$issn&amp;rft.aulast=$aulast&amp;rft.aufirst=$aufirst$oauthors&amp;rft.pub=$publisher&amp;rft.date=$pubyear";
     $coins_value =~ s/(\ |&[^a])/\+/g;
+    $coins_value =~ s/\"/\&quot\;/g;
 
 #<!-- TMPL_VAR NAME="ocoins_format" -->&amp;rft.au=<!-- TMPL_VAR NAME="author" -->&amp;rft.btitle=<!-- TMPL_VAR NAME="title" -->&amp;rft.date=<!-- TMPL_VAR NAME="publicationyear" -->&amp;rft.pages=<!-- TMPL_VAR NAME="pages" -->&amp;rft.isbn=<!-- TMPL_VAR NAME=amazonisbn -->&amp;rft.aucorp=&amp;rft.place=<!-- TMPL_VAR NAME="place" -->&amp;rft.pub=<!-- TMPL_VAR NAME="publishercode" -->&amp;rft.edition=<!-- TMPL_VAR NAME="edition" -->&amp;rft.series=<!-- TMPL_VAR NAME="series" -->&amp;rft.genre="
 
-- 
1.7.1


From chrisc at catalyst.net.nz  Wed Nov 17 04:38:14 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 17 Nov 2010 16:38:14 +1300
Subject: [Koha-patches] [PATCH] Analytical records - move host field
 population to a C4 routine, all changes in pl files to call new routine
In-Reply-To: <1289887327-15842-1-git-send-email-savitra.sirohi@osslabs.biz>
References: <1289887327-15842-1-git-send-email-savitra.sirohi@osslabs.biz>
Message-ID: <20101117033814.GD4325@rorohiko>

Hi,

This patch wouldnt apply, the following 2 analytical records one applied
ok.

Cannot fall back to three-way merge.
Patch failed at 0001 Analytical records - move host field population to
a C4 routine, all changes in pl files to call new routine

Chris


* savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz) wrote:
> From: Amit Gupta <amit.gupta at osslabs.biz>
> 
> ---
>  C4/Biblio.pm             |   25 +++++++++++++++++++++++++
>  cataloguing/addbiblio.pl |   11 ++---------
>  cataloguing/linkitem.pl  |    9 +--------
>  3 files changed, 28 insertions(+), 17 deletions(-)
> 
> diff --git a/C4/Biblio.pm b/C4/Biblio.pm
> index eb0b248..eb6ea42 100644
> --- a/C4/Biblio.pm
> +++ b/C4/Biblio.pm
> @@ -84,6 +84,7 @@ BEGIN {
>        &GetFrameworkCode
>        &GetPublisherNameFromIsbn
>        &TransformKohaToMarc
> +      &PrepHostMarcField
>  
>        &CountItemsIssued
>      );
> @@ -1663,6 +1664,30 @@ sub TransformKohaToMarc {
>      return $record;
>  }
>  
> +=head2 PrepHostMarcField
> +
> +    $hostfield = PrepHostMarcField ( $hostbiblionumber )
> +
> +This function returns a host field populated with data from the host record, the field can then be added to an analytical record
> +
> +=cut
> +
> +sub PrepHostMarcField {
> +	my ($hostbiblionumber,$hostitemnumber) = @_;
> +        my $hostrecord = GetMarcBiblio($hostbiblionumber);
> +
> +	my $hostmarcfield = MARC::Field->new(
> +			773, '', '',
> +			'w' => $hostbiblionumber,
> +                        'o' => $hostitemnumber,
> +                        'a' => $hostrecord->subfield('245','a'),
> +                        'x' => $hostrecord->subfield('245','x')
> +                );
> +
> +    return $hostmarcfield;
> +}
> +
> +
>  =head2 TransformKohaToMarcOneField
>  
>      $record = TransformKohaToMarcOneField( $sth, $record, $kohafieldname, $value, $frameworkcode );
> diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
> index 28aad1f..f0c94e0 100755
> --- a/cataloguing/addbiblio.pl
> +++ b/cataloguing/addbiblio.pl
> @@ -890,18 +890,11 @@ if (($biblionumber) && !($breedingid)){
>  if ($breedingid) {
>      ( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;
>  }
> -#populate 773 if hostbiblionumber is available
> +#populate hostfield if hostbiblionumber is available
>  if ($hostbiblionumber){
> -        my $hostrecord = &GetMarcBiblio($hostbiblionumber);
>  	$record=MARC::Record->new();
>  	$record->leader('');
> -	my $field = MARC::Field->new(
> -              773, '', '',
> -              'w' => $hostbiblionumber,
> -              'o' => $hostitemnumber,
> -		'a' => $hostrecord->subfield('245','a'),
> -		'x' => $hostrecord->subfield('245','x')
> -		);
> +        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
>  	$record->append_fields($field);
>  }
>  
> diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
> index bff001e..1504875 100755
> --- a/cataloguing/linkitem.pl
> +++ b/cataloguing/linkitem.pl
> @@ -55,16 +55,9 @@ if ($barcode && $biblionumber) {
>  
>      if ($hostitemnumber) {
>  	my $hostbiblionumber = GetBiblionumberFromItemnumber($hostitemnumber);
> -	my $hostrecord = GetMarcBiblio($hostbiblionumber);
>  
>  	if ($hostbiblionumber) {
> -	        my $field = MARC::Field->new(
> -			773, '', '',
> -			'w' => $hostbiblionumber,
> -			'o' => $hostitemnumber,
> -               		'a' => $hostrecord->subfield('245','a'),
> -	                'x' => $hostrecord->subfield('245','x')
> -                );
> +	        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
>  		$biblio->append_fields($field);
>  
>  		my $modresult = ModBiblio($biblio, $biblionumber, ''); 
> -- 
> 1.5.4.5
> 
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101117/d89cb515/attachment.pgp>

From chrisc at catalyst.net.nz  Wed Nov 17 05:00:39 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 17 Nov 2010 17:00:39 +1300
Subject: [Koha-patches] [PATCH] bug 5066: log timestamp consistently in
 _session_log
In-Reply-To: <809BE39CD64BFD4EB9036172EBCCFA311A24B9@S-MAIL-1B.rijksmuseum.intra>
References: <1289913435-13341-1-git-send-email-m.de.rooy@rijksmuseum.nl>
	<809BE39CD64BFD4EB9036172EBCCFA311A24B9@S-MAIL-1B.rijksmuseum.intra>
Message-ID: <20101117040039.GE4325@rorohiko>

Can you please rebase this against master, and resend. It currently
doesnt apply

Chris

* Marcel de Rooy (M.de.Rooy at rijksmuseum.nl) wrote:
> From: Galen Charlton <gmcharlt at gmail.com>
> 
> Alternative to Marcel de Rooy's patch of 4 November.  The
> rest of C4/Auth.pm uses strftime("%c", localtime) to format
> the timestamp, and in general,
> strftime('%c', localtime) ne scalar(localtime).
> 
> Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
> Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
> ---
>  C4/Auth.pm |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/C4/Auth.pm b/C4/Auth.pm
> index c7477b1..7404f96 100644
> --- a/C4/Auth.pm
> +++ b/C4/Auth.pm
> @@ -717,7 +717,7 @@ sub checkauth {
>                     ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
>                 }
>                 if ($return) {
> -               _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},localtime);
> +               _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime));
>                 if ( $flags = haspermission(  $userid, $flagsrequired ) ) {
>                                         $loggedin = 1;
>                 }
> --
> 1.6.0.6
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: </pipermail/koha-patches/attachments/20101117/80c0bf13/attachment-0001.pgp>

From M.de.Rooy at rijksmuseum.nl  Wed Nov 17 13:18:00 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Wed, 17 Nov 2010 12:18:00 +0000
Subject: [Koha-patches] [PATCH] Bug 5066 (Log timestamp consistently in
	_session_log)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA311A2754@S-MAIL-1B.rijksmuseum.intra>

Small fix with thanks to Galen.
---
 C4/Auth.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index c7477b1..7404f96 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -717,7 +717,7 @@ sub checkauth {
 		    ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password, $query );
 		}
 		if ($return) {
-            	_session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},localtime);
+               _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},(strftime '%c', localtime));
             	if ( $flags = haspermission(  $userid, $flagsrequired ) ) {
 					$loggedin = 1;
             	}
-- 
1.6.0.6


From colin.campbell at ptfs-europe.com  Wed Nov 17 15:24:28 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 17 Nov 2010 14:24:28 +0000
Subject: [Koha-patches] [PATCH 1/2] Bug 5415 More consistent returns from
	SimpleSearch
Message-ID: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>

SimpleSearch returns a 3 element array the first pf which is an error
indication. If an error is returned the other elements are
undefined. If error is undef the other elements are defined
This restores the consistency of the interface as it was before
the addition of zebra
---
 C4/Search.pm |   77 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 93999bb..4946d0a 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -120,18 +120,19 @@ sub FindDuplicate {
         }
     }
 
-    # FIXME: add error handling
-    my ( $error, $searchresults ) = SimpleSearch($query); # FIXME :: hardcoded !
+    my ( $error, $searchresults, undef ) = SimpleSearch($query); # FIXME :: hardcoded !
     my @results;
-    foreach my $possible_duplicate_record (@$searchresults) {
-        my $marcrecord =
-          MARC::Record->new_from_usmarc($possible_duplicate_record);
-        my $result = TransformMarcToKoha( $dbh, $marcrecord, '' );
-
-        # FIXME :: why 2 $biblionumber ?
-        if ($result) {
-            push @results, $result->{'biblionumber'};
-            push @results, $result->{'title'};
+    if (!defined $error) {
+        foreach my $possible_duplicate_record (@{$searchresults}) {
+            my $marcrecord =
+            MARC::Record->new_from_usmarc($possible_duplicate_record);
+            my $result = TransformMarcToKoha( $dbh, $marcrecord, '' );
+
+            # FIXME :: why 2 $biblionumber ?
+            if ($result) {
+                push @results, $result->{'biblionumber'};
+                push @results, $result->{'title'};
+            }
         }
     }
     return @results;
@@ -153,12 +154,16 @@ This function provides a simple search API on the bibliographic catalog
     * $max_results - if present, determines the maximum number of records to fetch. undef is All. defaults to undef.
 
 
-=item C<Output:>
+=item C<Return:>
 
-    * $error is a empty unless an error is detected
-    * \@results is an array of records.
+    Returns an array consisting of three elements
+    * $error is undefined unless an error is detected
+    * $results is a reference to an array of records.
     * $total_hits is the number of hits that would have been returned with no limit
 
+    If an error is returned the two other return elements are undefined. If error itself is undefined
+    the other two elements are always defined
+
 =item C<usage in the script:>
 
 =back
@@ -172,23 +177,23 @@ if (defined $error) {
     exit;
 }
 
-my $hits = scalar @$marcresults;
+my $hits = @{$marcresults};
 my @results;
 
-for my $i (0..$hits) {
-    my %resultsloop;
-    my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]);
-    my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,'');
-
-    #build the hash for the template.
-    $resultsloop{title}           = $biblio->{'title'};
-    $resultsloop{subtitle}        = $biblio->{'subtitle'};
-    $resultsloop{biblionumber}    = $biblio->{'biblionumber'};
-    $resultsloop{author}          = $biblio->{'author'};
-    $resultsloop{publishercode}   = $biblio->{'publishercode'};
-    $resultsloop{publicationyear} = $biblio->{'publicationyear'};
+for my $r ( @{$marcresults} ) {
+    my $marcrecord = MARC::File::USMARC::decode($r);
+    my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,q{});
+
+    #build the iarray of hashs for the template.
+    push @results, {
+        title           => $biblio->{'title'},
+        subtitle        => $biblio->{'subtitle'},
+        biblionumber    => $biblio->{'biblionumber'},
+        author          => $biblio->{'author'},
+        publishercode   => $biblio->{'publishercode'},
+        publicationyear => $biblio->{'publicationyear'},
+        };
 
-    push @results, \%resultsloop;
 }
 
 $template->param(result=>\@results);
@@ -206,14 +211,14 @@ sub SimpleSearch {
         return ( undef, $search_result, scalar($result->{hits}) );
     }
     else {
+        return ( 'No query entered', undef, undef ) unless $query;
         # FIXME hardcoded value. See catalog/search.pl & opac-search.pl too.
-        my @servers = defined ( $servers ) ? @$servers : ( "biblioserver" );
-        my @results;
+        my @servers = defined ( $servers ) ? @$servers : ( 'biblioserver' );
         my @zoom_queries;
         my @tmpresults;
         my @zconns;
-        my $total_hits;
-        return ( "No query entered", undef, undef ) unless $query;
+        my $results = [];
+        my $total_hits = 0;
 
         # Initialize & Search Zebra
         for ( my $i = 0 ; $i < @servers ; $i++ ) {
@@ -257,7 +262,7 @@ sub SimpleSearch {
 
                 for my $j ( $first_record..$last_record ) {
                     my $record = $tmpresults[ $i - 1 ]->record( $j-1 )->raw(); # 0 indexed
-                    push @results, $record;
+                    push @{$results}, $record;
                 }
             }
         }
@@ -269,7 +274,7 @@ sub SimpleSearch {
             $zoom_query->destroy();
         }
 
-        return ( undef, \@results, $total_hits );
+        return ( undef, $results, $total_hits );
     }
 }
 
@@ -2559,11 +2564,11 @@ AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|);
         warn "BIBLIOADDSAUTHORITIES: $error";
             return (0,0) ;
           }
-      if ($results && scalar(@$results)==1) {
+      if ( @{$results} == 1 ) {
         my $marcrecord = MARC::File::USMARC::decode($results->[0]);
         $field->add_subfields('9'=>$marcrecord->field('001')->data);
         $countlinked++;
-      } elsif (scalar(@$results)>1) {
+      } elsif ( @{$results} > 1 ) {
    #More than One result
    #This can comes out of a lack of a subfield.
 #         my $marcrecord = MARC::File::USMARC::decode($results->[0]);
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Wed Nov 17 15:24:29 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 17 Nov 2010 14:24:29 +0000
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
	utilize considtent interface
In-Reply-To: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
Message-ID: <1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>

Remove some unnecessary checks when check of error is
sufficient. Make the order in some cases more logical
Should remove some possibilities of runtime warning noise.
Although some calls belong to the 'Nothing could
ever go wrong' school have added some warnings
---
 C4/AuthoritiesMarc.pm                             |    9 +++++++--
 C4/Heading.pm                                     |    7 +++++++
 C4/Matcher.pm                                     |    9 ++++++---
 acqui/neworderbiblio.pl                           |   13 ++++++-------
 authorities/authorities-list.pl                   |    3 +++
 cataloguing/addbiblio.pl                          |    6 +++---
 cataloguing/addbooks.pl                           |    4 ++--
 cataloguing/value_builder/unimarc_field_4XX.pl    |    5 ++++-
 labels/label-item-search.pl                       |    4 ++--
 misc/migration_tools/bulkmarcimport.pl            |    8 ++++----
 misc/migration_tools/remove_unused_authorities.pl |    4 ++++
 serials/subscription-bib-search.pl                |    2 +-
 t/lib/KohaTest.pm                                 |    4 ++--
 13 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index d07cca4..606c1c8 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -362,7 +362,12 @@ sub CountUsage {
         my $query;
         $query= "an=".$authid;
   		my ($err,$res,$result) = C4::Search::SimpleSearch($query,0,10);
-        return ($result);
+        if ($err) {
+            warn "Error: $err from search $query";
+            $result = 0;
+        }
+
+        return $result;
     }
 }
 
@@ -903,7 +908,7 @@ sub FindDuplicateAuthority {
     }
     my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] );
     # there is at least 1 result => return the 1st one
-    if (@$results>0) {
+    if (!defined $error && @{$results} ) {
       my $marcrecord = MARC::File::USMARC::decode($results->[0]);
       return $marcrecord->field('001')->data,BuildSummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
     }
diff --git a/C4/Heading.pm b/C4/Heading.pm
index 9d7d98a..1ea5a74 100644
--- a/C4/Heading.pm
+++ b/C4/Heading.pm
@@ -24,6 +24,7 @@ use MARC::Field;
 use C4::Context;
 use C4::Heading::MARC21;
 use C4::Search;
+use Carp;
 
 our $VERSION = 3.00;
 
@@ -109,6 +110,9 @@ sub authorities {
     my $query = qq(Match-heading,ext="$self->{'search_form'}");
     $query .= $self->_query_limiters();
     my ($error, $results, $total_hits) = SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
+    if (defined $error) {
+        carp "Error:$error from search $query";
+    }
     return $results;
 }
 
@@ -126,6 +130,9 @@ sub preferred_authorities {
     my $query = "Match-heading-see-from,ext='$self->{'search_form'}'";
     $query .= $self->_query_limiters();
     my ($error, $results, $total_hits) = SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
+    if (defined $error) {
+        carp "Error:$error from search $query";
+    }
     return $results;
 }
 
diff --git a/C4/Matcher.pm b/C4/Matcher.pm
index 5915c12..9d1df67 100644
--- a/C4/Matcher.pm
+++ b/C4/Matcher.pm
@@ -606,9 +606,12 @@ sub get_matches {
         # FIXME only searching biblio index at the moment
         my ($error, $searchresults, $total_hits) = SimpleSearch($query, 0, $max_matches);
 
-        warn "search failed ($query) $error" if $error;
-        foreach my $matched (@$searchresults) {
-            $matches{$matched} += $matchpoint->{'score'};
+        if (defined $error ) {
+            warn "search failed ($query) $error";
+        } else {
+            foreach my $matched (@{$searchresults}) {
+                $matches{$matched} += $matchpoint->{'score'};
+            }
         }
     }
 
diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index 2333f89..9dd29d8 100755
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -112,16 +112,15 @@ if (defined $error) {
 
 my @results;
 
-if ($marcresults) {
-    foreach my $result ( @{$marcresults} ) {
-        my $marcrecord = MARC::File::USMARC::decode( $result );
-        my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
+foreach my $result ( @{$marcresults} ) {
+    my $marcrecord = MARC::File::USMARC::decode( $result );
+    my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
 
-        $biblio->{booksellerid} = $booksellerid;
-        push @results, $biblio;
+    $biblio->{booksellerid} = $booksellerid;
+    push @results, $biblio;
 
-    }
 }
+
 $template->param(
     basketno             => $basketno,
     booksellerid     => $bookseller->{'id'},
diff --git a/authorities/authorities-list.pl b/authorities/authorities-list.pl
index 9c472f1..eec3233 100755
--- a/authorities/authorities-list.pl
+++ b/authorities/authorities-list.pl
@@ -25,6 +25,9 @@ foreach my $authority (@$dataauthorities){
   $query= "an=".$authority->{'authid'};
   # search for biblios mapped
   my ($err,$res,$used) = C4::Search::SimpleSearch($query,0,10);
+  if (defined $err) {
+      $used = 0;
+  }
   if ($marcauthority && $marcauthority->field($authtypes{$authority->{'authtypecode'}}->{'tag'})){
     print qq("),$marcauthority->field($authtypes{$authority->{'authtypecode'}}->{"tag"})->as_string(),qq(";),qq($authority->{'authid'};"),$authtypes{$authority->{'authtypecode'}}->{'lib'},qq(";$used\n);
   }
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 2c0c63d..e64f4e2 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -768,16 +768,16 @@ AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|);
         warn "BIBLIOADDSAUTHORITIES: $error";
 	    return (0,0) ;
 	  }
-      if ($results && scalar(@$results)==1) {
+      if ( @{$results} == 1) {
         my $marcrecord = MARC::File::USMARC::decode($results->[0]);
         $field->add_subfields('9'=>$marcrecord->field('001')->data);
         $countlinked++;
-      } elsif (scalar(@$results)>1) {
+      } elsif (@{$results} > 1) {
    #More than One result 
    #This can comes out of a lack of a subfield.
 #         my $marcrecord = MARC::File::USMARC::decode($results->[0]);
 #         $record->field($data->{tagfield})->add_subfields('9'=>$marcrecord->field('001')->data);
-  $countlinked++;
+        $countlinked++;
       } else {
   #There are no results, build authority record, add it to Authorities, get authid and add it to 9
   ###NOTICE : This is only valid if a subfield is linked to one and only one authtypecode     
diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index 4c8a989..5e89ef8 100755
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -85,8 +85,8 @@ if ($query) {
 
     # format output
     # SimpleSearch() give the results per page we want, so 0 offet here
-    my $total = scalar @$marcresults;
-    my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, @$marcresults );
+    my $total = @{$marcresults};
+    my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, @{$marcresults} );
     $template->param(
         total          => $total_hits,
         query          => $query,
diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl
index 84a6208..ddb6547 100755
--- a/cataloguing/value_builder/unimarc_field_4XX.pl
+++ b/cataloguing/value_builder/unimarc_field_4XX.pl
@@ -335,7 +335,10 @@ sub plugin {
         my $orderby;
         $search = 'kw,wrdl='.$search.' and mc-itemtype='.$itype if $itype;
         my ( $errors, $results, $total_hits ) = SimpleSearch($search, $startfrom * $resultsperpage, $resultsperpage );
-        my $total = scalar(@$results);
+        if (defined $errors ) {
+            $results = [];
+        }
+        my $total = @{$results};
 
         #        warn " biblio count : ".$total;
 
diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index bdc2109..9b92009 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -92,8 +92,8 @@ if ( $op eq "do_search" ) {
     ( $error, $marcresults, $total_hits ) =
       SimpleSearch( $ccl_query, $offset, $resultsperpage );
 
-    if (scalar($marcresults) > 0) {
-        $show_results = scalar @$marcresults;
+    if (!defined $error && @{$marcresults} ) {
+        $show_results = @{$marcresults};
     }
     else {
         $debug and warn "ERROR label-item-search: no results from SimpleSearch";
diff --git a/misc/migration_tools/bulkmarcimport.pl b/misc/migration_tools/bulkmarcimport.pl
index 3bb9ed8..1d31382 100755
--- a/misc/migration_tools/bulkmarcimport.pl
+++ b/misc/migration_tools/bulkmarcimport.pl
@@ -222,15 +222,15 @@ RECORD: while (  ) {
        my ($error, $results,$totalhits)=C4::Search::SimpleSearch( $query, 0, 3, [$server] );
        die "unable to search the database for duplicates : $error" if (defined $error);
        #warn "$query $server : $totalhits";
-       if ($results && scalar(@$results)==1){
+       if ( @{$results} == 1 ){
            my $marcrecord = MARC::File::USMARC::decode($results->[0]);
 	   	   $id=GetRecordId($marcrecord,$tagid,$subfieldid);
        } 
-       elsif  ($results && scalar(@$results)>1){
-       $debug && warn "more than one match for $query";
+       elsif  ( @{$results} > 1){
+           $debug && warn "more than one match for $query";
        } 
        else {
-       $debug && warn "nomatch for $query";
+           $debug && warn "nomatch for $query";
        }
     }
 	my $originalid;
diff --git a/misc/migration_tools/remove_unused_authorities.pl b/misc/migration_tools/remove_unused_authorities.pl
index 070a109..fbeee78 100755
--- a/misc/migration_tools/remove_unused_authorities.pl
+++ b/misc/migration_tools/remove_unused_authorities.pl
@@ -62,6 +62,10 @@ while (my $data=$rqselect->fetchrow_hashref){
     $query= "an=".$data->{'authid'};
     # search for biblios mapped
     my ($err,$res,$used) = C4::Search::SimpleSearch($query,0,10);
+    if (defined $err) {
+        warn "error: $err on search $query\n";
+        next;
+    }
     print ".";
     print "$counter\n" unless $counter++ % 100;
     # if found, delete, otherwise, just count
diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl
index d1b0f63..b33737a 100755
--- a/serials/subscription-bib-search.pl
+++ b/serials/subscription-bib-search.pl
@@ -90,7 +90,6 @@ if ($op eq "do_search" && $query) {
     $resultsperpage = 20 if(!defined $resultsperpage);
 
     my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage);
-    my $total = scalar @$marcrecords;
 
     if (defined $error) {
         $template->param(query_error => $error);
@@ -98,6 +97,7 @@ if ($op eq "do_search" && $query) {
         output_html_with_http_headers $input, $cookie, $template->output;
         exit;
     }
+    my $total = @{$marcrecords};
     my @results;
 
     for(my $i=0;$i<$total;$i++) {
diff --git a/t/lib/KohaTest.pm b/t/lib/KohaTest.pm
index 323b55a..6fcedcf 100644
--- a/t/lib/KohaTest.pm
+++ b/t/lib/KohaTest.pm
@@ -590,8 +590,8 @@ sub add_biblios {
 
     $self->reindex_marc();
     my $query = 'Finn Test';
-    my ( $error, $results ) = SimpleSearch( $query );
-    if ( $param{'count'} <= scalar( @$results ) ) {
+    my ( $error, $results, undef ) = SimpleSearch( $query );
+    if ( !defined $error && $param{'count'} <=  @{$results} ) {
         pass( "found all $param{'count'} titles" );
     } else {
         fail( "we never found all $param{'count'} titles" );
-- 
1.7.3.2


From oleonard at myacpl.org  Wed Nov 17 15:43:10 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 17 Nov 2010 09:43:10 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5412 double quotes break
	coins and thus search results in some scenarios
Message-ID: <1290004990-20529-1-git-send-email-oleonard@myacpl.org>

From: Tom?s Cohen Arazi <tomascohen at gmail.com>


Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 C4/Biblio.pm |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 81ccfbb..6a422be 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1198,6 +1198,7 @@ sub GetCOinSBiblio {
     my $coins_value =
 "ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3A$mtx$genre$title&amp;rft.isbn=$isbn&amp;rft.issn=$issn&amp;rft.aulast=$aulast&amp;rft.aufirst=$aufirst$oauthors&amp;rft.pub=$publisher&amp;rft.date=$pubyear";
     $coins_value =~ s/(\ |&[^a])/\+/g;
+    $coins_value =~ s/\"/\&quot\;/g;
 
 #<!-- TMPL_VAR NAME="ocoins_format" -->&amp;rft.au=<!-- TMPL_VAR NAME="author" -->&amp;rft.btitle=<!-- TMPL_VAR NAME="title" -->&amp;rft.date=<!-- TMPL_VAR NAME="publicationyear" -->&amp;rft.pages=<!-- TMPL_VAR NAME="pages" -->&amp;rft.isbn=<!-- TMPL_VAR NAME=amazonisbn -->&amp;rft.aucorp=&amp;rft.place=<!-- TMPL_VAR NAME="place" -->&amp;rft.pub=<!-- TMPL_VAR NAME="publishercode" -->&amp;rft.edition=<!-- TMPL_VAR NAME="edition" -->&amp;rft.series=<!-- TMPL_VAR NAME="series" -->&amp;rft.genre="
 
-- 
1.7.1


From kmkale at anantcorp.com  Wed Nov 17 17:16:24 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Wed, 17 Nov 2010 21:46:24 +0530
Subject: [Koha-patches] [PATCH] Bug 5417: itemBarcodeInputFilter text change
Message-ID: <1290010584-1603-1-git-send-email-kmkale@anantcorp.com>

The text describing the itemBarcodeInputFilter system preference changed from "scanned patron barcodes." to "scanned item barcodes."
---
 .../en/modules/admin/preferences/circulation.pref  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index c4d4305..e441f54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -14,7 +14,7 @@ Circulation:
                   whitespace: Remove spaces from
                   cuecat: Convert from CueCat form
                   T-prefix: Remove the first number from T-prefix style
-            - scanned patron barcodes.
+            - scanned item barcodes.
         -
             - Sort previous checkouts on the circulation page from
             - pref: previousIssuesDefaultSortOrder
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Wed Nov 17 18:33:09 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Wed, 17 Nov 2010 18:33:09 +0100
Subject: [Koha-patches] [PATCH] Bug 5408 - Refactor GetIssuingRule and
 GetLoanLength
In-Reply-To: <AANLkTimJk0Y+TSRFVUjONb6xua=eoJ6jwH6eub70-qkq@mail.gmail.com>
References: <1289809040-1427-1-git-send-email-cfouts@liblime.com>
	<20101115092355.GV4325@rorohiko>
	<AANLkTinjs185VPgsiSQ0JU+OYp9P1YusHRKZc-fUicEv@mail.gmail.com>
	<4CE1790D.2090007@biblibre.com>
	<AANLkTimJk0Y+TSRFVUjONb6xua=eoJ6jwH6eub70-qkq@mail.gmail.com>
Message-ID: <4CE411D5.5000700@biblibre.com>

Le 16/11/2010 19:20, Clay Fouts a ?crit :
> What's the status of merging this development? Is anyone working on it?
Already answered by chris
> My implementation of that particular function is more readable (and less
> DB intensive in many cases), 
Maybe the first time... But since Memoize is used, it may not be as DB
intensive as you think.
One thing to improve that we havenot done would be to flush the memoized
GetIssuingRules whenever an issuing rule is edited so that it can be
refreshed.
Another thing would be to use Memoize::Memcached rather that Memoize...
Would be quite easy to do though. (other Koha.pm Memoize usage  we did
is done that way).

> but your branch has the advantage in terms
> of being more complete and fully separating out the issuing rules
> concerns into their own module. What remains to be done?
Apart from the thing I previously said, it is in production and works
quite well and efficiently.
Yes SQLHelper is quite Mysql demanding, but it was meant to be a first
step to DBIx::Class and I thought that we could also store the DB
structure in a yaml file so that we could get rid of columns.def and
have translations of field description in an authoritative file.
I have had no time to investigate in DBIx::Class::Schema to see if it
would be able to read and process from a YAML file. If anyone is willing
to tell his mind about that idea.
The fact is that columns.def was good in order to map columns and their
description. But it is not coped in the translation process. And we
already have some way to process some YAML file.... And a YAML file is
quick to parse. So naturally, I think it could be a good idea to store
those information in such a structure.

-- 
Henri-Damien LAURENT

From ian.walls at bywatersolutions.com  Wed Nov 17 22:29:25 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Wed, 17 Nov 2010 16:29:25 -0500
Subject: [Koha-patches] [PATCH] Fixes bug 3393: Overdue_notices.pl not
	respecting default notice rules
Message-ID: <1290029365-20515-1-git-send-email-ian.walls@bywatersolutions.com>

---
 C4/Overdues.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Overdues.pm b/C4/Overdues.pm
index 032ca93..468c252 100644
--- a/C4/Overdues.pm
+++ b/C4/Overdues.pm
@@ -956,7 +956,7 @@ returns a list of branch codes for branches with overdue rules defined.
 
 sub GetBranchcodesWithOverdueRules {
     my $dbh               = C4::Context->dbh;
-    my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> ''");
+    my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL");
     $rqoverduebranches->execute;
     my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref };
     return @branches;
-- 
1.5.6.5


From root at bigballofwax.co.nz  Wed Nov 17 23:41:56 2010
From: root at bigballofwax.co.nz (root)
Date: Thu, 18 Nov 2010 11:41:56 +1300
Subject: [Koha-patches] Request to pull for 3.2.x
Message-ID: <E1PIqhQ-0007X7-AO@ubuntu>

The following changes since commit aeba77bca64e1440b953edb1d112eec57ecde1f7:
  Chris Nighswonger (1):
        Beginning of Release Notes for 3.02.01.000

are available in the git repository at:

  git://git.workbuffer.org/git/koha.git translation_3_2

Chris Cormack (1):
      German and italian language updates

 .../po/de-DE-i-staff-t-prog-v-3002000.po           |    6 +-
 .../translator/po/it-IT-i-opac-t-prog-v-3002000.po |16893 +++++++++-----------
 2 files changed, 7685 insertions(+), 9214 deletions(-)

From kmkale at anantcorp.com  Thu Nov 18 07:31:41 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Thu, 18 Nov 2010 12:01:41 +0530
Subject: [Koha-patches] [PATCH] Bug 5418: Add a new itemBarcodeInputFilter
	for libsuite8 style barcodes
Message-ID: <1290061901-7833-1-git-send-email-kmkale@anantcorp.com>

In India a ILS product called Libsuite8 prints barcodes like b0007432. The
barcode is not stored anywhere in libsuite8's database. Neither is barcode
available in any of the reports generated by the software.

The barcode 'b0007432' when scanned into the libsuite8 software is
de-constructed like 'b' which is the itemtype i.e. Book in this instance, and
'7432' which is the 'Accession Number'. The software then takes the logged in
staff's branchcode and does a join on three tables 'Location', 'Media_Type',
and 'Books' to retrieve the particular record from the database.

There is no possibility of recreating the barcodes for insertion in Koha while
doing a retrospective conversion, because of arbitrary length of the barcode
string AND arbitrary number of zeros in the numeric part of the printed barcode
AND the fact that there are no reports available from the software which
contain barcodes AND the fact that the barcode is not stored in the database.
But most importantly due to the simple fact that printed barcodes are
duplicated among branches.

Therefore this patch emulates the functionality of Libsuite8 software of converting the scanned barcode into one stored in Koha using the itemBarcodeInputFilter system preference.

To use this new itemBarcodeInputFilter systempreference choice called 'libsuite8', the barcodes stored in Koha must match the pattern of <branchcode>-<itemtype_code>-<accession_number>. This is easy to achieve while doing retrospective conversion from Libsuite8 to Koha.

As expected the itemBarcodeInputFilter will return unmodified barcode is presented with a barcode of pattern <branchcode>-<itemtype_code>-<accession_number>

The perl code in C4/Circulation.pm is ugly and NEEDS major code cleanup. All help is much appreciated..
---
 C4/Circulation.pm                                  |   27 +++++++++++++++++++-
 circ/circulation.pl                                |    4 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    2 +-
 installer/data/mysql/updatedatabase.pl             |    2 +-
 .../en/modules/admin/preferences/circulation.pref  |    1 +
 .../prog/en/modules/circ/circulation.tmpl          |    2 +-
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 10c3c11..08778ca 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -136,7 +136,7 @@ System Pref options.
 # FIXME -- these plugins should be moved out of Circulation.pm
 #
 sub barcodedecode {
-    my ($barcode, $filter) = @_;
+    my ($barcode, $filter, $branch) = @_;
     $filter = C4::Context->preference('itemBarcodeInputFilter') unless $filter;
     $filter or return $barcode;     # ensure filter is defined, else return untouched barcode
 	if ($filter eq 'whitespace') {
@@ -155,6 +155,31 @@ sub barcodedecode {
         # FIXME: $barcode could be "T1", causing warning: substr outside of string
         # Why drop the nonzero digit after the T?
         # Why pass non-digits (or empty string) to "T%07d"?
+	} elsif ($filter eq 'libsuite8') {
+	# FIXME: This NEEDS major code cleanup. All help is much appreciated
+		use Scalar::Util qw(looks_like_number);
+		my $barcode1=$barcode;
+		my $branchcode=$branch."-";
+		if($barcode1 =~ m/^$branchcode/){
+		}
+		else {
+			my @chars;
+			my @nums;
+			my @m1=split(/ */, $barcode);
+			foreach (@m1){
+				looks_like_number ($_) ? push(@nums,$_) : push(@chars,$_);
+			}
+		my @n1;
+		foreach(@nums){
+			if($_ > 0){
+				push(@n1,$_);
+			}
+		}
+		my ($chars) = join('', at chars);
+		my ($n1) = join('', at n1);
+		$barcode = "$branchcode" . $chars . "-" . $n1;
+		}
+
 	}
     return $barcode;    # return barcode, modified or not
 }
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 7c4a0dc..b358a84 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -115,8 +115,8 @@ if (C4::Context->preference("UseTablesortForCirc")) {
 
 my $barcode        = $query->param('barcode') || '';
 $barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
-
-$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
+my $filter = C4::Context->preference('itemBarcodeInputFilter') || '';
+$barcode = barcodedecode($barcode,$filter,$branch) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
 my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickyduedate');
 my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
 my $issueconfirmed = $query->param('issueconfirmed');
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index 214d198..1904172 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -145,7 +145,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesMode','test','Choose the fines mode, \'off\', \'test\' (emails admin report) or \'production\' (accrue overdue fines).  Requires accruefines cronjob.','off|test|production','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('globalDueDate','','If set, allows a global static due date for all checkouts','10','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ceilingDueDate','','If set, date due will not be past this date.  Enter date according to the dateformat System Preference',NULL,'free');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','whitespace|T-prefix|cuecat','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','whitespace|T-prefix|cuecat|libsuite8','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('singleBranchMode',0,'Operate in Single-branch mode, hide branch selection in the OPAC',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('URLLinkText','','Text to display as the link anchor in the OPAC',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACViewOthersSuggestions',0,'If ON, allows all suggestions to be displayed in the OPAC',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index bf7acb6..66297db 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -731,7 +731,7 @@ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,ty
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('libraryAddress','','The address to use for printing receipts, overdues, etc. if different than physical address',NULL,'free')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesMode','test','Choose the fines mode, test or production','test|production','Choice')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('globalDueDate','','If set, allows a global static due date for all checkouts',NULL,'free')");
-$dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','cuecat','Choice')");
+$dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','libsuite8','Choice')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('singleBranchMode',0,'Operate in Single-branch mode, hide branch selection in the OPAC',NULL,'YesNo')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('URLLinkText','','Text to display as the link anchor in the OPAC',NULL,'free')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACSubscriptionDisplay','economical','Specify how to display subscription information in the OPAC','economical|off|full','Choice')");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index c4d4305..46570ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -14,6 +14,7 @@ Circulation:
                   whitespace: Remove spaces from
                   cuecat: Convert from CueCat form
                   T-prefix: Remove the first number from T-prefix style
+                  libsuite8: Convert from Libsuite8 form
             - scanned patron barcodes.
         -
             - Sort previous checkouts on the circulation page from
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 822de15..89874ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -301,7 +301,7 @@ function refocus(calendar) {
         <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
-            <li>The barcode was not found</li>
+            <li>The barcode was not found <!-- TMPL_VAR NAME="barcode" --></li>
         <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Thu Nov 18 10:56:38 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Thu, 18 Nov 2010 10:56:38 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
Message-ID: <4CE4F856.8060208@biblibre.com>

Hi Colin.
I have seen that you are using die....
There has already been a discussion on that on list.
No concensus achieved.
But I find it really clunky to have that kind of warning for users :
Koha Software error....

I acknowledge that a warning has to be raised.
Maybe dying is really good practise. But Having more failproof features
would be far more comfortable for users (and developers)... When seeing
Software error, they will undoubtedly open a new bug... on bugzilla,
which is already a bit crowded.
Your aim here is surely to HAVE problems reported rather than "hidden"
in logs file.
But I would have rather, when it is not really a blocking problem, just
try and raise a warning.

If dying is really a requirement in Modern::Perl then it HAS to be
handled in the pl script. And I donot think it is done. Gentlemen ?
Can we reach a good practise ?

-- 
Henri-Damien LAURENT

Le 17/11/2010 15:24, Colin Campbell a ?crit :
> Remove some unnecessary checks when check of error is
> sufficient. Make the order in some cases more logical
> Should remove some possibilities of runtime warning noise.
> Although some calls belong to the 'Nothing could
> ever go wrong' school have added some warnings
> ---
>  C4/AuthoritiesMarc.pm                             |    9 +++++++--
>  C4/Heading.pm                                     |    7 +++++++
>  C4/Matcher.pm                                     |    9 ++++++---
>  acqui/neworderbiblio.pl                           |   13 ++++++-------
>  authorities/authorities-list.pl                   |    3 +++
>  cataloguing/addbiblio.pl                          |    6 +++---
>  cataloguing/addbooks.pl                           |    4 ++--
>  cataloguing/value_builder/unimarc_field_4XX.pl    |    5 ++++-
>  labels/label-item-search.pl                       |    4 ++--
>  misc/migration_tools/bulkmarcimport.pl            |    8 ++++----
>  misc/migration_tools/remove_unused_authorities.pl |    4 ++++
>  serials/subscription-bib-search.pl                |    2 +-
>  t/lib/KohaTest.pm                                 |    4 ++--
>  13 files changed, 51 insertions(+), 27 deletions(-)
> 
> diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
> index d07cca4..606c1c8 100644
> --- a/C4/AuthoritiesMarc.pm
> +++ b/C4/AuthoritiesMarc.pm
> @@ -362,7 +362,12 @@ sub CountUsage {
>          my $query;
>          $query= "an=".$authid;
>    		my ($err,$res,$result) = C4::Search::SimpleSearch($query,0,10);
> -        return ($result);
> +        if ($err) {
> +            warn "Error: $err from search $query";
> +            $result = 0;
> +        }
> +
> +        return $result;
>      }
>  }
>  
> @@ -903,7 +908,7 @@ sub FindDuplicateAuthority {
>      }
>      my ($error, $results, $total_hits) = C4::Search::SimpleSearch( $query, 0, 1, [ "authorityserver" ] );
>      # there is at least 1 result => return the 1st one
> -    if (@$results>0) {
> +    if (!defined $error && @{$results} ) {
>        my $marcrecord = MARC::File::USMARC::decode($results->[0]);
>        return $marcrecord->field('001')->data,BuildSummary($marcrecord,$marcrecord->field('001')->data,$authtypecode);
>      }
> diff --git a/C4/Heading.pm b/C4/Heading.pm
> index 9d7d98a..1ea5a74 100644
> --- a/C4/Heading.pm
> +++ b/C4/Heading.pm
> @@ -24,6 +24,7 @@ use MARC::Field;
>  use C4::Context;
>  use C4::Heading::MARC21;
>  use C4::Search;
> +use Carp;
>  
>  our $VERSION = 3.00;
>  
> @@ -109,6 +110,9 @@ sub authorities {
>      my $query = qq(Match-heading,ext="$self->{'search_form'}");
>      $query .= $self->_query_limiters();
>      my ($error, $results, $total_hits) = SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
> +    if (defined $error) {
> +        carp "Error:$error from search $query";
> +    }
>      return $results;
>  }
>  
> @@ -126,6 +130,9 @@ sub preferred_authorities {
>      my $query = "Match-heading-see-from,ext='$self->{'search_form'}'";
>      $query .= $self->_query_limiters();
>      my ($error, $results, $total_hits) = SimpleSearch( $query, undef, undef, [ "authorityserver" ] );
> +    if (defined $error) {
> +        carp "Error:$error from search $query";
> +    }
>      return $results;
>  }
>  
> diff --git a/C4/Matcher.pm b/C4/Matcher.pm
> index 5915c12..9d1df67 100644
> --- a/C4/Matcher.pm
> +++ b/C4/Matcher.pm
> @@ -606,9 +606,12 @@ sub get_matches {
>          # FIXME only searching biblio index at the moment
>          my ($error, $searchresults, $total_hits) = SimpleSearch($query, 0, $max_matches);
>  
> -        warn "search failed ($query) $error" if $error;
> -        foreach my $matched (@$searchresults) {
> -            $matches{$matched} += $matchpoint->{'score'};
> +        if (defined $error ) {
> +            warn "search failed ($query) $error";
> +        } else {
> +            foreach my $matched (@{$searchresults}) {
> +                $matches{$matched} += $matchpoint->{'score'};
> +            }
>          }
>      }
>  
> diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
> index 2333f89..9dd29d8 100755
> --- a/acqui/neworderbiblio.pl
> +++ b/acqui/neworderbiblio.pl
> @@ -112,16 +112,15 @@ if (defined $error) {
>  
>  my @results;
>  
> -if ($marcresults) {
> -    foreach my $result ( @{$marcresults} ) {
> -        my $marcrecord = MARC::File::USMARC::decode( $result );
> -        my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
> +foreach my $result ( @{$marcresults} ) {
> +    my $marcrecord = MARC::File::USMARC::decode( $result );
> +    my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' );
>  
> -        $biblio->{booksellerid} = $booksellerid;
> -        push @results, $biblio;
> +    $biblio->{booksellerid} = $booksellerid;
> +    push @results, $biblio;
>  
> -    }
>  }
> +
>  $template->param(
>      basketno             => $basketno,
>      booksellerid     => $bookseller->{'id'},
> diff --git a/authorities/authorities-list.pl b/authorities/authorities-list.pl
> index 9c472f1..eec3233 100755
> --- a/authorities/authorities-list.pl
> +++ b/authorities/authorities-list.pl
> @@ -25,6 +25,9 @@ foreach my $authority (@$dataauthorities){
>    $query= "an=".$authority->{'authid'};
>    # search for biblios mapped
>    my ($err,$res,$used) = C4::Search::SimpleSearch($query,0,10);
> +  if (defined $err) {
> +      $used = 0;
> +  }
>    if ($marcauthority && $marcauthority->field($authtypes{$authority->{'authtypecode'}}->{'tag'})){
>      print qq("),$marcauthority->field($authtypes{$authority->{'authtypecode'}}->{"tag"})->as_string(),qq(";),qq($authority->{'authid'};"),$authtypes{$authority->{'authtypecode'}}->{'lib'},qq(";$used\n);
>    }
> diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
> index 2c0c63d..e64f4e2 100755
> --- a/cataloguing/addbiblio.pl
> +++ b/cataloguing/addbiblio.pl
> @@ -768,16 +768,16 @@ AND (authtypecode IS NOT NULL AND authtypecode<>\"\")|);
>          warn "BIBLIOADDSAUTHORITIES: $error";
>  	    return (0,0) ;
>  	  }
> -      if ($results && scalar(@$results)==1) {
> +      if ( @{$results} == 1) {
>          my $marcrecord = MARC::File::USMARC::decode($results->[0]);
>          $field->add_subfields('9'=>$marcrecord->field('001')->data);
>          $countlinked++;
> -      } elsif (scalar(@$results)>1) {
> +      } elsif (@{$results} > 1) {
>     #More than One result 
>     #This can comes out of a lack of a subfield.
>  #         my $marcrecord = MARC::File::USMARC::decode($results->[0]);
>  #         $record->field($data->{tagfield})->add_subfields('9'=>$marcrecord->field('001')->data);
> -  $countlinked++;
> +        $countlinked++;
>        } else {
>    #There are no results, build authority record, add it to Authorities, get authid and add it to 9
>    ###NOTICE : This is only valid if a subfield is linked to one and only one authtypecode     
> diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
> index 4c8a989..5e89ef8 100755
> --- a/cataloguing/addbooks.pl
> +++ b/cataloguing/addbooks.pl
> @@ -85,8 +85,8 @@ if ($query) {
>  
>      # format output
>      # SimpleSearch() give the results per page we want, so 0 offet here
> -    my $total = scalar @$marcresults;
> -    my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, @$marcresults );
> +    my $total = @{$marcresults};
> +    my @newresults = searchResults( 'intranet', $query, $total, $results_per_page, 0, 0, @{$marcresults} );
>      $template->param(
>          total          => $total_hits,
>          query          => $query,
> diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl
> index 84a6208..ddb6547 100755
> --- a/cataloguing/value_builder/unimarc_field_4XX.pl
> +++ b/cataloguing/value_builder/unimarc_field_4XX.pl
> @@ -335,7 +335,10 @@ sub plugin {
>          my $orderby;
>          $search = 'kw,wrdl='.$search.' and mc-itemtype='.$itype if $itype;
>          my ( $errors, $results, $total_hits ) = SimpleSearch($search, $startfrom * $resultsperpage, $resultsperpage );
> -        my $total = scalar(@$results);
> +        if (defined $errors ) {
> +            $results = [];
> +        }
> +        my $total = @{$results};
>  
>          #        warn " biblio count : ".$total;
>  
> diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
> index bdc2109..9b92009 100755
> --- a/labels/label-item-search.pl
> +++ b/labels/label-item-search.pl
> @@ -92,8 +92,8 @@ if ( $op eq "do_search" ) {
>      ( $error, $marcresults, $total_hits ) =
>        SimpleSearch( $ccl_query, $offset, $resultsperpage );
>  
> -    if (scalar($marcresults) > 0) {
> -        $show_results = scalar @$marcresults;
> +    if (!defined $error && @{$marcresults} ) {
> +        $show_results = @{$marcresults};
>      }
>      else {
>          $debug and warn "ERROR label-item-search: no results from SimpleSearch";
> diff --git a/misc/migration_tools/bulkmarcimport.pl b/misc/migration_tools/bulkmarcimport.pl
> index 3bb9ed8..1d31382 100755
> --- a/misc/migration_tools/bulkmarcimport.pl
> +++ b/misc/migration_tools/bulkmarcimport.pl
> @@ -222,15 +222,15 @@ RECORD: while (  ) {
>         my ($error, $results,$totalhits)=C4::Search::SimpleSearch( $query, 0, 3, [$server] );
>         die "unable to search the database for duplicates : $error" if (defined $error);
>         #warn "$query $server : $totalhits";
> -       if ($results && scalar(@$results)==1){
> +       if ( @{$results} == 1 ){
>             my $marcrecord = MARC::File::USMARC::decode($results->[0]);
>  	   	   $id=GetRecordId($marcrecord,$tagid,$subfieldid);
>         } 
> -       elsif  ($results && scalar(@$results)>1){
> -       $debug && warn "more than one match for $query";
> +       elsif  ( @{$results} > 1){
> +           $debug && warn "more than one match for $query";
>         } 
>         else {
> -       $debug && warn "nomatch for $query";
> +           $debug && warn "nomatch for $query";
>         }
>      }
>  	my $originalid;
> diff --git a/misc/migration_tools/remove_unused_authorities.pl b/misc/migration_tools/remove_unused_authorities.pl
> index 070a109..fbeee78 100755
> --- a/misc/migration_tools/remove_unused_authorities.pl
> +++ b/misc/migration_tools/remove_unused_authorities.pl
> @@ -62,6 +62,10 @@ while (my $data=$rqselect->fetchrow_hashref){
>      $query= "an=".$data->{'authid'};
>      # search for biblios mapped
>      my ($err,$res,$used) = C4::Search::SimpleSearch($query,0,10);
> +    if (defined $err) {
> +        warn "error: $err on search $query\n";
> +        next;
> +    }
>      print ".";
>      print "$counter\n" unless $counter++ % 100;
>      # if found, delete, otherwise, just count
> diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl
> index d1b0f63..b33737a 100755
> --- a/serials/subscription-bib-search.pl
> +++ b/serials/subscription-bib-search.pl
> @@ -90,7 +90,6 @@ if ($op eq "do_search" && $query) {
>      $resultsperpage = 20 if(!defined $resultsperpage);
>  
>      my ($error, $marcrecords, $total_hits) = SimpleSearch($query, $startfrom*$resultsperpage, $resultsperpage);
> -    my $total = scalar @$marcrecords;
>  
>      if (defined $error) {
>          $template->param(query_error => $error);
> @@ -98,6 +97,7 @@ if ($op eq "do_search" && $query) {
>          output_html_with_http_headers $input, $cookie, $template->output;
>          exit;
>      }
> +    my $total = @{$marcrecords};
>      my @results;
>  
>      for(my $i=0;$i<$total;$i++) {
> diff --git a/t/lib/KohaTest.pm b/t/lib/KohaTest.pm
> index 323b55a..6fcedcf 100644
> --- a/t/lib/KohaTest.pm
> +++ b/t/lib/KohaTest.pm
> @@ -590,8 +590,8 @@ sub add_biblios {
>  
>      $self->reindex_marc();
>      my $query = 'Finn Test';
> -    my ( $error, $results ) = SimpleSearch( $query );
> -    if ( $param{'count'} <= scalar( @$results ) ) {
> +    my ( $error, $results, undef ) = SimpleSearch( $query );
> +    if ( !defined $error && $param{'count'} <=  @{$results} ) {
>          pass( "found all $param{'count'} titles" );
>      } else {
>          fail( "we never found all $param{'count'} titles" );


From cnighswonger at foundations.edu  Thu Nov 18 13:42:16 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 18 Nov 2010 07:42:16 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <4CE4F856.8060208@biblibre.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
Message-ID: <AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>

On Thu, Nov 18, 2010 at 4:56 AM, LAURENT Henri-Damien
<henridamien.laurent at biblibre.com> wrote:
> Hi Colin.
> I have seen that you are using die....
> There has already been a discussion on that on list.
> No concensus achieved.
> But I find it really clunky to have that kind of warning for users :
> Koha Software error....
>
> I acknowledge that a warning has to be raised.
> Maybe dying is really good practise. But Having more failproof features
> would be far more comfortable for users (and developers)... When seeing
> Software error, they will undoubtedly open a new bug... on bugzilla,
> which is already a bit crowded.
> Your aim here is surely to HAVE problems reported rather than "hidden"
> in logs file.
> But I would have rather, when it is not really a blocking problem, just
> try and raise a warning.
>
> If dying is really a requirement in Modern::Perl then it HAS to be
> handled in the pl script. And I donot think it is done. Gentlemen ?
> Can we reach a good practise ?

I am in 100% agreement that we should not die, but rather throw a warn
to the log and then trap the error, passing useful information back to
the user and allowing graceful recovery. I can conceive of no problem
which should not be able to be properly trapped and an error message
passed back to the user. Even if it is a "blocking problem," graceful
recovery and or exit is a necessity. With bugzilla accepting emails it
may even be within the realm of possibility to have something like
C4::ErrorHandling do automatic bug reporting or the like.

I object to adding new code which just dies rather than handling the error.

Kind Regards,
Chris

From cnighswonger at foundations.edu  Thu Nov 18 14:14:58 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 18 Nov 2010 08:14:58 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>
Message-ID: <AANLkTinVr-DU9Ty6o0s+WPdEPoqyGrX4TNnEBs4kwzLy@mail.gmail.com>

On Thu, Nov 18, 2010 at 7:42 AM, Chris Nighswonger
<cnighswonger at foundations.edu> wrote:
> On Thu, Nov 18, 2010 at 4:56 AM, LAURENT Henri-Damien
> <henridamien.laurent at biblibre.com> wrote:
>> Hi Colin.
>> I have seen that you are using die....
>> There has already been a discussion on that on list.
>> No concensus achieved.
>> But I find it really clunky to have that kind of warning for users :
>> Koha Software error....
>>
>> I acknowledge that a warning has to be raised.
>> Maybe dying is really good practise. But Having more failproof features
>> would be far more comfortable for users (and developers)... When seeing
>> Software error, they will undoubtedly open a new bug... on bugzilla,
>> which is already a bit crowded.
>> Your aim here is surely to HAVE problems reported rather than "hidden"
>> in logs file.
>> But I would have rather, when it is not really a blocking problem, just
>> try and raise a warning.
>>
>> If dying is really a requirement in Modern::Perl then it HAS to be
>> handled in the pl script. And I donot think it is done. Gentlemen ?
>> Can we reach a good practise ?
>
> I am in 100% agreement that we should not die, but rather throw a warn
> to the log and then trap the error, passing useful information back to
> the user and allowing graceful recovery. I can conceive of no problem
> which should not be able to be properly trapped and an error message
> passed back to the user. Even if it is a "blocking problem," graceful
> recovery and or exit is a necessity. With bugzilla accepting emails it
> may even be within the realm of possibility to have something like
> C4::ErrorHandling do automatic bug reporting or the like.
>
> I object to adding new code which just dies rather than handling the error.
>

Correction: Colin's patch does not add a die. It just shows one up
which already exists about line 223 in builkmarcimport.pl.

However, I still hold my position on the use of die.

Kind Regards,
Chris

From gmcharlt at gmail.com  Thu Nov 18 14:16:10 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 18 Nov 2010 08:16:10 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <4CE4F856.8060208@biblibre.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
Message-ID: <AANLkTimbeiLM1mB9LnXLzRAQfp2mAJQVEVC=kqe76kha@mail.gmail.com>

Hi,

On Thu, Nov 18, 2010 at 4:56 AM, LAURENT Henri-Damien
<henridamien.laurent at biblibre.com> wrote:
> I have seen that you are using die....

Where?  I don't see anything in the patch that adds a die() or croak().

As far as general question is concerned, I agree that module code
should not be calling die() unless the code that calls the module
routine is set up to catch the exception [although adding exception
handling to Koha's bag of tricks would be a good idea] or if something
is so badly wrong that terminating is the only way to prevent data
loss.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From oleonard at myacpl.org  Thu Nov 18 15:00:34 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 18 Nov 2010 09:00:34 -0500
Subject: [Koha-patches] [PATCH] Further fixes for Bug 5142 - Untranslatable
	strings in tag review template
Message-ID: <1290088834-22170-1-git-send-email-oleonard@myacpl.org>

---
 .../intranet-tmpl/prog/en/modules/tags/review.tmpl |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
index a1d6dc2..ad2f360 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
@@ -48,25 +48,25 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 		}
 	}
 	var success_approve = function(tag){
-		// window.alert('AJAX approved tag: ' + tag);
+		// window.alert(_('AJAX approved tag: ') + tag);
 	};
 	var failure_approve = function(tag){
-		window.alert('AJAX failed to approve tag: ' + tag);
+		window.alert(_('AJAX failed to approve tag: ') + tag);
 	};
 	var success_reject  = function(tag){
-		// window.alert('AJAX rejected tag: ' + tag);
+		// window.alert(_('AJAX rejected tag: ') + tag);
 	};
 	var failure_reject  = function(tag){
-		window.alert('AJAX failed to reject tag: ' + tag);
+		window.alert(_('AJAX failed to reject tag: ') + tag);
 	};
 	var success_test    = function(tag){
-		$('#verdict').html(tag + ' is permitted!');
+		$('#verdict').html(tag + _(' is permitted!'));
 	};
 	var failure_test    = function(tag){
-		$('#verdict').html(tag + ' is prohibited!');
+		$('#verdict').html(tag + _(' is prohibited!'));
 	};
 	var indeterminate_test = function(tag){
-		$('#verdict').html(tag + ' is neither permitted nor prohibited!');
+		$('#verdict').html(tag + _(' is neither permitted nor prohibited!'));
 	};
 
 	var success_test_call = function() {
@@ -100,7 +100,7 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 	    });
 		$('body').click(function(event) {
 			pull_counts();
-			// window.alert("Click detected on " + event.target + ": " + $(event.target).html);
+			// window.alert(_("Click detected on ") + event.target + ": " + $(event.target).html);
 			if ($(event.target).is('.ok')) {
 				$.ajax({
 					"data": {ok: $(event.target).attr("title"), CGISESSID: readCookie('CGISESSID')},
-- 
1.7.1


From kmkale at anantcorp.com  Thu Nov 18 15:12:49 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Thu, 18 Nov 2010 19:42:49 +0530
Subject: [Koha-patches] [PATCH] Bug 5418: Revised patch new
	itemBarcodeInputFilter for libsuite8 style barcodes
Message-ID: <1290089569-8918-1-git-send-email-kmkale@anantcorp.com>

In India a ILS product called Libsuite8 prints barcodes like b0007432. The barcode is not stored anywhere in libsuite8's database. Neither is barcode available in any of the reports generated by the software.

The barcode 'b0007432' when scanned into the libsuite8 software is de-constructed like 'b' which is the itemtype i.e. Book in this instance, and '7432' which is the 'Accession Number'. The software then takes the logged in staff's branchcode and does a join on three tables 'Location', 'Media_Type', and 'Books' to retrieve the particular record from the database.

There is no possibility of recreating the barcodes for insertion in Koha while doing a retrospective conversion, because of arbitrary length of the barcode string AND arbitrary number of zeros in the numeric part of the printed barcode AND the fact that there are no reports available from the software which contain barcodes AND the fact that the barcode is not stored in the database.
But most importantly due to the simple fact that printed barcodes are duplicated among branches.

Therefore this patch emulates the functionality of Libsuite8 software of converting the scanned barcode into one stored in Koha using the itemBarcodeInputFilter system preference.

To use this new itemBarcodeInputFilter systempreference choice called 'libsuite8', the barcodes stored in Koha must match the pattern of <branchcode>-<itemtype_code>-<accession_number>. This is easy to achieve while doing retrospective conversion from Libsuite8 to Koha.

As expected the itemBarcodeInputFilter will return unmodified barcode if presented with a barcode of pattern <branchcode>-<itemtype_code>-<accession_number>

All help and comments about this are much appreciated..
---
 C4/Circulation.pm                                  |    6 +++++-
 circ/circulation.pl                                |    4 ++--
 installer/data/mysql/en/mandatory/sysprefs.sql     |    2 +-
 installer/data/mysql/updatedatabase.pl             |    2 +-
 .../en/modules/admin/preferences/circulation.pref  |    1 +
 .../prog/en/modules/circ/circulation.tmpl          |    2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 10c3c11..219991e 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -136,7 +136,7 @@ System Pref options.
 # FIXME -- these plugins should be moved out of Circulation.pm
 #
 sub barcodedecode {
-    my ($barcode, $filter) = @_;
+    my ($barcode, $filter, $branch) = @_;
     $filter = C4::Context->preference('itemBarcodeInputFilter') unless $filter;
     $filter or return $barcode;     # ensure filter is defined, else return untouched barcode
 	if ($filter eq 'whitespace') {
@@ -155,6 +155,10 @@ sub barcodedecode {
         # FIXME: $barcode could be "T1", causing warning: substr outside of string
         # Why drop the nonzero digit after the T?
         # Why pass non-digits (or empty string) to "T%07d"?
+	} elsif ($filter eq 'libsuite8') {
+		unless($barcode =~ m/^($branch)-/i){
+		$barcode =~ s/^(\D+)[0]*(\d+)$/$branch-$1-$2/i
+		}
 	}
     return $barcode;    # return barcode, modified or not
 }
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 7c4a0dc..b358a84 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -115,8 +115,8 @@ if (C4::Context->preference("UseTablesortForCirc")) {
 
 my $barcode        = $query->param('barcode') || '';
 $barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
-
-$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
+my $filter = C4::Context->preference('itemBarcodeInputFilter') || '';
+$barcode = barcodedecode($barcode,$filter,$branch) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
 my $stickyduedate  = $query->param('stickyduedate') || $session->param('stickyduedate');
 my $duedatespec    = $query->param('duedatespec')   || $session->param('stickyduedate');
 my $issueconfirmed = $query->param('issueconfirmed');
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index 214d198..1904172 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -145,7 +145,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesMode','test','Choose the fines mode, \'off\', \'test\' (emails admin report) or \'production\' (accrue overdue fines).  Requires accruefines cronjob.','off|test|production','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('globalDueDate','','If set, allows a global static due date for all checkouts','10','free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ceilingDueDate','','If set, date due will not be past this date.  Enter date according to the dateformat System Preference',NULL,'free');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','whitespace|T-prefix|cuecat','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','whitespace|T-prefix|cuecat|libsuite8','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('singleBranchMode',0,'Operate in Single-branch mode, hide branch selection in the OPAC',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('URLLinkText','','Text to display as the link anchor in the OPAC',NULL,'free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACViewOthersSuggestions',0,'If ON, allows all suggestions to be displayed in the OPAC',NULL,'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index bf7acb6..66297db 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -731,7 +731,7 @@ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,ty
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('libraryAddress','','The address to use for printing receipts, overdues, etc. if different than physical address',NULL,'free')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('finesMode','test','Choose the fines mode, test or production','test|production','Choice')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('globalDueDate','','If set, allows a global static due date for all checkouts',NULL,'free')");
-$dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','cuecat','Choice')");
+$dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('itemBarcodeInputFilter','','If set, allows specification of a item barcode input filter','libsuite8','Choice')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('singleBranchMode',0,'Operate in Single-branch mode, hide branch selection in the OPAC',NULL,'YesNo')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('URLLinkText','','Text to display as the link anchor in the OPAC',NULL,'free')");
 $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OPACSubscriptionDisplay','economical','Specify how to display subscription information in the OPAC','economical|off|full','Choice')");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index c4d4305..46570ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -14,6 +14,7 @@ Circulation:
                   whitespace: Remove spaces from
                   cuecat: Convert from CueCat form
                   T-prefix: Remove the first number from T-prefix style
+                  libsuite8: Convert from Libsuite8 form
             - scanned patron barcodes.
         -
             - Sort previous checkouts on the circulation page from
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 822de15..89874ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -301,7 +301,7 @@ function refocus(calendar) {
         <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
-            <li>The barcode was not found</li>
+            <li>The barcode was not found <!-- TMPL_VAR NAME="barcode" --></li>
         <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Thu Nov 18 15:16:58 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Thu, 18 Nov 2010 15:16:58 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <AANLkTimbeiLM1mB9LnXLzRAQfp2mAJQVEVC=kqe76kha@mail.gmail.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>	<4CE4F856.8060208@biblibre.com>
	<AANLkTimbeiLM1mB9LnXLzRAQfp2mAJQVEVC=kqe76kha@mail.gmail.com>
Message-ID: <4CE5355A.5040402@biblibre.com>

Le 18/11/2010 14:16, Galen Charlton a ?crit :
> Hi,
> 
> On Thu, Nov 18, 2010 at 4:56 AM, LAURENT Henri-Damien
> <henridamien.laurent at biblibre.com> wrote:
>> I have seen that you are using die....
> 
> Where?  I don't see anything in the patch that adds a die() or croak().
> 
> As far as general question is concerned, I agree that module code
> should not be calling die() unless the code that calls the module
> routine is set up to catch the exception [although adding exception
> handling to Koha's bag of tricks would be a good idea] or if something
> is so badly wrong that terminating is the only way to prevent data
> loss.
> 
> Regards,
> 
> Galen
in misc/migration_tools/bulkmarcimport.pl


From cnighswonger at foundations.edu  Thu Nov 18 15:58:51 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 18 Nov 2010 09:58:51 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <4CE5355A.5040402@biblibre.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTimbeiLM1mB9LnXLzRAQfp2mAJQVEVC=kqe76kha@mail.gmail.com>
	<4CE5355A.5040402@biblibre.com>
Message-ID: <AANLkTim1_c090jWsiTr=KL2zdbSCX8OpkZ2+gMZc-U=M@mail.gmail.com>

On Thu, Nov 18, 2010 at 9:16 AM, LAURENT Henri-Damien
<henridamien.laurent at biblibre.com> wrote:
> Le 18/11/2010 14:16, Galen Charlton a ?crit :
>> Hi,
>>
>> On Thu, Nov 18, 2010 at 4:56 AM, LAURENT Henri-Damien
>> <henridamien.laurent at biblibre.com> wrote:
>>> I have seen that you are using die....
>>
>> Where? ?I don't see anything in the patch that adds a die() or croak().
> in misc/migration_tools/bulkmarcimport.pl

That die is not added by this patch, but is already in existing code.

From henridamien.laurent at biblibre.com  Thu Nov 18 16:09:28 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Thu, 18 Nov 2010 16:09:28 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <AANLkTim1_c090jWsiTr=KL2zdbSCX8OpkZ2+gMZc-U=M@mail.gmail.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTimbeiLM1mB9LnXLzRAQfp2mAJQVEVC=kqe76kha@mail.gmail.com>
	<4CE5355A.5040402@biblibre.com>
	<AANLkTim1_c090jWsiTr=KL2zdbSCX8OpkZ2+gMZc-U=M@mail.gmail.com>
Message-ID: <4CE541A8.2070304@biblibre.com>

Le 18/11/2010 15:58, Chris Nighswonger a ?crit :
> On Thu, Nov 18, 2010 at 9:16 AM, LAURENT Henri-Damien
> <henridamien.laurent at biblibre.com> wrote:
>> Le 18/11/2010 14:16, Galen Charlton a ?crit :
>>> Hi,
>>>
>>> On Thu, Nov 18, 2010 at 4:56 AM, LAURENT Henri-Damien
>>> <henridamien.laurent at biblibre.com> wrote:
>>>> I have seen that you are using die....
>>>
>>> Where?  I don't see anything in the patch that adds a die() or croak().
>> in misc/migration_tools/bulkmarcimport.pl
> 
> That die is not added by this patch, but is already in existing code.
> 
Does it ? Blame it on the Colored Diff plugin in thunderbird.
lines were with +


From cnighswonger at foundations.edu  Thu Nov 18 17:19:46 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 18 Nov 2010 11:19:46 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <4CE541A8.2070304@biblibre.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTimbeiLM1mB9LnXLzRAQfp2mAJQVEVC=kqe76kha@mail.gmail.com>
	<4CE5355A.5040402@biblibre.com>
	<AANLkTim1_c090jWsiTr=KL2zdbSCX8OpkZ2+gMZc-U=M@mail.gmail.com>
	<4CE541A8.2070304@biblibre.com>
Message-ID: <AANLkTi=Q-jB6fiOdv18gVNy7MUVm2Y5X=d364koonLm4@mail.gmail.com>

On Thu, Nov 18, 2010 at 10:09 AM, LAURENT Henri-Damien
<henridamien.laurent at biblibre.com> wrote:
> Le 18/11/2010 15:58, Chris Nighswonger a ?crit :
>> On Thu, Nov 18, 2010 at 9:16 AM, LAURENT Henri-Damien
>> <henridamien.laurent at biblibre.com> wrote:
>>> Le 18/11/2010 14:16, Galen Charlton a ?crit :
>>>> Hi,
>>>>
>>>> On Thu, Nov 18, 2010 at 4:56 AM, LAURENT Henri-Damien
>>>> <henridamien.laurent at biblibre.com> wrote:
>>>>> I have seen that you are using die....
>>>>
>>>> Where? ?I don't see anything in the patch that adds a die() or croak().
>>> in misc/migration_tools/bulkmarcimport.pl
>>
>> That die is not added by this patch, but is already in existing code.
>>
> Does it ? Blame it on the Colored Diff plugin in thunderbird.
> lines were with +

http://git.koha-community.org/gitweb/?p=koha.git;a=blob;f=misc/migration_tools/bulkmarcimport.pl;h=3bb9ed85d92298c7a4e4bc956b9f6c001245159b;hb=HEAD#l223

From cfouts at liblime.com  Thu Nov 18 17:37:15 2010
From: cfouts at liblime.com (Clay Fouts)
Date: Thu, 18 Nov 2010 08:37:15 -0800
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>
Message-ID: <AANLkTi=BomPBKiYj91hO7C=-2gb215-EZSw78gKCBYJS@mail.gmail.com>

The die() in the above code is perfectly legitimate because the routine does
not know how to handle the error gracefully. I cannot count the number of
hours I've had to spend tracking a bug back to its source through all sorts
of twists and turns because Koha did not die() when it couldn't figure out
how to handle the original error and simply warn()ed about it or, more
frequently, opted not to check for errors at all.

The good thing about exceptions is that you cannot ignore the error and get
away with it. Warn()s can and do get ignored, much to the detriment of
developers, users, and everyone in between. Every best practices guide will
tell you to die() as soon as you figure out that you can't accommodate the
nature of the error, precisely because it is ugly and cannot be ignored,
forcing the developer to handle it somehow at a higher level. Programmers
are lazy. Unless we compel ourselves to address errors, it's far too easy to
ignore them, so we will (and do, if Koha's code is to serve as an example).
Exceptions demand better coding practicing.

Koha already has a CGI-friendly die() handler with CGI::Carp. If how it is
presented to the user is a concern, the template for that can be prettified.
Nevertheless, it's a favor to everyone not to let errors propagate
throughout the system. It corrupts data and gives the false perception that
everything is behaving correctly.

Cheers,
Clay


On Thu, Nov 18, 2010 at 4:42 AM, Chris Nighswonger <
cnighswonger at foundations.edu> wrote:

> On Thu, Nov 18, 2010 at 4:56 AM, LAURENT Henri-Damien
> <henridamien.laurent at biblibre.com> wrote:
> > Hi Colin.
> > I have seen that you are using die....
> > There has already been a discussion on that on list.
> > No concensus achieved.
> > But I find it really clunky to have that kind of warning for users :
> > Koha Software error....
> >
> > I acknowledge that a warning has to be raised.
> > Maybe dying is really good practise. But Having more failproof features
> > would be far more comfortable for users (and developers)... When seeing
> > Software error, they will undoubtedly open a new bug... on bugzilla,
> > which is already a bit crowded.
> > Your aim here is surely to HAVE problems reported rather than "hidden"
> > in logs file.
> > But I would have rather, when it is not really a blocking problem, just
> > try and raise a warning.
> >
> > If dying is really a requirement in Modern::Perl then it HAS to be
> > handled in the pl script. And I donot think it is done. Gentlemen ?
> > Can we reach a good practise ?
>
> I am in 100% agreement that we should not die, but rather throw a warn
> to the log and then trap the error, passing useful information back to
> the user and allowing graceful recovery. I can conceive of no problem
> which should not be able to be properly trapped and an error message
> passed back to the user. Even if it is a "blocking problem," graceful
> recovery and or exit is a necessity. With bugzilla accepting emails it
> may even be within the realm of possibility to have something like
> C4::ErrorHandling do automatic bug reporting or the like.
>
> I object to adding new code which just dies rather than handling the error.
>
> Kind Regards,
> Chris
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101118/66bcdaba/attachment.htm>

From cnighswonger at foundations.edu  Thu Nov 18 18:05:42 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Thu, 18 Nov 2010 12:05:42 -0500
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <AANLkTi=BomPBKiYj91hO7C=-2gb215-EZSw78gKCBYJS@mail.gmail.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>
	<AANLkTi=BomPBKiYj91hO7C=-2gb215-EZSw78gKCBYJS@mail.gmail.com>
Message-ID: <AANLkTikcOom78-owhNCsbfONiseYsY4K3C=MQ35SYaS3@mail.gmail.com>

On Thu, Nov 18, 2010 at 11:37 AM, Clay Fouts <cfouts at liblime.com> wrote:
> The die() in the above code is perfectly legitimate because the routine does
> not know how to handle the error gracefully.

I disagree. Rather than using a die(), take the time to code the
graceful error trapping. die() in most cases is the lazy way out,
imho.

>?I cannot count the number of
> hours I've had to spend tracking a bug back to its source through all sorts
> of twists and turns because Koha did not die() when it couldn't figure out
> how to handle the original error and simply warn()ed about it or, more
> frequently, opted not to check for errors at all.

This is due more so to poor coding than anything else. Always handle
errors. If the coder can anticipate places in the code where errors
are likely to occur with enough accuracy to warrant a die() then there
is no reason not to go ahead and code graceful error trapping.

> The good thing about exceptions is that you cannot ignore the error and get
> away with it. Warn()s can and do get ignored, much to the detriment of
> developers, users, and everyone in between. Every best practices guide will
> tell you to die() as soon as you figure out that you can't accommodate the
> nature of the error, precisely because it is ugly and cannot be ignored,
> forcing the developer to handle it somehow at a higher level. Programmers
> are lazy.

Bingo! So we must fix our laziness and code proper error trapping. If
that means working back up the stake, so be it. Fix it right: fix it
once. Again, if the coder knows enough to put a die() they know enough
to write proper error trapping.

> Unless we compel ourselves to address errors, it's far too easy to
> ignore them, so we will (and do, if Koha's code is to serve as an example).
> Exceptions demand better coding practicing.

I agree with this in theory. However, what we must compel ourselves to
do is handle errors, not die().

> Koha already has a CGI-friendly die() handler with CGI::Carp. If how it is
> presented to the user is a concern, the template for that can be prettified.

Then this should be used and made to integrate in a more user-friendly
way with the rest of the Koha experience.

> Nevertheless, it's a favor to everyone not to let errors propagate
> throughout the system. It corrupts data and gives the false perception that
> everything is behaving correctly.

I don't see anything in this thread which would suggest that we "let
errors propagate throughout the system." On the contrary, the entire
thread seems to revolve around the best way to prevent that while
giving useful information to the user and maintaining maximum
availability of the rest of the system.

I tend to shy away from software that presents solid color screens
with cryptic information when it crashes... ;-)

Kind Regards,
Chris

From henridamien.laurent at biblibre.com  Thu Nov 18 18:11:41 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Thu, 18 Nov 2010 18:11:41 +0100
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <AANLkTi=BomPBKiYj91hO7C=-2gb215-EZSw78gKCBYJS@mail.gmail.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>
	<AANLkTi=BomPBKiYj91hO7C=-2gb215-EZSw78gKCBYJS@mail.gmail.com>
Message-ID: <4CE55E4D.8080607@biblibre.com>

Le 18/11/2010 17:37, Clay Fouts a ?crit :
> The die() in the above code is perfectly legitimate because the routine
> does not know how to handle the error gracefully. I cannot count the
> number of hours I've had to spend tracking a bug back to its source
> through all sorts of twists and turns because Koha did not die() when it
> couldn't figure out how to handle the original error and simply warn()ed
> about it or, more frequently, opted not to check for errors at all.
> 
> The good thing about exceptions is that you cannot ignore the error and
> get away with it. Warn()s can and do get ignored, much to the detriment
> of developers, users, and everyone in between. Every best practices
> guide will tell you to die() as soon as you figure out that you can't
> accommodate the nature of the error, precisely because it is ugly and
> cannot be ignored, forcing the developer to handle it somehow at a
> higher level. Programmers are lazy. Unless we compel ourselves to
> address errors, it's far too easy to ignore them, so we will (and do, if
> Koha's code is to serve as an example). Exceptions demand better coding
> practicing.
ok. But
> 
> Koha already has a CGI-friendly die() handler with CGI::Carp. If how it
> is presented to the user is a concern, the template for that can be
> prettified. Nevertheless, it's a favor to everyone not to let errors
> propagate throughout the system. It corrupts data and gives the false
> perception that everything is behaving correctly.
> 
> Cheers,
> Clay
Hi Clay.
So If in a result list or in a bulkedition, there is one biblio which
can't be decoded (because XML::Parser fails), you are in favor of
returning Error 500 to the user ?
I am not. You may think it hides problems. But if for one record which
has a problem, you throw away all the results by breaking at the first
error, then you end up with having to make kind of a hell of a work only
to find where the error might be and even worse, make the user feel very
uncomfortable with your tool... (Just look at the way zebra is dying
when you have an error with the indexing process. I just think it is not
a sane way to do things.) Yes raise an error, Yes warn that error AND
provide information about the context (biblionumber if it is about
biblios). But No, donot simply die... because when running a
bulkmarcimport on a 100000 records, having to do things over and over
again for 10 records with an error is just insane. Or Please, please,
die in functions, AND add tests to whatever script or function which is
using this other function and try to provide correct information.

> Exceptions demand better coding
> practicing.
I fully agree though. Should we begin some kind of New module for that ?
Croak could be good, but we would have to make things more failsafe and
not fail first error of an array of task.


Friendly.
-- 
Henri-Damien LAURENT

From cfouts at liblime.com  Thu Nov 18 18:22:30 2010
From: cfouts at liblime.com (Clay Fouts)
Date: Thu, 18 Nov 2010 09:22:30 -0800
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <AANLkTikcOom78-owhNCsbfONiseYsY4K3C=MQ35SYaS3@mail.gmail.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>
	<AANLkTi=BomPBKiYj91hO7C=-2gb215-EZSw78gKCBYJS@mail.gmail.com>
	<AANLkTikcOom78-owhNCsbfONiseYsY4K3C=MQ35SYaS3@mail.gmail.com>
Message-ID: <AANLkTik=aqHvuVdGsBKVWdZbMUsz=vCso=d-1sNJ1nZe@mail.gmail.com>

On Thu, Nov 18, 2010 at 9:05 AM, Chris Nighswonger <
cnighswonger at foundations.edu> wrote:

> On Thu, Nov 18, 2010 at 11:37 AM, Clay Fouts <cfouts at liblime.com> wrote:
> > The die() in the above code is perfectly legitimate because the routine
> does
> > not know how to handle the error gracefully.
>
> I disagree. Rather than using a die(), take the time to code the
> graceful error trapping. die() in most cases is the lazy way out,
> imho.
>

A properly handled die() is just as if not more graceful than checking
return values. Using tools like Try::Tiny or even a plain old eval{} give
the developer lots of options as to how to deal with a value. Also, die()
makes sure that intermediary layers that *don't* check for and percolate
error values don't get in the way of upper layers being able to check for
it. In Koha's current state of error checking, this latter point is crucial.



> > I cannot count the number of
> > hours I've had to spend tracking a bug back to its source through all
> sorts
> > of twists and turns because Koha did not die() when it couldn't figure
> out
> > how to handle the original error and simply warn()ed about it or, more
> > frequently, opted not to check for errors at all.
>
> This is due more so to poor coding than anything else. Always handle
> errors. If the coder can anticipate places in the code where errors
> are likely to occur with enough accuracy to warrant a die() then there
> is no reason not to go ahead and code graceful error trapping.
>

Are you going to reject code that doesn't check every last possible error
status?



> I agree with this in theory. However, what we must compel ourselves to
> do is handle errors, not die().
>

That's the whole purpose of eval{}.



> I don't see anything in this thread which would suggest that we "let
> errors propagate throughout the system." On the contrary, the entire
> thread seems to revolve around the best way to prevent that while
> giving useful information to the user and maintaining maximum
> availability of the rest of the system.
>
> I tend to shy away from software that presents solid color screens
> with cryptic information when it crashes... ;-)
>

I tend to shy away from software that allows defective state to lazily
propagate throughout the system.

Clay
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101118/68e3fb09/attachment-0001.htm>

From cfouts at liblime.com  Thu Nov 18 18:34:07 2010
From: cfouts at liblime.com (Clay Fouts)
Date: Thu, 18 Nov 2010 09:34:07 -0800
Subject: [Koha-patches] [PATCH 2/2] Bug 5415 Let calls of SimpleSearch
 utilize considtent interface
In-Reply-To: <4CE55E4D.8080607@biblibre.com>
References: <1290003869-21023-1-git-send-email-colin.campbell@ptfs-europe.com>
	<1290003869-21023-2-git-send-email-colin.campbell@ptfs-europe.com>
	<4CE4F856.8060208@biblibre.com>
	<AANLkTi=Kwwxp3U=R1tyOQv_4A8YOCuOVgtcT9PUDV+Ne@mail.gmail.com>
	<AANLkTi=BomPBKiYj91hO7C=-2gb215-EZSw78gKCBYJS@mail.gmail.com>
	<4CE55E4D.8080607@biblibre.com>
Message-ID: <AANLkTin0W7JjLnFP4M2XZ3SDoSZM-3iJWCQ2U4EkPieU@mail.gmail.com>

Hello, Henri.

No, presenting an HTTP 500 error is not appropriate way to handle this
situation. Catching the exception with eval{} is more proper.

With this CLI bulkmarcimport script, yes, it should die if it can't perform
the match. What if the bogus record is the one that matches? Then depending
on the circumstance you could have two identical records floating around
(unexpected and not good) or it could cause an exception somewhere else down
the line when it tries to insert a duplicate key (causing the developer to
have to trace back through who knows what in order to find the source of the
error later). Skimming over the broken record is not a solution!

Clay


On Thu, Nov 18, 2010 at 9:11 AM, LAURENT Henri-Damien <
henridamien.laurent at biblibre.com> wrote:

> Le 18/11/2010 17:37, Clay Fouts a ?crit :
> > The die() in the above code is perfectly legitimate because the routine
> > does not know how to handle the error gracefully. I cannot count the
> > number of hours I've had to spend tracking a bug back to its source
> > through all sorts of twists and turns because Koha did not die() when it
> > couldn't figure out how to handle the original error and simply warn()ed
> > about it or, more frequently, opted not to check for errors at all.
> >
> > The good thing about exceptions is that you cannot ignore the error and
> > get away with it. Warn()s can and do get ignored, much to the detriment
> > of developers, users, and everyone in between. Every best practices
> > guide will tell you to die() as soon as you figure out that you can't
> > accommodate the nature of the error, precisely because it is ugly and
> > cannot be ignored, forcing the developer to handle it somehow at a
> > higher level. Programmers are lazy. Unless we compel ourselves to
> > address errors, it's far too easy to ignore them, so we will (and do, if
> > Koha's code is to serve as an example). Exceptions demand better coding
> > practicing.
> ok. But
> >
> > Koha already has a CGI-friendly die() handler with CGI::Carp. If how it
> > is presented to the user is a concern, the template for that can be
> > prettified. Nevertheless, it's a favor to everyone not to let errors
> > propagate throughout the system. It corrupts data and gives the false
> > perception that everything is behaving correctly.
> >
> > Cheers,
> > Clay
> Hi Clay.
> So If in a result list or in a bulkedition, there is one biblio which
> can't be decoded (because XML::Parser fails), you are in favor of
> returning Error 500 to the user ?
> I am not. You may think it hides problems. But if for one record which
> has a problem, you throw away all the results by breaking at the first
> error, then you end up with having to make kind of a hell of a work only
> to find where the error might be and even worse, make the user feel very
> uncomfortable with your tool... (Just look at the way zebra is dying
> when you have an error with the indexing process. I just think it is not
> a sane way to do things.) Yes raise an error, Yes warn that error AND
> provide information about the context (biblionumber if it is about
> biblios). But No, donot simply die... because when running a
> bulkmarcimport on a 100000 records, having to do things over and over
> again for 10 records with an error is just insane. Or Please, please,
> die in functions, AND add tests to whatever script or function which is
> using this other function and try to provide correct information.
>
> > Exceptions demand better coding
> > practicing.
> I fully agree though. Should we begin some kind of New module for that ?
> Croak could be good, but we would have to make things more failsafe and
> not fail first error of an array of task.
>
>
> Friendly.
> --
> Henri-Damien LAURENT
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101118/8f18a8a8/attachment.htm>

From oleonard at myacpl.org  Thu Nov 18 19:03:13 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 18 Nov 2010 13:03:13 -0500
Subject: [Koha-patches] [PATCH] Follow-up fix for Bug 4912,
	redirect user to correct lists
Message-ID: <1290103393-23976-1-git-send-email-oleonard@myacpl.org>

---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    2 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 8f9b246..85bf24d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -9,7 +9,7 @@ a, a:visited {
 	color : #006699;
 }
 
-a:hover,input.editshelf:hover,a.editshelf:hover,input.deleteshelf:hover {
+a:hover,#toolbar input.editshelf:hover,input.editshelf:hover,a.editshelf:hover,input.deleteshelf:hover {
 	color : #990033;
 }
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 7804bae..998eeeb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -209,7 +209,7 @@ $(function() {
 
 <a class="print tag_hides" href="opac-shelves.pl" onclick="print(); return false;">Print List</a>
 
-                <!-- TMPL_IF NAME="manageshelf" --> | <a class="editshelf tag_hides" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=<!-- TMPL_VAR NAME="shelfnumber" -->&amp;op=modif">Edit List</a>
+                <!-- TMPL_IF NAME="manageshelf" --> | <form method="get" action="opac-shelves.pl" class="tag_hides"><input type="hidden" name="op" value="modif" /><!-- TMPL_IF NAME="showprivateshelves" --><input type="hidden" name="display" value="privateshelves" /><!-- /TMPL_IF --> <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /> <input type="submit" class="editshelf tag_hides" value="Edit List" /></form>
                       <form method="post" action="opac-shelves.pl" class="tag_hides">
                         <input type="hidden" value="1" name="shelves"/>
                     <!-- TMPL_IF NAME="showprivateshelves" -->
@@ -412,7 +412,7 @@ $(function() {
                         <!-- /TMPL_LOOP -->
                       </table>
                     <!-- TMPL_ELSE -->
-                         No Private Lists.
+                         <p>No private lists.</p>
                     <!-- /TMPL_IF --><!-- /shelveslooppriv -->
                   <!-- /TMPL_IF --><!-- /showprivateshelves -->
                   <!-- TMPL_ELSE --><!-- /loggedinusername -->
@@ -479,7 +479,7 @@ $(function() {
                     <!-- /TMPL_LOOP --><!-- /shelvesloop -->
                       </table>
                   <!-- TMPL_ELSE --><!-- /shelvesloop -->
-                    <!-- TMPL_IF NAME="showpublicshelves" -->No Public Lists.<!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="showpublicshelves" --><p>No public lists.</p><!-- /TMPL_IF -->
                   <!-- /TMPL_IF --><!-- /shelvesloop -->
                   
                     </div><!-- /publicshelves -->
-- 
1.7.1


From mdhafen at tech.washk12.org  Thu Nov 18 19:24:25 2010
From: mdhafen at tech.washk12.org (Mike Hafen)
Date: Thu, 18 Nov 2010 11:24:25 -0700
Subject: [Koha-patches] [PATCH] Bug 5418: Add a new
 itemBarcodeInputFilter for libsuite8 style barcodes
In-Reply-To: <1290061901-7833-1-git-send-email-kmkale@anantcorp.com>
References: <1290061901-7833-1-git-send-email-kmkale@anantcorp.com>
Message-ID: <AANLkTin8WMaay9jT3n0RFUc1x9euHhN6HWnxfwWDXx-j@mail.gmail.com>

Two suggestions.

First, perhaps the users branch could be used, like from
C4::Branch::mybranch()
Then you wouldn't need to add the branch parameter to the sub

Second, perhaps instead of splitting the barcode string you should do
something like s/(.*)0+(.*)/$1$2/
That should strip out all the zeros.

On Wed, Nov 17, 2010 at 11:31 PM, Koustubha Kale <kmkale at anantcorp.com>wrote:
...

> diff --git a/C4/Circulation.pm b/C4/Circulation.pm
> index 10c3c11..08778ca 100644
> --- a/C4/Circulation.pm
> +++ b/C4/Circulation.pm
> @@ -136,7 +136,7 @@ System Pref options.
>  # FIXME -- these plugins should be moved out of Circulation.pm
>  #
>  sub barcodedecode {
> -    my ($barcode, $filter) = @_;
> +    my ($barcode, $filter, $branch) = @_;
>     $filter = C4::Context->preference('itemBarcodeInputFilter') unless
> $filter;
>     $filter or return $barcode;     # ensure filter is defined, else return
> untouched barcode
>        if ($filter eq 'whitespace') {
> @@ -155,6 +155,31 @@ sub barcodedecode {
>         # FIXME: $barcode could be "T1", causing warning: substr outside of
> string
>         # Why drop the nonzero digit after the T?
>         # Why pass non-digits (or empty string) to "T%07d"?
> +       } elsif ($filter eq 'libsuite8') {
> +       # FIXME: This NEEDS major code cleanup. All help is much
> appreciated
> +               use Scalar::Util qw(looks_like_number);
> +               my $barcode1=$barcode;
> +               my $branchcode=$branch."-";
> +               if($barcode1 =~ m/^$branchcode/){
> +               }
> +               else {
> +                       my @chars;
> +                       my @nums;
> +                       my @m1=split(/ */, $barcode);
> +                       foreach (@m1){
> +                               looks_like_number ($_) ? push(@nums,$_) :
> push(@chars,$_);
> +                       }
> +               my @n1;
> +               foreach(@nums){
> +                       if($_ > 0){
> +                               push(@n1,$_);
> +                       }
> +               }
> +               my ($chars) = join('', at chars);
> +               my ($n1) = join('', at n1);
> +               $barcode = "$branchcode" . $chars . "-" . $n1;
> +               }
> +
>        }
>     return $barcode;    # return barcode, modified or not
>  }
> diff --git a/circ/circulation.pl b/circ/circulation.pl
> index 7c4a0dc..b358a84 100755
> --- a/circ/circulation.pl
> +++ b/circ/circulation.pl
> @@ -115,8 +115,8 @@ if (C4::Context->preference("UseTablesortForCirc")) {
>
>  my $barcode        = $query->param('barcode') || '';
>  $barcode =~  s/^\s*|\s*$//g; # remove leading/trailing whitespace
> -
> -$barcode = barcodedecode($barcode) if( $barcode &&
> C4::Context->preference('itemBarcodeInputFilter'));
> +my $filter = C4::Context->preference('itemBarcodeInputFilter') || '';
> +$barcode = barcodedecode($barcode,$filter,$branch) if( $barcode &&
> C4::Context->preference('itemBarcodeInputFilter'));
>  my $stickyduedate  = $query->param('stickyduedate') ||
> $session->param('stickyduedate');
>  my $duedatespec    = $query->param('duedatespec')   ||
> $session->param('stickyduedate');
>  my $issueconfirmed = $query->param('issueconfirmed');
>
...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101118/589cff08/attachment.htm>

From mdhafen at tech.washk12.org  Thu Nov 18 19:27:38 2010
From: mdhafen at tech.washk12.org (Mike Hafen)
Date: Thu, 18 Nov 2010 11:27:38 -0700
Subject: [Koha-patches] [PATCH] Bug 5418: Revised patch new
 itemBarcodeInputFilter for libsuite8 style barcodes
In-Reply-To: <1290089569-8918-1-git-send-email-kmkale@anantcorp.com>
References: <1290089569-8918-1-git-send-email-kmkale@anantcorp.com>
Message-ID: <AANLkTikSwWaiqDbyQMF5GHb1nUV8LShOg=Q0+EeAPsSg@mail.gmail.com>

Ah, I see you already got the second suggestion.  One comment about that
though, my libraries all have branch codes that are numbers.  So this filter
would be broken in that case.

On Thu, Nov 18, 2010 at 7:12 AM, Koustubha Kale <kmkale at anantcorp.com>wrote:
...

> diff --git a/C4/Circulation.pm b/C4/Circulation.pm
> index 10c3c11..219991e 100644
> --- a/C4/Circulation.pm
> +++ b/C4/Circulation.pm
> @@ -136,7 +136,7 @@ System Pref options.
>  # FIXME -- these plugins should be moved out of Circulation.pm
>  #
>  sub barcodedecode {
> -    my ($barcode, $filter) = @_;
> +    my ($barcode, $filter, $branch) = @_;
>     $filter = C4::Context->preference('itemBarcodeInputFilter') unless
> $filter;
>     $filter or return $barcode;     # ensure filter is defined, else return
> untouched barcode
>        if ($filter eq 'whitespace') {
> @@ -155,6 +155,10 @@ sub barcodedecode {
>         # FIXME: $barcode could be "T1", causing warning: substr outside of
> string
>         # Why drop the nonzero digit after the T?
>         # Why pass non-digits (or empty string) to "T%07d"?
> +       } elsif ($filter eq 'libsuite8') {
> +               unless($barcode =~ m/^($branch)-/i){
> +               $barcode =~ s/^(\D+)[0]*(\d+)$/$branch-$1-$2/i
> +               }
>        }
>     return $barcode;    # return barcode, modified or not
>  }
>
...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101118/c10e6237/attachment-0001.htm>

From gmcharlt at gmail.com  Fri Nov 19 01:37:16 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 18 Nov 2010 19:37:16 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Further fixes for Bug 5142 -
	Untranslatable strings in tag review template
Message-ID: <1290127036-19978-1-git-send-email-gmcharlt@gmail.com>

From: Owen Leonard <oleonard at myacpl.org>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../intranet-tmpl/prog/en/modules/tags/review.tmpl |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
index a1d6dc2..ad2f360 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
@@ -48,25 +48,25 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 		}
 	}
 	var success_approve = function(tag){
-		// window.alert('AJAX approved tag: ' + tag);
+		// window.alert(_('AJAX approved tag: ') + tag);
 	};
 	var failure_approve = function(tag){
-		window.alert('AJAX failed to approve tag: ' + tag);
+		window.alert(_('AJAX failed to approve tag: ') + tag);
 	};
 	var success_reject  = function(tag){
-		// window.alert('AJAX rejected tag: ' + tag);
+		// window.alert(_('AJAX rejected tag: ') + tag);
 	};
 	var failure_reject  = function(tag){
-		window.alert('AJAX failed to reject tag: ' + tag);
+		window.alert(_('AJAX failed to reject tag: ') + tag);
 	};
 	var success_test    = function(tag){
-		$('#verdict').html(tag + ' is permitted!');
+		$('#verdict').html(tag + _(' is permitted!'));
 	};
 	var failure_test    = function(tag){
-		$('#verdict').html(tag + ' is prohibited!');
+		$('#verdict').html(tag + _(' is prohibited!'));
 	};
 	var indeterminate_test = function(tag){
-		$('#verdict').html(tag + ' is neither permitted nor prohibited!');
+		$('#verdict').html(tag + _(' is neither permitted nor prohibited!'));
 	};
 
 	var success_test_call = function() {
@@ -100,7 +100,7 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 	    });
 		$('body').click(function(event) {
 			pull_counts();
-			// window.alert("Click detected on " + event.target + ": " + $(event.target).html);
+			// window.alert(_("Click detected on ") + event.target + ": " + $(event.target).html);
 			if ($(event.target).is('.ok')) {
 				$.ajax({
 					"data": {ok: $(event.target).attr("title"), CGISESSID: readCookie('CGISESSID')},
-- 
1.7.0


From kmkale at anantcorp.com  Fri Nov 19 06:03:29 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Fri, 19 Nov 2010 10:33:29 +0530
Subject: [Koha-patches] [PATCH] Bug 5418: Revised patch new
 itemBarcodeInputFilter for libsuite8 style barcodes
In-Reply-To: <AANLkTikSwWaiqDbyQMF5GHb1nUV8LShOg=Q0+EeAPsSg@mail.gmail.com>
References: <1290089569-8918-1-git-send-email-kmkale@anantcorp.com>
	<AANLkTikSwWaiqDbyQMF5GHb1nUV8LShOg=Q0+EeAPsSg@mail.gmail.com>
Message-ID: <AANLkTima0AepWzotbVzjKDd5kjb4oNqWXEj6Q49X0NOX@mail.gmail.com>

On Thu, Nov 18, 2010 at 11:57 PM, Mike Hafen <mdhafen at tech.washk12.org> wrote:
> Ah, I see you already got the second suggestion.? One comment about that
> though, my libraries all have branch codes that are numbers.? So this filter
> would be broken in that case.
>

Hi Mike,
Thanks for the suggestions.
Will try the first one. Got the second one covered with some help on
irc from druthb and chris_n.

Also this itemBarcodeInputFilter is specifically meant for libraries
doing retrospective conversion from a ILS product called Libsuit8 AND
if they are stuck with barcodes already printed and attached to
items..

Regards,
Koustubha Kale
Anant Corporation

Contact Details :
Address  : 103, Armaan Residency, R. W Sawant Road, Nr. Golden Dyes
Naka, Thane (w),
                Maharashtra, India, Pin : 400601.
TeleFax  : +91-22-21720108, +91-22-21720109
Mobile     : +919820715876
Website  : http://www.anantcorp.com
Blog : http://www.anantcorp.com/blog/?author=2

From kmkale at anantcorp.com  Fri Nov 19 08:10:24 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Fri, 19 Nov 2010 12:40:24 +0530
Subject: [Koha-patches] [PATCH] Bug 5418: Revised patch new
 itemBarcodeInputFilter for libsuite8 style barcodes
In-Reply-To: <AANLkTima0AepWzotbVzjKDd5kjb4oNqWXEj6Q49X0NOX@mail.gmail.com>
References: <1290089569-8918-1-git-send-email-kmkale@anantcorp.com>
	<AANLkTikSwWaiqDbyQMF5GHb1nUV8LShOg=Q0+EeAPsSg@mail.gmail.com>
	<AANLkTima0AepWzotbVzjKDd5kjb4oNqWXEj6Q49X0NOX@mail.gmail.com>
Message-ID: <AANLkTi=Ey9Hmkjv1QkiNm_bA8pGmz5+dG2RK6N+OgOJX@mail.gmail.com>

>First, perhaps the users branch could be used, like from C4::Branch::mybranch()
>Then you wouldn't need to add the branch parameter to the sub

1) Ok. C4::Branch::mybranch() worked so that eliminates the need to
touch circ/circulation.pl
2) Do you think displaying the barcode like <li>The barcode was not
found <!-- TMPL_VAR NAME="barcode" --></li> in
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl is a
good idea? If not, even that file can be left untouched.

Regards,
Koustubha Kale
Anant Corporation

Contact Details :
Address  : 103, Armaan Residency, R. W Sawant Road, Nr. Golden Dyes
Naka, Thane (w),
                Maharashtra, India, Pin : 400601.
TeleFax  : +91-22-21720108, +91-22-21720109
Mobile     : +919820715876
Website  : http://www.anantcorp.com
Blog : http://www.anantcorp.com/blog/?author=2

From mdhafen at tech.washk12.org  Fri Nov 19 17:45:55 2010
From: mdhafen at tech.washk12.org (Mike Hafen)
Date: Fri, 19 Nov 2010 09:45:55 -0700
Subject: [Koha-patches] [PATCH] Bug 5418: Revised patch new
 itemBarcodeInputFilter for libsuite8 style barcodes
In-Reply-To: <AANLkTi=Ey9Hmkjv1QkiNm_bA8pGmz5+dG2RK6N+OgOJX@mail.gmail.com>
References: <1290089569-8918-1-git-send-email-kmkale@anantcorp.com>
	<AANLkTikSwWaiqDbyQMF5GHb1nUV8LShOg=Q0+EeAPsSg@mail.gmail.com>
	<AANLkTima0AepWzotbVzjKDd5kjb4oNqWXEj6Q49X0NOX@mail.gmail.com>
	<AANLkTi=Ey9Hmkjv1QkiNm_bA8pGmz5+dG2RK6N+OgOJX@mail.gmail.com>
Message-ID: <AANLkTi=QO=tPiv=3onYtL=s5oankwi4N1CCq6DyVBUcF@mail.gmail.com>

On Thu, Nov 18, 2010 at 10:03 PM, Koustubha Kale <kmkale at anantcorp.com>wrote:
>Also this itemBarcodeInputFilter is specifically meant for libraries
>doing retrospective conversion from a ILS product called Libsuit8 AND
>if they are stuck with barcodes already printed and attached to
>items..

Yes, I am aware of that.  Just wanted to make the point in case others later
on wanting to use this filter.

On Fri, Nov 19, 2010 at 12:10 AM, Koustubha Kale <kmkale at anantcorp.com>wrote:

> >First, perhaps the users branch could be used, like from
> C4::Branch::mybranch()
> >Then you wouldn't need to add the branch parameter to the sub
>
> 1) Ok. C4::Branch::mybranch() worked so that eliminates the need to
> touch circ/circulation.pl
> 2) Do you think displaying the barcode like <li>The barcode was not
> found <!-- TMPL_VAR NAME="barcode" --></li> in
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl is a
> good idea? If not, even that file can be left untouched.
>
>
I like having the barcode in the error message.  This is a good idea I
think.  The only place I might hesitate displaying the barcode is the OPAC,
where it wouldn't be useful.  For the staff interface though I think more
information is almost always useful.


> Regards,
> Koustubha Kale
> Anant Corporation
>
> Contact Details :
> Address  : 103, Armaan Residency, R. W Sawant Road, Nr. Golden Dyes
> Naka, Thane (w),
>                Maharashtra, India, Pin : 400601.
> TeleFax  : +91-22-21720108, +91-22-21720109
> Mobile     : +919820715876
> Website  : http://www.anantcorp.com
> Blog : http://www.anantcorp.com/blog/?author=2
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101119/e4d113c1/attachment.htm>

From Katrin.Fischer.83 at web.de  Sat Nov 20 14:00:01 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sat, 20 Nov 2010 14:00:01 +0100
Subject: [Koha-patches] [PATCH] Bug 5175: Publisher link breaks display,
	if no publisher exists
Message-ID: <1290258001-26920-1-git-send-email-Katrin.Fischer.83@web.de>

If there is no publisher the empty publisher link will break the record display
in staff and intranet.

This patch adds a check for existence of subfield b.
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    2 ++
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 075472e..a49e04d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -222,11 +222,13 @@
         <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <xsl:if test="marc:subfield[@code='b']">
                 <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:{marc:subfield[@code='b']}">
                     <xsl:call-template name="subfieldSelect">
                         <xsl:with-param name="codes">b</xsl:with-param>
                     </xsl:call-template>
                </a>
+               </xsl:if>
                <xsl:text> </xsl:text>
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index e76b8df..8334a02 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -243,11 +243,13 @@
         <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary"><span class="label">Publisher: </span>
             <xsl:for-each select="marc:datafield[@tag=260]">
+                <xsl:if test="marc:subfield[@code='b']">
                 <a href="/cgi-bin/koha/opac-search.pl?q=pb:{marc:subfield[@code='b']}">
                     <xsl:call-template name="subfieldSelect">
                         <xsl:with-param name="codes">b</xsl:with-param>
                     </xsl:call-template>
                </a>
+               </xsl:if>
                <xsl:text> </xsl:text>
                 <xsl:call-template name="chopPunctuation">
                   <xsl:with-param name="chopString">
-- 
1.7.1


From Katrin.Fischer.83 at web.de  Sun Nov 21 03:03:16 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sun, 21 Nov 2010 03:03:16 +0100
Subject: [Koha-patches] [PATCH] [HEAD] Bug 5423: Deleted Patrons are no
	longer saved in table deletedborrowers
Message-ID: <1290304996-29368-1-git-send-email-Katrin.Fischer.83@web.de>

---
 installer/data/mysql/kohastructure.sql |    3 ++-
 installer/data/mysql/updatedatabase.pl |    9 +++++++++
 kohaversion.pl                         |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 9148970..695129b 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -642,7 +642,7 @@ CREATE TABLE `deletedbiblioitems` (
 DROP TABLE IF EXISTS `deletedborrowers`;
 CREATE TABLE `deletedborrowers` (
   `borrowernumber` int(11) NOT NULL default 0,
-  `cardnumber` varchar(9) NOT NULL default '',
+  `cardnumber` varchar(16) NOT NULL default '',
   `surname` mediumtext NOT NULL,
   `firstname` text,
   `title` mediumtext,
@@ -703,6 +703,7 @@ CREATE TABLE `deletedborrowers` (
   `altcontactcountry` text default NULL,
   `altcontactphone` varchar(50) default NULL,
   `smsalertnumber` varchar(50) default NULL,
+  `privacy` integer(11) DEFAULT '1' NOT NULL,
   KEY `borrowernumber` (`borrowernumber`),
   KEY `cardnumber` (`cardnumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index bf7acb6..59aa3c2 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3842,6 +3842,15 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = '3.03.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE deletedborrowers ADD `privacy` int(11) AFTER smsalertnumber;");
+    $dbh->do("ALTER TABLE deletedborrowers CHANGE `cardnumber` `cardnumber` varchar(16);");
+    print "Upgrade to $DBversion done (Fix differences between borrowers and deletedborrowers)\n";
+    SetVersion ($DBversion);
+}
+
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/kohaversion.pl b/kohaversion.pl
index 86d63f9..8330459 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.03.00.003';
+    our $VERSION = '3.03.00.XXX';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install
-- 
1.7.1


From Katrin.Fischer.83 at web.de  Sun Nov 21 03:33:13 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sun, 21 Nov 2010 03:33:13 +0100
Subject: [Koha-patches] [PATCH] [3.2] Bug 5423: Deleted Patrons are no
	longer saved in table deletedborrowers
Message-ID: <1290306793-21848-1-git-send-email-Katrin.Fischer.83@web.de>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
---
 installer/data/mysql/kohastructure.sql |    3 ++-
 installer/data/mysql/updatedatabase.pl |    9 +++++++++
 kohaversion.pl                         |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 9148970..695129b 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -642,7 +642,7 @@ CREATE TABLE `deletedbiblioitems` (
 DROP TABLE IF EXISTS `deletedborrowers`;
 CREATE TABLE `deletedborrowers` (
   `borrowernumber` int(11) NOT NULL default 0,
-  `cardnumber` varchar(9) NOT NULL default '',
+  `cardnumber` varchar(16) NOT NULL default '',
   `surname` mediumtext NOT NULL,
   `firstname` text,
   `title` mediumtext,
@@ -703,6 +703,7 @@ CREATE TABLE `deletedborrowers` (
   `altcontactcountry` text default NULL,
   `altcontactphone` varchar(50) default NULL,
   `smsalertnumber` varchar(50) default NULL,
+  `privacy` integer(11) DEFAULT '1' NOT NULL,
   KEY `borrowernumber` (`borrowernumber`),
   KEY `cardnumber` (`cardnumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 62e7991..31a86ba 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3842,6 +3842,15 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
+$DBversion = '3.02.00.XXX';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE deletedborrowers ADD `privacy` int(11) AFTER smsalertnumber;");
+    $dbh->do("ALTER TABLE deletedborrowers CHANGE `cardnumber` `cardnumber` varchar(16);");
+    print "Upgrade to $DBversion done (Fix differences between borrowers and deletedborrowers)\n";
+    SetVersion ($DBversion);
+}
+
+
 =head1 FUNCTIONS
 
 =head2 DropAllForeignKeys($table)
diff --git a/kohaversion.pl b/kohaversion.pl
index a506d9b..8129b69 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.02.00.007';
+    our $VERSION = '3.02.00.XXX';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install
-- 
1.7.1


From kmkale at anantcorp.com  Mon Nov 22 08:16:55 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Mon, 22 Nov 2010 12:46:55 +0530
Subject: [Koha-patches] [PATCH] Bug 5418: Re-revised patch new
 itemBarcodeInputFilter for libsuite8 style barcodes
Message-ID: <AANLkTimGYGf-jdpcpGWnGk27_dfsuz0Kr_EKRh7r80Aj@mail.gmail.com>

This revision eliminates the need to change circ/circulation.pl as was
the case in the earlier patch.

All help and comments about this are much appreciated..


Regards,
Koustubha Kale
Anant Corporation

Contact Details :
Address? : 103, Armaan Residency, R. W Sawant Road, Nr. Golden Dyes
Naka, Thane (w),
? ? ? ? ??? ? ? Maharashtra, India, Pin : 400601.
TeleFax? : +91-22-21720108, +91-22-21720109
Mobile? ?? : +919820715876
Website? : http://www.anantcorp.com
Blog : http://www.anantcorp.com/blog/?author=2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5418-Re-revised-patch-new-itemBarcodeInputFilter.patch
Type: application/octet-stream
Size: 8696 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101122/28100272/attachment.obj>

From kmkale at anantcorp.com  Mon Nov 22 13:08:04 2010
From: kmkale at anantcorp.com (Koustubha Kale)
Date: Mon, 22 Nov 2010 17:38:04 +0530
Subject: [Koha-patches] [PATCH] Bug 5418: Rev-3 patch new
 itemBarcodeInputFilter for libsuite8 style barcodes
Message-ID: <AANLkTik6GUwnFZJPaW621U-Usvah_-bkhy=b98HGTgny@mail.gmail.com>

This revision adds a test to t/Circulation_barcodedecode.t


Regards,
Koustubha Kale
Anant Corporation

Contact Details :
Address? : 103, Armaan Residency, R. W Sawant Road, Nr. Golden Dyes
Naka, Thane (w),
? ? ? ? ??? ? ? Maharashtra, India, Pin : 400601.
TeleFax? : +91-22-21720108, +91-22-21720109
Mobile? ?? : +919820715876
Website? : http://www.anantcorp.com
Blog : http://www.anantcorp.com/blog/?author=2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5418-Rev-3-patch-new-itemBarcodeInputFilter-for-.patch
Type: application/octet-stream
Size: 10016 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101122/f31a4f92/attachment.obj>

From Katrin.Fischer.83 at web.de  Wed Nov 24 07:40:39 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Wed, 24 Nov 2010 07:40:39 +0100
Subject: [Koha-patches] [PATCH] Bug 5430: Add Control number as option to
	OPACSearchForTitleIn
Message-ID: <1290580839-21442-1-git-send-email-Katrin.Fischer.83@web.de>

Makes {CONTROLNUMBER} available as new placeholder in
system preference OPACSearchForTitleIn.

{CONTROLNUMBER} will be replaced by the number in tag 001.
---
 C4/Biblio.pm                                       |   19 +++++++++++++++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 opac/opac-detail.pl                                |    3 +++
 3 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 6a422be..4102e23 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -67,6 +67,7 @@ BEGIN {
 
       &GetISBDView
 
+      &GetMarcControlnumber
       &GetMarcNotes
       &GetMarcSubjects
       &GetMarcBiblio
@@ -1254,6 +1255,24 @@ sub GetAuthorisedValueDesc {
     }
 }
 
+=head2 GetMarcControlnumber
+
+  $marccontrolnumber = GetMarcControlnumber($record,$marcflavour);
+
+Get the control number / record Identifier from the MARC record and return it.
+
+=cut
+
+sub GetMarcControlnumber {
+    my ( $record, $marcflavour ) = @_;
+    my $controlnumber = "";
+    # Control number or Record identifier are the same field in MARC21 and UNIMARC
+    # Keep $marcflavour for possible later use
+    if ($marcflavour eq "MARC21" || $marcflavour eq "UNIMARC") {
+        $controlnumber = $record->field('001')->data();
+    }
+}
+
 =head2 GetMarcNotes
 
   $marcnotesarray = GetMarcNotes( $record, $marcflavour );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 2619d8c..55560d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -137,7 +137,7 @@ OPAC:
               class: code
         -
             - 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
-            - '<br />Note: The placeholders {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
+            - '<br />Note: The placeholders {CONTROLNUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
             - pref: OPACSearchForTitleIn
               type: textarea
               class: code
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 0cd05f7..2de8ec8 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -584,12 +584,15 @@ if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->pref
 }
 
 #Search for title in links
+my $marccontrolnumber   = GetMarcControlnumber   ($record, $marcflavour);
+
 if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
     $dat->{author} ? $search_for_title =~ s/{AUTHOR}/$dat->{author}/g : $search_for_title =~ s/{AUTHOR}//g;
     $dat->{title} =~ s/\/+$//; # remove trailing slash
     $dat->{title} =~ s/\s+$//; # remove trailing space
     $dat->{title} ? $search_for_title =~ s/{TITLE}/$dat->{title}/g : $search_for_title =~ s/{TITLE}//g;
     $isbn ? $search_for_title =~ s/{ISBN}/$isbn/g : $search_for_title =~ s/{ISBN}//g;
+    $marccontrolnumber ? $search_for_title =~ s/{CONTROLNUMBER}/$marccontrolnumber/g : $search_for_title =~ s/{CONTROLNUMBER}//g;
  $template->param('OPACSearchForTitleIn' => $search_for_title);
 }
 
-- 
1.7.1


From savitra.sirohi at osslabs.biz  Wed Nov 24 05:46:43 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Wed, 24 Nov 2010 10:16:43 +0530
Subject: [Koha-patches] [PATCH] Analytical records - move host field
	population to a C4 routine,
	all changes in pl files to call new routine
Message-ID: <1290574003-23006-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

Signed-off-by: Amit Gupta <amit.gupta at osslabs.biz>
---
 C4/Biblio.pm             |   25 +++++++++++++++++++++++++
 cataloguing/addbiblio.pl |    7 +++++++
 cataloguing/linkitem.pl  |    9 +--------
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index eb0b248..eb6ea42 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -84,6 +84,7 @@ BEGIN {
       &GetFrameworkCode
       &GetPublisherNameFromIsbn
       &TransformKohaToMarc
+      &PrepHostMarcField
 
       &CountItemsIssued
     );
@@ -1663,6 +1664,30 @@ sub TransformKohaToMarc {
     return $record;
 }
 
+=head2 PrepHostMarcField
+
+    $hostfield = PrepHostMarcField ( $hostbiblionumber )
+
+This function returns a host field populated with data from the host record, the field can then be added to an analytical record
+
+=cut
+
+sub PrepHostMarcField {
+	my ($hostbiblionumber,$hostitemnumber) = @_;
+        my $hostrecord = GetMarcBiblio($hostbiblionumber);
+
+	my $hostmarcfield = MARC::Field->new(
+			773, '', '',
+			'w' => $hostbiblionumber,
+                        'o' => $hostitemnumber,
+                        'a' => $hostrecord->subfield('245','a'),
+                        'x' => $hostrecord->subfield('245','x')
+                );
+
+    return $hostmarcfield;
+}
+
+
 =head2 TransformKohaToMarcOneField
 
     $record = TransformKohaToMarcOneField( $sth, $record, $kohafieldname, $value, $frameworkcode );
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 5111365..e3f69e5 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -929,6 +929,13 @@ if (($biblionumber) && !($breedingid)){
 if ($breedingid) {
     ( $record, $encoding ) = MARCfindbreeding( $breedingid ) ;
 }
+#populate hostfield if hostbiblionumber is available
+if ($hostbiblionumber){
+	$record=MARC::Record->new();
+	$record->leader('');
+        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
+	$record->append_fields($field);
+}
 
 $is_a_modif = 0;
     
diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
index c299a5a..d4959ad 100755
--- a/cataloguing/linkitem.pl
+++ b/cataloguing/linkitem.pl
@@ -55,16 +55,9 @@ if ($barcode && $biblionumber) {
 
     if ($hostitemnumber) {
 	my $hostbiblionumber = GetBiblionumberFromItemnumber($hostitemnumber);
-	my $hostrecord = GetMarcBiblio($hostbiblionumber);
 
 	if ($hostbiblionumber) {
-	        my $field = MARC::Field->new(
-			773, '', '',
-			'w' => $hostbiblionumber,
-			'o' => $hostitemnumber,
-               		'a' => $hostrecord->subfield('245','a'),
-	                'x' => $hostrecord->subfield('245','x')
-                );
+	        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
 		$biblio->append_fields($field);
 
 		my $modresult = ModBiblio($biblio, $biblionumber, ''); 
-- 
1.5.4.5


From savitra.sirohi at osslabs.biz  Wed Nov 24 05:48:08 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Wed, 24 Nov 2010 10:18:08 +0530
Subject: [Koha-patches] [PATCH] Analytical records: allow only specific copy
	holds for analytical records plus changes to use new C4 routines
Message-ID: <1290574088-23067-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

Signed-off-by: Amit Gupta <amit.gupta at osslabs.biz>
---
 .../opac-tmpl/prog/en/modules/opac-reserve.tmpl    |   47 ++++++++++++++++---
 opac/opac-reserve.pl                               |   28 ++++++------
 2 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 4d06e85..ee99c0d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -99,6 +99,21 @@
         $(".copiesrow").hide();
     });
 
+    // When 'hide copies' radion button is clicked
+    $(".hidecopies").click(function() {
+        // Make sure all other specific copy table rows are hidden
+        biblioNum = suffixOf($(this).attr("id"), "_");
+        newCopiesRowId = "#copiesrow_" + biblioNum;
+
+        if (!changeSelection(newCopiesRowId, false)) {
+            return false;
+        }
+
+        // Hide the copies table row
+        $(".copiesrow").hide();
+    });
+
+
     // When 'Place Hold' button is clicked
     $(".placehold").click(function(){
         var biblionumbers = "";
@@ -387,14 +402,26 @@
                                        disabled="disabled"
                                 />
                               <!-- TMPL_ELSE -->
-                                <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       class="selectany"
-                                       value="Any"
-                                       checked="checked"
-                                />
+					<!-- TMPL_IF NAME = "hostitemsflag" -->
+                                        <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                               id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                               class="hidecopies"
+                                               checked="checked"
+                                        />
+					<!-- TMPL_ELSE -->
+	                                <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
+		                               id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
+			                       class="selectany"
+				               value="Any"
+					       checked="checked"
+					/>
+					<!-- /TMPL_IF -->
                               <!-- /TMPL_UNLESS -->
-                              <label for="reqany_<!-- TMPL_VAR NAME="biblionumber" -->">Next available copy</label>
+				<!-- TMPL_IF NAME="hostitemsflag" -->
+					<label>Hide copies</label>
+				<!-- TMPL_ELSE -->
+	                              <label for="reqany_<!-- TMPL_VAR NAME="biblionumber" -->">Next available copy</label>
+				<!-- /TMPL_UNLESS -->
                             </td>
                           </tr>
                           <tr>
@@ -413,7 +440,11 @@
                                        value="Specific"
                                 />
                               <!-- /TMPL_UNLESS -->
-                              <label for="reqspecific_<!-- TMPL_VAR NAME="biblionumber"-->">A specific copy</label>
+				<!-- TMPL_IF NAME="hostitemsflag" -->
+                                      <label for="reqspecific_<!-- TMPL_VAR NAME="biblionumber"-->">Show Copies</label>
+				<!-- TMPL_ELSE -->
+	                              <label for="reqspecific_<!-- TMPL_VAR NAME="biblionumber"-->">A specific copy</label>
+				<!-- /TMPL_IF -->
                             </td>
                           </tr>
                         </table>
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 01cd576..62f4848 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -117,17 +117,15 @@ foreach my $biblioNumber (@biblionumbers) {
 
     my $marcrecord= GetMarcBiblio($biblioNumber);
 
-# adding items linked via host biblios
-    foreach my $hostfield ( $marcrecord->field('773')) {
-        my $hostbiblionumber = $hostfield->subfield("w");
-        my $linkeditemnumber = $hostfield->subfield("o");
-        my @hostitemInfos = GetItemsInfo($hostbiblionumber);
-        foreach my $hostitemInfo (@hostitemInfos){
-                if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
-                        push(@itemInfos, $hostitemInfo);
-                }
-         }
-    }
+	# flag indicating existence of at least one item linked via a host record
+	my $hostitemsflag;
+	# adding items linked via host biblios
+	my @hostitemInfos = GetHostItemsInfo($marcrecord);
+	if (@hostitemInfos){
+		$hostitemsflag =1;
+	        push (@itemInfos, at hostitemInfos);
+	}
+
 
 
     $biblioData->{itemInfos} = \@itemInfos;
@@ -196,9 +194,11 @@ if ( $query->param('place_reserve') ) {
         }
 
 	#item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber
-	my $hostbiblioNum = GetBiblionumberFromItemnumber($itemNum);
-	if ($hostbiblioNum ne $biblioNum) {
-		$biblioNum = $hostbiblioNum;
+	if ($itemNum ne '') {
+		my $hostbiblioNum = GetBiblionumberFromItemnumber($itemNum);
+		if ($hostbiblioNum ne $biblioNum) {
+			$biblioNum = $hostbiblioNum;
+		}
 	}
 
         my $biblioData = $biblioDataHash{$biblioNum};
-- 
1.5.4.5


From savitra.sirohi at osslabs.biz  Wed Nov 24 05:48:30 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Wed, 24 Nov 2010 10:18:30 +0530
Subject: [Koha-patches] [PATCH] Analytical records: Support for holds on
	items linked via host records
Message-ID: <1290574110-23112-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 C4/Items.pm                                        |   38 ++++++++++++++++++++
 C4/Reserves.pm                                     |    8 ++++
 .../prog/en/modules/reserve/request.tmpl           |    8 ++++-
 .../opac-tmpl/prog/en/includes/item-status.inc     |    2 +
 reserve/placerequest.pl                            |   10 +++++
 reserve/request.pl                                 |   21 +++++++++--
 6 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index c0c223a..1f82db1 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -66,6 +66,7 @@ BEGIN {
         GetItemsInfo
 	GetHostItemsInfo
         get_itemnumbers_of
+	get_hostitemnumbers_of
         GetItemnumberFromBarcode
         GetBarcodeFromItemnumber
 
@@ -1433,6 +1434,43 @@ sub get_itemnumbers_of {
     return \%itemnumbers_of;
 }
 
+=head2 get_hostitemnumbers_of
+
+  my @itemnumbers_of = get_hostitemnumbers_of($biblionumber);
+
+Given a biblionumber, return the list of corresponding itemnumbers that are linked to it via host fields
+
+Return a reference on a hash where key is a biblionumber and values are
+references on array of itemnumbers.
+
+=cut
+
+
+sub get_hostitemnumbers_of {
+	my ($biblionumber) = @_;
+	my $marcrecord = GetMarcBiblio($biblionumber);
+        my @returnhostitemnumbers;
+
+        #MARC21 mapping, UNIMARC to be added
+        foreach my $hostfield ( $marcrecord->field('773') ) {
+                my $hostbiblionumber = $hostfield->subfield("w");
+                my $linkeditemnumber = $hostfield->subfield("o");
+		my @itemnumbers;
+                if (my $itemnumbers = get_itemnumbers_of($hostbiblionumber)->{$hostbiblionumber})
+		{
+			@itemnumbers = @$itemnumbers;
+		}
+                foreach my $itemnumber (@itemnumbers){
+                        if ($itemnumber eq $linkeditemnumber){
+                                push (@returnhostitemnumbers,$itemnumber);
+                                last;
+                        }
+                }
+	}
+        return @returnhostitemnumbers;
+}
+
+
 =head2 GetItemnumberFromBarcode
 
   $result = GetItemnumberFromBarcode($barcode);
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index fcf9209..763830f 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -381,6 +381,14 @@ sub CanBookBeReserved{
     my ($borrowernumber, $biblionumber) = @_;
 
     my @items = GetItemsInfo($biblionumber);
+
+	#get items linked via host records
+	my $marcrecord= GetMarcBiblio($biblionumber);
+	my @hostitemInfos = GetHostItemsInfo($marcrecord);
+	if (@hostitemInfos){
+		push (@items, at hostitemInfos);
+	}
+
     foreach my $item (@items){
         return 1 if CanItemBeReserved($borrowernumber, $item->{itemnumber});
     }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 53f9138..3628fa0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -253,7 +253,7 @@ function checkMultiHold() {
             <input type="hidden" name="request" value="any"/>
             <!-- TMPL_LOOP NAME="biblioloop" -->
               <input type="hidden" name="title_<!-- TMPL_VAR NAME="biblionumber">" value="<!-- TMPL_VAR NAME="title" ESCAPE="html">"/>
-              <input type="hidden" name="rank_<!-- TMPL_VAR NAME="biblionumber">" value="<!-- TMPL_VAR NAME="rank">"/>
+              <input type="hidden" name="rank_<!-- TMPL_VAR NAME="biblionumber">" value="<!-- TMPL_VAR NAME="rank">"/> 
             <!-- /TMPL_LOOP -->
         <!-- TMPL_ELSE -->
             <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
@@ -389,6 +389,9 @@ function checkMultiHold() {
             <th>Call no.</th>
             <th>Copy no.</th>
             <th>Information</th>
+		<!-- TMPL_IF NAME="hostitemsflag"-->
+		<th>Host record</th>
+		<!--/TMPL_IF-->
         </tr>
     <!-- TMPL_LOOP Name="itemloop" -->
         <tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">
@@ -454,6 +457,9 @@ function checkMultiHold() {
                     Not on hold
             <!-- /TMPL_IF -->
             </td>
+		<!-- TMPL_IF NAME="hostitemsflag" -->
+			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Host Record</a></td>
+		<!-- /TMPL_IF -->
         </tr>
     <!-- /TMPL_LOOP --> <!-- itemloop -->
         </table>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
index 5e881fe..276bf24 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
@@ -9,6 +9,8 @@
     to <!-- TMPL_VAR NAME="transfertto" --> since <!-- TMPL_VAR NAME="transfertwhen" -->
 <!-- TMPL_ELSIF NAME="waiting" -->
     On hold
+<!-- TMPL_ELSIF NAME="onhold" -->
+	On hold
 <!-- TMPL_ELSIF NAME="wthdrawn" -->
     Item withdrawn
 <!-- TMPL_ELSIF name="itemlost"-->
diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl
index bc3fc74..a665333 100755
--- a/reserve/placerequest.pl
+++ b/reserve/placerequest.pl
@@ -81,6 +81,7 @@ if ($checkitem ne ''){
     }
 }
 
+
 if ($type eq 'str8' && $borrowernumber ne ''){
 
     foreach my $biblionumber (keys %bibinfos) {
@@ -98,6 +99,15 @@ if ($type eq 'str8' && $borrowernumber ne ''){
         }
         my $const;
 
+	if ($checkitem ne ''){
+		my $item = GetItem($checkitem);
+        	if ($item->{'biblionumber'} ne $biblionumber) {
+                	$biblionumber = $item->{'biblionumber'};
+        	}
+	}
+
+
+
         if ($multi_hold) {
             my $bibinfo = $bibinfos{$biblionumber};
             AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber],
diff --git a/reserve/request.pl b/reserve/request.pl
index 859a65b..ea7811e 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -285,16 +285,22 @@ foreach my $biblionumber (@biblionumbers) {
     my @branchcodes;
     my %itemnumbers_of_biblioitem;
     my @itemnumbers;
-    
+
     ## $items is array of 'item' table numbers
     if (my $items = get_itemnumbers_of($biblionumber)->{$biblionumber}){
         @itemnumbers  = @$items;
     }
-    else {
+	my @hostitems = get_hostitemnumbers_of($biblionumber);
+	if (@hostitems){
+		push(@itemnumbers, @hostitems);
+	}
+
+    if (!@itemnumbers) {
         $template->param('noitems' => 1);
         $biblioloopiter{noitems} = 1;
     }
-    
+
+   
     ## Hash of item number to 'item' table fields
     my $iteminfos_of = GetItemInfosOf(@itemnumbers);
     
@@ -322,6 +328,9 @@ foreach my $biblionumber (@biblionumbers) {
         
         $biblioitem->{description} =
           $itemtypes->{ $biblioitem->{itemtype} }{description};
+	if($biblioitem->{biblioitemnumber} ne $biblionumber){
+		$biblioitem->{hostitemsflag}=1;
+	}
         $biblioloopiter{description} = $biblioitem->{description};
         $biblioloopiter{itypename} = $biblioitem->{description};
         $biblioloopiter{imageurl} =
@@ -344,7 +353,11 @@ foreach my $biblionumber (@biblionumbers) {
                 $item->{holdingbranchname} =
                   $branches->{ $item->{holdingbranch} }{branchname};
             }
-            
+
+		if($item->{biblionumber} ne $biblionumber){
+			$item->{hostitemsflag}=1;
+		}
+		
             #   add information
             $item->{itemcallnumber} = $item->{itemcallnumber};
             
-- 
1.5.4.5


From oleonard at myacpl.org  Wed Nov 24 15:31:56 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 24 Nov 2010 09:31:56 -0500
Subject: [Koha-patches] [PATCH] Fix for Bug 5402,
	"add to cart" shown on checkbox hover
Message-ID: <1290609116-2503-1-git-send-email-oleonard@myacpl.org>

This patch removes the title hint altogether. The checkbox might
be used for the cart, lists, holds, or tags, and expressing this
in a title hint seems overly complicated.
---
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index aa39b9a..cfd5e36 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -367,9 +367,9 @@ $(document).ready(function(){
                 <tr>
             <!-- /TMPL_UNLESS -->
 
-                <td class="select selectcol"><!--TMPL_IF NAME="opacbookbag" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to cart" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="virtualshelves" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to cart" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="RequestOnOpac" --><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to cart" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></td>
+                <td class="select selectcol"><!--TMPL_IF NAME="opacbookbag" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- TMPL_ELSE -->
+<!-- TMPL_IF NAME="virtualshelves" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- TMPL_ELSE -->
+<!-- TMPL_IF NAME="RequestOnOpac" --><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></td>
                 <td class="select selectcol"><!-- TMPL_VAR NAME="result_number" -->.</td>
 
 				<!-- TMPL_UNLESS NAME="item-level_itypes" -->
-- 
1.7.1


From oleonard at myacpl.org  Wed Nov 24 15:48:24 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 24 Nov 2010 09:48:24 -0500
Subject: [Koha-patches] [PATCH] Fix for Bug 5416,
	Template syntax error in moredetails.tmpl
Message-ID: <1290610104-2720-1-git-send-email-oleonard@myacpl.org>

---
 .../prog/en/modules/catalogue/moredetail.tmpl      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 55ca81f..b87e14a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -42,7 +42,7 @@
     <!-- TMPL_LOOP NAME="ITEM_DATA" -->
     <div class="yui-g">
         <h3 id="item<!-- TMPL_VAR NAME="itemnumber" -->">Barcode <!-- TMPL_VAR NAME="barcode" -->  <!-- TMPL_IF name="notforloantext" --><!-- TMPL_VAR name="notforloantext" --> <!-- /TMPL_IF --></h3>
-        <div class="listgroup"><h4>Item Information <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><!-- TMPL_UNLESS name="nomod" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">[Edit Item]</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --></h4>
+        <div class="listgroup"><h4>Item Information <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><!-- TMPL_UNLESS name="nomod" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">[Edit Item]</a><!-- /TMPL_UNLESS --><!-- /TMPL_IF --></h4>
             <ol class="bibliodetails">
             <li><span class="label">Home Library:</span> <!-- TMPL_VAR NAME="homebranchname" -->&nbsp;</li>
 	    <!-- TMPL_IF NAME="item-level_itypes" -->
-- 
1.7.1


From oleonard at myacpl.org  Wed Nov 24 15:50:23 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 24 Nov 2010 09:50:23 -0500
Subject: [Koha-patches] [PATCH] Fix for Bug 5416,
	Template syntax error in moredetails.tmpl
In-Reply-To: <1290610104-2720-1-git-send-email-oleonard@myacpl.org>
References: <1290610104-2720-1-git-send-email-oleonard@myacpl.org>
Message-ID: <AANLkTi=6GaEKwZ0xYmxV=arxVT6KbTSmGqRQJHQ1cjsG@mail.gmail.com>

Credit for finding this bug and patching it goes to Fridolyn Somers,
but the patch in Bugzilla didn't apply for me so I duplicated the
changes and reformatted.

  -- Owen

From savitra.sirohi at osslabs.biz  Wed Nov 24 12:02:00 2010
From: savitra.sirohi at osslabs.biz (savitra.sirohi at osslabs.biz)
Date: Wed, 24 Nov 2010 16:32:00 +0530
Subject: [Koha-patches] [PATCH] Analytical record - improvements in creating
	analytical record
Message-ID: <1290596520-10647-1-git-send-email-savitra.sirohi@osslabs.biz>

From: Amit Gupta <amit.gupta at osslabs.biz>

---
 cataloguing/addbiblio.pl                           |   44 ++------------------
 .../prog/en/modules/cataloguing/addbiblio.tmpl     |    2 +-
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index e3f69e5..79b8d17 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -348,8 +348,6 @@ sub create_input {
         );
     # always expand all subfields of a mandatory field
     $subfield_data{visibility} = "" if $tagslib->{$tag}->{mandatory};
-    # expand all subfields of 773 if there is a host item provided in the input
-    $subfield_data{visibility} ="" if ($tag eq 773 and $cgi->param('hostitemnumber'));
     # it's an authorised field
     if ( $tagslib->{$tag}->{$subfield}->{authorised_value} ) {
         $subfield_data{marc_value} =
@@ -681,14 +679,6 @@ sub build_tabs ($$$$$) {
             # if breeding is empty
             }
             else {
-               my $hostbiblionumber;
-               my $hostitemnumber;
-               my $hostrecord;
-               if ($tag eq 773){
-			$hostbiblionumber = $input->param('hostbiblionumber');
-			$hostitemnumber = $input->param('hostitemnumber');
-			$hostrecord = &GetMarcBiblio($hostbiblionumber);
-               }
                 my @subfields_data;
                 foreach my $subfield ( sort( keys %{ $tagslib->{$tag} } ) ) {
                     next if ( length $subfield != 1 );
@@ -705,35 +695,6 @@ sub build_tabs ($$$$$) {
                            # always include in the form regardless of the hidden setting - bug 2206
                     next
                       if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
-                    if ( $tag eq 773 and $hostbiblionumber){
-                                if ($subfield eq "w"){
-                                        push(
-                                                @subfields_data,
-                                        &create_input(
-                                            $tag, $subfield,$hostbiblionumber, $index_tag, $tabloop, $record,
-                                            $authorised_values_sth,$input
-                                        ));
-					next;
-                                }
-                                if ($subfield eq "a"){
-                                        push(
-                                        @subfields_data,
-                                        &create_input(
-                                            $tag, $subfield,$hostrecord->subfield('245',"a"), $index_tag, $tabloop, $record,
-                                            $authorised_values_sth,$input
-                                        ));
-					next;
-                                }
-                                if ($subfield eq "o"){
-                                        push(
-                                        @subfields_data,
-                                        &create_input(
-                                            $tag, $subfield,$hostitemnumber, $index_tag, $tabloop, $record,
-                                            $authorised_values_sth,$input
-                                        ));
-					next;
-                                }
-                    }
 			push(
                         @subfields_data,
                         &create_input(
@@ -872,6 +833,8 @@ my $mode          = $input->param('mode');
 my $frameworkcode = $input->param('frameworkcode');
 my $redirect      = $input->param('redirect');
 my $dbh           = C4::Context->dbh;
+my $hostbiblionumber = $input->param('hostbiblionumber');
+my $hostitemnumber = $input->param('hostitemnumber');
 
 my $userflags = ($frameworkcode eq 'FA') ? "fast_cataloging" : "edit_catalogue";
 
@@ -932,7 +895,6 @@ if ($breedingid) {
 #populate hostfield if hostbiblionumber is available
 if ($hostbiblionumber){
 	$record=MARC::Record->new();
-	$record->leader('');
         my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
 	$record->append_fields($field);
 }
@@ -1062,6 +1024,8 @@ elsif ( $op eq "delete" ) {
         biblioitemnumtagfield    => $biblioitemnumtagfield,
         biblioitemnumtagsubfield => $biblioitemnumtagsubfield,
         biblioitemnumber         => $biblioitemnumber,
+	hostbiblionumber	=> $hostbiblionumber,
+	hostitemnumber		=> $hostitemnumber
     );
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index ccd1039..3d3b9c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -230,7 +230,7 @@ function GetZ3950Terms(){
 
 function Changefwk(FwkList) {
 	var fwk = FwkList.options[FwkList.selectedIndex].value;
- 	window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&breedingid=<!-- TMPL_VAR name="breedingid" -->&frameworkcode="+fwk;
+ 	window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&breedingid=<!-- TMPL_VAR name="breedingid" -->&hostbiblionumber=<!-- TMPL_VAR Name="hostbiblionumber" -->&hostitemnumber=<!--TMPL_VAR Name="hostitemnumber" -->&frameworkcode="+fwk;
 
 }
 
-- 
1.5.4.5


From oleonard at myacpl.org  Wed Nov 24 17:35:43 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 24 Nov 2010 11:35:43 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5430: Add Control number as
	option to OPACSearchForTitleIn
Message-ID: <1290616543-3598-1-git-send-email-oleonard@myacpl.org>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

Makes {CONTROLNUMBER} available as new placeholder in
system preference OPACSearchForTitleIn.

{CONTROLNUMBER} will be replaced by the number in tag 001.

Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 C4/Biblio.pm                                       |   19 +++++++++++++++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 opac/opac-detail.pl                                |    3 +++
 3 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 6a422be..4102e23 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -67,6 +67,7 @@ BEGIN {
 
       &GetISBDView
 
+      &GetMarcControlnumber
       &GetMarcNotes
       &GetMarcSubjects
       &GetMarcBiblio
@@ -1254,6 +1255,24 @@ sub GetAuthorisedValueDesc {
     }
 }
 
+=head2 GetMarcControlnumber
+
+  $marccontrolnumber = GetMarcControlnumber($record,$marcflavour);
+
+Get the control number / record Identifier from the MARC record and return it.
+
+=cut
+
+sub GetMarcControlnumber {
+    my ( $record, $marcflavour ) = @_;
+    my $controlnumber = "";
+    # Control number or Record identifier are the same field in MARC21 and UNIMARC
+    # Keep $marcflavour for possible later use
+    if ($marcflavour eq "MARC21" || $marcflavour eq "UNIMARC") {
+        $controlnumber = $record->field('001')->data();
+    }
+}
+
 =head2 GetMarcNotes
 
   $marcnotesarray = GetMarcNotes( $record, $marcflavour );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 2619d8c..55560d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -137,7 +137,7 @@ OPAC:
               class: code
         -
             - 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
-            - '<br />Note: The placeholders {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
+            - '<br />Note: The placeholders {CONTROLNUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.'
             - pref: OPACSearchForTitleIn
               type: textarea
               class: code
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 0cd05f7..2de8ec8 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -584,12 +584,15 @@ if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->pref
 }
 
 #Search for title in links
+my $marccontrolnumber   = GetMarcControlnumber   ($record, $marcflavour);
+
 if (my $search_for_title = C4::Context->preference('OPACSearchForTitleIn')){
     $dat->{author} ? $search_for_title =~ s/{AUTHOR}/$dat->{author}/g : $search_for_title =~ s/{AUTHOR}//g;
     $dat->{title} =~ s/\/+$//; # remove trailing slash
     $dat->{title} =~ s/\s+$//; # remove trailing space
     $dat->{title} ? $search_for_title =~ s/{TITLE}/$dat->{title}/g : $search_for_title =~ s/{TITLE}//g;
     $isbn ? $search_for_title =~ s/{ISBN}/$isbn/g : $search_for_title =~ s/{ISBN}//g;
+    $marccontrolnumber ? $search_for_title =~ s/{CONTROLNUMBER}/$marccontrolnumber/g : $search_for_title =~ s/{CONTROLNUMBER}//g;
  $template->param('OPACSearchForTitleIn' => $search_for_title);
 }
 
-- 
1.7.1


From oleonard at myacpl.org  Wed Nov 24 20:59:34 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 24 Nov 2010 14:59:34 -0500
Subject: [Koha-patches] [PATCH 2/2] Further fixes for Bug 3652 - XSS
	vulnerabilities
Message-ID: <1290628774-5425-1-git-send-email-oleonard@myacpl.org>

Applying "ESCAPE='0'" where necessary in the staff client
---
 .../prog/en/includes/auth-finder-search.inc        |    6 ++--
 .../prog/en/includes/doc-head-close.inc            |    2 +-
 .../prog/en/includes/doc-head-open.inc             |    6 ++++-
 .../intranet-tmpl/prog/en/includes/header.inc      |    2 +-
 .../prog/en/includes/intranet-bottom.inc           |   10 ++++----
 .../prog/en/modules/acqui/neworderbiblio.tmpl      |    2 +-
 .../prog/en/modules/acqui/neworderempty.tmpl       |   12 +++++-----
 .../prog/en/modules/acqui/newordersuggestion.tmpl  |    2 +-
 .../prog/en/modules/acqui/z3950_search.tmpl        |    4 +-
 .../prog/en/modules/admin/aqbudgetperiods.tmpl     |    2 +-
 .../prog/en/modules/admin/aqbudgets.tmpl           |    1 +
 .../prog/en/modules/admin/aqplan.tmpl              |    8 +++---
 .../en/modules/admin/auth_subfields_structure.tmpl |   18 ++++++++--------
 .../prog/en/modules/admin/authorised_values.tmpl   |    2 +-
 .../prog/en/modules/admin/classsources.tmpl        |    5 +--
 .../en/modules/admin/item_circulation_alerts.tmpl  |    4 +-
 .../prog/en/modules/admin/koha2marclinks.tmpl      |   22 ++++++++++----------
 .../en/modules/admin/marc_subfields_structure.tmpl |   16 +++++++-------
 .../prog/en/modules/admin/matching-rules.tmpl      |    2 +-
 .../prog/en/modules/admin/patron-attr-types.tmpl   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl  |    2 +-
 .../prog/en/modules/authorities/authorities.tmpl   |    2 +-
 .../modules/authorities/searchresultlist-auth.tmpl |    2 +-
 .../en/modules/authorities/searchresultlist.tmpl   |    2 +-
 .../prog/en/modules/basket/basket.tmpl             |    6 ++--
 .../prog/en/modules/basket/sendbasket.tmpl         |    2 +-
 .../prog/en/modules/catalogue/ISBDdetail.tmpl      |    2 +-
 .../prog/en/modules/catalogue/MARCdetail.tmpl      |    2 +-
 .../prog/en/modules/catalogue/detail.tmpl          |   20 +++++++++---------
 .../en/modules/catalogue/labeledMARCdetail.tmpl    |    2 +-
 .../prog/en/modules/cataloguing/addbiblio.tmpl     |    2 +-
 .../prog/en/modules/cataloguing/additem.tmpl       |    4 +-
 .../prog/en/modules/circ/circulation.tmpl          |   10 ++++----
 .../prog/en/modules/intranet-main.tmpl             |    4 +-
 .../prog/en/modules/labels/label-edit-batch.tmpl   |    2 +-
 .../prog/en/modules/labels/label-home.tmpl         |    4 +-
 .../prog/en/modules/labels/spinelabel-print.tmpl   |    2 +-
 .../prog/en/modules/members/borrowers_details.tmpl |    4 ++-
 .../prog/en/modules/members/member.tmpl            |    2 +-
 .../prog/en/modules/members/memberentrygen.tmpl    |    6 ++--
 .../en/modules/reports/acquisitions_stats.tmpl     |   14 ++++++------
 .../prog/en/modules/reports/bor_issues_top.tmpl    |    2 +-
 .../prog/en/modules/reports/borrowers_out.tmpl     |    4 +-
 .../prog/en/modules/reports/borrowers_stats.tmpl   |    4 +-
 .../prog/en/modules/reports/cat_issues_top.tmpl    |    4 +-
 .../prog/en/modules/reports/catalogue_out.tmpl     |    4 +-
 .../prog/en/modules/reports/catalogue_stats.tmpl   |    4 +-
 .../prog/en/modules/reports/issues_avg_stats.tmpl  |   16 +++++++-------
 .../reports/issues_by_borrower_category.tmpl       |    2 +-
 .../prog/en/modules/reports/issues_stats.tmpl      |    4 +-
 .../prog/en/modules/reports/itemtypes.tmpl         |    2 +-
 .../prog/en/modules/reports/serials_stats.tmpl     |    4 +-
 .../prog/en/modules/reserve/request.tmpl           |    4 +-
 53 files changed, 142 insertions(+), 136 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index 437b313..fe4f612 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -17,7 +17,7 @@
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value_mainstr" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_mainstr" -->" />
+                    <input type="text" name="value_mainstr" value="<!-- TMPL_VAR name="value_mainstr" -->" />
                 </li>
                 <li>
                     <label for="mainentry">Main entry</label>
@@ -29,7 +29,7 @@
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value_main" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_main" -->" />
+                    <input type="text" name="value_main" value="<!-- TMPL_VAR name="value_main" -->" />
                 </li>
                 <li>
                     <label for="marclist">Anywhere</label>
@@ -41,7 +41,7 @@
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value_any" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_any" -->" />
+                    <input type="text" name="value_any" value="<!-- TMPL_VAR name="value_any" -->" />
                 </li>
 		<li>
 		<label for="orderby">Sort by </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 1970440..f17bc29 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -75,7 +75,7 @@
 <!-- TMPL_IF NAME="intranetuserjs" -->
     <script type="text/javascript">
     //<![CDATA[
-    <!-- TMPL_VAR NAME="intranetuserjs" -->
+    <!-- TMPL_VAR NAME="intranetuserjs" ESCAPE="0" -->
     //]]>
     </script>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
index df2dc01..d7b838d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
@@ -1,4 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" <!-- TMPL_IF NAME="bidi" -->dir="<!-- TMPL_VAR NAME="bidi" -->"<!-- /TMPL_IF --> xmlns="http://www.w3.org/1999/xhtml">
+<!-- TMPL_IF NAME="bidi" -->
+<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" dir="<!-- TMPL_VAR NAME="bidi" -->" xmlns="http://www.w3.org/1999/xhtml">
+<!-- TMPL_ELSE -->
+<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" xmlns="http://www.w3.org/1999/xhtml">
+<!-- /TMPL_IF -->
 <head>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 95ce8dd..3e3ab36 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -9,7 +9,7 @@
                 <!-- TMPL_IF NAME="intranetbookbag" -->
                     <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
                 <!-- /TMPL_IF -->
-                <!-- TMPL_VAR name="IntranetNav" -->
+                <!-- TMPL_VAR name="IntranetNav" ESCAPE="0" -->
                 <li class="more">
                     <a id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
                     <div id="moremenu">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index 78334b2..71eff05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -7,14 +7,14 @@
         <!-- TMPL_LOOP NAME="languages_loop" -->
             <!-- TMPL_IF NAME="group_enabled" -->
             <!-- TMPL_IF NAME="plural" -->
-            <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sublangs">
+            <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a><div id="sublangs">
             <div class="bd"><ul>
             <!-- TMPL_LOOP NAME="sublanguages_loop" -->
 		<!-- TMPL_IF NAME="enabled" -->
                 <!-- TMPL_IF NAME="sublanguage_current" -->
-                    <li> <a href="#"><!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li>
+                    <li> <a href="#"><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="script_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" ESCAPE="0" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a></li>
                 <!-- TMPL_ELSE -->
-                <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li>
+                <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="script_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="region_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a></li>
 		<!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
 
@@ -24,9 +24,9 @@
             <!-- TMPL_ELSE -->
 	    	<!-- TMPL_IF NAME="group_enabled" -->
                 <!-- TMPL_IF NAME="current" -->
-                    <li><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></li>
+                    <li><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" --><!-- /TMPL_IF --></li>
                 <!-- TMPL_ELSE -->
-                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></a></li>
+                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" --><!-- /TMPL_IF --></a></li>
                 <!-- /TMPL_IF -->
 		<!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index f09f474..dbbf8f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -48,7 +48,7 @@
     <!-- TMPL_LOOP NAME="resultsloop" -->
         <tr>
             <td>
-                <p><span class="title"><!-- TMPL_VAR NAME="title" escape="html" --></span>
+                <p><span class="title"><!-- TMPL_VAR NAME="title" --></span>
                 <!-- TMPL_IF name="author" -->  by <span class="author"><!-- TMPL_VAR NAME="author" --></span>,<!-- /TMPL_IF --></p>
                 <p><!-- TMPL_IF name="isbn" --> <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
                 <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index e53c7da..21f5044 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -140,10 +140,10 @@ ff.submit();
         <ol><li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Title</span>
-                <input type="hidden" size="50" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="HTML" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></span>
+                <input type="hidden" size="50" name="title" value="<!-- TMPL_VAR NAME="title" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" --></span>
             <!-- TMPL_ELSE -->
             <label for="entertitle" class="required">Title: </label>
-                <input type="text" id="entertitle" size="50" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" />
+                <input type="text" id="entertitle" size="50" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
@@ -206,8 +206,8 @@ ff.submit();
             <ol><!-- TMPL_LOOP NAME="iteminformation" --><li>
                 <div class="subfield_line" style="<!-- TMPL_VAR NAME='hidden' -->;" id="subfield<!-- TMPL_VAR NAME='serialid' --><!-- TMPL_VAR NAME='countitems' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
 
-                    <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
-                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <label><!-- TMPL_VAR NAME="subfield" ESCAPE="0" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" ESCAPE="0" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
+                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
                     <input type="hidden" name="itemid" value="1" />
                     <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
                     <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
@@ -340,7 +340,7 @@ ff.submit();
                 <label for="sort1">Planning value1: </label>
 
                 <!-- TMPL_IF Name="CGIsort1" -->
-                    <!-- TMPL_VAR Name="CGIsort1" -->
+                    <!-- TMPL_VAR Name="CGIsort1" ESCAPE="0" -->
                 <!-- TMPL_ELSE -->
 
                     <input type="text" id="sort1" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
@@ -350,7 +350,7 @@ ff.submit();
                 <label for="sort2">Planning value2: </label>
 
                 <!-- TMPL_IF Name="CGIsort2" -->
-                    <!-- TMPL_VAR Name="CGIsort2" -->
+                    <!-- TMPL_VAR Name="CGIsort2" ESCAPE="0" -->
                 <!-- TMPL_ELSE -->
                     <input type="text" id="sort2" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
                 <!--/TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
index 630d9ba..e9c0495 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
@@ -27,7 +27,7 @@
         <!-- TMPL_LOOP NAME="suggestions_loop" -->
             <tr>
                 <td>
-                    <p><!-- TMPL_VAR NAME="title" escape="html" --> - <!-- TMPL_VAR NAME="author" --></p>
+                    <p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
                     <p>
                         <!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
index 2219dfa..fbf6565 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
@@ -73,7 +73,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 	<div class="yui-g">
     <div class="yui-u first">
 	    <fieldset class="rows">
-		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" /></li>
+		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="<!-- TMPL_VAR NAME="title" -->" /></li>
 		 <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" /></li>
 		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li></ol>
 		</fieldset>
@@ -141,7 +141,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 
         <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
             <td><!-- TMPL_VAR name="server" --> <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=<!-- TMPL_VAR NAME="breedingid" -->" rel="gb_page_center[600,500]">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=<!-- TMPL_VAR NAME="breedingid" -->" rel="gb_page_center[600,500]">Preview Card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->&amp;breedingid=<!-- TMPL_VAR NAME="breedingid" -->&amp;booksellerid=<!-- TMPL_VAR name="booksellerid" -->&amp;basketno=<!-- TMPL_VAR name="basketno" -->">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
-            <td><!-- TMPL_VAR NAME="title" ESCAPE="html" --></td>
+            <td><!-- TMPL_VAR NAME="title" --></td>
             <td><!-- TMPL_VAR NAME="author" --></td>
             <td><!-- TMPL_VAR NAME="isbn" --></td>
             <td><!-- TMPL_VAR NAME="lccn" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index 523fd13..8f1f06b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -294,7 +294,7 @@
     	<!-- /TMPL_UNLESS -->
     </tbody>
     </table>
-    <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+    <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index 80d9156..925cb7e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -241,6 +241,7 @@
     </tbody>
 </table>
 
+<!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR NAME="cur" --> <!-- TMPL_VAR NAME="cur_format" --></b></p><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF -->
 <!-- /TMPL_IF --> <!-- else -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index 2192178..fc39f8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -104,7 +104,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
     </td>
     <td>
         <label for="authcat"  > Select planning type:</label>
-        <!-- TMPL_VAR NAME="authcat_dropbox" -->
+        <!-- TMPL_VAR NAME="authcat_dropbox" ESCAPE="0" -->
         <input type="submit" name="option_submit" value="Select" />
     </td>
     </tr>
@@ -176,7 +176,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
         <tr > 
             <!--/TMPL_IF -->
 
-        <td align='left'><!-- TMPL_VAR NAME="budget_name_indent"--></td>
+        <td align='left'><!-- TMPL_VAR NAME="budget_name_indent" ESCAPE="0" --></td>
         <td align='right'><span id='budget_tot_formatted_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount_formatted"-->&nbsp;</span>
 
         <!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->
@@ -279,8 +279,8 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
     <ol>
     <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" />
     <label class="inline" for="MIME">Into an application
-    </label><!-- TMPL_VAR NAME="CGIextChoice" -->
-    <!-- TMPL_VAR NAME="CGIsepChoice" --> &nbsp;&nbsp;&nbsp;
+    </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+    <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --> &nbsp;&nbsp;&nbsp;
     <input type="submit" value="Output"/>
     <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
     <input type="hidden" name="output" value="file" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index 1b431ec..64d2a29 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -75,34 +75,34 @@ function displayMoreConstraint(numlayer){
 			<fieldset class="rows"><ol>
 
                     <!-- TMPL_IF NAME="new_subfield" -->
-                <li><label for="tagsubfieldinput<!-- TMPL_VAR NAME="row" -->">Subfield code: </label><!-- TMPL_VAR NAME="tagsubfieldinput" -->&nbsp;</li>
+                <li><label for="tagsubfieldinput<!-- TMPL_VAR NAME="row" -->">Subfield code: </label><!-- TMPL_VAR NAME="tagsubfieldinput" ESCAPE="0" -->&nbsp;</li>
                     <!-- TMPL_ELSE -->
                 <li>
                 <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR name="tagsubfield" -->" />
                  </li>
                     <!-- /TMPL_IF -->
-                <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</li>
-                <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</li>
+                <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" ESCAPE="0" -->&nbsp;</li>
+                <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" ESCAPE="0" -->&nbsp;</li>
                 <li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
                 <li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
-                <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield does not display in the record editor)</li>
+                <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" ESCAPE="0" --> (ignore means that the subfield does not display in the record editor)</li>
                 <li>
                     <fieldset>
                         <legend>Display</legend>
                         <ol>
-                            <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Select to display or not:</label><!-- TMPL_VAR name="ohidden" -->  </li>
+                            <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Select to display or not:</label><!-- TMPL_VAR name="ohidden" ESCAPE="0" -->  </li>
                             <!-- <li><label for="ihidden<!-- TMPL_VAR NAME="row" -->">Intranet:</label><!-- TMPL_VAR name="ihidden" --> </li> -->
                             <!-- <li><label for="ehidden<!-- TMPL_VAR NAME="row" -->">Editor:</label><!-- TMPL_VAR name="ehidden" --> (see online help)</li> -->
                         </ol>
                     </fieldset>
                 </li>
-                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
+                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" ESCAPE="0" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
                 <li>
                     <fieldset><legend>Help input</legend>	
                         <ol>
-                            <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label> <!-- TMPL_VAR NAME="authorised_value" --></li>
-                            <li><label for="frameworkcode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label> <!-- TMPL_VAR NAME="frameworkcode" --></li>
-                            <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label> <!-- TMPL_VAR NAME="value_builder" --></li>
+                            <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label> <!-- TMPL_VAR NAME="authorised_value" ESCAPE="0" --></li>
+                            <li><label for="frameworkcode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label> <!-- TMPL_VAR NAME="frameworkcode" ESCAPE="0" --></li>
+                            <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label> <!-- TMPL_VAR NAME="value_builder" ESCAPE="0" --></li>
                         </ol>
                     </fieldset>
                 </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index bef0cae..7264db1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
@@ -174,7 +174,7 @@
 </span>
 </div>
 <!-- /TMPL_IF -->
-<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Submit" /></form>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" ESCAPE="0" --> <input type="submit" value="Submit" /></form>
 <!-- TMPL_IF EXPR="category eq 'Bsort1'" -->
     <p>An authorized value attached to patrons, that can be used for stats purposes</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index 569d875..a5f81b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -274,9 +274,8 @@ $(document).ready(function() {
   <!-- /TMPL_LOOP -->
 </table>
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 <h2>Classification Filing Rules</h2>
 <!-- TMPL_IF name="added_rule" -->
 <div class="dialog message">Added filing rule <!-- TMPL_VAR name="added_rule" --></div>
@@ -310,7 +309,7 @@ $(document).ready(function() {
   </tr>
   <!-- /TMPL_LOOP -->
 </table>
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
index 48dd3ad..d2ffbaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
@@ -157,7 +157,7 @@ $(function(){
 <tr>
   <th>&nbsp;</th>
   <!-- TMPL_LOOP NAME="item_types" -->
-  <th><!-- TMPL_VAR NAME="br_description" --></th>
+  <th><!-- TMPL_VAR NAME="br_description" ESCAPE="0" --></th>
   <!-- /TMPL_LOOP -->
 </tr>
 </thead>
@@ -181,7 +181,7 @@ $(function(){
 <tr>
   <th>&nbsp;</th>
   <!-- TMPL_LOOP NAME="item_types" -->
-  <th><!-- TMPL_VAR NAME="br_description" --></th>
+  <th><!-- TMPL_VAR NAME="br_description" ESCAPE="0"  --></th>
   <!-- /TMPL_LOOP -->
 </tr>
 </thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
index b8f664a..c1e3103 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
@@ -33,7 +33,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>000s</label>
-            <!-- TMPL_VAR name="marclist0" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist0" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -42,7 +42,7 @@
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <label>100s</label>
-            <!-- TMPL_VAR name="marclist1" -->
+            <!-- TMPL_VAR name="marclist1" ESCAPE="0" -->
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" />	</form>
         
     </li>
@@ -53,7 +53,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>200s</label>
-            <!-- TMPL_VAR name="marclist2" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist2" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -63,7 +63,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>300s</label>
-            <!-- TMPL_VAR name="marclist3" --> <input type="submit" value="OK" />	</form>
+            <!-- TMPL_VAR name="marclist3" ESCAPE="0" --> <input type="submit" value="OK" />	</form>
         
     </li>
     <li>
@@ -73,7 +73,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>400s</label>
-            <!-- TMPL_VAR name="marclist4" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist4" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -83,7 +83,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>500s</label>
-            <!-- TMPL_VAR name="marclist5" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist5" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -93,7 +93,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>600s</label>
-            <!-- TMPL_VAR name="marclist6" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist6" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -103,7 +103,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>700s</label>
-            <!-- TMPL_VAR name="marclist7" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist7" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -113,7 +113,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>800s</label>
-            <!-- TMPL_VAR name="marclist8" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist8" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -123,7 +123,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>900s</label>
-            <!-- TMPL_VAR name="marclist9" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist9" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     </ol></fieldset>
@@ -144,7 +144,7 @@
 
 <h1>Koha to MARC Mapping <!-- TMPL_VAR name="tagfield" --></h1>
 <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-<p><!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK" /></p>
+<p><!-- TMPL_VAR name="tablename" ESCAPE="0" --> <input type="submit" value="OK" /></p>
 </form>
 <table>
 <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 7873296..b432d72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -98,9 +98,9 @@
                 		<!-- /TMPL_IF -->
                 		<li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
                 		<li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
-                		<li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" --></li>
-                		<li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" --></li>
-                		<li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield does not display in the record editor)</li>
+                		<li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" ESCAPE="0"  --></li>
+                		<li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" ESCAPE="0"  --></li>
+                		<li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" ESCAPE="0"  --> (ignore means that the subfield does not display in the record editor)</li>
                 	</ol>
             </fieldset>
 			
@@ -111,17 +111,17 @@
                 <ol><li><label for="defaultvalue<!-- TMPL_VAR NAME="row" -->">Default value:</label>
                     <input type="text" name="defaultvalue" id="defaultvalue<!-- TMPL_VAR NAME="row" -->" value="<!-- TMPL_VAR NAME="defaultvalue" -->" /></li>
                 <li><label for="hidden<!-- TMPL_VAR NAME="row" -->">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</li>
-                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
+                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" ESCAPE="0"  --> (if checked, it means that the subfield is a URL and can be clicked)</li>
                 <li><label for="link<!-- TMPL_VAR NAME="row" -->">Link:</label><input type="text" id="link<!-- TMPL_VAR NAME="row" -->" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>Warning: This value should not change after data has been added to your catalog</em></span></li>
-                <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label><!-- TMPL_VAR NAME="kohafield" --></li>
+                <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label><!-- TMPL_VAR NAME="kohafield" ESCAPE="0"  --></li>
 			</ol>
 	</fieldset>
 	 <fieldset class="rows">
                 <legend>Other Options: (choose one)</legend>
                     	<ol>
-                    		<li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label><!-- TMPL_VAR NAME="authorised_value" --></li>
-                    		<li><label for="authtypecode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label><!-- TMPL_VAR NAME="authtypes" --></li>
-                    		<li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label><!-- TMPL_VAR NAME="value_builder" --></li>
+                    		<li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label><!-- TMPL_VAR NAME="authorised_value" ESCAPE="0"  --></li>
+                    		<li><label for="authtypecode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label><!-- TMPL_VAR NAME="authtypes" ESCAPE="0"  --></li>
+                    		<li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label><!-- TMPL_VAR NAME="value_builder" ESCAPE="0"  --></li>
                     	</ol>
 				</fieldset>
             </div><br class="clear" /><!-- /more  -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
index bfa2ed9..df77592 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
@@ -572,7 +572,7 @@ function CheckRuleForm(f) {
   <!-- /TMPL_LOOP -->
 </table><!-- TMPL_ELSE --><p>There are no saved matching rules.</p><!-- /TMPL_IF -->
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 
 <!-- /TMPL_IF -->
  <!-- TMPL_IF name="matching_rule_form" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
index b445c41..8e1c7ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
@@ -221,7 +221,7 @@ function CheckAttributeTypeForm(f) {
   <!-- /TMPL_LOOP -->
 </table><!-- TMPL_ELSE --><p>There are no saved patron attribute types.</p><!-- /TMPL_IF -->
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 
 <!-- /TMPL_IF -->
  
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
index fe2cd96..5d8b767 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
@@ -39,7 +39,7 @@
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="loginform" id="loginform">
     <input type="hidden" name="koha_login_context" value="intranet" />
 <!-- TMPL_LOOP NAME="INPUTS" -->
-    <input type="hidden" name="<!-- TMPL_VAR ESCAPE=HTML NAME="name" -->" value="<!-- TMPL_VAR NAME="value" ESCAPE="html" -->" />
+    <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
 <!-- /TMPL_LOOP -->
 <p><label for="userid">Username:</label>
 <input type="text" name="userid" id="userid" class="input focus" value="<!-- TMPL_VAR NAME="userid" -->" size="20" tabindex="1" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index cadea08..877de7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -705,7 +705,7 @@ function searchauthority() {
                         </label>
                     <!-- /TMPL_UNLESS -->
                     
-                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
                     
                     <!-- TMPL_IF NAME="repeatable" -->
                         <a href="#" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->'); return false;"><img src="/intranet-tmpl/prog/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /></a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
index e327451..80c7657 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
@@ -93,7 +93,7 @@ function jumpfull(page)
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
                 <!-- TMPL_IF name="displaynext" -->
-                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->&amp;orderby=<!-- TMPL_VAR name="orderby" -->">
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&amp;<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->&amp;orderby=<!-- TMPL_VAR name="orderby" -->">
                         &gt;&gt;</a>
                 <!-- /TMPL_IF -->
         </div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
index 01667e5..6c7ccf6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -79,7 +79,7 @@ function searchauthority() {
   </table>
 </div>
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="0" --></div>
 
 <!-- TMPL_ELSE -->
   No results found
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
index d3d83ac..4057166 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
@@ -133,12 +133,12 @@ function placeHold () {
     <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
     <h3>
         <!-- TMPL_IF NAME="print_basket" -->
-            <!-- TMPL_VAR NAME="title" ESCAPE="html" -->
+            <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
                 <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
                 <input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)" />
-                <!-- TMPL_VAR NAME="title" escape="html" -->
+                <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
                 <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
@@ -318,7 +318,7 @@ function placeHold () {
 
                 </td> <!-- /TMPL_UNLESS -->
             <td><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
-                        <!-- TMPL_VAR NAME="title" escape="html" -->
+                        <!-- TMPL_VAR NAME="title" -->
                     </a>
                         <!-- TMPL_VAR NAME="author" -->
                         <p><!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
index e5cc60d..f4bcde0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
@@ -15,7 +15,7 @@ Reference Manager or ProCite.
 <MESSAGE>
 ---------------------------------------------
 <!-- TMPL_IF NAME="comment" -->
-<!-- TMPL_VAR NAME="comment" -->
+<!-- TMPL_VAR NAME="comment" ESCAPE="0" -->
 <!-- /TMPL_IF -->
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF "HASAUTHORS" -->
 Author(s): <!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="MARCAUTHORS" --><!-- TMPL_IF NAME="author" -->; <!-- /TMPL_IF --><!-- TMPL_LOOP NAME="MARCAUTHORS" --><!-- TMPL_LOOP NAME="MARCAUTHOR_SUBFIELDS_LOOP" --><!-- TMPL_VAR NAME="separator" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_LOOP --><!-- TMPL_UNLESS NAME="__last__" -->; <!-- TMPL_ELSE --><!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="ISBN" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
index 1516268..1fc87dc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -17,7 +17,7 @@
 <!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
 
 	<div id="catalogue_ISBDdetail">
-		<!-- TMPL_VAR NAME="ISBD" -->
+		<!-- TMPL_VAR NAME="ISBD" ESCAPE="0" -->
 	</div>
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 8880f8b..736e09e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -391,7 +391,7 @@ function Changefwk(FwkList) {
                 </tr>
                 <!-- TMPL_LOOP NAME="item_loop" -->
                     <tr>
-                        <!-- TMPL_VAR NAME="item_value" -->
+                        <!-- TMPL_VAR NAME="item_value" ESCAPE="0" -->
                     </tr>
                 <!-- /TMPL_LOOP -->
         </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index e3391ac..2f15388 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Catalog &rsaquo; Details for <!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></title>
+<title>Koha &rsaquo; Catalog &rsaquo; Details for <!-- TMPL_VAR NAME="title" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --><script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
@@ -44,7 +44,7 @@ function verify_images() {
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Details for <i><!-- TMPL_VAR NAME="title" escape="html" -->  <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Details for <i><!-- TMPL_VAR NAME="title" -->  <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></i></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -72,7 +72,7 @@ function verify_images() {
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="XSLTDetailsDisplay" -->
-        <!-- TMPL_VAR NAME="XSLTBloc" -->
+        <!-- TMPL_VAR NAME="XSLTBloc" ESCAPE="0" -->
 
         <!-- TMPL_IF NAME="GetShelves" -->
             <span class="results_summary"><span class="label">Lists that include this title: </span>
@@ -87,12 +87,12 @@ function verify_images() {
         <a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="" /></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
 
-    <h3><!-- TMPL_VAR NAME="title" escape="html"--></h3>
+    <h3><!-- TMPL_VAR NAME="title"--></h3>
     <!-- TMPL_LOOP NAME="subtitle" -->
     	<h4><!-- TMPL_VAR NAME="subfield" --></h4>
     <!-- /TMPL_LOOP -->
             <!-- TMPL_UNLESS NAME="item-level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="unititle" --><p><!-- TMPL_VAR name="unititle" escape="html" --></p><!-- /TMPL_IF -->
+            <!-- TMPL_IF name="unititle" --><p><!-- TMPL_VAR name="unititle" --></p><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="author" --><p>By <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="url" -->"><!-- TMPL_VAR NAME="author" --></a></p><!-- /TMPL_IF -->
         <ul>
         <!-- TMPL_IF name="MARCAUTHORS" -->
@@ -114,7 +114,7 @@ function verify_images() {
         <!-- TMPL_IF name="publishercode" -->
     <li><strong>Published by:</strong>
         <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode" ESCAPE="url" -->">
-            <!-- TMPL_VAR NAME="publishercode" ESCAPE="html" -->
+            <!-- TMPL_VAR NAME="publishercode" -->
         </a> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->
     </li>
     <!-- /TMPL_IF -->
@@ -163,7 +163,7 @@ function verify_images() {
             <li><strong>Subjects:</strong> 
             <ul>
                 <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-                <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --> <!-- TMPL_VAR NAME="separator" --> <a title="&#8225;<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" escape="url" --><!-- TMPL_VAR name="limit" -->:<!-- TMPL_VAR NAME="link" escape="url" --><!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" ESCAPE="html" --></a><!-- /TMPL_LOOP --></li>
+                <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --> <!-- TMPL_VAR NAME="separator" --> <a title="&#8225;<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" escape="url" --><!-- TMPL_VAR name="limit" -->:<!-- TMPL_VAR NAME="link" escape="url" --><!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" --></a><!-- /TMPL_LOOP --></li>
                 <!-- /TMPL_LOOP -->
                 </ul>
             </li>
@@ -374,7 +374,7 @@ function verify_images() {
 <!-- TMPL_LOOP NAME="AMAZON_EDITORIAL_REVIEWS" -->
     <!-- TMPL_IF NAME="Content" -->
     <h4>From <!-- TMPL_VAR NAME="Source" -->:</h4>
-    <p><!-- TMPL_VAR NAME="Content" --></p>
+    <p><!-- TMPL_VAR NAME="Content" ESCAPE="0" --></p>
     <!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF-->
@@ -444,7 +444,7 @@ function verify_images() {
 <div id="editions"><h2>Editions</h2>
 <table>
 <!-- TMPL_LOOP NAME="XISBNS" --><tr><!-- TMPL_IF NAME="AmazonEnabled" --><td><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01._AA75_PU_PU-5_.jpg" /></a></td><!-- /TMPL_IF --><td><!-- TMPL_IF NAME="noItemTypeImages" --><!-- TMPL_VAR NAME="description" --><!-- TMPL_ELSE --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_IF --></td><td>
-<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> by <!-- TMPL_VAR NAME="author" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> by <!-- TMPL_VAR NAME="author" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" -->
   <!-- TMPL_IF name="publishercode" -->
 <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
@@ -462,7 +462,7 @@ function verify_images() {
 <ul>
 <!-- TMPL_LOOP NAME="AMAZON_SIMILAR_PRODUCTS" -->
 <!-- TMPL_LOOP NAME="similar_biblionumbers" -->
-<li><img alt="img" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="ASIN"-->.01._SS50_.jpg" /> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML" --></a> </li>
+<li><img alt="img" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="ASIN"-->.01._SS50_.jpg" /> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> </li>
 <!-- /TMPL_LOOP -->
 <!-- /TMPL_LOOP -->
 </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
index ce26a71..9be4720 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
@@ -35,7 +35,7 @@
 					<!-- TMPL_UNLESS name="popup" -->
 						<h1>Labeled MARC biblio : <!-- TMPL_VAR NAME="biblionumber" -->  ( <!-- TMPL_VAR NAME="bibliotitle" --> )</h1>
 					<!-- /TMPL_UNLESS -->
-					<p><b>With Framework :<!--TMPL_VAR Name="framework" --></b></p>
+					<p><b>With Framework :<!--TMPL_VAR Name="framework" ESCAPE="0" --></b></p>
 					<!-- div id="bibliotabs" class="toptabs numbered" -->
 					<div>
 						<table class="labeledmarc-table">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index ccd1039..634b472 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -843,7 +843,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
                     </label>
                 <!-- /TMPL_UNLESS -->
                 
-                <!-- TMPL_VAR NAME="marc_value" -->
+                <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
                 
                 <!-- TMPL_IF NAME="repeatable" -->
                     <span class="subfield_controls"><a href="#" class="buttonPlus" tabindex="1" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->'); return false;"><img src="/intranet-tmpl/prog/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /></a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index d0be875..677bdcc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -232,8 +232,8 @@ function set_to_today(id, force) {
         <!-- TMPL_LOOP NAME="item" -->
                <li><div class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
 
-               <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
-                <!-- TMPL_VAR NAME="marc_value" -->
+               <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" ESCAPE="0" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
+                <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
                 <input type="hidden" name="tag"       value="<!-- TMPL_VAR NAME="tag" -->" />
                 <input type="hidden" name="subfield"  value="<!-- TMPL_VAR NAME="subfield" -->" />
                 <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 822de15..5ce935c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -386,7 +386,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 
 <ol>    <li>
     <label for="borrowernumber">Select a patron: </label>
-    <!-- TMPL_VAR name="CGIselectborrower" -->
+    <!-- TMPL_VAR name="CGIselectborrower" ESCAPE="0" -->
     </li>
 </ol>
 <p><input type="submit" value="Select" /></p>
@@ -553,7 +553,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 		    <h4>Holds waiting:</h4>
 			        <!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
 			            <ul>
-			                <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"-->.
+			                <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"-->.
 			            <!-- TMPL_IF NAME="waitingat" -->
 			                <br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
 			            <!-- /TMPL_IF -->
@@ -680,7 +680,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <tr class="highlight">
     <!-- /TMPL_IF -->
         <td><!-- TMPL_VAR NAME="dd" --></td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
         <td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td>
         <td><!-- TMPL_VAR NAME="checkoutdate" --></td>
         <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
@@ -744,7 +744,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <!-- TMPL_IF NAME="od" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
         <!-- TMPL_VAR NAME="dd" -->
         </td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
         <td>
             <!-- TMPL_VAR NAME="itemtype" -->
         </td>
@@ -834,7 +834,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <!-- TMPL_LOOP NAME="reservloop" -->
         <tr class="<!-- TMPL_VAR NAME="color" -->">
                     <td><!-- TMPL_VAR NAME="reservedate" --></td>
-                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
+                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
                     <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 					<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
                         <!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 420d7e1..7f299d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -77,7 +77,7 @@
 	</div>
 	</div>
 		<!-- TMPL_IF NAME="IntranetmainUserblock" --><div id="mainuserblock" class="yui-g">
-			<!-- TMPL_VAR NAME="IntranetmainUserblock" -->
+			<!-- TMPL_VAR NAME="IntranetmainUserblock" ESCAPE="0" -->
 			</div><!-- TMPL_ELSE -->&nbsp;
 		<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="koha_news_count" -->
@@ -88,7 +88,7 @@
             <h3>News</h3>
             <!-- TMPL_LOOP name="koha_news" -->
                     <div class="newsitem" id="news<!-- TMPL_VAR NAME="idnew" -->"><h4><!-- TMPL_VAR name="title" --></h4>
-					 <p><!-- TMPL_VAR name="new" --></p>
+					 <p><!-- TMPL_VAR name="new" ESCAPE="0" --></p>
 					<p class="newsfooter"> Posted on <!-- TMPL_VAR name="newdate" --> <!-- TMPL_IF NAME="CAN_user_tools" -->
     <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=<!-- TMPL_VAR NAME="idnew" -->">Edit</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=<!-- TMPL_VAR NAME="idnew" -->">Delete</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a><!-- /TMPL_IF --></p></div>
             <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
index 7ca0d02..4f1c0a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
@@ -70,7 +70,7 @@
                                         <!-- TMPL_IF NAME="select_field" -->
                                             <td align="center"><input type="checkbox" name="action" value="<!-- TMPL_VAR NAME="field_value" -->"></td>
                                         <!-- TMPL_ELSE -->
-                                            <td><!-- TMPL_VAR NAME="field_value" --></td>
+                                            <td><!-- TMPL_VAR NAME="field_value" ESCAPE="0" --></td>
                                         <!-- /TMPL_IF -->
                                         <!-- /TMPL_LOOP -->
                                         </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index ade714d..1da8f69 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -7,8 +7,8 @@
     <!-- TMPL_INCLUDE NAME="header.inc" -->
     <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
     <div id="breadcrumbs">
-        <a href="/cgi-bin/koha/mainpage.pl">Home</a>&rsaquo;
-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>&rsaquo;
+        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; 
+        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         Labels Home
     </div>
     <div id="doc3" class="yui-t2">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
index d7c1da5..9f4a707 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
@@ -24,7 +24,7 @@
 			<body>
 		<!-- /TMPL_IF --> 
 			<span id="spinelabel" class="label">
-				<!-- TMPL_VAR NAME="content" -->
+				<!-- TMPL_VAR NAME="content" ESCAPE="0" -->
 			</span>
 			<span id="print_button" class="noprint">
 				<button onclick="window.print()">Print This Label</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
index 763cf66..01b39a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
@@ -60,4 +60,6 @@
 	</form>
 
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index fef7b69..9261388 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -75,7 +75,7 @@
 							<!-- /TMPL_LOOP -->
 							</tbody>
 							</table>
-							<div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" --><!--/TMPL_IF--></div>
+							<div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" ESCAPE="0" --><!--/TMPL_IF--></div>
 						</div>
 						<!-- TMPL_ELSE -->
 						<!-- TMPL_IF NAME="searching" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 806b43c..7cad8a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -180,7 +180,7 @@
                 <label for="btitle">
             <!-- /TMPL_IF-->
             Salutation: </label>
-            <!-- TMPL_VAR NAME="borrotitlepopup" -->
+            <!-- TMPL_VAR NAME="borrotitlepopup" ESCAPE="0" -->
             <!-- TMPL_IF NAME="mandatorytitle" --><span class="required">Required</span><!-- /TMPL_IF -->
             </li>
 		<!-- /TMPL_IF -->
@@ -380,7 +380,7 @@
       <label for="streettype">
       <!-- /TMPL_IF-->
       Street type: </label>
-      <!-- TMPL_VAR NAME="roadpopup" -->
+      <!-- TMPL_VAR NAME="roadpopup" ESCAPE="0" -->
 	  <!-- TMPL_IF NAME="mandatorystreettype" --><span class="required">Required</span><!-- /TMPL_IF -->
       </li>
     <!--/TMPL_IF--> 
@@ -734,7 +734,7 @@
         <label for="branchcode">
       <!-- /TMPL_IF-->
       Library: </label>
-      <!-- TMPL_VAR NAME="CGIbranch" -->
+      <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
 	  <!-- TMPL_IF NAME="mandatorybranchcode" --><span class="required">Required</span><!-- /TMPL_IF -->
     </li>
     <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index 0bf5daf..3f94373 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -242,20 +242,20 @@
 				<td>Vendor</td>
 				<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
 				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
+				<td><!-- TMPL_VAR NAME="CGIBookSeller" ESCAPE="0" --></td>
 			</tr>
 			<tr>
 				<td>Item Type</td>
 				<td><input type="radio" name="Line" value="biblioitems.itemtype" /></td>
 				<td><input type="radio" name="Column" value="biblioitems.itemtype" /></td>
-				<td><!-- TMPL_VAR NAME="CGIItemType" --></td>
+				<td><!-- TMPL_VAR NAME="CGIItemType" ESCAPE="0" --></td>
 			</tr>
 
 			<tr>
 				<td>Budget</td>
 				<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
 				<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBudget" --></td>
+				<td><!-- TMPL_VAR NAME="CGIBudget" ESCAPE="0" --></td>
 			</tr>
 
 			<!-- TMPL_IF Name="hassort1" -->
@@ -263,7 +263,7 @@
 					<td>Sort1</td>
 					<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
 					<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+					<td><!-- TMPL_VAR NAME="CGISort1" ESCAPE="0" --> </td>
 				</tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="hassort2" -->
@@ -271,7 +271,7 @@
 					<td>Sort2</td>
 					<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
 					<td><input type="radio" name="Column" value="aqorders.sort2" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+					<td><!-- TMPL_VAR NAME="CGISort2" ESCAPE="0" --> </td>
 				</tr>
 			<!-- /TMPL_IF -->
 		</tbody>
@@ -286,8 +286,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index b20a2f7..a6c1ac1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -257,7 +257,7 @@ function Dopop(link) {
 			<!-- /TMPL_LOOP -->
 			</select>
 			<label class="inline" for="sep">Delimiter: </label>
-			<!-- TMPL_VAR NAME="CGIseplist" -->
+			<!-- TMPL_VAR NAME="CGIseplist" ESCAPE="0" -->
 		</li>
 	</ol>
 	</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
index d624f99..fb4efc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
@@ -98,8 +98,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
index 5e8f6a2..daefcff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
@@ -257,8 +257,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
index 6a66948..da0b019 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
@@ -247,8 +247,8 @@ function Dopop(link) {
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
index d6218e1..a665be9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
@@ -139,11 +139,11 @@
 		<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
 		<label class="inline" for="MIME">Into an application </label>
         <select name="MIME" id="MIME">
-        <!-- TMPL_LOOP NAME="CGIextChoice" -->
+        <!-- TMPL_LOOP NAME="CGIextChoice" ESCAPE="0" -->
           <option value="<!-- TMPL_VAR NAME="type" -->"><!-- TMPL_VAR NAME="type" --></option>
         <!-- /TMPL_LOOP -->
         </select>
-        <!-- TMPL_VAR NAME="CGIsepChoice" -->
+        <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" -->
 	</li>
 </ol>
 	</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
index 419193e..129992b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
@@ -207,12 +207,12 @@
 			<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
 			<label class="inline" for="MIME">Into an application: </label>
 			<select name="MIME" id="MIME">
-			<!-- TMPL_LOOP NAME="CGIextChoice" -->
+			<!-- TMPL_LOOP NAME="CGIextChoice" ESCAPE="0" -->
 			<option value="<!-- TMPL_VAR NAME="type" -->"><!-- TMPL_VAR NAME="type" --></option>
 			<!-- /TMPL_LOOP -->
 			</select>
 			<!-- <label class="inline" for="sep">Delimiter: </label> -->
-			<!-- TMPL_VAR NAME="CGIsepChoice" -->
+			<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" -->
 		</li>
 	</ol>
 	</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
index 26d671b..f961da5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
@@ -229,26 +229,26 @@
 				<td>Patron category</td>
 				<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>
 				<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBorCat" --></td>
+				<td><!-- TMPL_VAR NAME="CGIBorCat" ESCAPE="0" --></td>
 			</tr>
 			<tr>
 				<td>Item type</td>
 				<td><input type="radio" name="Line" value="itemtype" /></td>
 				<td><input type="radio" name="Column" value="itemtype" /></td>
-				<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
+				<td ><!-- TMPL_VAR NAME="CGIItemType" ESCAPE="0" --></td>
 			</tr>
 			<tr class="hilighted">
 				<td>Library</td>
 				<td><input type="radio" name="Line" value="branchcode" /></td>
 				<td><input type="radio" name="Column" value="branchcode" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBranch" --></td>
+				<td><!-- TMPL_VAR NAME="CGIBranch" ESCAPE="0" --></td>
 			</tr>
 <!-- Modified according to statistics table
 			<tr>
 				<td>Issuing Library</td>
 				<td><input type="radio" name="Line" value="issuingbranch"></td>
 				<td><input type="radio" name="Column" value="issuingbranch"></td>
-				<td ><! TMPL_VAR NAME="CGIBranch" ></td>
+				<td ><! TMPL_VAR NAME="CGIBranch" ESCAPE="0" ></td>
 			</tr> -->
 <!--End Modified -->
 			<!-- TMPL_IF Name="hassort1" -->
@@ -256,7 +256,7 @@
 					<td>Sort1</td>
 					<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
 					<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+					<td><!-- TMPL_VAR NAME="CGISort1" ESCAPE="0" --> </td>
 				</tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="hassort2" -->
@@ -264,7 +264,7 @@
 					<td>Sort2</td>
 					<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
 					<td><input type="radio" name="Column" value="borrowers.sort2" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+					<td><!-- TMPL_VAR NAME="CGISort2" ESCAPE="0" --> </td>
 				</tr>
 			<!-- /TMPL_IF -->
 		</tbody>
@@ -275,8 +275,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application:  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
index 2121551..87958c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
@@ -60,7 +60,7 @@
         <option value="<!--TMPL_VAR Name="value"-->" ><!--TMPL_VAR Name="description"--> </option>  
      <!--/TMPL_LOOP --> 
     </select></li>
-		<li><label for="branch">Select a branch:</label> <!-- TMPL_VAR NAME="CGIbranch" --></li></ol></fieldset>
+		<li><label for="branch">Select a branch:</label> <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" --></li></ol></fieldset>
 		<fieldset class="action"><input type="submit" value="Submit" />
 		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
 		<input type="hidden" name="do_it" value="1" /></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
index 6eefeac..da69272 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
@@ -281,8 +281,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
index 22a39dc..403535b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
@@ -37,7 +37,7 @@
 <!-- TMPL_ELSE -->
 
 	<form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">
-		<fieldset class="rows"><legend>View catalog group by item types</legend><ol><li><label for="value">Select a branch</label> <!-- TMPL_VAR NAME="CGIbranch" -->
+		<fieldset class="rows"><legend>View catalog group by item types</legend><ol><li><label for="value">Select a branch</label> <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
 		<span class="tip">Select none to see all branches</span></li></ol></fieldset>
 		<fieldset class="action"><input type="submit" value="Submit" />
 		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
index d8bb17b..956aa92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
@@ -96,8 +96,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
-		<label class="inline" for="MIME">Into an application</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		<label class="inline" for="MIME">Into an application</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 53f9138..c42bfd8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -184,7 +184,7 @@ function checkMultiHold() {
 			</fieldset>
         <!-- TMPL_ELSE -->
 			<fieldset>
-			<!-- TMPL_VAR NAME="CGIselectborrower" -->
+			<!-- TMPL_VAR NAME="CGIselectborrower" ESCAPE="0" -->
 			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->" /><fieldset class="action"><input type="submit" value="Select" /></fieldset></fieldset>
 
         <!-- /TMPL_UNLESS -->
@@ -280,7 +280,7 @@ function checkMultiHold() {
         </li>
         <li>
             <label for="pickup">Pickup at:</label>
-            <!-- TMPL_VAR NAME="CGIbranch" -->
+            <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
         </li>
 
 	<!-- TMPL_IF NAME="reserve_in_future" -->
-- 
1.7.1


From oleonard at myacpl.org  Wed Nov 24 21:51:55 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 24 Nov 2010 15:51:55 -0500
Subject: [Koha-patches] [PATCH] Fix for Bug 5443,
	Inaccurate highlighting of fields in patron update email
Message-ID: <1290631915-5908-1-git-send-email-oleonard@myacpl.org>

- email was incorrectly named emailaddress
- string processing was being done to address and B_address
  which didn't seem to be serving a purpose
---
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |    2 +-
 opac/opac-userupdate.pl                            |   14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index 64c81f2..ad29dd8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -37,7 +37,7 @@
 <li><label for="mobile">Mobile Phone:</label> <input id="mobile" type="text" value="<!-- TMPL_VAR name="mobile" -->"  name="mobile" /></li>
 <li><label for="phonepro">Work phone:</label> <input id="phonepro"  type="text" value="<!-- TMPL_VAR name="phonepro" -->"  name="phonepro" /></li>
 <li><label for="fax">Fax:</label> <input id="fax" type="text" value="<!-- TMPL_VAR name="fax" -->"  name="fax" /></li>
-<li><label for="emailaddress">Email:</label> <input id="emailaddress" type="text" value="<!-- TMPL_VAR name="email" -->"  name="emailaddress" /></li>
+<li><label for="emailaddress">Email:</label> <input id="emailaddress" type="text" value="<!-- TMPL_VAR name="email" -->"  name="email" /></li>
 <li><label for="emailpro">Work Email:</label> <input id="emailpro" type="text" value="<!-- TMPL_VAR name="emailpro" -->"  name="emailpro" /></li>
 </ol>
 </fieldset>
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index b38a477..ec1300f 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -53,7 +53,7 @@ my $lib = GetBranchDetail($borr->{'branchcode'});
 # handle the new information....
 # collect the form values and send an email.
 my @fields = (
-    'surname','firstname','othernames','streetnumber','address','address2','city','zipcode','country','phone','mobile','fax','phonepro', 'emailaddress','emailpro','B_streetnumber','B_address','B_address2','B_city','B_zipcode','B_country','B_phone','B_email','dateofbirth','sex'
+    'surname','firstname','othernames','streetnumber','address','address2','city','zipcode','country','phone','mobile','fax','phonepro', 'email','emailpro','B_streetnumber','B_address','B_address2','B_city','B_zipcode','B_country','B_phone','B_email','dateofbirth','sex'
 );
 my $update;
 my $updateemailaddress = $lib->{'branchemail'};
@@ -84,7 +84,7 @@ if ( $query->param('modify') ) {
 
     # get all the fields:
     my $message = <<"EOF";
-Borrower $borr->{'cardnumber'}
+Patron $borr->{'cardnumber'}
 
 has requested to change her/his personal details.
 Please check these new details and make the changes:
@@ -104,16 +104,6 @@ EOF
             $borrowerfield = $borr->{$field};
         }
         
-        # reconstruct the address
-        if($field eq "address") {
-            $borrowerfield = "$streetnumber $address, $address2";
-        }
-        
-        # reconstruct the alternate address
-        if($field eq "B_address") {
-            $borrowerfield = "$B_streetnumber $B_address, $B_address2";
-        }
-        
         if($field eq "dateofbirth") {
            $borrowerfield  = format_date( $borr->{'dateofbirth'} ) || '';
         }
-- 
1.7.1


From f.demians at tamil.fr  Thu Nov 25 08:55:05 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Thu, 25 Nov 2010 08:55:05 +0100
Subject: [Koha-patches] [PATCH] Bug 5444 Fix misc/translate script for
	'standard' Koha install
Message-ID: <1290671705-8461-1-git-send-email-f.demians@tamil.fr>

[3.2] Should apply
---
 misc/translator/LangInstaller.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/misc/translator/LangInstaller.pm b/misc/translator/LangInstaller.pm
index 6d78237..a1fef0f 100644
--- a/misc/translator/LangInstaller.pm
+++ b/misc/translator/LangInstaller.pm
@@ -23,6 +23,7 @@ use warnings;
 use C4::Context;
 use YAML::Syck qw( Dump LoadFile );
 use Locale::PO;
+use FindBin qw( $Bin );
 
 $YAML::Syck::ImplicitTyping = 1;
 
@@ -46,7 +47,7 @@ sub new {
                                '/prog/en/modules/admin/preferences';
     set_lang( $self, $lang ) if $lang;
     $self->{pref_only}       = $pref_only;
-    $self->{translator_path} = $context->config('intranetdir') . "/misc/translator";
+    $self->{translator_path} = $Bin;
     $self->{path_po}         = $self->{translator_path} . "/po";
     $self->{po}              = {};
 
-- 
1.7.3.2


From fridolyn.somers at gmail.com  Thu Nov 25 10:32:39 2010
From: fridolyn.somers at gmail.com (Fridolyn SOMERS)
Date: Thu, 25 Nov 2010 10:32:39 +0100
Subject: [Koha-patches] Bug 3154 : Facets performance
Message-ID: <AANLkTimQmP3Z1nz5VWc=RDQOUSfDVb4_=d8LoDKOqCY9@mail.gmail.com>

Hie,

Here is my patch for facets performance in C4::Search.

Regards,

-- 
Fridolyn SOMERS
ICT engineer
PROGILONE - Lyon - France
fridolyn.somers at gmail.com

---------- Forwarded message ----------
From: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed, Nov 24, 2010 at 8:32 PM
Subject: Re: [Koha-devel] Facets performance
To: Fridolyn SOMERS <fridolyn.somers at gmail.com>
Cc: koha-devel at lists.koha-community.org


* Fridolyn SOMERS (fridolyn.somers at gmail.com) wrote:
>    Little up.
>    Any feedback is welcome.

Hi Fridolyn

Can you please send your patch to the
koha-patches at lists.koha-community.org mailing list.

Then my scripts will pick it up and I can apply it easily :)

Chris
>
>    On Fri, Oct 22, 2010 at 12:47 AM, Chris Cormack <
chris at bigballofwax.co.nz>
>    wrote:
>
>      2010/10/21 Fridolyn SOMERS <fridolyn.somers at gmail.com>:
>      > Hie,
>
>      Hi Fridolyn
>      >
>      > I have posted a proposed patch for Bug 3154 :
>      > http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3154
>      >
>      > It's about the fact that facets computation is limited to the
records
>      in
>      > search results page.
>      > I think I've found a good way to improve the facets extraction
>      performance.
>      >
>      > Any comment or modification is welcome.
>      >
>      This looks really promising, I probably won't get a chance to try it
>      out until after Kohacon.
>      But i'm looking forward to giving it some testing
>
>      Thank you
>      Chris
>
>    --
>    Fridolyn SOMERS
>    ICT engineer
>    PROGILONE - Lyon - France
>    fridolyn.somers at gmail.com

> _______________________________________________
> Koha-devel mailing list
> Koha-devel at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/


--
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkztaDEACgkQZgbcHEvgMLOl8gCeMe12GFTJ9Cs1S1Y1380G3nis
404AoIzjCDGgB39exQqsSziu3zep5/Oo
=zAnn
-----END PGP SIGNATURE-----
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101125/85dfe422/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: facets.patch
Type: text/x-patch
Size: 5048 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101125/85dfe422/attachment.bin>

From chrisc at catalyst.net.nz  Thu Nov 25 11:41:24 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 25 Nov 2010 23:41:24 +1300
Subject: [Koha-patches] [PATCH] Bug 3154: Improving facets perfomance
Message-ID: <1290681684-10976-1-git-send-email-chrisc@catalyst.net.nz>

From: Fridolyn SOMERS <fridolyn.somers at gmail.com>

Reformated as a git patch, bug chrisc at catalyst.net.nz
---
 C4/Search.pm |   74 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index 93999bb..86d403c 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -418,7 +418,6 @@ sub getRecords {
                 for ( my $j = $offset ; $j < $times ; $j++ ) {
                     my $records_hash;
                     my $record;
-                    my $facet_record;
 
                     ## Check if it's an index scan
                     if ($scan) {
@@ -451,33 +450,58 @@ sub getRecords {
 
                         # warn "RECORD $j:".$record;
                         $results_hash->{'RECORDS'}[$j] = $record;
-
-            # Fill the facets while we're looping, but only for the biblioserver
-                        $facet_record = MARC::Record->new_from_usmarc($record)
-                          if $servers[ $i - 1 ] =~ /biblioserver/;
-
-                    #warn $servers[$i-1]."\n".$record; #.$facet_record->title();
-                        if ($facet_record) {
-                            for ( my $k = 0 ; $k <= @$facets ; $k++ ) {
-                                ($facets->[$k]) or next;
-                                my @fields = map {$facet_record->field($_)} @{$facets->[$k]->{'tags'}} ;
-                                for my $field (@fields) {
-                                    my @subfields = $field->subfields();
-                                    for my $subfield (@subfields) {
-                                        my ( $code, $data ) = @$subfield;
-                                        ($code eq $facets->[$k]->{'subfield'}) or next;
-                                        $facets_counter->{ $facets->[$k]->{'link_value'} }->{$data}++;
-                                    }
-                                }
-                                $facets_info->{ $facets->[$k]->{'link_value'} }->{'label_value'} =
-                                    $facets->[$k]->{'label_value'};
-                                $facets_info->{ $facets->[$k]->{'link_value'} }->{'expanded'} =
-                                    $facets->[$k]->{'expanded'};
-                            }
-                        }
                     }
+
                 }
                 $results_hashref->{ $servers[ $i - 1 ] } = $results_hash;
+                
+                # Fill the facets while we're looping, but only for the biblioserver and not for a scan
+                if ( !$scan && $servers[ $i - 1 ] =~ /biblioserver/ ) {
+                    
+                    my $jmax = $size;
+                    if ( $jmax > 500 ) {
+                        $jmax = 500; # limit to 500 first records
+                    }
+                    
+                    for ( my $k = 0 ; $k <= @$facets ; $k++ ) {
+                        ($facets->[$k]) or next;
+                        my @fcodes = @{$facets->[$k]->{'tags'}};
+                        my $sfcode = $facets->[$k]->{'subfield'};
+                                
+		                for ( my $j = 0 ; $j < $jmax ; $j++ ) {
+		                    my $render_record = $results[ $i - 1 ]->record($j)->render();
+                            my @used_datas = ();
+                            
+                            foreach my $fcode (@fcodes) {
+                                
+                                # avoid first line
+                                my $field_pattern = '\n'.$fcode.' ([^\n]+)';
+                                my @field_tokens = ( $render_record =~ /$field_pattern/g ) ;
+                                
+                                foreach my $field_token (@field_tokens) {
+                                    my $subfield_pattern = '\$'.$sfcode.' ([^\$]+)';
+                                    my @subfield_values = ( $field_token =~ /$subfield_pattern/g );
+                                    
+                                    foreach my $subfield_value (@subfield_values) {
+                                    
+                                        my $data = $subfield_value;
+                                        $data =~ s/^\s+//; # trim left
+                                        $data =~ s/\s+$//; # trim right
+                                        
+                                        unless ( $data ~~ @used_datas ) {
+                                            $facets_counter->{ $facets->[$k]->{'link_value'} }->{$data}++;
+                                            push @used_datas, $data;
+                                        }
+                                    } # subfields
+                                } # fields
+                            } # field codes 
+                        } # records
+                        
+                        $facets_info->{ $facets->[$k]->{'link_value'} }->{'label_value'} = $facets->[$k]->{'label_value'};
+                        $facets_info->{ $facets->[$k]->{'link_value'} }->{'expanded'} = $facets->[$k]->{'expanded'};
+                    } # facets
+                }
+                # End PROGILONE
             }
 
             # warn "connection ", $i-1, ": $size hits";
-- 
1.7.0.4


From M.de.Rooy at rijksmuseum.nl  Thu Nov 25 13:49:38 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 25 Nov 2010 12:49:38 +0000
Subject: [Koha-patches] [PATCH] Bug 4959 (Language inconsistencies on basket
 groups; skip confirmation when closing basket.)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA311A499E@S-MAIL-1B.rijksmuseum.intra>

This patch adds a new pref SkipBasketConfirmations. This adds the option to skip
confirmations on closing and reopening a basket. If you skip the confirm,
you do not create a new basket group.
The confusing line Create a purchase order (when closing a basket) is replaced
by Attach basket to a new basket group with the same name.
A warning for a null value on basketgroupid is fixed.
---
 acqui/basket.pl                                    |    7 +++++--
 .../prog/en/modules/acqui/basket.tmpl              |    9 ++++-----
 .../en/modules/admin/preferences/acquisitions.pref |    6 ++++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 005fcb9..57308b1 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -90,6 +90,9 @@ if (!defined $op) {
     $op = q{};
 }
 
+my $skip_pref= C4::Context->preference("SkipBasketConfirmations") || 0;
+$template->param( skip_confirm_reopen => 1) if $skip_pref;
+
 if ( $op eq 'delete_confirm' ) {
     my $basketno = $query->param('basketno');
     DelBasket($basketno);
@@ -144,7 +147,7 @@ if ( $op eq 'delete_confirm' ) {
     print GetBasketAsCSV($query->param('basketno'));
     exit;
 } elsif ($op eq 'close') {
-    my $confirm = $query->param('confirm');
+    my $confirm = $query->param('confirm') || $skip_pref;
     if ($confirm) {
         my $basketno = $query->param('basketno');
         my $booksellerid = $query->param('booksellerid');
@@ -197,7 +200,7 @@ if ( $op eq 'delete_confirm' ) {
     if ($basket->{closedate} && haspermission({ flagsrequired   => { acquisition => 'group_manage'} })) {
         $basketgroups = GetBasketgroups($basket->{booksellerid});
         for my $bg ( @{$basketgroups} ) {
-            if ($basket->{basketgroupid} == $bg->{id}){
+            if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){
                 $bg->{default} = 1;
             }
         }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 9079b6d..3084b48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -39,8 +39,8 @@
 <!-- TMPL_UNLESS name="grouped" -->
 <script type="text/javascript">
 //<![CDATA[
-            function confirm_reopen() {
-                var is_confirmed = confirm(_('Are you sure you want to reopen this basket?'));
+            function confirm_reopen(skip) {
+                var is_confirmed = skip || confirm(_('Are you sure you want to reopen this basket?'));
                 if (is_confirmed) {
                     window.location = "<!-- TMPL_VAR name="script_name" -->?op=reopen&basketno=<!-- TMPL_VAR name="basketno" -->";
                 }
@@ -95,7 +95,6 @@
                     <li><a href="basketheader.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;op=add_form" class="button" id="basketheadbutton">Edit basket header information</a></li>
                     <li><a href="javascript:confirm_deletion();" class="button" id="delbasketbutton">Delete this basket</a></li>
                     <!-- TMPL_IF name="unclosable" -->
-                        <li><button onclick="confirm_close()" class="yui-button-disabled" id="closebutton" type="button" disabled="disabled" title="You can not close this basket">Can not close basket</button></li>
                     <!-- TMPL_ELSIF name="uncertainprices" -->
                         <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->&amp;owner=1" class="button" id="uncertpricesbutton">Uncertain prices</a></li>
                     <!-- TMPL_ELSE -->
@@ -121,7 +120,7 @@
                         //]]>
                     </script>
                         <ul id="toolbar-list" class="toolbar">
-                            <li><a href="javascript:confirm_reopen();" class="button" id="reopenbutton">Reopen this basket</a></li>
+                            <li><a href="javascript:confirm_reopen(<!-- TMPL_VAR NAME="skip_confirm_reopen" -->);" class="button" id="reopenbutton">Reopen this basket</a></li>
                         </ul>
                 </div>
                 <!-- /TMPL_UNLESS -->
@@ -313,7 +312,7 @@
         <form action="/cgi-bin/koha/acqui/basket.pl" class="confirm">
             <h1>Are you sure you want to close basket <!-- TMPL_VAR name="basketname" -->?</h1>
             <p>
-            <label for="createbasketgroup">create a purchase order now?</label>
+            <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
             <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
             </p>
             <input type="hidden" id="basketno" value="<!-- TMPL_VAR name="basketno" -->" name="basketno" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index 2a900f0..41ebe78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -18,6 +18,12 @@ Acquisitions:
         - The default tax rate is   
         - pref: gist
         - (enter in numeric form, 0.12 for 12%)
+    -
+        - When closing or reopening a basket,
+        - pref: SkipBasketConfirmations
+          choices:
+              0: always ask for confirmation.
+              1: do not ask for confirmation.
 
     Printing:
     -
-- 
1.6.0.6


From katrin.fischer at bsz-bw.de  Thu Nov 25 16:24:33 2010
From: katrin.fischer at bsz-bw.de (Katrin Fischer)
Date: Thu, 25 Nov 2010 15:24:33 -0000
Subject: [Koha-patches] [PATCH] Bug 5104: Add control number as search
	option to acq z39.50 search
Message-ID: <1284545386-21274-1-git-send-email-katrin.fischer@bsz-bw.de>

From: Katrin Fischer <Katrin.Fischer.83 at web.de>

Adds control number as search option to z39.50 search in acquisitions.
---
 acqui/z3950_search.pl                              |    6 ++++++
 .../prog/en/modules/acqui/z3950_search.tmpl        |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 182e121..b0a8b92 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -57,6 +57,7 @@ my $lccn          = $input->param('lccn');
 my $lccall          = $input->param('lccall');
 my $subject= $input->param('subject');
 my $dewey = $input->param('dewey');
+my $controlnumber	= $input->param('controlnumber');
 my $op            = $input->param('op');
 my $booksellerid = $input->param('booksellerid');
 my $basketno = $input->param('basketno');
@@ -118,6 +119,7 @@ if ( $op ne "do_search" ) {
         lccall       => $lccall,
         title        => $title,
         author       => $author,
+        controlnumber=> $controlnumber,
         serverloop   => $serverloop,
         opsearch     => "search",
         biblionumber => $biblionumber,
@@ -164,6 +166,10 @@ else {
         $query .= " \@attr 1=16 \@attr 2=3 \@attr 3=1 \@attr 4=1 \@attr 5=1 \@attr 6=1 \"$lccall\" ";
         $nterms++;
     }
+    if ($controlnumber) {
+        $query .= " \@attr 1=12 \"$controlnumber\" ";
+        $nterms++;
+    }
 for my $i (1..$nterms-1) {
     $query = "\@and " . $query;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
index 2219dfa..063520c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
@@ -75,7 +75,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 	    <fieldset class="rows">
 		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" /></li>
 		 <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" /></li>
-		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li></ol>
+		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li>
+         <li><label for="controlnumber">Control No.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
+</ol>
 		</fieldset>
 	    </div>
     <div class="yui-u">
-- 
1.7.1



From chrisc at catalyst.net.nz  Thu Nov 25 21:05:39 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 26 Nov 2010 09:05:39 +1300
Subject: [Koha-patches] [PATCH 2/2] Fixing formatting and links in the
	history document
Message-ID: <1290715539-3265-1-git-send-email-chrisc@catalyst.net.nz>

---
 docs/history.txt |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index dfc4b4c..36173ab 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -238,7 +238,7 @@ June 3 2005	 Gavin ?? becomes the 34th committer to Koha
 June 3 2005	 Joshua Ferraro and Chris Cormack discuss trying out Koha for fulltext search on irc	searching, fulltext
 June 3 2005	 Friedrich zur Hellen becomes the 35th committer to Koha
 June 5 2005	 Joshua experiments with Zebra, finds very positive and encouraging results	searching, fulltext
-June 11 2005     MJ Ray presents Koha to the British & Irish Association of Law Librarians 36th Annual Study Conference and Exhibition
+June 11 2005	MJ Ray presents Koha to the British & Irish Association of Law Librarians 36th Annual Study Conference and Exhibition
 June 13 2005 	 Catalogue KOHA : mode d???emploi (in French) by the Biblioth??que de sociologie du CNRS, Paris is published on www.kohadocs.org
 June 13 2005	 After more discussion on irc, Joshua Ferraro sets up a test site using zebra on liblime servers	  search, fulltext, liblime
 June 14 2005	 Draft coding guidelines published
@@ -256,7 +256,7 @@ August 18 2005	 An expanded version of the first chapter of the Koha Users Guide
 August 19 2005	 Mason James (at Katipo) becomes the 36th committer to Koha
 August 23 2005	 A new document is available on http://www.kohadocs.org -- "MARC Holdings, Koha, and Migration" by Thomas Dukleth.  Look for it in section 2.2, "Migration."	documentation
 August 26 2005	 A new link to a document has been added to http://www.kohadocs.org -- "Gestion de la biblioth??que du LabSAD avec le logiciel Koha" by Caroline Naget (available in pdf format only).  This document is in the General Information section because it covers several aspects of Koha: installing on Gentoo Linux, setting parameters, and use.
-September 8 2005 New website softlaunched
+September 8 2005	New website softlaunched
 September 12-14 2005	 Katipo and Koha at LIANZA conference
 September 20 2005	???????????? ?????????? starts work on a Ukranian translation	translation, ukranian
 October 6 2005	 New www.koha.org website
@@ -423,8 +423,8 @@ April 29 2009	Liz Rea becomes the 87th committer to have a patch pushed into the
 April 29 2009	Lenora Oftedahl sets up an SQL library on the koha wiki, users rejoice, and lo a multitude of reports are added
 May 1 2009	Colin Campbell becomes the 88th committer to have a patch pushed into the main repository	developer
 May 1 2009	David Birmingham becomes the 89th committer to have a patch pushed into the main repository	developer
-May 6 2009	IRC meeting http://wiki.koha.org/doku.php?id=meetingnotes09apr07	
-May 7 2009	Maintenance tree created on git.koha.org for testing for 3.0.2
+May 6 2009	IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_6_May_2009	
+May 7 2009	Maintenance tree created on git.koha-community.org for testing for 3.0.2
 May 21 2009	Andrei V. Toutoukine becomes the 90th committer to have a patch accepted in Koha	developer
 May 22 2009	First feature sponsored by Northeast Kansas Library System (NEKLS) accepted	sponsor
 May 28 2009	Rick Welykochy becomes the 91st committer to have a patch accepted	developer
@@ -433,54 +433,54 @@ May 28 2009	Zeno Tajoli becomes the 92nd committer to have a patch accepted	deve
 May 29 2009	Matthias Meusburger becomes the 93rd committer to have patch accepted	developer
 May 29 2009	First feature sponsored by Plano Independent School District committed	sponsor
 June 3 2009	Savitra Sirohi becomes the 94th committer to have a patch accepted	developer,India
-June 3 2009	IRC general Meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09jun3
+June 3 2009	IRC general Meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_3_June_2009
 June 4 2009	Koha 3.0.2 released	releases
 June 8 2009	Koha passed 10,000 commits in the master branch (since December 2000)	statistics
 June 26 2009	Koha 3.0.3 released	releases
-July 1 2009	IRC general Meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09jul01
+July 1 2009	IRC general Meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_1_July_2009
 July 27 2009	Feature sponsored by East Brunswick Public Library, East Brunswick, NJ USA and Middletown Township Public Library, Middletown, NJ USA committed	sponsor
 July 30	2009	First message to koha-commits mailing list
 August 1 2009	S??bastien Hinderer becomes the 95th committer to have a patched accepted	developer,france
-August 5 2009	IRC general meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09aug05
+August 5 2009	IRC general meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_5_August_2009
 August 30 2009	John A. Graziano Memorial Library contributes a icon for Bridge Icon set
-September 2 2009	IRC general meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09sep02
+September 2 2009	IRC general meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_2_September_2009
 September 5 2009	UNIMARC XSLT cleanup and new features Sponsored by BULAC, www.bulac.fr
 September 5 2009	Labels rewrite committed, sponsored by Foundations Bible College & Seminary, Dunn, NC USA
 September 6 2009  Katrin Fischer becomes the 96th committer to have a patch accepted  developer
 September 6 2009  Wolfgang Heymans becomes the 97th committer to have a patch accepted  developer
-September 15 2009	Foundation forming meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09sep15
-October 7 2009	IRC general meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09oct07
+September 15 2009	Foundation forming meeting http://wiki.koha-community.org/wiki/Foundation_Forming_IRC_Meeting,_15_September_2009
+October 7 2009	IRC general meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_7_October_2009
 October 22 2009	Koha 3.0.4 released	releases
-October 29 2009	Foundation Forming meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09oct29
-November 4 2009	General meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09nov04
-December 2 2009 KUDOS meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:kudosmeetingnotes09dec02
-December 2 2009 General meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09dec02
-December 3 2009	Foundation meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes09dec03
+October 29 2009	Foundation Forming meeting http://wiki.koha-community.org/wiki/Foundation_Forming_IRC_Meeting,_29_October_2009
+November 4 2009	General meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_4_November_2009
+December 2 2009 KUDOS meeting http://wiki.koha-community.org/wiki/KUDOS_Meeting,_2_December_2009
+December 2 2009 General meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_2_December_2009
+December 3 2009	Foundation meeting http://wiki.koha-community.org/wiki/Foundation_Forming_IRC_Meeting,_3_December_2009
 December 9 2009	Piotr Wejman becomes the 98th committer to have a patch accepted	developer
 December 19 2009	Koha 3.0.5 released	releases
 December 20 2009 NYUHSL becomes the 99th committer to have a patch accepted	developer
 December 23 2009	Sharon Moreland becomes the 100th committer to have a patch accepted (sent via Liz Rea)	developer
 December 23 2009	Nicolas Morin becomes the 101st committed to have a patch accepted	developer
-January 13 2010	IRC General Meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10jan13
+January 13 2010	IRC General Meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_13_January_2010
 January 14 2010	Bywater Solutions and Biblibre partner to offer support in the US
 January 14 2010	Chris Cormack elected Release Manager for 3.4.0
 January 15 2010	PTFS announce intention to buy Liblime
 January 26 2010	Biblibre and Libriotech partner to offer support in Norway
-February 2 2010	Community Handover meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10feb02
+February 2 2010	Community Handover meeting http://wiki.koha-community.org/wiki/Community_Handover_IRC_Meeting,_2_February_2010
 February 2 2010	koha-community.org website started
 February 3 2010	Koha 3.2.0 Alpha released
-February 9 2010	General IRC meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10feb09
+February 9 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_9_February_2010
 February 10 2010	Magnus Enger becomes the 102nd committer to have a patch accepted
 February 11 2010	Acquisition of Liblime by PTFS called off
 February 11 2010	Equinox begin to offer Koha support
 February 15 2010	Will Stokes becomes the 103rd committer to have a patch accepted
-February 16 2010	Kohacon10 IRC meeting http://wiki.koha.org/doku.php?id=en:kohacon2010:meetingminutes16feb
-March 2	2010	Community Handover meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10mar02
-March 3 2010	General IRC meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10mar03
+February 16 2010	Kohacon10 IRC meeting http://wiki.koha-community.org/wiki/KohaCon_Meeting,_16_Feb_2010
+March 2	2010	Community Handover meeting http://wiki.koha-community.org/wiki/Community_Handover_IRC_Meeting,_2_March_2010
+March 3 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_3_March_2010
 March 15 2010	PTFS acquires LibLime after all
 March 16 2010	Lars Wirzenius becomes the 104th committer to have a patch accepted
-April 6 2010	Community handover meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10apr06
-April 7 2010	General meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10apr07
+April 6 2010	Community handover meeting http://wiki.koha-community.org/wiki/Community_Handover_IRC_Meeting,_6_April_2010
+April 7 2010	General meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_7_April_2010
 April 7 2010	Donovan Jones becomes the 105th committer to have a patch accepted
 April 7 2010	Srdjan Jankovic becomes the 106th committer to have a patch accepted
 April 7 2010	Cindy Murdock Ames becomes the 107th committer to have a patch accepted
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Thu Nov 25 21:18:06 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 26 Nov 2010 09:18:06 +1300
Subject: [Koha-patches] [PATCH 3/3] Adding 3.2.1 release to the history
Message-ID: <1290716286-3818-1-git-send-email-chrisc@catalyst.net.nz>

---
 docs/history.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index 36173ab..4f9da78 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -507,3 +507,4 @@ October 25-31 2010	Kohacon10 in Wellington
 October 30 2010	Brian Engard becomes the 117th committer to have a patch accepted
 October 30 2010 Daniel Grobani becomes the 118th committer to have a patch accepted
 October 31 2010	Nate Curulla becomes the 119th committer to have patch accepted
+November 20 2010	Koha 3.2.1 released
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Thu Nov 25 21:44:13 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Fri, 26 Nov 2010 09:44:13 +1300
Subject: [Koha-patches] [PATCH] Updating about.tmpl with new committers
Message-ID: <1290717853-4595-1-git-send-email-chrisc@catalyst.net.nz>

---
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
index bef9e20..674cca0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
@@ -100,7 +100,7 @@
             <h2>Koha Release Team</h2>
             <ul>
                <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614260">Galen Charlton</a></strong> (Koha 3.2 Release Manager)</li>
-	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a></strong> (Koha 1.x Release Manager, Koha 3.2 Translation Manager)</li>
+	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a></strong> (Koha 1.x Release Manager, Koha 3.2 Translation Manager, Koha 3.4 Release Manager)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a></strong> (Koha 3.x Documentation Manager)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609053">Joshua Ferraro</a></strong> (Koha 3.0 Release Manager &amp; Translation Manager)</li>
 	           <li><strong>Rachel Hamilton-Williams</strong> (Kaitiaki from 2004 to present)</li>
@@ -109,6 +109,7 @@
                <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a></strong> (Koha 3.2 Release Maintainer)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a></strong> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer)</li>
 	           <li><strong><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></strong> (Koha 2.0 Release Maintainer)</li>
+		   <li><srtong><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Fr??d??ric Demians (Koha 3.4 Translation Manager)</a>
                 </ul>
             <h2>Koha Development Team</h2>
 			<ul>
@@ -134,7 +135,9 @@
                 <li>DeAndre Carroll</li>
                 <li>Chris Catalfo (new plugin MARC editor)</li>
                 <li>Marc Chantreux</li>
+		<li>Andrew Chilton</li>
                 <li>Garry Collum</li>
+		<li>Nathan Curulla</li>
                 <li>Vincent Danjean</li>
                 <li>Kip DeGraaf</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Fr??d??ric Demians</a></li>
@@ -143,7 +146,9 @@
                 <li>Ecole des Mines de Saint Etienne, Philippe Jaillon (OAI-PMH support)</li>
                 <li>Stephen Edwards</li>
                 <li>Andrew Elwell</li>
+		<li>Brian Engard</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
+		<li>Jared CAMINS-ESAKOV</li>
                 <li>Esiee School (J??rome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
                 <li>Pate Eyler (Kaitiaki from 2002 to 2004)</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
@@ -155,6 +160,7 @@
                 <li>Russel Garlick</li>
                 <li>Daniel Kahn Gillmor</li>
                 <li>David Goldfein</li>
+		<li>Daniel Grobani</li>
                 <li>Amit Gupta</li>
                 <li>Michael Hafen</li>
                 <li>Mike Hansen</li>
@@ -165,6 +171,7 @@
                 <li>S??bastien Hinderer</li>
                 <li>Daniel Holth</li>
                 <li>Andrew Hooper</li>
+		<li>Matthew Hunt</li>
                 <li>Christopher Hyde</li>
                 <li>Cory Jaeger</li>
                 <li>Srdjan Jankovic</li>
@@ -187,10 +194,13 @@
                 <li>Nicolas Morin</li>
  		<li>Mike Mylonas</li>
                 <li><a href="https://www.ohloh.net/accounts/cnighswonger">Chris Nighswonger</a></li>
+		<li>Eric Olsen</li>
                 <li>Polytechnic University</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
                 <li>Liz Rea</li>
                 <li>Allen Reinmeyer</li>
+		<li>Marcel de Rooy</li>
+		<li><a href=https://www.ohloh.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
                 <li>Savitra Sirohi</li>
                 <li>Pawel Skuza (Polish for 1.2)</li>
                 <li>Southeastern University</li>
-- 
1.7.0.4


From f.demians at tamil.fr  Fri Nov 26 08:22:45 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Fri, 26 Nov 2010 08:22:45 +0100
Subject: [Koha-patches] [PATCH] Bug 5446 Item creation in Acquisition module
	doesn't control mandatory field
Message-ID: <1290756165-32144-1-git-send-email-f.demians@tamil.fr>

Add some JS validing form, so saving an order is blocked if any item mandatory
field is empty.
---
 .../prog/en/modules/acqui/neworderempty.tmpl       |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index e53c7da..85ccb6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -36,7 +36,20 @@ function Check(ff) {
 
     if (totalExceedsBudget(ff.budget_id.value, ff.total.value  )  ) {
         ok=1;
-        _alertString += "\n- " + "Order total (" + ff.total.value + ") exceeds budget available ("+actTotal+")";
+        _alertString += "\n- " + _("Order total (") + ff.total.value +
+            _(") exceeds budget available (") + actTotal+")";
+    }
+
+    var empty_item_mandatory = 0;
+    for (i = 0; i < ff.field_value.length; i++) {
+        if (ff.field_value[i].value.length == 0 && ff.mandatory[i].value == 1) {
+            empty_item_mandatory++;
+        }
+    }
+    if (empty_item_mandatory > 0) {
+        ok = 1;
+        _alertString +=
+            "\n- " + empty_item_mandatory + _(" item mandatory fields empty");
     }
 
 if (ok) {
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Fri Nov 26 15:39:18 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 26 Nov 2010 14:39:18 +0000
Subject: [Koha-patches] [PATCH] Fix some compile time errors reported in
	test suite
Message-ID: <1290782358-26054-1-git-send-email-colin.campbell@ptfs-europe.com>

redeclaration of itemnumber in RotatingCollections
A couple of errors caused by retaining commas in qw()
---
 C4/Creators.pm            |    2 +-
 C4/Patroncards.pm         |    2 +-
 C4/RotatingCollections.pm |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/C4/Creators.pm b/C4/Creators.pm
index c9538e2..47900b5 100644
--- a/C4/Creators.pm
+++ b/C4/Creators.pm
@@ -2,7 +2,7 @@ package C4::Creators;
 
 BEGIN {
     use version; our $VERSION = qv('1.0.0_1');
-    use vars qw(@EXPORT, @ISA);
+    use vars qw(@EXPORT @ISA);
     @ISA = qw(Exporter);
     our @EXPORT = qw(get_all_templates
                      get_all_layouts
diff --git a/C4/Patroncards.pm b/C4/Patroncards.pm
index cc20c2c..e833193 100644
--- a/C4/Patroncards.pm
+++ b/C4/Patroncards.pm
@@ -2,7 +2,7 @@ package C4::Patroncards;
 
 BEGIN {
     use version; our $VERSION = qv('1.0.0_1');
-    use vars qw(@EXPORT, @ISA);
+    use vars qw(@EXPORT @ISA);
     @ISA = qw(Exporter);
     our @EXPORT = qw(unpack_UTF8
                      text_alignment
diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm
index c880fe8..b576868 100644
--- a/C4/RotatingCollections.pm
+++ b/C4/RotatingCollections.pm
@@ -504,7 +504,7 @@ sub isItemInAnyCollection {
       
   my $row = $sth->fetchrow_hashref;
         
-  my $itemnumber = $$row{'itemnumber'};
+  $itemnumber = $row->{itemnumber};
   $sth->finish;
             
   if ( $itemnumber ) {
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Fri Nov 26 17:31:34 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 26 Nov 2010 16:31:34 +0000
Subject: [Koha-patches] [PATCH 1/2] Bug 5448 Use Test::More in Boolean.t
Message-ID: <1290789095-26834-1-git-send-email-colin.campbell@ptfs-europe.com>

Use Test::More's structure as more readable
Replaced a test of an used function with a use_ok test
of the module
---
 t/Boolean.t |  103 ++++++++---------------------------------------------------
 1 files changed, 14 insertions(+), 89 deletions(-)

diff --git a/t/Boolean.t b/t/Boolean.t
index 4e67ee8..fb3b0bf 100755
--- a/t/Boolean.t
+++ b/t/Boolean.t
@@ -1,96 +1,21 @@
-#!/usr/bin/perl
-#
 
 use strict;
-#use warnings; FIXME - Bug 2505
-use C4::Boolean;
-
-use vars qw( @tests );
-use vars qw( $loaded );
-
-sub f ($) {
-   my($x) = @_;
-   my $it;
-   # Returns either the value returned prefixed with 'OK:',
-   # or the caught exception (string expected)
-   local($@);
-   eval {
-      $it = 'OK:' . C4::Boolean::true_p($x);
-   };
-   if ($@) {
-      $it = $@;
-      $it =~ s/ at \S+ line \d+\.\n//s;
-   }
-   return $it;
-}
-
-BEGIN {
-   @tests = (
-   [
-      'control',
-      sub { C4::Boolean::INVALID_BOOLEAN_STRING_EXCEPTION },
-      'The given value does not seem to be interpretable as a Boolean value',
-      undef
-
-   # False strings
-   ], [
-      '"0"',     \&f, 'OK:0', '0'
-   ], [
-      '"false"', \&f, 'OK:0', 'false'
-   ], [
-      '"off"',   \&f, 'OK:0', 'off'
-   ], [
-      '"no"',    \&f, 'OK:0', 'no'
-
-   # True strings
-   ], [
-      '"1"',     \&f, 'OK:1', '1'
-   ], [
-      '"true"',  \&f, 'OK:1', 'true'
-   ], [
-      '"on"',    \&f, 'OK:1', 'on'
-   ], [
-      '"yes"',   \&f, 'OK:1', 'yes'
-   ], [
-      '"YES"',   \&f, 'OK:1', 'YES'	# verify case insensitivity
-
-   # Illegal strings
-   ], [
-      'undef',   \&f, 'OK:', undef
-   ], [
-      '"foo"',   \&f, 'OK:', 'foo'
-   ],
-);
-}
-
-BEGIN { $| = 1; printf "1..%d\n", scalar(@tests); }
-END {print "not ok 1\n" unless $loaded;}
-$loaded = 1;
-
-
-# Run all tests in sequence
-for (my $i = 1; $i <= scalar @tests; $i += 1) {
-   my $test = $tests[$i - 1];
-   my($title, $f, $expected, $input) = @$test;
-   die "not ok $i (malformed test case)\n"
-      unless @$test == 4 && ref $f eq 'CODE';
-
-   my $output = &$f($input);
-   if (
-	 (!defined $output && !defined $expected)
-      || (defined $output && defined $expected && $output eq $expected)
-   ) {
-      print "ok $i - $title\n";
-   } else {
-      print "not ok $i - $title: got ",
-	    (defined $output? "\"$output\"": 'undef'),
-	    ', expected ',
-	    (defined $expected? "\"$expected\"": 'undef'),
-	    "\n";
-   }
-}
+use warnings;
 
+use Test::More tests => 12;
 
+BEGIN { use_ok( 'C4::Boolean', qw( true_p ) ); }
 
+is( true_p('0'),     '0', 'recognizes \'0\' as false' );
+is( true_p('false'), '0', 'recognizes \'false\' as false' );
+is( true_p('off'),   '0', 'recognizes \'off\' as false' );
+is( true_p('no'),    '0', 'recognizes \'no\' as false' );
 
+is( true_p('1'),    '1', 'recognizes \'1\' as true' );
+is( true_p('true'), '1', 'recognizes \'true\' as true' );
+is( true_p('on'),   '1', 'recognizes \'on\' as true' );
+is( true_p('yes'),  '1', 'recognizes \'yes\' as true' );
+is( true_p('YES'),  '1', 'verified case insensitivity' );
 
+is( true_p(undef), undef, 'recognizes undefined as not boolean' );
+is( true_p('foo'), undef, 'recognizes \'foo\' as not boolean' );
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Fri Nov 26 17:31:35 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 26 Nov 2010 16:31:35 +0000
Subject: [Koha-patches] [PATCH 2/2] Bug 5448: Refactor Boolean.pm
In-Reply-To: <1290789095-26834-1-git-send-email-colin.campbell@ptfs-europe.com>
References: <1290789095-26834-1-git-send-email-colin.campbell@ptfs-europe.com>
Message-ID: <1290789095-26834-2-git-send-email-colin.campbell@ptfs-europe.com>

Remove unnecesssary export
Use Exporter according to best practices
Use Carp not warn so we know where the error string came from
Don't create warnings manipulating undefined input
Replace package variables by lexicals
---
 C4/Boolean.pm |   69 +++++++++++++++++++++-----------------------------------
 1 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/C4/Boolean.pm b/C4/Boolean.pm
index f546464..02c0014 100644
--- a/C4/Boolean.pm
+++ b/C4/Boolean.pm
@@ -24,26 +24,15 @@ package C4::Boolean;
 use strict;
 use warnings;
 
-use POSIX;
-
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-
-BEGIN {
-	# set the version for version checking
-	$VERSION = 0.02;
-	require Exporter;
-	@EXPORT = qw(
-		&INVALID_BOOLEAN_STRING_EXCEPTION
-    );
-	@EXPORT_OK = qw(
-		true_p
-    );
-	@ISA = qw(Exporter);
-}
+use Carp;
+use base qw(Exporter);
+
+our    $VERSION = 0.03;
+our    @EXPORT_OK = qw( true_p);
 
 =head1 NAME
 
-C4::Boolean - Convenience functions to handle boolean values
+C4::Boolean - Convenience function to handle boolean values
 in the parameter table
 
 =head1 SYNOPSIS
@@ -63,25 +52,23 @@ Boolean values in a consistent way which makes common sense.
 
 =cut
 
-sub INVALID_BOOLEAN_STRING_EXCEPTION ()
-    { 'The given value does not seem to be interpretable as a Boolean value' }
-
-use vars qw( %strings );
-
-%strings = (
-   '0'     => 0,	'1'     => 1,	# C
-   			'-1'    => 1,	# BASIC
-   'nil'   => 0,	't'     => 1,	# LISP
-   'false' => 0,	'true'  => 1,	# Pascal
-   'off'   => 0,	'on'    => 1,
-   'no'    => 0,	'yes'   => 1,
-   'n'     => 0,	'y'     => 1,
+use constant INVALID_BOOLEAN_STRING_EXCEPTION =>
+  q{The given value does not seem to be interpretable as a Boolean value};
+
+our %strings = (
+   '0'     => 0,    '1'     => 1,    # C
+                    '-1'    => 1,    # BASIC
+   'nil'   => 0,    't'     => 1,    # LISP
+   'false' => 0,    'true'  => 1,    # Pascal
+   'off'   => 0,    'on'    => 1,
+   'no'    => 0,    'yes'   => 1,
+   'n'     => 0,    'y'     => 1,
 );
 
 =item true_p
 
     if ( C4::Boolean::true_p(C4::Context->preference("insecure")) ) {
-	...
+    ...
     }
 
 Tries to interpret the passed string as a Boolean value. Returns
@@ -90,27 +77,23 @@ exception is thrown.
 
 =cut
 
-sub true_p ($) {
-    my($x) = @_;
+sub true_p  {
+    my $x = shift;
     my $it;
-    if (!defined $x || ref($x) ne '') {
-	warn INVALID_BOOLEAN_STRING_EXCEPTION;
+    if (!defined $x || ref $x ) {
+        carp INVALID_BOOLEAN_STRING_EXCEPTION;
+        return;
     }
-    $x = lc($x);
+    $x = lc $x;
     $x =~ s/\s//g;
     if (defined $strings{$x}) {
-	$it = $strings{$x};
+        $it = $strings{$x};
     } else {
-	warn INVALID_BOOLEAN_STRING_EXCEPTION;
+        carp INVALID_BOOLEAN_STRING_EXCEPTION;
     }
     return $it;
 }
 
-
-#---------------------------------
-
-END { }       # module clean-up code here (global destructor)
-
 1;
 __END__
 
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Fri Nov 26 18:27:13 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 26 Nov 2010 17:27:13 +0000
Subject: [Koha-patches] [PATCH] Bug 5450 Avoid a name clash in ILSDI modules
Message-ID: <1290792433-28233-1-git-send-email-colin.campbell@ptfs-europe.com>

C4::ILSDI::Utility exports a subroutine CanBookBeReserved
Both ILSDI were also importing a subroutine of that name from
C4::Reserves Remove conflict by listing subroutines
imported from C4::Reserves explicitly
---
 C4/ILSDI/Services.pm |    2 +-
 C4/ILSDI/Utility.pm  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index c99f2a9..ba0c429 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -26,7 +26,7 @@ use C4::Circulation;
 use C4::Branch;
 use C4::Accounts;
 use C4::Biblio;
-use C4::Reserves;
+use C4::Reserves qw(AddReserve CancelReserve GetReservesFromBiblionumber GetReservesFromBorrowernumber);
 use C4::Context;
 use C4::AuthoritiesMarc;
 use C4::ILSDI::Utility;
diff --git a/C4/ILSDI/Utility.pm b/C4/ILSDI/Utility.pm
index 708ba21..8ee1224 100644
--- a/C4/ILSDI/Utility.pm
+++ b/C4/ILSDI/Utility.pm
@@ -24,7 +24,7 @@ use C4::Members;
 use C4::Items;
 use C4::Circulation;
 use C4::Biblio;
-use C4::Reserves;
+use C4::Reserves qw(GetReservesFromBorrowernumber);
 use C4::Context;
 use C4::Branch qw/GetBranchName/;
 use Digest::MD5 qw(md5_base64);
-- 
1.7.3.2


From Katrin.Fischer.83 at web.de  Fri Nov 26 21:51:02 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri, 26 Nov 2010 21:51:02 +0100
Subject: [Koha-patches] [PATCH] Bug 5104: Add control number as search
	option to acq z39.50 search
Message-ID: <1290804662-31059-1-git-send-email-Katrin.Fischer.83@web.de>

Adds control number as search option to z39.50 search in acquisitions.
---
 acqui/z3950_search.pl                              |    6 ++++++
 .../prog/en/modules/acqui/z3950_search.tmpl        |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 182e121..b0a8b92 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -57,6 +57,7 @@ my $lccn          = $input->param('lccn');
 my $lccall          = $input->param('lccall');
 my $subject= $input->param('subject');
 my $dewey = $input->param('dewey');
+my $controlnumber	= $input->param('controlnumber');
 my $op            = $input->param('op');
 my $booksellerid = $input->param('booksellerid');
 my $basketno = $input->param('basketno');
@@ -118,6 +119,7 @@ if ( $op ne "do_search" ) {
         lccall       => $lccall,
         title        => $title,
         author       => $author,
+        controlnumber=> $controlnumber,
         serverloop   => $serverloop,
         opsearch     => "search",
         biblionumber => $biblionumber,
@@ -164,6 +166,10 @@ else {
         $query .= " \@attr 1=16 \@attr 2=3 \@attr 3=1 \@attr 4=1 \@attr 5=1 \@attr 6=1 \"$lccall\" ";
         $nterms++;
     }
+    if ($controlnumber) {
+        $query .= " \@attr 1=12 \"$controlnumber\" ";
+        $nterms++;
+    }
 for my $i (1..$nterms-1) {
     $query = "\@and " . $query;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
index 2219dfa..063520c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
@@ -75,7 +75,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 	    <fieldset class="rows">
 		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" /></li>
 		 <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" /></li>
-		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li></ol>
+		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li>
+         <li><label for="controlnumber">Control No.: </label> <input type="text" id="controlnumber" name="controlnumber" value="" /></li>
+</ol>
 		</fieldset>
 	    </div>
     <div class="yui-u">
-- 
1.7.1


From Katrin.Fischer.83 at web.de  Sun Nov 28 13:40:36 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Sun, 28 Nov 2010 13:40:36 +0100
Subject: [Koha-patches] [PATCH] Bug 5430: Follow-up,
	fixes error message when no 001 exists
Message-ID: <1290948036-4322-1-git-send-email-Katrin.Fischer.83@web.de>

Please test.
---
 C4/Biblio.pm |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 4102e23..c3a3094 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1269,8 +1269,12 @@ sub GetMarcControlnumber {
     # Control number or Record identifier are the same field in MARC21 and UNIMARC
     # Keep $marcflavour for possible later use
     if ($marcflavour eq "MARC21" || $marcflavour eq "UNIMARC") {
-        $controlnumber = $record->field('001')->data();
+        my $controlnumberField = $record->field('001');
+        if ($controlnumberField) {
+            $controlnumber = $controlnumberField->data();
+        }
     }
+    return $controlnumber;
 }
 
 =head2 GetMarcNotes
-- 
1.7.1


From fridolyn.somers at gmail.com  Mon Nov 29 11:03:46 2010
From: fridolyn.somers at gmail.com (Fridolyn SOMERS)
Date: Mon, 29 Nov 2010 11:03:46 +0100
Subject: [Koha-patches] Bug 5452 : Overdue date color in borrower's today
	issues
Message-ID: <AANLkTinkS5V2Oy5qu98xsd37nCeTrbvng_099=9+YCY0@mail.gmail.com>

Proposed patch.

-- 
Fridolyn SOMERS
ICT engineer
PROGILONE - Lyon - France
fridolyn.somers at gmail.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101129/62db3814/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: od_in_today_issues.patch
Type: text/x-patch
Size: 1460 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20101129/62db3814/attachment.bin>

From M.de.Rooy at rijksmuseum.nl  Mon Nov 29 11:36:40 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 29 Nov 2010 10:36:40 +0000
Subject: [Koha-patches] [PATCH] bug4959 (Language inconsistencies on basket
 groups; skip confirmation when closing basket) REVISED
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA311A4ED2@S-MAIL-1B.rijksmuseum.intra>

This patch adds a new pref BasketConfirmations. This adds the option to skip
confirmations on closing and reopening a basket. If you skip the confirmation,
you do not create a new basket group.
The confusing line Create a purchase order (when closing a basket) is replaced
by Attach basket to a new basket group with the same name.
A warning for a null value on basketgroupid is fixed.
---
 acqui/basket.pl                                    |    7 +++++--
 .../prog/en/modules/acqui/basket.tmpl              |    9 ++++-----
 .../en/modules/admin/preferences/acquisitions.pref |    7 +++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 005fcb9..330ddbf 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -90,6 +90,9 @@ if (!defined $op) {
     $op = q{};
 }
 
+my $confirm_pref= C4::Context->preference("BasketConfirmations") || '1';
+$template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2';
+
 if ( $op eq 'delete_confirm' ) {
     my $basketno = $query->param('basketno');
     DelBasket($basketno);
@@ -144,7 +147,7 @@ if ( $op eq 'delete_confirm' ) {
     print GetBasketAsCSV($query->param('basketno'));
     exit;
 } elsif ($op eq 'close') {
-    my $confirm = $query->param('confirm');
+    my $confirm = $query->param('confirm') || $confirm_pref eq '2';
     if ($confirm) {
         my $basketno = $query->param('basketno');
         my $booksellerid = $query->param('booksellerid');
@@ -197,7 +200,7 @@ if ( $op eq 'delete_confirm' ) {
     if ($basket->{closedate} && haspermission({ flagsrequired   => { acquisition => 'group_manage'} })) {
         $basketgroups = GetBasketgroups($basket->{booksellerid});
         for my $bg ( @{$basketgroups} ) {
-            if ($basket->{basketgroupid} == $bg->{id}){
+            if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){
                 $bg->{default} = 1;
             }
         }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 9079b6d..3084b48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -39,8 +39,8 @@
 <!-- TMPL_UNLESS name="grouped" -->
 <script type="text/javascript">
 //<![CDATA[
-            function confirm_reopen() {
-                var is_confirmed = confirm(_('Are you sure you want to reopen this basket?'));
+            function confirm_reopen(skip) {
+                var is_confirmed = skip || confirm(_('Are you sure you want to reopen this basket?'));
                 if (is_confirmed) {
                     window.location = "<!-- TMPL_VAR name="script_name" -->?op=reopen&basketno=<!-- TMPL_VAR name="basketno" -->";
                 }
@@ -95,7 +95,6 @@
                     <li><a href="basketheader.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;op=add_form" class="button" id="basketheadbutton">Edit basket header information</a></li>
                     <li><a href="javascript:confirm_deletion();" class="button" id="delbasketbutton">Delete this basket</a></li>
                     <!-- TMPL_IF name="unclosable" -->
-                        <li><button onclick="confirm_close()" class="yui-button-disabled" id="closebutton" type="button" disabled="disabled" title="You can not close this basket">Can not close basket</button></li>
                     <!-- TMPL_ELSIF name="uncertainprices" -->
                         <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->&amp;owner=1" class="button" id="uncertpricesbutton">Uncertain prices</a></li>
                     <!-- TMPL_ELSE -->
@@ -121,7 +120,7 @@
                         //]]>
                     </script>
                         <ul id="toolbar-list" class="toolbar">
-                            <li><a href="javascript:confirm_reopen();" class="button" id="reopenbutton">Reopen this basket</a></li>
+                            <li><a href="javascript:confirm_reopen(<!-- TMPL_VAR NAME="skip_confirm_reopen" -->);" class="button" id="reopenbutton">Reopen this basket</a></li>
                         </ul>
                 </div>
                 <!-- /TMPL_UNLESS -->
@@ -313,7 +312,7 @@
         <form action="/cgi-bin/koha/acqui/basket.pl" class="confirm">
             <h1>Are you sure you want to close basket <!-- TMPL_VAR name="basketname" -->?</h1>
             <p>
-            <label for="createbasketgroup">create a purchase order now?</label>
+            <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
             <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
             </p>
             <input type="hidden" id="basketno" value="<!-- TMPL_VAR name="basketno" -->" name="basketno" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index 2a900f0..43a7ad5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -9,6 +9,13 @@ Acquisitions:
               receiving: receiving an order.
               cataloguing: cataloging the record.
     -
+        - When closing or reopening a basket,
+        - pref: BasketConfirmations
+          default: 1
+          choices:
+              1: always ask for confirmation.
+              2: do not ask for confirmation.
+    -
         - Display currencies using the following format 
         - pref: CurrencyFormat
           choices:
-- 
1.6.0.6


From colin.campbell at ptfs-europe.com  Mon Nov 29 11:40:26 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 29 Nov 2010 10:40:26 +0000
Subject: [Koha-patches] [PATCH] Bug 5453 Do not declare variables in
	conditionals
Message-ID: <1291027226-21654-1-git-send-email-colin.campbell@ptfs-europe.com>

Removed occurences in acqui/*.pl
---
 acqui/basketgroup.pl |   16 ++++++----------
 acqui/booksellers.pl |    5 ++++-
 acqui/histsearch.pl  |   14 ++++++++++----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 69de099..8df6b15 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -301,26 +301,22 @@ if ( $op eq "add" ) {
         # Build the combobox to select the billing place
         my @billingplaceloop;
         for (sort keys %$branches) {
-            my $selected = 1 if $_ eq $billingplace;
-            my %row = (
+            push @billingplaceloop, {
                 value      => $_,
-                selected   => $selected,
+                selected   => $_ eq $billingplace,
                 branchname => $branches->{$_}->{branchname},
-            );
-            push @billingplaceloop, \%row;
+            };
         }
         $template->param( billingplaceloop => \@billingplaceloop );
         
         # Build the combobox to select the delivery place
         my @deliveryplaceloop;
         for (sort keys %$branches) {
-            my $selected = 1 if $_ eq $deliveryplace;
-            my %row = (
+            push @deliveryplaceloop, {
                 value      => $_,
-                selected   => $selected,
+                selected   => $_ eq $deliveryplace,
                 branchname => $branches->{$_}->{branchname},
-            );
-            push @deliveryplaceloop, \%row;
+            };
         }
         $template->param( deliveryplaceloop => \@deliveryplaceloop );
 
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 7641e68..cffc679 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -105,7 +105,10 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
     $line{name}       = $suppliers[$i]->{'name'};
     $line{active}     = $suppliers[$i]->{'active'};
     my @loop_basket;
-    my $uid = GetMember(borrowernumber => $loggedinuser)->{userid} if $loggedinuser;
+    my $uid = q{}; # initialized as haspermission does not check for undef
+    if ($loggedinuser) {
+        $uid = GetMember(borrowernumber => $loggedinuser)->{userid};
+    }
     for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) {
         if ( $orders->[$i2]{'authorisedby'} eq $loggedinuser || haspermission($uid, { flagsrequired   => { 'acquisition' => '*' } } ) ) {
             my %inner_line;
diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 0190e4a..2c41742 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -75,11 +75,17 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $from_iso = C4::Dates->new($input->param('from'))->output('iso') if $input->param('from');
-my   $to_iso =   C4::Dates->new($input->param('to'))->output('iso') if $input->param('iso');
+my ( $from_iso, $to_iso, $d );
+if ( $d = $input->param('from') ) {
+    $from_iso = C4::Dates->new($d)->output('iso');
+}
+if ( $d = $input->param('iso') ) {
+    $to_iso = C4::Dates->new($d)->output('iso');
+}
+
 my ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) =
-  &GetHistory( $title, $author, $name, $from_iso, $to_iso );
-  
+  GetHistory( $title, $author, $name, $from_iso, $to_iso );
+
 $template->param(
     suggestions_loop        => $order_loop,
     total_qty               => $total_qty,
-- 
1.7.3.2


From tajoli at cile.it  Mon Nov 29 12:17:54 2010
From: tajoli at cile.it (Zeno Tajoli)
Date: Mon, 29 Nov 2010 12:17:54 +0100
Subject: [Koha-patches] [PATCH] Analytical record: Insert UNIMARC support in
	API e cgi, I set the variable $marcflavour or used
	C4::Context->preference('marcflavour')
Message-ID: <1291029474-6403-1-git-send-email-tajoli@cile.it>

From: Zeno Tajoli <tajoli at cilea.it>

---
 C4/Biblio.pm             |   40 ++++++++++++++++++++++++++--------------
 C4/Items.pm              |   34 +++++++++++++++++++++++++---------
 C4/Search.pm             |   24 +++++++++++++++++++++++-
 cataloguing/addbiblio.pl |    3 ++-
 cataloguing/additem.pl   |   17 ++++++++++++++---
 cataloguing/linkitem.pl  |    8 ++++++--
 opac/opac-detail.pl      |   28 ++++++++++++++++++++++------
 7 files changed, 118 insertions(+), 36 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index eb6ea42..692f1a8 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1572,13 +1572,13 @@ sub GetMarcHosts {
         $title_subf = "a";
         $bibnumber_subf ="w";
         $itemnumber_subf='o';
-    }
-    elsif ($marcflavour eq "UNIMARC") {
+    };
+    if ($marcflavour eq "UNIMARC") {
         $tag = "461";
         $title_subf = "t";
         $bibnumber_subf ="0";
         $itemnumber_subf='9';
-    }
+    };
 
     my @marchosts;
 
@@ -1666,23 +1666,35 @@ sub TransformKohaToMarc {
 
 =head2 PrepHostMarcField
 
-    $hostfield = PrepHostMarcField ( $hostbiblionumber )
+    $hostfield = PrepHostMarcField ( $hostbiblionumber,$hostitemnumber,$marcflavour )
 
 This function returns a host field populated with data from the host record, the field can then be added to an analytical record
 
 =cut
 
 sub PrepHostMarcField {
-	my ($hostbiblionumber,$hostitemnumber) = @_;
-        my $hostrecord = GetMarcBiblio($hostbiblionumber);
-
-	my $hostmarcfield = MARC::Field->new(
-			773, '', '',
-			'w' => $hostbiblionumber,
-                        'o' => $hostitemnumber,
-                        'a' => $hostrecord->subfield('245','a'),
-                        'x' => $hostrecord->subfield('245','x')
-                );
+    my ($hostbiblionumber,$hostitemnumber, $marcflavour) = @_;
+    $marcflavour ||="MARC21";
+    
+    my $hostrecord = GetMarcBiblio($hostbiblionumber);
+
+    if ( $marcflavour eq "MARC21" ) {
+        my $hostmarcfield = MARC::Field->new(
+            773, '', '',
+            'w' => $hostbiblionumber, 
+            'o' => $hostitemnumber,
+            'a' => $hostrecord->subfield('245','a'),
+            'x' => $hostrecord->subfield('245','x')
+        );
+    };
+    if ($marcflavour eq "UNIMARC") {
+        my $hostmarcfield = MARC::Field->new(
+            461, '', '',
+            '0' => $hostbiblionumber,
+            't' => $hostrecord->subfield('200','a'), 
+            '9' => $hostitemnumber
+        );	
+    };
 
     return $hostmarcfield;
 }
diff --git a/C4/Items.pm b/C4/Items.pm
index 1f82db1..ac3c9ec 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1323,7 +1323,6 @@ sub GetItemsInfo {
 =head2 GetHostItemsInfo
 
 	$hostiteminfo = GetHostItemsInfo($hostfield);
-
 	Returns the iteminfo for items linked to records via a host field
 
 =cut
@@ -1332,8 +1331,8 @@ sub GetHostItemsInfo {
 	my ($record) = @_;
 	my @returnitemsInfo;
 
-	#MARC21 mapping, UNIMARC to be added
-	foreach my $hostfield ( $record->field('773') ) {
+	if ( C4::Context->preference('marcflavour') eq 'MARC21'){
+	    foreach my $hostfield ( $record->field('773') ) {
         	my $hostbiblionumber = $hostfield->subfield("w");
 	        my $linkeditemnumber = $hostfield->subfield("o");
         	my @hostitemInfos = GetItemsInfo($hostbiblionumber);
@@ -1343,6 +1342,20 @@ sub GetHostItemsInfo {
 				last;
                 	}
         	}
+	    }
+	}
+	if ( C4::Context->preference('marcflavour') eq 'UNIMARC'){
+	    foreach my $hostfield ( $record->field('461') ) {
+        	my $hostbiblionumber = $hostfield->subfield("0");
+	        my $linkeditemnumber = $hostfield->subfield("9");
+        	my @hostitemInfos = GetItemsInfo($hostbiblionumber);
+	        foreach my $hostitemInfo (@hostitemInfos){
+        	        if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
+                	        push (@returnitemsInfo,$hostitemInfo);
+				last;
+                	}
+        	}
+	    }
 	}
 	return @returnitemsInfo;
 }
@@ -1449,12 +1462,15 @@ references on array of itemnumbers.
 sub get_hostitemnumbers_of {
 	my ($biblionumber) = @_;
 	my $marcrecord = GetMarcBiblio($biblionumber);
-        my @returnhostitemnumbers;
-
-        #MARC21 mapping, UNIMARC to be added
-        foreach my $hostfield ( $marcrecord->field('773') ) {
-                my $hostbiblionumber = $hostfield->subfield("w");
-                my $linkeditemnumber = $hostfield->subfield("o");
+        my (@returnhostitemnumbers,$tag, $biblio_s, $item_s);
+	
+	my $marcflavor = C4::Context->preference('marcflavour');
+	if ($marcflavor eq 'MARC21'){$tag='773';$biblio_s='w';$item_s='o'};
+	if ($marcflavor eq 'UNIMARC'){$tag='461';$biblio_s='0';$item_s='9'};
+	
+        foreach my $hostfield ( $marcrecord->field($tag) ) {
+                my $hostbiblionumber = $hostfield->subfield($biblio_s);
+                my $linkeditemnumber = $hostfield->subfield($item_s);
 		my @itemnumbers;
                 if (my $itemnumbers = get_itemnumbers_of($hostbiblionumber)->{$hostbiblionumber})
 		{
diff --git a/C4/Search.pm b/C4/Search.pm
index 7795b6f..74ae142 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1502,7 +1502,8 @@ sub searchResults {
         my @fields = $marcrecord->field($itemtag);
 
         # adding linked items that belong to host records
-        foreach my $hostfield ( $marcrecord->field('773')) {
+        if ($marcflavor eq 'MARC21'){
+            foreach my $hostfield ( $marcrecord->field('773')) {
                 my $hostbiblionumber = $hostfield->subfield("w");
                 my $linkeditemnumber = $hostfield->subfield("o");
                 if(!$hostbiblionumber eq undef){
@@ -1519,6 +1520,27 @@ sub searchResults {
                         }
                         }
                 }
+            }
+        }
+        if ($marcflavor eq 'UNIMARC'){
+            foreach my $hostfield ( $marcrecord->field('461')) {
+                my $hostbiblionumber = $hostfield->subfield("0");
+                my $linkeditemnumber = $hostfield->subfield("9");
+                if(!$hostbiblionumber eq undef){
+                        my $hostbiblio = GetMarcBiblio($hostbiblionumber);
+                        if(!$hostbiblio eq undef){
+                        my @hostitems = $hostbiblio->field('995');
+                        foreach my $hostitem (@hostitems){
+                                if ($hostitem->subfield("9") eq $linkeditemnumber){
+                                        my $linkeditem =$hostitem;
+                                         # append linked items if they exist
+                                        if (!$linkeditem eq undef){
+                                        push (@fields, $linkeditem);}
+                                }
+                        }
+                    }
+                }
+            }
         }
 
         # Setting item statuses for display
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 79b8d17..0bbd237 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -894,8 +894,9 @@ if ($breedingid) {
 }
 #populate hostfield if hostbiblionumber is available
 if ($hostbiblionumber){
+	my $marcflavour = C4::Context->preference("marcflavour");
 	$record=MARC::Record->new();
-        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
+        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber,$marcflavour);
 	$record->append_fields($field);
 }
 
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 32c7a4f..869e612 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -97,6 +97,7 @@ my $biblionumber = $input->param('biblionumber');
 my $itemnumber   = $input->param('itemnumber');
 my $op           = $input->param('op');
 my $hostitemnumber = $input->param('hostitemnumber');
+my $marcflavour  = C4::Context->preference("marcflavour");
 
 my $frameworkcode = &GetFrameworkCode($biblionumber);
 
@@ -302,12 +303,22 @@ if ($op eq "additem") {
     }
     $nextop="additem";
 } elsif ($op eq "delinkitem"){
-	foreach my $field ($record->field('773')){
+	if ($marcflavour  eq 'MARC21'){
+	    foreach my $field ($record->field('773')){
 		if ($field->subfield('o') eq $hostitemnumber){
 			$record->delete_field($field);
 			last;
 		}
+	    }
 	}
+	if ($marcflavour  eq 'UNIMARC'){
+	    foreach my $field ($record->field('461')){
+		if ($field->subfield('9') eq $hostitemnumber){
+			$record->delete_field($field);
+			last;
+		}
+	    }
+	}	
 	my $modbibresult = ModBiblio($record, $biblionumber,'');
 }
 
@@ -585,9 +596,9 @@ foreach my $tag (sort keys %{$tagslib}) {
         $subfield_data{marc_value} = qq(<input type="text" $attributes />);
     }
     elsif ( length($value) > 100
-            or (C4::Context->preference("marcflavour") eq "UNIMARC" and
+            or ($marcflavour eq "UNIMARC" and
                   300 <= $tag && $tag < 400 && $subfield eq 'a' )
-            or (C4::Context->preference("marcflavour") eq "MARC21"  and
+            or ($marcflavour eq "MARC21"  and
                   500 <= $tag && $tag < 600                     )
           ) {
         # oversize field (textarea)
diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
index d4959ad..33a8397 100755
--- a/cataloguing/linkitem.pl
+++ b/cataloguing/linkitem.pl
@@ -45,7 +45,11 @@ my ($template, $loggedinuser, $cookie)
                  });
 
 my $biblio = GetMarcBiblio($biblionumber);
-$template->param(bibliotitle => $biblio->subfield('245','a'));
+my $marcflavour = C4::Context->preference("marcflavour");
+$marcflavour ||="MARC21";
+if ($marcflavour eq 'MARC21'){$template->param(bibliotitle => $biblio->subfield('245','a'))};
+if ($marcflavour eq 'UNIMARC'){$template->param(bibliotitle => $biblio->subfield('200','a'))};
+
 $template->param(biblionumber => $biblionumber);
 
 if ($barcode && $biblionumber) { 
@@ -57,7 +61,7 @@ if ($barcode && $biblionumber) {
 	my $hostbiblionumber = GetBiblionumberFromItemnumber($hostitemnumber);
 
 	if ($hostbiblionumber) {
-	        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber);
+	        my $field = PrepHostMarcField($hostbiblionumber, $hostitemnumber,$marcflavour);
 		$biblio->append_fields($field);
 
 		my $modresult = ModBiblio($biblio, $biblionumber, ''); 
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 0487783..48ec720 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -80,16 +80,33 @@ $template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowChec
 my @all_items = &GetItemsInfo( $biblionumber, 'opac' );
 
 # adding items linked via host biblios
-   foreach my $hostfield ( $record->field('773')) {
+my $marcflavour  = C4::Context->preference("marcflavour");
+
+
+if ($marcflavour eq 'MARC21'){
+    foreach my $hostfield ( $record->field('773')) {
         my $hostbiblionumber = $hostfield->subfield("w");
         my $linkeditemnumber = $hostfield->subfield("o");
         my @hostitemInfos = GetItemsInfo($hostbiblionumber);
         foreach my $hostitemInfo (@hostitemInfos){
-                if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
-                        push(@all_items, $hostitemInfo);
-                }
-         }
+            if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
+                push(@all_items, $hostitemInfo);
+            }
+        }
     }
+}
+if ($marcflavour eq 'UNIMARC'){
+    foreach my $hostfield ( $record->field('461')) {
+        my $hostbiblionumber = $hostfield->subfield("0");
+        my $linkeditemnumber = $hostfield->subfield("9");
+        my @hostitemInfos = GetItemsInfo($hostbiblionumber);
+        foreach my $hostitemInfo (@hostitemInfos){
+            if ($hostitemInfo->{itemnumber} eq $linkeditemnumber){
+                push(@all_items, $hostitemInfo);
+            }
+        }
+    }
+}
 
 my @items;
 @items = @all_items unless C4::Context->preference('hidelostitems');
@@ -209,7 +226,6 @@ for my $itm (@items) {
 
 ## get notes and subjects from MARC record
 my $dbh              = C4::Context->dbh;
-my $marcflavour      = C4::Context->preference("marcflavour");
 my $marcnotesarray   = GetMarcNotes   ($record,$marcflavour);
 my $marcauthorsarray = GetMarcAuthors ($record,$marcflavour);
 my $marcsubjctsarray = GetMarcSubjects($record,$marcflavour);
-- 
1.6.0.4


From M.de.Rooy at rijksmuseum.nl  Mon Nov 29 13:46:55 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 29 Nov 2010 12:46:55 +0000
Subject: [Koha-patches] [PATCH] bug5455 (Fix uninitialized-warnings on
	authorities.pl)
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA311A4F4E@S-MAIL-1B.rijksmuseum.intra>

Fix warnings for uninitialized authtypecode on lines 646, 653.
---
 authorities/authorities.pl |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index 9429a58..d4f1601 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -545,7 +545,9 @@ my $linkid=$input->param('linkid');
 my $authtypecode = $input->param('authtypecode');
 
 my $dbh = C4::Context->dbh;
-$authtypecode = &GetAuthTypeCode($authid) if !$authtypecode;
+if(!$authtypecode) {
+  $authtypecode = $authid? &GetAuthTypeCode($authid): '';
+}
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "authorities/authorities.tmpl",
-- 
1.6.0.6


From M.de.Rooy at rijksmuseum.nl  Mon Nov 29 15:34:45 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Mon, 29 Nov 2010 14:34:45 +0000
Subject: [Koha-patches] [PATCH] Bug 4839 (System pref for MARC field 008
 authorities; additional logic for position 14) REVISED
Message-ID: <809BE39CD64BFD4EB9036172EBCCFA311A4F8B@S-MAIL-1B.rijksmuseum.intra>

Currently, the default for this MARC control field is hardcoded in the plugin code
of marc21_field_008_authorities.pl (two occurrences).
This patch moves it into a new syspref. If this pref should not exist, the old
hardcoded value is used. Authorities preference file is updated too.
A warning is generated if the length of the field is not correct.

Furthermore, the default for position 14 (heading use: main or added entry)
should be dependent on the authority type. For CHRON_TERM, GENRE/FORM and
TOPIC_TERM, it should be b (not appropriate) instead of a (appropriate).
---
 .../value_builder/marc21_field_008_authorities.pl  |   34 +++++++++++++++++---
 .../en/modules/admin/preferences/authorities.pref  |    6 +++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl
index b887806..d2ac1f6 100755
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -27,6 +27,9 @@ use C4::Context;
 use C4::Search;
 use C4::Output;
 
+use constant FIXLEN_DATA_ELTS => '|| aca||aabn           | a|a     d';
+use constant PREF_008 => 'MARCAuthorityControlField008';
+
 =head1 DESCRIPTION
 
 plugin_parameters : other parameters added when the plugin is called by the dopop function
@@ -38,6 +41,8 @@ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
 
 $year +=1900; $mon +=1;
 my $dateentered = substr($year,2,2).sprintf ("%0.2d", $mon).sprintf ("%0.2d",$mday);
+my $defaultval = Field008();
+
 sub plugin_parameters {
 	my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
 	return "";
@@ -52,7 +57,12 @@ sub plugin_javascript {
 
 function Focus$function_name(subfield_managed) {
     if (!document.getElementById(\"$field_number\").value) {
-        document.getElementById(\"$field_number\").value='$dateentered' + '|| aca||aabn           | a|a     d';
+	var authtype=document.forms['f'].elements['authtypecode'].value;
+	var fieldval='$dateentered$defaultval';
+	if(authtype && (authtype == 'TOPIC_TERM' || authtype == 'GENRE/FORM' || authtype == 'CHRON_TERM')) {
+	  fieldval= fieldval.substr(0,14)+'b'+fieldval.substr(15);
+	}
+        document.getElementById(\"$field_number\").value=fieldval;
     }
     return 1;
 }
@@ -62,8 +72,9 @@ function Blur$function_name(subfield_managed) {
 }
 
 function Clic$function_name(i) {
+	var authtype=document.forms['f'].elements['authtypecode'].value;
 	defaultvalue=document.getElementById(\"$field_number\").value;
-	newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=marc21_field_008_authorities.pl&index=$field_number&result=\"+defaultvalue,\"tag_editor\",'width=1000,height=600,toolbar=false,scrollbars=yes');
+	newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=marc21_field_008_authorities.pl&index=$field_number&result=\"+defaultvalue+\"&authtypecode=\"+authtype,\"tag_editor\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
 //]]>
@@ -76,7 +87,8 @@ sub plugin {
 	my ($input) = @_;
 	my $index= $input->param('index');
 	my $result= $input->param('result');
-
+	my $authtype= $input->param('authtypecode')||'';
+	substr($defaultval,14-6,1)='b' if $authtype=~ /TOPIC_TERM|GENRE.FORM|CHRON_TERM/;
 
 	my $dbh = C4::Context->dbh;
 
@@ -88,7 +100,7 @@ sub plugin {
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
-	$result = "$dateentered".'|| aca||aabn           | a|a     d' unless $result;
+	$result = "$dateentered$defaultval" unless $result;
 	my $f1 = substr($result,0,6);
 	my $f6 = substr($result,6,1);
 	my $f7 = substr($result,7,1);
@@ -105,7 +117,7 @@ sub plugin {
 	my $f28 = substr($result,28,1);
 	my $f29 = substr($result,29,1);
 	my $f31 = substr($result,31,1);
-	my $f32 = substr($result,32,2);
+	my $f32 = substr($result,32,1);
 	my $f33 = substr($result,33,1);
 	my $f38 = substr($result,38,1);
 	my $f39 = substr($result,39,1);
@@ -158,4 +170,16 @@ if ((!$f1) ||($f1 =~ m/ /)){
         output_html_with_http_headers $input, $cookie, $template->output;
 }
 
+sub Field008 {
+  my $pref= C4::Context->preference(PREF_008);
+  if(!$pref) {
+    return FIXLEN_DATA_ELTS;
+  }
+  elsif(length($pref)<34) {
+    warn "marc21_field_008_authorities.pl: Syspref ".PREF_008." should be 34 characters long ";
+    return FIXLEN_DATA_ELTS;
+  }
+  return substr($pref,0,34);  #ignore remainder
+}
+
 1;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
index f06d983..6752fb5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
@@ -14,3 +14,9 @@ Authorities:
               yes: "Don't"
               no: Do
         - automatically update attached biblios when changing an authority record. If this is off, please ask your administrator to enable the merge_authorities.pl cronjob.
+    -
+        - Use the following text for the contents of MARC authority control field 008 position 06-39 (fixed length data elements). Do NOT include the date (position 00-05).
+        - pref: MARCAuthorityControlField008
+          default: "|| aca||aabn           | a|a     d"
+          type: textarea
+          class: code
-- 
1.6.0.6


From colin.campbell at ptfs-europe.com  Mon Nov 29 18:58:23 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 29 Nov 2010 17:58:23 +0000
Subject: [Koha-patches] [PATCH 1/6] Bug 5453: Move declarations out of
	conditionals
Message-ID: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>

Patch admin/*.pl scripts
---
 admin/aqbudgets.pl          |    6 +++++-
 admin/aqcontract.pl         |   32 ++++++++++++++++++++++----------
 admin/auth_tag_structure.pl |   17 ++++++++---------
 admin/branches.pl           |    8 +++-----
 admin/smart-rules.pl        |   13 ++++++-------
 5 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index d266727..6f66773 100755
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -325,7 +325,11 @@ if ($op eq 'add_form') {
         );
     }
 
-    my $budget_period_total = $num->format_price($$period{budget_period_total}) if $$period{budget_period_total};
+    my $budget_period_total;
+    if ( $period->{budget_period_total} ) {
+        $budget_period_total =
+          $num->format_price( $period->{budget_period_total} );
+    }
     $template->param(
         else                   => 1,
         budget                 => \@loop,
diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
index 07fb757..7126c99 100755
--- a/admin/aqcontract.pl
+++ b/admin/aqcontract.pl
@@ -59,17 +59,29 @@ $template->param(
 if ( $op eq 'add_form' ) {
     $template->param( add_form => 1 );
 
-    # if contractnumber exists, it's a modify action, so read values to modify...
-    my $contract = @{GetContract( { contractnumber => $contractnumber } )}[0] if $contractnumber;
-
-    $template->param(
-        contractnumber           => $$contract{contractnumber},
-        contractname             => $$contract{contractname},
-        contractdescription      => $$contract{contractdescription},
-        contractstartdate        => format_date( $$contract{contractstartdate} ),
-        contractenddate          => format_date( $$contract{contractenddate} ),
-        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar,
-    );
+   # if contractnumber exists, it's a modify action, so read values to modify...
+    if ($contractnumber) {
+        my $contract =
+          @{ GetContract( { contractnumber => $contractnumber } ) }[0];
+
+        $template->param(
+            contractnumber      => $contract->{contractnumber},
+            contractname        => $contract->{contractname},
+            contractdescription => $contract->{contractdescription},
+            contractstartdate => format_date( $contract->{contractstartdate} ),
+            contractenddate   => format_date( $contract->{contractenddate} ),
+            DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar,
+        );
+    } else {
+        $template->param(
+            contractnumber           => undef,
+            contractname             => undef,
+            contractdescription      => undef,
+            contractstartdate        => undef,
+            contractenddate          => undef,
+            DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar,
+        );
+    }
 
     # END $OP eq ADD_FORM
 }
diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index 6314c0a..fd7c1b9 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -55,15 +55,14 @@ my ($template, $loggedinuser, $cookie)
 			     });
 
 # get authtype list
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
-	my $selected = 1 if $thisauthtype eq $authtypecode;
-	my %row =(value => $thisauthtype,
-				selected => $selected,
-				authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'},
-			);
-	push @authtypesloop, \%row;
+my $authtypes     = getauthtypes;
+my @authtypesloop = ();
+foreach my $thisauthtype ( keys %{$authtypes} ) {
+    push @authtypesloop,
+      { value        => $thisauthtype,
+        selected     => $thisauthtype eq $authtypecode,
+        authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'},
+      };
 }
 
 my $sth;
diff --git a/admin/branches.pl b/admin/branches.pl
index 758fa32..a97a91b 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -189,12 +189,10 @@ elsif ( $op eq 'addcategory_validate' ) {
 elsif ( $op eq 'delete_category' ) {
 
     # if the user has pressed the "delete branch" button.
-    my $message = "MESSAGE8" if CheckBranchCategorycode($categorycode);
-    if ($message) {
+    if ( CheckBranchCategorycode($categorycode) ) {
         $template->param( else => 1 );
-        default($message,$template);
-    }
-    else {
+        default( 'MESSAGE8', $template );
+    } else {
         $template->param( delete_category => 1 );
         $template->param( categorycode    => $categorycode );
     }
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index fdd9b91..95f958e 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -335,12 +335,11 @@ elsif ($op eq "add-branch-item") {
 my $branches = GetBranches();
 my @branchloop;
 for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-    my $selected = 1 if $thisbranch eq $branch;
-    my %row =(value => $thisbranch,
-                selected => $selected,
-                branchname => $branches->{$thisbranch}->{'branchname'},
-            );
-    push @branchloop, \%row;
+    push @branchloop, {
+        value      => $thisbranch,
+        selected   => $thisbranch eq $branch,
+        branchname => $branches->{$thisbranch}->{'branchname'},
+    };
 }
 
 my $sth=$dbh->prepare("SELECT description,categorycode FROM categories ORDER BY description");
@@ -413,7 +412,7 @@ foreach my $entry (@sorted_branch_cat_rules, @sorted_row_loop) {
     $entry->{unlimited_maxissueqty} = 1 unless defined($entry->{maxissueqty});
 }
 
-my @sorted_row_loop = sort by_category_and_itemtype @row_loop;
+ at sorted_row_loop = sort by_category_and_itemtype @row_loop;
 
 my $sth_branch_item;
 if ($branch eq "*") {
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Mon Nov 29 18:58:24 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 29 Nov 2010 17:58:24 +0000
Subject: [Koha-patches] [PATCH 2/6] Bug 5453: Move declarations from within
	conditionals in catalogue/search.pl
In-Reply-To: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
References: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
Message-ID: <1291053508-23600-2-git-send-email-colin.campbell@ptfs-europe.com>

---
 catalogue/search.pl |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index ac2209a..1c9024c 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -273,9 +273,13 @@ if ( $template_type eq 'advsearch' ) {
     $template->param(outer_sup_servers_loop => $secondary_servers_loop,);
 
     # set the default sorting
-    my $default_sort_by = C4::Context->preference('defaultSortField')."_".C4::Context->preference('defaultSortOrder')
-        if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
-    $template->param($default_sort_by => 1);
+    if (   C4::Context->preference('OPACdefaultSortField')
+        && C4::Context->preference('OPACdefaultSortOrder') ) {
+        my $default_sort_by =
+            C4::Context->preference('defaultSortField') . '_'
+          . C4::Context->preference('defaultSortOrder');
+        $template->param( $default_sort_by => 1 );
+    }
 
     # determine what to display next to the search boxes (ie, boolean option
     # shouldn't appear on the first one, scan indexes should, adding a new
@@ -338,8 +342,13 @@ my $params = $cgi->Vars;
 # sort by is used to sort the query
 # in theory can have more than one but generally there's just one
 my @sort_by;
-my $default_sort_by = C4::Context->preference('defaultSortField')."_".C4::Context->preference('defaultSortOrder') 
-    if (C4::Context->preference('defaultSortField') && C4::Context->preference('defaultSortOrder'));
+my $default_sort_by;
+if (   C4::Context->preference('defaultSortField')
+    && C4::Context->preference('defaultSortOrder') ) {
+    $default_sort_by =
+        C4::Context->preference('defaultSortField') . '_'
+      . C4::Context->preference('defaultSortOrder');
+}
 
 @sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
 $sort_by[0] = $default_sort_by unless $sort_by[0];
@@ -561,7 +570,10 @@ for (my $i=0;$i<@servers;$i++) {
             # default page number
             my $current_page_number = 1;
             $current_page_number = ($offset / $results_per_page + 1) if $offset;
-            my $previous_page_offset = $offset - $results_per_page unless ($offset - $results_per_page <0);
+            my $previous_page_offset;
+            if ( $offset >= $results_per_page ) {
+                $previous_page_offset = $offset - $results_per_page;
+            }
             my $next_page_offset = $offset + $results_per_page;
             # If we're within the first 10 pages, keep it simple
             #warn "current page:".$current_page_number;
@@ -575,10 +587,14 @@ for (my $i=0;$i<@servers;$i++) {
                     my $this_offset = (($i*$results_per_page)-$results_per_page);
                     # the page number for this page
                     my $this_page_number = $i;
-                    # it should only be highlighted if it's the current page
-                    my $highlight = 1 if ($this_page_number == $current_page_number);
                     # put it in the array
-                    push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ", at sort_by };
+                    push @page_numbers,
+                      { offset    => $this_offset,
+                        pg        => $this_page_number,
+                        # it should only be highlighted if it's the current page
+                        highlight => $this_page_number == $current_page_number,
+                        sort_by   => join ' ', @sort_by
+                      };
                                 
                 }
                         
@@ -589,9 +605,13 @@ for (my $i=0;$i<@servers;$i++) {
                 for (my $i=$current_page_number; $i<=($current_page_number + 20 );$i++) {
                     my $this_offset = ((($i-9)*$results_per_page)-$results_per_page);
                     my $this_page_number = $i-9;
-                    my $highlight = 1 if ($this_page_number == $current_page_number);
-                    if ($this_page_number <= $pages) {
-                        push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ", at sort_by };
+                    if ( $this_page_number <= $pages ) {
+                        push @page_numbers,
+                          { offset    => $this_offset,
+                            pg        => $this_page_number,
+                            highlight => $this_page_number == $current_page_number,
+                            sort_by   => join ' ', @sort_by
+                          };
                     }
                 }
             }
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Mon Nov 29 18:58:25 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 29 Nov 2010 17:58:25 +0000
Subject: [Koha-patches] [PATCH 3/6] Bug 5453 Move declarations out of
	conditionals
In-Reply-To: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
References: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
Message-ID: <1291053508-23600-3-git-send-email-colin.campbell@ptfs-europe.com>

Fix im members scripts
---
 members/mancredit.pl   |    7 +++++--
 members/maninvoice.pl  |    7 +++++--
 members/memberentry.pl |   38 +++++++++++++++++++++-----------------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/members/mancredit.pl b/members/mancredit.pl
index 51b71d6..42f8274 100755
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -42,8 +42,11 @@ my $data=GetMember('borrowernumber' => $borrowernumber);
 my $add=$input->param('add');
 
 if ($add){
-    my $barcode=$input->param('barcode');
-    my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode;
+    my $barcode = $input->param('barcode');
+    my $itemnum;
+    if ($barcode) {
+        $itemnum = GetItemnumberFromBarcode($barcode);
+    }
     my $desc=$input->param('desc');
     my $amount=$input->param('amount') || 0;
     $amount = -$amount;
diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index df12a2a..49b8611 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -42,8 +42,11 @@ my $data=GetMember('borrowernumber'=>$borrowernumber);
 my $add=$input->param('add');
 if ($add){
 #  print $input->header;
-    my $barcode=$input->param('barcode');
-    my $itemnum = GetItemnumberFromBarcode($barcode) if $barcode;
+    my $barcode = $input->param('barcode');
+    my $itemnum;
+    if ($barcode) {
+        $itemnum = GetItemnumberFromBarcode($barcode);
+    }
     my $desc=$input->param('desc');
     my $amount=$input->param('amount');
     my $type=$input->param('type');
diff --git a/members/memberentry.pl b/members/memberentry.pl
index fbd8538..dd4c069 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -177,24 +177,28 @@ if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') {
 }
 
 #############test for member being unique #############
-if (($op eq 'insert') and !$nodouble){
-        my $category_type_send=$category_type if ($category_type eq 'I'); 
-        my $check_category; # recover the category code of the doublon suspect borrowers
-			#   ($result,$categorycode) = checkuniquemember($collectivity,$surname,$firstname,$dateofbirth)
-        ($check_member,$check_category) = checkuniquemember(
-			$category_type_send, 
-			($newdata{surname}     ? $newdata{surname}     : $data{surname}    ),
-			($newdata{firstname}   ? $newdata{firstname}   : $data{firstname}  ),
-			($newdata{dateofbirth} ? $newdata{dateofbirth} : $data{dateofbirth})
-		);
-        if(!$check_member){
-            $nodouble = 1;
-        }
-  #   recover the category type if the borrowers is a doublon
+if ( ( $op eq 'insert' ) and !$nodouble ) {
+    my $category_type_send;
+    if ( $category_type eq 'I' ) {
+        $category_type_send = $category_type;
+    }
+    my $check_category;    # recover the category code of the doublon suspect borrowers
+     #   ($result,$categorycode) = checkuniquemember($collectivity,$surname,$firstname,$dateofbirth)
+    ( $check_member, $check_category ) = checkuniquemember(
+        $category_type_send,
+        ( $newdata{surname}     ? $newdata{surname}     : $data{surname} ),
+        ( $newdata{firstname}   ? $newdata{firstname}   : $data{firstname} ),
+        ( $newdata{dateofbirth} ? $newdata{dateofbirth} : $data{dateofbirth} )
+    );
+    if ( !$check_member ) {
+        $nodouble = 1;
+    }
+
+    #   recover the category type if the borrowers is a doublon
     if ($check_category) {
-      my $tmpborrowercategory=GetBorrowercategory($check_category);
-      $check_categorytype=$tmpborrowercategory->{'category_type'};
-    }   
+        my $tmpborrowercategory = GetBorrowercategory($check_category);
+        $check_categorytype = $tmpborrowercategory->{'category_type'};
+    }
 }
 
   #recover all data from guarantor address phone ,fax... 
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Mon Nov 29 18:58:26 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 29 Nov 2010 17:58:26 +0000
Subject: [Koha-patches] [PATCH 4/6] Bug 5453 Move declarations out of
	conditionals in opac
In-Reply-To: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
References: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
Message-ID: <1291053508-23600-4-git-send-email-colin.campbell@ptfs-europe.com>

---
 opac/opac-ISBDdetail.pl        |    5 +++-
 opac/opac-authorities-home.pl  |   26 +++++++++++---------
 opac/opac-authoritiesdetail.pl |   16 +++++-------
 opac/opac-detail.pl            |   17 +++++++++-----
 opac/opac-search.pl            |   49 ++++++++++++++++++++++++++++-----------
 opac/opac-topissues.pl         |   17 ++++++++-----
 opac/opac-user.pl              |   14 +++++++----
 7 files changed, 90 insertions(+), 54 deletions(-)

diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 88904da..aea48ff 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -84,7 +84,10 @@ my $upc = GetNormalizedUPC($record,$marcflavour);
 my $ean = GetNormalizedEAN($record,$marcflavour);
 my $oclc = GetNormalizedOCLCNumber($record,$marcflavour);
 my $isbn = GetNormalizedISBN(undef,$record,$marcflavour);
-my $content_identifier_exists = 1 if ($isbn or $ean or $oclc or $upc);
+my $content_identifier_exists;
+if ( $isbn or $ean or $oclc or $upc ) {
+    $content_identifier_exists = 1;
+}
 $template->param(
     normalized_upc => $upc,
     normalized_ean => $ean,
diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl
index 104dff2..45d18b4 100755
--- a/opac/opac-authorities-home.pl
+++ b/opac/opac-authorities-home.pl
@@ -41,18 +41,20 @@ $startfrom = 0 if ( !defined $startfrom );
 my ( $template, $loggedinuser, $cookie );
 my $resultsperpage;
 
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype ( sort { $authtypes->{$a}{'authtypetext'} cmp $authtypes->{$b}{'authtypetext'} }
-    keys %$authtypes )
-{
-    my $selected = 1 if $thisauthtype eq $authtypecode;
-    my %row = (
-        value        => $thisauthtype,
-        selected     => $selected,
-        authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-    );
-    push @authtypesloop, \%row;
+my $authtypes     = getauthtypes();
+my @authtypesloop = ();
+foreach my $thisauthtype (
+    sort {
+        $authtypes->{$a}->{'authtypetext'}
+          cmp $authtypes->{$b}->{'authtypetext'}
+    }
+    keys %{$authtypes}
+  ) {
+    push @authtypesloop,
+      { value        => $thisauthtype,
+        selected     => $thisauthtype eq $authtypecode,
+        authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'},
+      };
 }
 
 if ( $op eq "do_search" ) {
diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index 71f746e..ead3e75 100755
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.pl
@@ -165,16 +165,14 @@ foreach my $field (@fields) {
 }
 $template->param( "0XX" => \@loop_data );
 
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype ( keys %$authtypes ) {
-    my $selected = 1 if $thisauthtype eq $authtypecode;
-    my %row = (
-        value        => $thisauthtype,
-        selected     => $selected,
+my $authtypes     = getauthtypes();
+my @authtypesloop = ();
+foreach my $thisauthtype ( keys %{$authtypes} ) {
+    push @authtypesloop,
+      { value        => $thisauthtype,
+        selected     => $thisauthtype eq $authtypecode,
         authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-    );
-    push @authtypesloop, \%row;
+      };
 }
 
 $template->param(
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 2de8ec8..047c95d 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -232,7 +232,10 @@ my $upc = GetNormalizedUPC($record,$marcflavour);
 my $ean = GetNormalizedEAN($record,$marcflavour);
 my $oclc = GetNormalizedOCLCNumber($record,$marcflavour);
 my $isbn = GetNormalizedISBN(undef,$record,$marcflavour);
-my $content_identifier_exists = 1 if ($isbn or $ean or $oclc or $upc);
+my $content_identifier_exists;
+if ( $isbn or $ean or $oclc or $upc ) {
+    $content_identifier_exists = 1;
+}
 $template->param(
 	normalized_upc => $upc,
 	normalized_ean => $ean,
@@ -534,11 +537,13 @@ if (C4::Context->preference("OPACShelfBrowser")) {
         }
         push @next_items, $this_item;
     }
-    
-    # alas, these won't auto-vivify, see http://www.perlmonks.org/?node_id=508481
-    my $shelfbrowser_next_itemnumber = $next_items[-1]->{itemnumber} if @next_items;
-    my $shelfbrowser_next_biblionumber = $next_items[-1]->{biblionumber} if @next_items;
-    
+
+    my ( $shelfbrowser_next_itemnumber, $shelfbrowser_next_biblionumber );
+    if (@next_items) {
+        $shelfbrowser_next_itemnumber   = $next_items[-1]->{itemnumber};
+        $shelfbrowser_next_biblionumber = $next_items[-1]->{biblionumber};
+    }
+
     $template->param(
         starting_homebranch => $starting_homebranch->{description},
         starting_location => $starting_location->{description},
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 2bfcb6d..4058a08 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -203,9 +203,13 @@ if ( $template_type && $template_type eq 'advsearch' ) {
     $template->param(outer_sup_servers_loop => $secondary_servers_loop,);
 
     # set the default sorting
-    my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') 
-        if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
-    $template->param($default_sort_by => 1);
+    if (   C4::Context->preference('OPACdefaultSortField')
+        && C4::Context->preference('OPACdefaultSortOrder') ) {
+        my $default_sort_by =
+            C4::Context->preference('OPACdefaultSortField') . '_'
+          . C4::Context->preference('OPACdefaultSortOrder');
+        $template->param( $default_sort_by => 1 );
+    }
 
     # determine what to display next to the search boxes (ie, boolean option
     # shouldn't appear on the first one, scan indexes should, adding a new
@@ -269,8 +273,13 @@ $tag = $params->{tag} if $params->{tag};
 # sort by is used to sort the query
 # in theory can have more than one but generally there's just one
 my @sort_by;
-my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') 
-    if (C4::Context->preference('OPACdefaultSortField') && C4::Context->preference('OPACdefaultSortOrder'));
+my $default_sort_by;
+if (   C4::Context->preference('OPACdefaultSortField')
+    && C4::Context->preference('OPACdefaultSortOrder') ) {
+    $default_sort_by =
+        C4::Context->preference('OPACdefaultSortField') . '_'
+      . C4::Context->preference('OPACdefaultSortOrder');
+}
 
 @sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
 $sort_by[0] = $default_sort_by if !$sort_by[0] && defined($default_sort_by);
@@ -551,8 +560,13 @@ for (my $i=0;$i<@servers;$i++) {
             my $pages = ceil($hits / $results_per_page);
             # default page number
             my $current_page_number = 1;
-            $current_page_number = ($offset / $results_per_page + 1) if $offset;
-            my $previous_page_offset = $offset - $results_per_page unless ($offset - $results_per_page <0);
+            if ($offset) {
+                $current_page_number = ( $offset / $results_per_page + 1 );
+            }
+            my $previous_page_offset;
+            if ( $offset >= $results_per_page ) {
+                $previous_page_offset = $offset - $results_per_page;
+            }
             my $next_page_offset = $offset + $results_per_page;
             # If we're within the first 10 pages, keep it simple
             #warn "current page:".$current_page_number;
@@ -566,11 +580,14 @@ for (my $i=0;$i<@servers;$i++) {
                     my $this_offset = (($i*$results_per_page)-$results_per_page);
                     # the page number for this page
                     my $this_page_number = $i;
-                    # it should only be highlighted if it's the current page
-                    my $highlight = 1 if ($this_page_number == $current_page_number);
                     # put it in the array
-                    push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ", at sort_by };
-                                
+                    push @page_numbers,
+                      { offset    => $this_offset,
+                        pg        => $this_page_number,
+                        highlight => $this_page_number == $current_page_number,
+                        sort_by   => join ' ', @sort_by
+                      };
+
                 }
                         
             }
@@ -579,9 +596,13 @@ for (my $i=0;$i<@servers;$i++) {
                 for ($i=$current_page_number; $i<=($current_page_number + 20 );$i++) {
                     my $this_offset = ((($i-9)*$results_per_page)-$results_per_page);
                     my $this_page_number = $i-9;
-                    my $highlight = 1 if ($this_page_number == $current_page_number);
-                    if ($this_page_number <= $pages) {
-                        push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ", at sort_by };
+                    if ( $this_page_number <= $pages ) {
+                        push @page_numbers,
+                          { offset    => $this_offset,
+                            pg        => $this_page_number,
+                            highlight => $this_page_number == $current_page_number,
+                            sort_by => join ' ', @sort_by
+                          };
                     }
                 }
                         
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 70b712e..a89823e 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -101,13 +101,16 @@ $template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}
 #doctype
 $itemtypes = GetItemTypes;
 my @itemtypeloop;
-foreach my $thisitemtype (sort {$itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}} keys %$itemtypes) {
-        my $selected = 1 if $thisitemtype eq $itemtype;
-        my %row =(value => $thisitemtype,
-                    description => $itemtypes->{$thisitemtype}->{'description'},
-                    selected => $selected,
-                 );
-        push @itemtypeloop, \%row;
+foreach my $thisitemtype (
+    sort {
+        $itemtypes->{$a}->{'description'} cmp $itemtypes->{$b}->{'description'}
+    } keys %{$itemtypes}
+  ) {
+    push @itemtypeloop,
+      { value       => $thisitemtype,
+        description => $itemtypes->{$thisitemtype}->{'description'},
+        selected    => $thisitemtype eq $itemtype,
+      };
 }
 
 $template->param(
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 634b77a..7b4684c 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -169,13 +169,17 @@ $template->param( overdues_count => $overdues_count );
 # load the branches
 my $branches = GetBranches();
 my @branch_loop;
-for my $branch_hash (sort keys %$branches ) {
-    my $selected=(C4::Context->userenv && ($branch_hash eq C4::Context->userenv->{branch})) if (C4::Context->preference('SearchMyLibraryFirst'));
+for my $branch_hash ( sort keys %{$branches} ) {
+    my $selected;
+    if ( C4::Context->preference('SearchMyLibraryFirst') ) {
+        $selected =
+          ( C4::Context->userenv
+              && ( $branch_hash eq C4::Context->userenv->{branch} ) );
+    }
     push @branch_loop,
-      {
-        value      => "branch: $branch_hash",
+      { value      => "branch: $branch_hash",
         branchname => $branches->{$branch_hash}->{'branchname'},
-        selected => $selected
+        selected   => $selected,
       };
 }
 $template->param( branchloop => \@branch_loop );
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Mon Nov 29 18:58:27 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 29 Nov 2010 17:58:27 +0000
Subject: [Koha-patches] [PATCH 5/6] Bug 5453 Move declarations out of
	conditionals
In-Reply-To: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
References: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
Message-ID: <1291053508-23600-5-git-send-email-colin.campbell@ptfs-europe.com>

---
 cataloguing/addbiblio.pl    |    5 ++++-
 reports/issues_avg_stats.pl |   35 +++++++++++++++++++++++++++--------
 suggestion/suggestion.pl    |   12 +++++++++---
 tools/export.pl             |   17 +++++++++--------
 tools/holidays.pl           |   20 +++++++++++---------
 tools/picture-upload.pl     |   12 +++++++++---
 6 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 2c0c63d..00a52d6 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -916,7 +916,10 @@ if ( $op eq "addbiblio" ) {
     my @params = $input->param();
     $record = TransformHtmlToMarc( \@params , $input );
     # check for a duplicate
-    my ($duplicatebiblionumber,$duplicatetitle) = FindDuplicate($record) if (!$is_a_modif);
+    my ( $duplicatebiblionumber, $duplicatetitle );
+    if ( !$is_a_modif ) {
+        ( $duplicatebiblionumber, $duplicatetitle ) = FindDuplicate($record);
+    }
     my $confirm_not_duplicate = $input->param('confirm_not_duplicate');
     # it is not a duplicate (determined either by Koha itself or by user checking it's not a duplicate)
     if ( !$duplicatebiblionumber or $confirm_not_duplicate ) {
diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index f0f1dd5..c6a3859 100755
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -554,8 +554,23 @@ sub calculate {
     # and the number matches the number of columns
         my $colcount=0;
         foreach my $col ( @loopcol ) {
-            my $value =$table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} / $wgttable{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} if ($table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}});
-
+            my $value;
+            if ($table{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                }
+              ) {
+                $value = $table{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                  } / $wgttable{$row}->{
+                    (        ( $col->{coltitle} eq 'NULL' )
+                          or ( $col->{coltitle} eq q{} )
+                      ) ? 'zzEMPTY' : $col->{coltitle}
+                  };
+            }
             $table{$row}->{(($col->{coltitle} eq "NULL")or ($col->{coltitle} eq ""))?"zzEMPTY":$col->{coltitle}} = $value;
             $table{$row}->{totalrow}+=$value;
             #warn "row : $row col:$col  $cnttable{$row}->{(($col->{coltitle} eq \"NULL\")or ($col->{coltitle} eq \"\"))?\"zzEMPTY\":$col->{coltitle}}";
@@ -563,12 +578,16 @@ sub calculate {
             push @loopcell, {value => ($value)?sprintf("%.2f",$value):0  } ;
         }
         #warn "row : $row colcount:$colcount";
-        my $total = $table{$row}->{totalrow}/$colcount if ($colcount>0);
-        push @looprow,{ 'rowtitle' => ($row eq "zzEMPTY")?"NULL":$row,
-                        'loopcell' => \@loopcell,
-                        'hilighted' => ($hilighted >0),
-                        'totalrow' => ($total)?sprintf("%.2f",$total):0
-                    };
+        my $total;
+        if ( $colcount > 0 ) {
+            $total = $table{$row}->{totalrow} / $colcount;
+        }
+        push @looprow,
+          { 'rowtitle' => ( $row eq "zzEMPTY" ) ? "NULL" : $row,
+            'loopcell' => \@loopcell,
+            'hilighted' => ( $hilighted > 0 ),
+            'totalrow'  => ($total) ? sprintf( "%.2f", $total ) : 0
+          };
         $hilighted = -$hilighted;
     }
 # 	
diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 57a1ba7..3142f0d 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -260,10 +260,16 @@ foreach my $support(@$supportlist){
 $template->param(itemtypeloop=>$supportlist);
 
 #Budgets management
-my $searchbudgets={ budget_branchcode=>$branchfilter} if $branchfilter;
-my $budgets = GetBudgets($searchbudgets);
+my $budgets = [];
+if ($branchfilter) {
+    my $searchbudgets = { budget_branchcode => $branchfilter };
+    $budgets = GetBudgets($searchbudgets);
+} else {
+    $budgets = GetBudgets(undef);
+}
 
-foreach my $budget (@$budgets){
+foreach my $budget ( @{$budgets} ) {
+## Please see file perltidy.ERR
     $budget->{'selected'}=1 if ($$suggestion_ref{'budgetid'} && $budget->{'budget_id'} eq $$suggestion_ref{'budgetid'})
 };
 
diff --git a/tools/export.pl b/tools/export.pl
index a1e9a22..dc692e1 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -183,16 +183,17 @@ else {
        push @itemtypesloop, \%row;
     }
     my @branchloop;
-	for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-        my $selected = 1 if $thisbranch eq $branch;
-        my %row = (
-            value => $thisbranch,
-            selected => $selected,
+    for my $thisbranch (
+        sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
+        keys %{$branches}
+      ) {
+        push @branchloop,
+          { value      => $thisbranch,
+            selected   => $thisbranch eq $branch,
             branchname => $branches->{$thisbranch}->{'branchname'},
-       );
-       push @branchloop, \%row;
+          };
     }
-    
+
     $template->param(
         branchloop   => \@branchloop,
         itemtypeloop => \@itemtypesloop,
diff --git a/tools/holidays.pl b/tools/holidays.pl
index eb3bc9c..90ef56a 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -65,18 +65,20 @@ if ( $onlymine ) {
     $branch = C4::Context->userenv->{'branch'};
 }
 my $branchname = GetBranchName($branch);
-my $branches = GetBranches($onlymine);
+my $branches   = GetBranches($onlymine);
 my @branchloop;
-for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-    my $selected = 1 if $thisbranch eq $branch;
-    my %row =(value => $thisbranch,
-                selected => $selected,
-                branchname => $branches->{$thisbranch}->{'branchname'},
-            );
-    push @branchloop, \%row;
+for my $thisbranch (
+    sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
+    keys %{$branches} ) {
+    push @branchloop,
+      { value      => $thisbranch,
+        selected   => $thisbranch eq $branch,
+        branchname => $branches->{$thisbranch}->{'branchname'},
+      };
 }
+
 # branches calculated - put branch codes in a single string so they can be passed in a form
-my $branchcodes = join("|", keys %$branches);
+my $branchcodes = join '|', keys %{$branches};
 
 # Get all the holidays
 
diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index f4c75d8..bfb233e 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -78,7 +78,10 @@ my ( $total, $handled, @counts, $tempfile, $tfh );
 if ( ($op eq 'Upload') && $uploadfile ) {       # Case is important in these operational values as the template must use case to be visually pleasing!
     my $dirname = File::Temp::tempdir( CLEANUP => 1);
     $debug and warn "dirname = $dirname";
-    my $filesuffix = $1 if $uploadfilename =~ m/(\..+)$/i;
+    my $filesuffix;
+    if ( $uploadfilename =~ m/(\..+)$/i ) {
+        my $filesuffix = $1;
+    }
     ( $tfh, $tempfile ) = File::Temp::tempfile( SUFFIX => $filesuffix, UNLINK => 1 );
     $debug and warn "tempfile = $tempfile";
     my ( @directories, $errors );
@@ -254,8 +257,11 @@ sub handle_file {
 					undef $srcimage;    # This object can get big...
 				}
 				$debug and warn "Image is of mimetype $mimetype";
-				my $dberror = PutPatronImage($cardnumber,$mimetype, $imgfile) if $mimetype;
-				if ( !$dberror && $mimetype ) { # Errors from here on are fatal only to the import of a particular image, so don't bail, just note the error and keep going
+                my $dberror;
+                if ($mimetype) {
+                    $dberror = PutPatronImage( $cardnumber, $mimetype, $imgfile );
+                }
+                if ( !$dberror && $mimetype ) { # Errors from here on are fatal only to the import of a particular image, so don't bail, just note the error and keep going
 					$count{count}++;
 					push @{ $count{filenames} }, { source => $filename, cardnumber => $cardnumber };
 				} elsif ( $dberror ) {
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Mon Nov 29 18:58:28 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 29 Nov 2010 17:58:28 +0000
Subject: [Koha-patches] [PATCH 6/6] Bug 5453 : Move declarations out of
	conditionals
In-Reply-To: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
References: <1291053508-23600-1-git-send-email-colin.campbell@ptfs-europe.com>
Message-ID: <1291053508-23600-6-git-send-email-colin.campbell@ptfs-europe.com>

Patched for C4 Modules
---
 C4/Auth.pm           |   15 ++++++----
 C4/Auth_with_ldap.pm |    5 ++-
 C4/Biblio.pm         |   79 ++++++++++++++++++++++++++++++++++++++-----------
 C4/Budgets.pm        |    5 ++-
 C4/Letters.pm        |   24 +++++++++------
 C4/Members.pm        |    8 +++--
 C4/Record.pm         |   17 +++++++---
 7 files changed, 108 insertions(+), 45 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 7404f96..16bda1e 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -128,12 +128,15 @@ sub get_template_and_user {
     my $in       = shift;
     my $template =
       gettemplate( $in->{'template_name'}, $in->{'type'}, $in->{'query'} );
-    my ( $user, $cookie, $sessionID, $flags ) = checkauth(
-        $in->{'query'},
-        $in->{'authnotrequired'},
-        $in->{'flagsrequired'},
-        $in->{'type'}
-    ) unless ($in->{'template_name'}=~/maintenance/);
+    my ( $user, $cookie, $sessionID, $flags );
+    if ( $in->{'template_name'} !~m/maintenance/ ) {
+        ( $user, $cookie, $sessionID, $flags ) = checkauth(
+            $in->{'query'},
+            $in->{'authnotrequired'},
+            $in->{'flagsrequired'},
+            $in->{'type'}
+        );
+    }
 
     my $borrowernumber;
     my $insecure = C4::Context->preference('insecure');
diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
index b25697c..7d30d2a 100644
--- a/C4/Auth_with_ldap.pm
+++ b/C4/Auth_with_ldap.pm
@@ -165,8 +165,9 @@ sub checkpw_ldap {
 	if (C4::Context->preference('ExtendedPatronAttributes') && $borrowernumber && ($config{update} ||$config{replicate})) {
    		my @types = C4::Members::AttributeTypes::GetAttributeTypes();
 		my @attributes = grep{my $key=$_; any{$_ eq $key}@types;} keys %borrower;
-		my $extended_patron_attributes = map{{code=>$_,value=>$borrower{$_}}}@attributes;
-		my $extended_patron_attributes = [] unless $extended_patron_attributes;
+        my $extended_patron_attributes;
+        @{$extended_patron_attributes} =
+          map { { code => $_, value => $borrower{$_} } } @attributes;
 		my @errors;
 		#Check before add
 		for (my $i; $i< scalar(@$extended_patron_attributes)-1;$i++) {
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 4102e23..89acfd2 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1358,7 +1358,10 @@ sub GetMarcSubjects {
             my $value     = $subject_subfield->[1];
             my $linkvalue = $value;
             $linkvalue =~ s/(\(|\))//g;
-            my $operator = " and " unless $counter == 0;
+            my $operator;
+            if ( $counter != 0 ) {
+                $operator = ' and ';
+            }
             if ( $code eq 9 ) {
                 $found9 = 1;
                 @link_loop = ( { 'limit' => 'an', link => "$linkvalue" } );
@@ -1366,7 +1369,10 @@ sub GetMarcSubjects {
             if ( not $found9 ) {
                 push @link_loop, { 'limit' => 'su', link => $linkvalue, operator => $operator };
             }
-            my $separator = C4::Context->preference("authoritysep") unless $counter == 0;
+            my $separator;
+            if ( $counter != 0 ) {
+                $separator = C4::Context->preference('authoritysep');
+            }
 
             # ignore $9
             my @this_link_loop = @link_loop;
@@ -1424,7 +1430,10 @@ sub GetMarcAuthors {
             my $value        = $authors_subfield->[1];
             my $linkvalue    = $value;
             $linkvalue =~ s/(\(|\))//g;
-            my $operator = " and " unless $count_auth == 0;
+            my $operator;
+            if ( $count_auth != 0 ) {
+                $operator = ' and ';
+            }
 
             # if we have an authority link, use that as the link, otherwise use standard searching
             if ($subfield9) {
@@ -1440,8 +1449,17 @@ sub GetMarcAuthors {
             $value = GetAuthorisedValueDesc( $field->tag(), $authors_subfield->[0], $authors_subfield->[1], '', $tagslib )
               if ( $marcflavour eq 'UNIMARC' and ( $authors_subfield->[0] =~ /4/ ) );
             my @this_link_loop = @link_loop;
-            my $separator = C4::Context->preference("authoritysep") unless $count_auth == 0;
-            push @subfields_loop, { code => $subfieldcode, value => $value, link_loop => \@this_link_loop, separator => $separator } unless ( $authors_subfield->[0] eq '9' );
+            my $separator;
+            if ( $count_auth != 0 ) {
+                $separator = C4::Context->preference('authoritysep');
+            }
+            push @subfields_loop,
+              { code      => $subfieldcode,
+                value     => $value,
+                link_loop => \@this_link_loop,
+                separator => $separator
+              }
+              unless ( $authors_subfield->[0] eq '9' );
             $count_auth++;
         }
         push @marcauthors, { MARCAUTHOR_SUBFIELDS_LOOP => \@subfields_loop };
@@ -1552,13 +1570,25 @@ sub GetMarcSeries {
             my $value     = $series_subfield->[1];
             my $linkvalue = $value;
             $linkvalue =~ s/(\(|\))//g;
-            my $operator = " and " unless $counter == 0;
-            push @link_loop, { link => $linkvalue, operator => $operator };
-            my $separator = C4::Context->preference("authoritysep") unless $counter == 0;
+            if ( $counter != 0 ) {
+                push @link_loop, { link => $linkvalue, operator => ' and ', };
+            } else {
+                push @link_loop, { link => $linkvalue, operator => undef, };
+            }
+            my $separator;
+            if ( $counter != 0 ) {
+                $separator = C4::Context->preference('authoritysep');
+            }
             if ($volume_number) {
                 push @subfields_loop, { volumenum => $value };
             } else {
-                push @subfields_loop, { code => $code, value => $value, link_loop => \@link_loop, separator => $separator, volumenum => $volume_number };
+                push @subfields_loop,
+                  { code      => $code,
+                    value     => $value,
+                    link_loop => \@link_loop,
+                    separator => $separator,
+                    volumenum => $volume_number
+                  };
             }
             $counter++;
         }
@@ -2193,8 +2223,11 @@ sub PrepareItemrecordDisplay {
     my $tagslib = &GetMarcStructure( 1, $frameworkcode );
 
     # return nothing if we don't have found an existing framework.
-    return "" unless $tagslib;
-    my $itemrecord = C4::Items::GetMarcItem( $bibnum, $itemnum ) if ($itemnum);
+    return q{} unless $tagslib;
+    my $itemrecord;
+    if ($itemnum) {
+        $itemrecord = C4::Items::GetMarcItem( $bibnum, $itemnum );
+    }
     my @loop_data;
     my $authorised_values_sth = $dbh->prepare( "SELECT authorised_value,lib FROM authorised_values WHERE category=? ORDER BY lib" );
     foreach my $tag ( sort keys %{$tagslib} ) {
@@ -2233,15 +2266,20 @@ sub PrepareItemrecordDisplay {
                     && C4::Context->preference('itemcallnumber') ) {
                     my $CNtag      = substr( C4::Context->preference('itemcallnumber'), 0, 3 );
                     my $CNsubfield = substr( C4::Context->preference('itemcallnumber'), 3, 1 );
-                    my $temp = $itemrecord->field($CNtag) if ($itemrecord);
-                    if ($temp) {
-                        $defaultvalue = $temp->subfield($CNsubfield);
+                    if ($itemrecord) {
+                        my $temp = $itemrecord->field($CNtag);
+                        if ($temp) {
+                            $defaultvalue = $temp->subfield($CNsubfield);
+                        }
                     }
                 }
                 if (   $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.itemcallnumber'
                     && $defaultvalues
                     && $defaultvalues->{'callnumber'} ) {
-                    my $temp = $itemrecord->field($subfield) if ($itemrecord);
+                    my $temp;
+                    if ($itemrecord) {
+                        $temp = $itemrecord->field($subfield);
+                    }
                     unless ($temp) {
                         $defaultvalue = $defaultvalues->{'callnumber'} if $defaultvalues;
                     }
@@ -2249,7 +2287,10 @@ sub PrepareItemrecordDisplay {
                 if (   ( $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.holdingbranch' || $tagslib->{$tag}->{$subfield}->{kohafield} eq 'items.homebranch' )
                     && $defaultvalues
                     && $defaultvalues->{'branchcode'} ) {
-                    my $temp = $itemrecord->field($subfield) if ($itemrecord);
+                    my $temp;
+                    if ($itemrecord) {
+                        $temp = $itemrecord->field($subfield);
+                    }
                     unless ($temp) {
                         $defaultvalue = $defaultvalues->{branchcode} if $defaultvalues;
                     }
@@ -2332,8 +2373,10 @@ sub PrepareItemrecordDisplay {
             }
         }
     }
-    my $itemnumber = $itemrecord->subfield( $itemtagfield, $itemtagsubfield )
-      if ( $itemrecord && $itemrecord->field($itemtagfield) );
+    my $itemnumber;
+    if ( $itemrecord && $itemrecord->field($itemtagfield) ) {
+        $itemnumber = $itemrecord->subfield( $itemtagfield, $itemtagsubfield );
+    }
     return {
         'itemtagfield'    => $itemtagfield,
         'itemtagsubfield' => $itemtagsubfield,
diff --git a/C4/Budgets.pm b/C4/Budgets.pm
index 005bba8..27dd146 100644
--- a/C4/Budgets.pm
+++ b/C4/Budgets.pm
@@ -587,7 +587,10 @@ sub GetBudgetHierarchy {
 # add budget-percent and allocation, and flags for html-template
 	foreach my $r (@sort) {
 		my $subs_href = $r->{'child'};
-        my @subs_arr = @$subs_href if defined $subs_href;
+        my @subs_arr = ();
+        if ( defined $subs_href ) {
+            @subs_arr = @{$subs_href};
+        }
 
         my $moo = $r->{'budget_code_indent'};
         $moo =~ s/\ /\&nbsp\;/g;
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 5414adb..4454c5b 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -322,12 +322,14 @@ sub SendAlerts {
         $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
         $letter->{content} =~
           s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-        foreach my $data (@$dataorders) {
-            my $line = $1 if ( $letter->{content} =~ m/(<<.*>>)/ );
-            foreach my $field ( keys %$data ) {
-                $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
+        foreach my $data ( @{$dataorders} ) {
+            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
+                my $line = $1;
+                foreach my $field ( keys %{$data} ) {
+                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
+                }
+                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
             }
-            $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
         }
         $letter->{content} =~ s/<<[^>]*>>//g;
         my $innerletter = $letter;
@@ -390,12 +392,14 @@ sub SendAlerts {
         $letter->{content} =~ s/<<LibrarianSurname>>/$userenv->{surname}/g;
         $letter->{content} =~
           s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
-        foreach my $data (@$dataorders) {
-            my $line = $1 if ( $letter->{content} =~ m/(<<.*>>)/ );
-            foreach my $field ( keys %$data ) {
-                $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
+        foreach my $data ( @{$dataorders} ) {
+            if ( $letter->{content} =~ m/(<<.*>>)/ ) {
+                my $line = $1;
+                foreach my $field ( keys %{$data} ) {
+                    $line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
+                }
+                $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
             }
-            $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
         }
         $letter->{content} =~ s/<<[^>]*>>//g;
         my $innerletter = $letter;
diff --git a/C4/Members.pm b/C4/Members.pm
index 4c1d37c..102cf1a 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1097,9 +1097,11 @@ sub GetMemberAccountRecords {
     $sth->execute( @bind );
     my $total = 0;
     while ( my $data = $sth->fetchrow_hashref ) {
-		my $biblio = GetBiblioFromItemNumber($data->{itemnumber}) if $data->{itemnumber};
-		$data->{biblionumber} = $biblio->{biblionumber};
-	        $data->{title} = $biblio->{title};
+        if ( $data->{itemnumber} ) {
+            my $biblio = GetBiblioFromItemNumber( $data->{itemnumber} );
+            $data->{biblionumber} = $biblio->{biblionumber};
+            $data->{title}        = $biblio->{title};
+        }
         $acctlines[$numlines] = $data;
         $numlines++;
         $total += int(1000 * $data->{'amountoutstanding'}); # convert float to integer to avoid round-off errors
diff --git a/C4/Record.pm b/C4/Record.pm
index 497c03d..61da777 100644
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -266,12 +266,19 @@ sub marc2modsxml {
 sub marc2endnote {
     my ($marc) = @_;
 	my $marc_rec_obj =  MARC::Record->new_from_usmarc($marc);
-	my $f260 = $marc_rec_obj->field('260');
-	my $f260a = $f260->subfield('a') if $f260;
+    my ( $abstract, $f260a, $f710a );
+    my $f260 = $marc_rec_obj->field('260');
+    if ($f260) {
+        $f260a = $f260->subfield('a') if $f260;
+    }
     my $f710 = $marc_rec_obj->field('710');
-    my $f710a = $f710->subfield('a') if $f710;
-	my $f500 = $marc_rec_obj->field('500');
-	my $abstract = $f500->subfield('a') if $f500;
+    if ($f710) {
+        $f710a = $f710->subfield('a');
+    }
+    my $f500 = $marc_rec_obj->field('500');
+    if ($f500) {
+        $abstract = $f500->subfield('a');
+    }
 	my $fields = {
 		DB => C4::Context->preference("LibraryName"),
 		Title => $marc_rec_obj->title(),	
-- 
1.7.3.2


From colin.campbell at ptfs-europe.com  Mon Nov 29 19:09:07 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 29 Nov 2010 18:09:07 +0000
Subject: [Koha-patches] Pull Request
Message-ID: <4CF3EC43.8000706@ptfs-europe.com>

The seven patches posted earlier to address bug 5453 can be pulled from
branch bug_5453 at git://github.com/colinsc/koha.git


-- 
Colin Campbell
Chief Software Engineer,
PTFS Europe Limited
Content Management and Library Solutions
+44 (0) 208 366 1295 (phone)
+44 (0) 7759 633626  (mobile)
colin.campbell at ptfs-europe.com
skype: colin_campbell2

http://www.ptfs-europe.com

From ian.walls at bywatersolutions.com  Tue Nov 30 15:38:51 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Tue, 30 Nov 2010 09:38:51 -0500
Subject: [Koha-patches] [PATCH] [SIGNED OFF] bug 5293 remove references to
	email on suggestions
Message-ID: <1291127931-16329-1-git-send-email-ian.walls@bywatersolutions.com>

From: Nicole Engard <nengard at bywatersolutions.com>

The purchase suggestions form in the opac says it will
send an email to the patron, but there is no such functionality
so I've removed that reference.

Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
---
 .../prog/en/modules/opac-suggestions.tmpl          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index ab5b753..3c8dd47 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -74,8 +74,8 @@ $.tablesorter.addParser({
 <!-- TMPL_IF name="op_add" -->
     <h1>Enter a new purchase suggestion</h1>
 
-    <p>Please fill out this form to make a purchase suggestion. You will receive an email when the library processes your suggestion</p>
-    <p>Only the title is required, but the more information you enter the easier it will be for the librarians to find title you're requesting. The "Notes" field can be used to provide any additional information.</p>
+    <p>Please fill out this form to make a purchase suggestion. You can follow the progress of your suggestion by going to 'my purchase suggestions' once you are logged in.</p>
+    <p>Only the title is required, but the more information you enter the easier it will be for the librarians to find title you're requesting. The 'Notes' field can be used to provide any additional information.</p>
     <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
    <fieldset class="rows"> <ol>
     <li><label class="required" for="title">Title:</label><input type="text" id="title" name="title" size="50" maxlength="80" /></li>
-- 
1.5.6.5


From paul.poulain at biblibre.com  Tue Nov 30 15:54:32 2010
From: paul.poulain at biblibre.com (Paul Poulain)
Date: Tue, 30 Nov 2010 15:54:32 +0100
Subject: [Koha-patches] [PATCH] [SIGNED OFF] bug 5293 remove references
 to	email on suggestions
In-Reply-To: <1291127931-16329-1-git-send-email-ian.walls@bywatersolutions.com>
References: <1291127931-16329-1-git-send-email-ian.walls@bywatersolutions.com>
Message-ID: <4CF51028.5000207@biblibre.com>

Le 30/11/2010 15:38, Ian Walls a ?crit :
> From: Nicole Engard <nengard at bywatersolutions.com>
>
> The purchase suggestions form in the opac says it will
> send an email to the patron, but there is no such functionality
> so I've removed that reference.
??? There used to be mails on accepting the suggestion, placing the
order and receiving the order. Has this code disappeared ?

-- 
Paul POULAIN
http://www.biblibre.com
Expert en Logiciels Libres pour l'info-doc
Tel : (33) 4 91 81 35 08


From cnighswonger at foundations.edu  Tue Nov 30 15:57:55 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Tue, 30 Nov 2010 09:57:55 -0500
Subject: [Koha-patches] [PATCH] [SIGNED OFF] bug 5293 remove references
 to email on suggestions
In-Reply-To: <4CF51028.5000207@biblibre.com>
References: <1291127931-16329-1-git-send-email-ian.walls@bywatersolutions.com>
	<4CF51028.5000207@biblibre.com>
Message-ID: <AANLkTinuutEV1w44=Z+c__6uOqvQbNPo2dUfnJiYbBiA@mail.gmail.com>

On Tue, Nov 30, 2010 at 9:54 AM, Paul Poulain <paul.poulain at biblibre.com>wrote:

> Le 30/11/2010 15:38, Ian Walls a ?crit :
> > From: Nicole Engard <nengard at bywatersolutions.com>
> >
> > The purchase suggestions form in the opac says it will
> > send an email to the patron, but there is no such functionality
> > so I've removed that reference.
> ??? There used to be mails on accepting the suggestion, placing the
> order and receiving the order. Has this code disappeared ?
>
>
I think bugs 4211 and 5127 both touch upon this and fix it iirc.

Kind Regards,
Chris
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101130/6796ce27/attachment.htm>

From ian.walls at bywatersolutions.com  Tue Nov 30 16:06:00 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Tue, 30 Nov 2010 10:06:00 -0500
Subject: [Koha-patches] [PATCH] [SIGNED OFF] bug 5293 remove references
 to email on suggestions
In-Reply-To: <AANLkTinuutEV1w44=Z+c__6uOqvQbNPo2dUfnJiYbBiA@mail.gmail.com>
References: <1291127931-16329-1-git-send-email-ian.walls@bywatersolutions.com>
	<4CF51028.5000207@biblibre.com>
	<AANLkTinuutEV1w44=Z+c__6uOqvQbNPo2dUfnJiYbBiA@mail.gmail.com>
Message-ID: <AANLkTikd2PfLfbibd_j85RO=rmP=_ViN5SvR6nhzHd8b@mail.gmail.com>

Delightful, thank you all!  This was an older patch I'd rebased, and it's
nice to know it's no longer necessary.


-Ian

On Tue, Nov 30, 2010 at 9:57 AM, Chris Nighswonger <
cnighswonger at foundations.edu> wrote:

>
>
> On Tue, Nov 30, 2010 at 9:54 AM, Paul Poulain <paul.poulain at biblibre.com>wrote:
>
>> Le 30/11/2010 15:38, Ian Walls a ?crit :
>> > From: Nicole Engard <nengard at bywatersolutions.com>
>> >
>> > The purchase suggestions form in the opac says it will
>> > send an email to the patron, but there is no such functionality
>> > so I've removed that reference.
>> ??? There used to be mails on accepting the suggestion, placing the
>> order and receiving the order. Has this code disappeared ?
>>
>>
> I think bugs 4211 and 5127 both touch upon this and fix it iirc.
>
> Kind Regards,
> Chris
>
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
> website : http://www.koha-community.org/
> git : http://git.koha-community.org/
> bugs : http://bugs.koha-community.org/
>



-- 
Ian Walls
Lead Development Specialist
ByWater Solutions
Phone # (888) 900-8944
http://bywatersolutions.com
ian.walls at bywatersolutions.com
Twitter: @sekjal
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/koha-patches/attachments/20101130/ec569429/attachment.htm>

From ian.walls at bywatersolutions.com  Tue Nov 30 16:14:23 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Tue, 30 Nov 2010 10:14:23 -0500
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5402,
	"add to cart" shown on checkbox hover
Message-ID: <1291130063-16872-1-git-send-email-ian.walls@bywatersolutions.com>

From: Owen Leonard <oleonard at myacpl.org>

This patch removes the title hint altogether. The checkbox might
be used for the cart, lists, holds, or tags, and expressing this
in a title hint seems overly complicated.

Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
---
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index aa39b9a..cfd5e36 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -367,9 +367,9 @@ $(document).ready(function(){
                 <tr>
             <!-- /TMPL_UNLESS -->
 
-                <td class="select selectcol"><!--TMPL_IF NAME="opacbookbag" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to cart" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="virtualshelves" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to cart" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="RequestOnOpac" --><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to cart" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></td>
+                <td class="select selectcol"><!--TMPL_IF NAME="opacbookbag" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- TMPL_ELSE -->
+<!-- TMPL_IF NAME="virtualshelves" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- TMPL_ELSE -->
+<!-- TMPL_IF NAME="RequestOnOpac" --><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></td>
                 <td class="select selectcol"><!-- TMPL_VAR NAME="result_number" -->.</td>
 
 				<!-- TMPL_UNLESS NAME="item-level_itypes" -->
-- 
1.5.6.5


From ian.walls at bywatersolutions.com  Tue Nov 30 19:20:40 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Tue, 30 Nov 2010 13:20:40 -0500
Subject: [Koha-patches] [PATCH] Bug 5460: AutoEmailPrimaryAddress set to
	invalid value in sysprefs.sql
Message-ID: <1291141240-18263-1-git-send-email-ian.walls@bywatersolutions.com>

Fixes de-DE, en, fr-FR, pl-PL, ru-RU and uk-UA default install values for this system preference (changing from '0'
to 'OFF', the preferred value).

Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
---
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    2 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    2 +-
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    2 +-
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    2 +-
 ...m_preferences_full_optimal_for_install_only.sql |    2 +-
 ...m_preferences_full_optimal_for_install_only.sql |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
index 07f8567..96ded44 100644
--- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql
+++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql
@@ -181,7 +181,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RandomizeHoldsQueueWeight','0','if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaticHoldsQueueWeight','0','Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailOpacUser','0','Sends notification emails containing new account details to patrons - when account is created.',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','0','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','OFF','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
 
 -- Tags and BakerTaylor (note field order differs from above)
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index 214d198..d4fb9a2 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -182,7 +182,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RandomizeHoldsQueueWeight','0','if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaticHoldsQueueWeight','0','Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailOpacUser','0','Sends notification emails containing new account details to patrons - when account is created.',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','0','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','OFF','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
 
 -- Tags and BakerTaylor (note field order differs from above)
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index 1be8d7d..8be770a 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -186,7 +186,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RandomizeHoldsQueueWeight','0','if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight',NULL,'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('StaticHoldsQueueWeight','0','Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailOpacUser','0','Envoie des notifications par mail lors de l''inscription de nouveaux lecteurs. ',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','0','D?finit l''adresse utilis?e par d?faut utilis?e lors des envois de mail ','email|emailpro|B_email|cardnumber|OFF','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','OFF','D?finit l''adresse utilis?e par d?faut utilis?e lors des envois de mail ','email|emailpro|B_email|cardnumber|OFF','Choice');
 
 -- Tags and BakerTaylor (note field order differs from above)
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
index 1735fe5..06f0801 100644
--- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql
@@ -181,7 +181,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RandomizeHoldsQueueWeight','0','if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaticHoldsQueueWeight','0','Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailOpacUser','0','Sends notification emails containing new account details to patrons - when account is created.',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','0','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','OFF','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
 
 -- Tags and BakerTaylor (note field order differs from above)
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
index 9fc7690..33aabfd 100644
--- a/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
@@ -209,7 +209,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RandomizeHoldsQueueWeight','0','if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaticHoldsQueueWeight','0','Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailOpacUser','0','Sends notification emails containing new account details to patrons - when account is created.',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','0','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','OFF','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
 
 -- Tags and BakerTaylor (note field order differs from above)
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
diff --git a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
index 607a9ec..eb430ac 100644
--- a/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ b/installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
@@ -235,7 +235,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RandomizeHoldsQueueWeight','0','if ON, the holds queue in circulation will be randomized, either based on all location codes, or by the location codes specified in StaticHoldsQueueWeight',NULL,'YesNo');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('StaticHoldsQueueWeight','0','Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective',NULL,'Integer');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailOpacUser','0','Sends notification emails containing new account details to patrons - when account is created.',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','0','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AutoEmailPrimaryAddress','OFF','Defines the default email address where \'Account Details\' emails are sent.','email|emailpro|B_email|cardnumber|OFF','Choice');
 
 -- Tags and BakerTaylor (note field order differs from above)
 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES
-- 
1.5.6.5


From nengard at bywatersolutions.com  Tue Nov 30 08:19:49 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Tue, 30 Nov 2010 02:19:49 -0500
Subject: [Koha-patches] [PATCH] [SIGNED OFF] Bug 4449:
	AllowHoldPolicyOverride does not override all hold policies
Message-ID: <1291101589-3247-1-git-send-email-nengard@bywatersolutions.com>

From: Ian Walls <ian.walls at bywatersolutions.com>

This patch provides a universal override to any hold policy if the AllowHoldPolicyOverride is set.
Amongst other overrides, this patch allows missing, non-checked out items to be placed on hold even with AllowShelfHolds turned off.

Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
---
 reserve/request.pl |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/reserve/request.pl b/reserve/request.pl
index 859a65b..7e51364 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -435,6 +435,9 @@ foreach my $biblionumber (@biblionumbers) {
                     $item->{available} = 1;
                     $num_available++;
                 }
+            } elsif (C4::Context->preference( 'AllowHoldPolicyOverride' ) ) {
+                    $item->{override} = 1;
+                    $num_override++;
             }
             # If none of the conditions hold true, then neither override nor available is set and the item cannot be checked
             
-- 
1.5.6.5


From nengard at bywatersolutions.com  Tue Nov 30 08:25:30 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Tue, 30 Nov 2010 02:25:30 -0500
Subject: [Koha-patches] [PATCH] Fixes bug 5232: Shelfname won't display on
	high-numbered lists
Message-ID: <1291101930-3333-1-git-send-email-nengard@bywatersolutions.com>

From: Ian Walls <ian.walls at bywatersolutions.com>

This bugfix adds an explicit GetShelf for the specific shelfnumber when viewing that individual shelfnumber.  This captures the
shelfname, which was originally pulled from shelflist->{$shelfnumber}, which may not have been populated if the List in question was
beyond the 20th private or public list in the system.

Also adds a more explicit sort: the sort from the CGI takes top priority, then it falls back to the default sort for the list, and
ultimate falls to 'title' if neither CGI nor default sort exist.

Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
---
 C4/VirtualShelves/Page.pm |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index e772db8..80d8f3c 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -174,13 +174,22 @@ sub shelfpage ($$$$$) {
             last SWITCH;
         }
         if ( $shelfnumber = $query->param('viewshelf') ) {
+            # explicitly fetch this shelf
+            my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
 
             #check that the user can view the shelf
             if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) {
                 my $items;
                 my $authorsort;
                 my $yearsort;
-                my $sortfield = ( $query->param('sortfield') ? $query->param('sortfield') : 'title' );
+                my $sortfield;
+                if ( $query->param('sortfield')) {
+                   $sortfield = $query->param('sortfield');
+                } elsif ($sorton) {
+                   $sortfield = $sorton;
+                } else {
+                   $sortfield = 'title';
+                }
                 if ( $sortfield eq 'author' ) {
                     $authorsort = 'author';
                 }
@@ -210,7 +219,7 @@ sub shelfpage ($$$$$) {
                 my $i = 0;
                 my $manageshelf = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' );
                 $template->param(
-                    shelfname => $shelflist->{$shelfnumber}->{'shelfname'} || $privshelflist->{$shelfnumber}->{'shelfname'},
+                    shelfname   => $shelfname,
                     shelfnumber => $shelfnumber,
                     viewshelf   => $shelfnumber,
                     authorsort  => $authorsort,
-- 
1.5.6.5