[% resultsloo.cardnumber %]	[% resultsloo.surname %], [% resultsloo.firstname %]	[% resultsloo.branchcode %]	Add
Add

[% IF ( issues_count ) %] - + @@ -254,7 +273,7 @@ $.tablesorter.addParser({ [% END %] [% IF ( OpacRenewalAllowed ) %] [% UNLESS ( ISSUE.patron_flagged ) %] - @@ -269,14 +288,15 @@ $.tablesorter.addParser({ [% END %]

[% IF ( ISSUE.status ) %]Renew ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining) +

[% IF ( ISSUE.status ) %] Renew ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining) [% ELSE %] Not renewable[% IF ( ISSUE.too_many ) %] ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)[% ELSE %][% IF ( ISSUE.on_reserve ) %] (On hold)[% END %][% END %] [% END %]

Billing Place:

Delivery Place:

-- 1.7.4.1 From chrisc at catalyst.net.nz Fri Jul 8 00:04:42 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Fri, 8 Jul 2011 10:04:42 +1200 Subject: [Koha-patches] [PATCH] Bug 5009 : Turning off autocomplete Message-ID: <1310076282-27746-1-git-send-email-chrisc@catalyst.net.nz> Files affected koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt --- .../intranet-tmpl/prog/en/includes/cat-search.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/circ-search.inc | 2 +- .../prog/en/includes/patron-search.inc | 2 +- .../prog/en/modules/circ/circulation.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc index a74e2fd..379cc56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -48,7 +48,7 @@ YAHOO.util.Event.onContentReady("header_search", function() { [% IF ( CAN_user_circulate ) %]

You have nothing checked out

@@ -254,7 +273,7 @@ $.tablesorter.addParser({ [% END %] [% IF ( OpacRenewalAllowed ) %] [% UNLESS ( ISSUE.patron_flagged ) %] - @@ -269,14 +288,15 @@ $.tablesorter.addParser({ [% END %]

[% IF ( ISSUE.status ) %]Renew ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining) +

- + [% IF ( canrenew ) %] [% IF ( OpacRenewalAllowed ) %] [% END %] + [% END %] [% IF ( OpacRenewalAllowed ) %] - - [% END %] + [% END %] [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/prog/images/check.png b/koha-tmpl/opac-tmpl/prog/images/check.png new file mode 100644 index 0000000000000000000000000000000000000000..249805717f1de5b22c8c1f6a7e2ea415da552ea2 GIT binary patch literal 210 zcmeAS at N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdEa{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=?1^9%xns;yg|Nno0&Gg4W5vGzL zzu^B2Pq!O*0eLQ-E{-7;w~`WC7#kRp8ZI+1vZNXs7%;I2Fe@|9ICy|Vz=0=0Prw)` yFoVfZf|03%QHhm>f$<2#b$*~!!Dj|09tLg}2HUjyoo9gNF?hQAxvXoWax8 K&t;ucLK6U at T|m_U literal 0 HcmV?d00001 diff --git a/opac/opac-user.pl b/opac/opac-user.pl index a2f7d9b..3f0d6c4 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -112,6 +112,7 @@ my @overdues; my @issuedat; my $itemtypes = GetItemTypes(); my ($issues) = GetPendingIssues($borrowernumber); +my $canrenew = 0; if ($issues){ foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) { # check for reserves @@ -140,7 +141,10 @@ if ($issues){ # check if item is renewable my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} ); ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'}); - $issue->{'status'} = $status && C4::Context->preference("OpacRenewalAllowed"); + if($status && C4::Context->preference("OpacRenewalAllowed")){ + $issue->{'status'} = $status; + $canrenew = 1; + } $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many'; $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve'; @@ -179,7 +183,7 @@ if ($issues){ } $template->param( ISSUES => \@issuedat ); $template->param( issues_count => $count ); - +$template->param( canrenew => $canrenew ); $template->param( OVERDUES => \@overdues ); $template->param( overdues_count => $overdues_count ); -- 1.7.0.4 From jonathan.druart at biblibre.com Fri Jul 8 10:45:07 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Fri, 8 Jul 2011 10:45:07 +0200 Subject: [Koha-patches] [PATCH] [PATCH] Bug 6080: total is wrong in acqui-home.pl Message-ID: <1310114707-14794-1-git-send-email-jonathan.druart@biblibre.com> In Acqui-home, with hierarchic bugdets, it's a non sense to do total & sub-totals: we're adding budgets more than once. For example : Books 1000 fictions books 500 NF books 500 result in a total of 2000 ! This patch removes the total BibLibre MT5446 --- acqui/acqui-home.pl | 16 ---------------- .../prog/en/modules/acqui/acqui-home.tt | 11 ----------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index 0d9c207..74d504e 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -82,12 +82,6 @@ my $budget_arr = GetBudgetHierarchy( '', $user->{branchcode}, $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'} ); -my $total = 0; -my $totspent = 0; -my $totordered = 0; -my $totcomtd = 0; -my $totavail = 0; - my $total_active = 0; my $totspent_active = 0; my $totordered_active = 0; @@ -121,11 +115,6 @@ foreach my $budget ( @{$budget_arr} ) { $budget->{'budget_avail'} = $budget->{'budget_amount'} - ( $budget->{'budget_spent'} + $budget->{'budget_ordered'} ); - $total += $budget->{'budget_amount'}; - $totspent += $budget->{'budget_spent'}; - $totordered += $budget->{'budget_ordered'}; - $totavail += $budget->{'budget_avail'}; - if ($budget->{budget_period_active}){ $total_active += $budget->{'budget_amount'}; $totspent_active += $budget->{'budget_spent'}; @@ -142,11 +131,6 @@ $template->param( type => 'intranet', loop_budget => $budget_arr, branchname => $branchname, - total => $num_formatter->format_price($total), - totspent => $num_formatter->format_price($totspent), - totordered => $num_formatter->format_price($totordered), - totcomtd => $num_formatter->format_price($totcomtd), - totavail => $num_formatter->format_price($totavail), total_active => $num_formatter->format_price($total_active), totspent_active => $num_formatter->format_price($totspent_active), totordered_active => $num_formatter->format_price($totordered_active), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index a274365..87343bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -99,17 +99,6 @@ $(document).ready(function() { - - - - - - - - - - - [% FOREACH loop_budge IN loop_budget %] [% IF ( loop_budge.budget_period_active ) %] -- 1.7.1 From julian.maurice at biblibre.com Fri Jul 8 10:59:23 2011 From: julian.maurice at biblibre.com (Julian Maurice) Date: Fri, 8 Jul 2011 10:59:23 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Corrects the popup menu links in the z3950 search results. Message-ID: <1310115563-6768-1-git-send-email-julian.maurice@biblibre.com> From: Fr?d?rick Capovilla The popup menu's options didn't link to the correct breedingid. Signed-off-by: Julian Maurice --- .../prog/en/modules/acqui/z3950_search.tmpl | 5 +++-- .../prog/en/modules/cataloguing/z3950_search.tmpl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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..452c1f8 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 @@ -38,6 +38,9 @@ $.tablesorter.addParser({ var $tgt = $(event.target); $(".linktools").hide(); $("tr").removeClass("selected"); + var row = $(this).parent(); + row.addClass("selected"); + if($tgt.is("a")||$tgt.is(":nth-child(5)")||$tgt.is(":nth-child(6)")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")){ return true; } else { @@ -46,8 +49,6 @@ $.tablesorter.addParser({ var left = position.left+5; $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left); } - var row = $(this).parent(); - row.addClass("selected"); }); }); //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl index d4b292f..b669d22 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl @@ -42,6 +42,9 @@ $(document).ready(function(){ var $tgt = $(event.target); $(".linktools").hide(); $("tr").removeClass("selected"); + var row = $(this).parent(); + row.addClass("selected"); + if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){ return true; } else { @@ -50,8 +53,6 @@ $(document).ready(function(){ var left = position.left+5; $(".linktools",row).show().css("position","absolute").css("top",top).css("left",left); } - var row = $(this).parent(); - row.addClass("selected"); }); $("form[name='f']").submit(function(){ if ($('input[type=checkbox]').filter(':checked').length == 0) { -- 1.7.5.4 From stephane.delaune at biblibre.com Fri Jul 8 11:13:56 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Fri, 8 Jul 2011 11:13:56 +0200 Subject: [Koha-patches] [PATCH][SIGNED-OFF] Bug 5871 : opac CSS new classes Message-ID: <1310116436-15960-1-git-send-email-stephane.delaune@biblibre.com> From: Paul Poulain Some new classes for OPAC css Signed-off-by: St?phane Delaune --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 35 ++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index b8a531f..0aefa86 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -2000,6 +2000,41 @@ div.ft { .searchresults .commentline.yours { background-color : rgb(239, 254, 213); background-color : rgba(239, 254, 213, 0.4); + +select.advsearch { + margin-left:5em; +} +select.advsearchoperator { + position:absolute; +} + +.authorSearch { + position: absolute; + display: none; + z-index: 2; + background-color: white; + border: 1px solid black; + padding: 4px; +} +.authorSearch li { + list-style-type: none; +} +.authorSearch ul { + padding-left: 0px; +} +.subjectSearch { + position: absolute; + display: none; + z-index: 2; + background-color: white; + border: 1px solid black; + padding: 4px; +} +.subjectSearch li { + list-style-type: none; +} +.subjectSearch ul { + padding-left: 0px; } #plainmarc table { border: 0; margin: .7em 0 0 0; font-family: monospace; font-size: 95%; } -- 1.7.0.4 From jonathan.druart at biblibre.com Fri Jul 8 11:14:30 2011 From: jonathan.druart at biblibre.com (Jonathan Druart) Date: Fri, 8 Jul 2011 11:14:30 +0200 Subject: [Koha-patches] [PATCH] [PATCH] BZ7076: acqui pdf error when marcxml wrong Message-ID: <1310116470-15641-1-git-send-email-jonathan.druart@biblibre.com> when marcxml is wrong the PDF is not generated. There is a Perl error because the biblio can't be retrieved. This can be workarounded with a eval when decoding the marc --- acqui/basketgroup.pl | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index 457b616..0211c24 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -226,10 +226,13 @@ sub printbasketgrouppdf{ push(@ba_orders, \@ba_order); # Editor Number my $en; - if (C4::Context->preference("marcflavour") eq 'UNIMARC') { - $en = MARC::Record::new_from_xml($ord->{marcxml},'UTF-8')->subfield('345',"b"); - } elsif (C4::Context->preference("marcflavour") eq 'MARC21') { - $en = MARC::Record::new_from_xml($ord->{marcxml},'UTF-8')->subfield('037',"a"); + my $marcrecord=eval{MARC::Record::new_from_xml( $ord->{marcxml},'UTF-8' )}; + if ($marcrecord){ + if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) { + $en = $marcrecord->subfield( '345', "b" ); + } elsif ( C4::Context->preference("marcflavour") eq 'MARC21' ) { + $en = $marcrecord->subfield( '037', "a" ); + } } if($en){ push(@ba_order, $en); -- 1.7.1 From julian.maurice at biblibre.com Fri Jul 8 11:33:10 2011 From: julian.maurice at biblibre.com (Julian Maurice) Date: Fri, 8 Jul 2011 11:33:10 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6474 Barcode not incrementing properly in format HBYYMMINCR if HB contains - Message-ID: <1310117590-7551-1-git-send-email-julian.maurice@biblibre.com> From: Sophie Meynieux Adding - to regexp for matching branch code. Wondering if other characters should not be added too. Signed-off-by: Julian Maurice --- cataloguing/value_builder/barcode.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl index c05ec48..c5e1fd3 100755 --- a/cataloguing/value_builder/barcode.pl +++ b/cataloguing/value_builder/barcode.pl @@ -102,7 +102,7 @@ sub plugin_javascript { $year = substr($year, -2); $query = "SELECT MAX(CAST(SUBSTRING(barcode,-4) AS signed)) AS number FROM items WHERE barcode REGEXP ?"; my $sth = $dbh->prepare($query); - $sth->execute("^[a-zA-Z]{1,}$year"); + $sth->execute("^[-a-zA-Z]{1,}$year"); while (my ($count)= $sth->fetchrow_array) { $nextnum = $count if $count; $nextnum = 0 if $nextnum == 9999; # this sequence only allows for cataloging 10000 books per month -- 1.7.5.4 From stephane.delaune at biblibre.com Fri Jul 8 11:55:46 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Fri, 8 Jul 2011 11:55:46 +0200 Subject: [Koha-patches] [PATCH 1/2][NEEDS SIGNOFF] Bug #6142 - Delete sub CanBookBeReserved Message-ID: <1310118947-23931-1-git-send-email-stephane.delaune@biblibre.com> From: Alex Arnaud Signed-off-by: St?phane Delaune --- C4/ILSDI/Utility.pm | 49 ------------------------------------------------- 1 files changed, 0 insertions(+), 49 deletions(-) diff --git a/C4/ILSDI/Utility.pm b/C4/ILSDI/Utility.pm index 8ee1224..274a266 100644 --- a/C4/ILSDI/Utility.pm +++ b/C4/ILSDI/Utility.pm @@ -67,55 +67,6 @@ sub BorrowerExists { return $sth->fetchrow; } -=head2 CanBookBeReserved - -Checks if a book (at bibliographic level) can be reserved by a borrower. - - if ( CanBookBeReserved($borrower, $biblionumber) ) { - # Do stuff - } - -=cut - -sub CanBookBeReserved { - my ( $borrower, $biblionumber ) = @_; - - my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves"); - my $MAXOUTSTANDING = C4::Context->preference("maxoutstanding"); - - my $out = 1; - - if ( $borrower->{'amountoutstanding'} > $MAXOUTSTANDING ) { - $out = undef; - } - if ( $borrower->{gonenoaddress} eq 1 ) { - $out = undef; - } - if ( $borrower->{lost} eq 1 ) { - $out = undef; - } - if ( $borrower->{debarred} eq 1 ) { - $out = undef; - } - my @reserves = GetReservesFromBorrowernumber( $borrower->{'borrowernumber'} ); - if ( $MAXIMUM_NUMBER_OF_RESERVES && scalar(@reserves) >= $MAXIMUM_NUMBER_OF_RESERVES ) { - $out = undef; - } - foreach my $res (@reserves) { - if ( $res->{'biblionumber'} == $biblionumber ) { - $out = undef; - } - } - my $issues = GetPendingIssues( $borrower->{'borrowernumber'} ); - foreach my $issue (@$issues) { - if ( $issue->{'biblionumber'} == $biblionumber ) { - $out = undef; - } - } - - return $out; -} - =head2 Availability Returns, for an itemnumber, an array containing availability information. -- 1.7.0.4 From stephane.delaune at biblibre.com Fri Jul 8 11:55:47 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Fri, 8 Jul 2011 11:55:47 +0200 Subject: [Koha-patches] [PATCH 2/2] Bug #6142 - Followup Delete sub CanBookBeReserved In-Reply-To: <1310118947-23931-1-git-send-email-stephane.delaune@biblibre.com> References: <1310118947-23931-1-git-send-email-stephane.delaune@biblibre.com> Message-ID: <1310118947-23931-2-git-send-email-stephane.delaune@biblibre.com> delete function's reference on @EXPORT Signed-off-by: St?phane Delaune --- C4/ILSDI/Utility.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/C4/ILSDI/Utility.pm b/C4/ILSDI/Utility.pm index 274a266..152fb41 100644 --- a/C4/ILSDI/Utility.pm +++ b/C4/ILSDI/Utility.pm @@ -38,7 +38,7 @@ BEGIN { require Exporter; @ISA = qw(Exporter); @EXPORT = qw( - &BorrowerExists &CanBookBeReserved &Availability + &BorrowerExists &Availability ); } -- 1.7.0.4 From sjohnson at hpplnj.org Fri Jul 8 11:56:15 2011 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Fri, 8 Jul 2011 05:56:15 -0400 Subject: [Koha-patches] Out of office Message-ID: I will be out of the office beginning Friday July 1st and will return on Wednesday July 20th, If you need assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From christophe.croullebois at biblibre.com Fri Jul 8 12:02:28 2011 From: christophe.croullebois at biblibre.com (Christophe Croullebois) Date: Fri, 8 Jul 2011 12:02:28 +0200 Subject: [Koha-patches] [PATCH 1/1] Bug 6566 Checking if DB's records are properly indexed Message-ID: <1310119348-31064-1-git-send-email-christophe.croullebois@biblibre.com> Small script that checks that each biblio in the DB is properly indexed (MT #6389) --- misc/migration_tools/checkNonIndexedBiblios.pl | 69 ++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) create mode 100755 misc/migration_tools/checkNonIndexedBiblios.pl diff --git a/misc/migration_tools/checkNonIndexedBiblios.pl b/misc/migration_tools/checkNonIndexedBiblios.pl new file mode 100755 index 0000000..7bfede5 --- /dev/null +++ b/misc/migration_tools/checkNonIndexedBiblios.pl @@ -0,0 +1,69 @@ +#!/usr/bin/perl +# Small script that checks that each biblio in the DB is properly indexed + +use strict; + +use warnings; + +BEGIN { + + # find Koha's Perl modules + # test carefully before changing this + use FindBin; + eval { require "$FindBin::Bin/kohalib.pl" }; +} + +# Koha modules used +use MARC::Record; +use C4::Context; +use C4::Search; +use Time::HiRes qw(gettimeofday); + +use Getopt::Long; +my ( $input_marc_file, $number ) = ( '', 0 ); +my ( $version, $confirm, $zebraqueue, $silent ); +GetOptions( + 'c' => \$confirm, + 'h' => \$version, + 'z' => \$zebraqueue, + 's' => \$silent +); + +if ( $version || ( !$confirm ) ) { + print < shows this screen) +\t./batchCheckNonIndexedBiblios.pl -c (c like confirm => check all records (may be long) +\t-t => test only, change nothing in DB +EOF + ; + exit; +} + +my $dbh = C4::Context->dbh; +my $i = 0; +my $starttime = time(); + +$| = 1; # flushes output +$starttime = gettimeofday; + +my $sth = $dbh->prepare("SELECT biblionumber FROM biblio"); +my $sth_insert = $dbh->prepare("INSERT INTO zebraqueue (biblio_auth_number,operation,server,done) VALUES (?,'specialUpdate','biblioserver',0)"); +$sth->execute; +my ($nbhits); +while ( my ($biblionumber) = $sth->fetchrow ) { + (undef,undef,$nbhits) = SimpleSearch("Local-number=$biblionumber"); + print "biblionumber $biblionumber not indexed\n" unless $nbhits; + $sth_insert->execute($biblionumber) if $zebraqueue and !$nbhits; + $i++; + print "$i done\n" unless $i % 1000; +} + -- 1.7.0.4 From henridamien.laurent at biblibre.com Fri Jul 8 12:22:35 2011 From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT) Date: Fri, 8 Jul 2011 12:22:35 +0200 Subject: [Koha-patches] [PATCH] bug 6568 problem in SQL generated Message-ID: <1310120555-1258-1-git-send-email-henridamien.laurent@biblibre.com> Problem on GetPendingIssues When no @borrowernumber sent in GetPendingIssues SQL generated is wrong. This patch is fixing that and adds some testing on relissues lists --- C4/Members.pm | 1 + circ/circulation.pl | 20 +++++++++++--------- members/moremember.pl | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index 4eb9979..0c536d9 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -1032,6 +1032,7 @@ The keys include C fields except marc and marcxml. #' sub GetPendingIssues { my (@borrowernumbers) = @_; + return unless scalar(@borrowernumbers); # Borrowers part of the query my $bquery = ''; diff --git a/circ/circulation.pl b/circ/circulation.pl index c34db54..a9ac69e 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -458,18 +458,20 @@ sub build_issue_data { if ($borrower) { - # Getting borrower relatives - my @relborrowernumbers = GetMemberRelatives($borrower->{'borrowernumber'}); - #push @borrowernumbers, $borrower->{'borrowernumber'}; - # get each issue of the borrower & separate them in todayissues & previous issues my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'}); - my ($relissueslist) = GetPendingIssues(@relborrowernumbers); - build_issue_data($issueslist, 0); - build_issue_data($relissueslist, 1); - - $displayrelissues = scalar($relissueslist); + + # Getting borrower relatives + my @relborrowernumbers = GetMemberRelatives($borrower->{'borrowernumber'}); + if (scalar(@relborrowernumbers)>0){ + my $relissueslist = GetPendingIssues(@relborrowernumbers); + if ($relissueslist){ + build_issue_data($relissueslist, 1); + $displayrelissues = scalar($relissueslist); + } + } + if ( C4::Context->preference( "todaysIssuesDefaultSortOrder" ) eq 'asc' ) { @todaysissues = sort { $a->{'timestamp'} cmp $b->{'timestamp'} } @todaysissues; diff --git a/members/moremember.pl b/members/moremember.pl index b766f2f..3601669 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -244,7 +244,7 @@ my @borrowernumbers = GetMemberRelatives($borrowernumber); my $issue = GetPendingIssues($borrowernumber); my $relissue = GetPendingIssues(@borrowernumbers); my $issuecount = scalar(@$issue); -my $relissuecount = scalar(@$relissue); +my $relissuecount = ($relissue?scalar(@$relissue):0); my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} ); my $today = POSIX::strftime("%Y-%m-%d", localtime); # iso format my @issuedata; -- 1.7.1 From stephane.delaune at biblibre.com Fri Jul 8 12:34:22 2011 From: stephane.delaune at biblibre.com (=?UTF-8?q?St=C3=A9phane=20Delaune?=) Date: Fri, 8 Jul 2011 12:34:22 +0200 Subject: [Koha-patches] [PATCH] [PATCH] Bug 5983 minor fix in html to improve translatability Message-ID: <1310121262-24416-1-git-send-email-stephane.delaune@biblibre.com> Signed-off-by: St?phane Delaune --- koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt index dfa7ed9..91b03f2 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt @@ -53,7 +53,19 @@

Sorry, the CAS login failed.

[% END %] -

If you have a CAS account, please click here to login.

If you have a CAS account, +[% IF ( casServerUrl ) %] + please click here to login.

+[% END %] + +[% IF ( casServersLoop ) %] +please choose against which one you would like to authenticate:

[% searchdomainloo.name %]

Local Login

If you do not have a CAS account, but a local account, you can still log in :

-- 1.7.0.4 From f.demians at tamil.fr Fri Jul 8 13:32:35 2011 From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=) Date: Fri, 8 Jul 2011 13:32:35 +0200 Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_XSL_UNIMARC_Improvments?= Message-ID: <1310124755-12629-1-git-send-email-f.demians@tamil.fr> - Exclude 'marc' & 'item' prefix from UNIMARC util XSL to slim down result - Add missing NSB/NSE characters striping - 200 fields on result/detail page: show all subfields in order, link to detail page only on $a - 4xx display, more fields and more subfields, respects subfields order which matter - Improve RAMEAU authorities linkings to subdivisions (pure XSLT) - Add missing fields: 205, 500 - Add missing MARC21 syspref: - DisplayOPACiconsXSLT, not implemtable in UNIMARC - OPACURLOpenInNewWindow - URLLinkText - ShowISBD Sidenote: this should have been done by people having introduced those syspref into MARC21 XSL. Suite --- .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 133 ++++-- .../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 90 +++-- .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl | 475 +++++++++++--------- 3 files changed, 415 insertions(+), 283 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl index 2832b6b..5f6daa2 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl @@ -15,45 +15,89 @@ - - + + + +

- - - - - : - - - - - - [ - - ] - - - / - - - - ; - - + + + + + + + + + [ + + ] + + + = + + + + : + + + + / + + + + ; + + + + , + + + +

- +

+ + Normal View + + + MARC View + + + Expanded MARC View + + + + Card View (ISBD) + + +

+ + + 454 + Translation of + + + + 461 + Set Level + + + + 464 + Piece-Analytic Level + 700 @@ -85,9 +129,19 @@ Corporate Author (Secondary) + + 500 + Uniform Title + + + + 503 + Uniform Conventional Heading + + - - Language: + + Language:

@@ -133,6 +187,11 @@

+ + 205 + Edition Statement + +

@@ -350,24 +409,30 @@ - Online Resources: + Online Resources:

+ + _blank + - -

100 -

y3z

- Click here to access online + + + + + + Click here to access online + + diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl index 831724c..5364ded 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl @@ -18,7 +18,6 @@

- @@ -31,42 +30,65 @@

- - -

- - - - /cgi-bin/koha/opac-detail.pl?biblionumber= - - - - : - + + + + + + + + /cgi-bin/koha/opac-detail.pl?biblionumber= + + + + + + + [

- - - [ - - ] - - - / - - - - ; - - - -

+ ] + + + = + + + + : + + + + / + + + + ; + + + + , + + + +

- + + 454 + Translation of + + + + 461 + Set Level + + + + 464 + Piece-Analytic Level +

@@ -77,7 +99,6 @@ -

@@ -85,9 +106,6 @@ - -

100 -

y3z diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl index 8eec0fd..146b88c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl @@ -2,7 +2,10 @@ ]> - + @@ -23,37 +26,158 @@ + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + rtl + + + + + + + + + + : + + + + + + + + + + + [ + + ] + + + = + + + + : + + + + / + + + + ; + + + + + , + + + + + + + ? + + + + + + + + + + + + + : + + + + + , + + + + + ? + + + + + + - Publication: + Publication:

- - - , - - - - : - - - - , - - - - ? - - - - : - - - - , - - + + + + + : + + + + + + , + + + + + ? @@ -62,7 +186,7 @@

- +

Description: @@ -82,219 +206,144 @@

- - - - Linked with: - - - - - - : - - - / - - - , - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - rtl - - - - - - - - -

- - - - : - - - - - - - - - - / - - - - , - - - - , - - - - , - - - - , - - - - , - + + + + + + + + + + + + , + + + + + + + + + + 1000 + + + + + + + + , + + + +

+ + /cgi-bin/koha/opac-search.pl?q=an: + + + + + + + -- + - + + + + + /cgi-bin/koha/opac-search.pl?q=su: + + + + + + abcdfijkmnpvxyz + ijknpxyz + -- + + + + + + + + |

- -

- - - - - /cgi-bin/koha/opac-search.pl?q=an: - - - /cgi-bin/koha/opac-search.pl?q=su: - - - - - - abcdjpvxyz - jpxyz - -- - - + + + : + + + + - - - | - - + + - -

- - - + + + : + + + - /cgi-bin/koha/opac-search.pl?q=an: + + /cgi-bin/koha/opac-search.pl?q=an: + + - /cgi-bin/koha/opac-search.pl?q=au:

+ + /cgi-bin/koha/opac-search.pl?q=au: + + + + - - - - - , - - - - , - - - - - - - - - ( - - ) - - - - - - - - - - + + + + + + + + + + , + + - - - ; - - + + + ; + + + + -- 1.7.5.1 From christophe.croullebois at biblibre.com Fri Jul 8 13:55:42 2011 From: christophe.croullebois at biblibre.com (Christophe Croullebois) Date: Fri, 8 Jul 2011 13:55:42 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6080: total is wrong in acqui-home.pl Message-ID: <1310126142-684-1-git-send-email-christophe.croullebois@biblibre.com> From: Jonathan Druart In Acqui-home, with hierarchic bugdets, it's a non sense to do total & sub-totals: we're adding budgets more than once. For example : Books 1000 fictions books 500 NF books 500 result in a total of 2000 ! This patch removes the total BibLibre MT5446 Signed-off-by: Christophe Croullebois --- acqui/acqui-home.pl | 16 ---------------- .../prog/en/modules/acqui/acqui-home.tt | 11 ----------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index 0d9c207..74d504e 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -82,12 +82,6 @@ my $budget_arr = GetBudgetHierarchy( '', $user->{branchcode}, $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'} ); -my $total = 0; -my $totspent = 0; -my $totordered = 0; -my $totcomtd = 0; -my $totavail = 0; - my $total_active = 0; my $totspent_active = 0; my $totordered_active = 0; @@ -121,11 +115,6 @@ foreach my $budget ( @{$budget_arr} ) { $budget->{'budget_avail'} = $budget->{'budget_amount'} - ( $budget->{'budget_spent'} + $budget->{'budget_ordered'} ); - $total += $budget->{'budget_amount'}; - $totspent += $budget->{'budget_spent'}; - $totordered += $budget->{'budget_ordered'}; - $totavail += $budget->{'budget_avail'}; - if ($budget->{budget_period_active}){ $total_active += $budget->{'budget_amount'}; $totspent_active += $budget->{'budget_spent'}; @@ -142,11 +131,6 @@ $template->param( type => 'intranet', loop_budget => $budget_arr, branchname => $branchname, - total => $num_formatter->format_price($total), - totspent => $num_formatter->format_price($totspent), - totordered => $num_formatter->format_price($totordered), - totcomtd => $num_formatter->format_price($totcomtd), - totavail => $num_formatter->format_price($totavail), total_active => $num_formatter->format_price($total_active), totspent_active => $num_formatter->format_price($totspent_active), totordered_active => $num_formatter->format_price($totordered_active), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index a274365..87343bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -99,17 +99,6 @@ $(document).ready(function() { - - - - - - - - - - - [% FOREACH loop_budge IN loop_budget %] [% IF ( loop_budge.budget_period_active ) %] -- 1.7.0.4 From oleonard at myacpl.org Fri Jul 8 14:12:40 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 8 Jul 2011 08:12:40 -0400 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 5009 : Turning off autocomplete Message-ID: <1310127160-19056-1-git-send-email-oleonard@myacpl.org> From: Chris Cormack Files affected koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt Signed-off-by: Owen Leonard --- .../intranet-tmpl/prog/en/includes/cat-search.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/circ-search.inc | 2 +- .../prog/en/includes/patron-search.inc | 2 +- .../prog/en/modules/circ/circulation.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc index a74e2fd..379cc56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -48,7 +48,7 @@ YAHOO.util.Event.onContentReady("header_search", function() { [% IF ( CAN_user_circulate ) %]

Enter patron card number or partial name:

- + [% IF ( CircAutocompl ) %]

@@ -72,7 +72,7 @@ YAHOO.util.Event.onContentReady("header_search", function() { [% IF ( CAN_user_circulate ) %]

Scan a barcode to check in:

- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc index b367f14..089b06d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc @@ -6,7 +6,7 @@ [% IF ( CAN_user_circulate ) %]

Scan a barcode to check in:

- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index bea0510..0be014a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -79,7 +79,7 @@ YAHOO.util.Event.onContentReady("header_search", function() { [% IF ( CAN_user_circulate ) %]

Enter patron card number or partial name:

- + [% IF ( CircAutocompl ) %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index d2f6405..1ab5ca9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -274,7 +274,7 @@ function refocus(calendar) { [% END %] - + [% IF ( RESERVED ) %]

@@ -423,7 +423,7 @@ No patron matched [% message %] [% IF ( CGIselectborrower ) %] [% INCLUDE 'patron-toolbar.inc' %] - +

Patron selection @@ -455,7 +455,7 @@ No patron matched [% message %] [% END %] - +

[% IF ( DisplayClearScreenButton ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index c02be49..0f22883 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -324,7 +324,7 @@ function Dopop(link) {

- +

Check In -- 1.7.3 From oleonard at myacpl.org Fri Jul 8 15:36:57 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 8 Jul 2011 09:36:57 -0400 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] bug 6558 correct description for IntranetNav Message-ID: <1310132217-19980-1-git-send-email-oleonard@myacpl.org> From: Nicole C. Engard IntranetNav says the HTML will appear in the More menu, but it appears to the left of the More menu. This patch fixes the preference description. Signed-off-by: Nicole C. Engard Signed-off-by: Owen Leonard --- .../en/modules/admin/preferences/staff_client.pref | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref index abde94a..df0a434 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref @@ -36,7 +36,7 @@ Staff Client: type: textarea class: code - - - "Show the following HTML in the More menu at the top of each page on the staff client (should be a list of links or blank):" + - "Show the following HTML to the left of the More menu at the top of each page on the staff client (should be a list of links or blank):" - pref: IntranetNav type: textarea class: code -- 1.7.3 From oleonard at myacpl.org Fri Jul 8 16:46:07 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 8 Jul 2011 10:46:07 -0400 Subject: [Koha-patches] [PATCH] Revised fix for Bug 6133 - Authorised values administration, warn for modifs Message-ID: <1310136367-20620-1-git-send-email-oleonard@myacpl.org> - Reformatted for T:T - Changed wording slighly - Styled message with new "note" style for non-dialog messages - Added correct alert style to existing error message --- .../intranet-tmpl/prog/en/css/staff-global.css | 17 +++++++++++++++++ .../prog/en/modules/admin/authorised_values.tt | 12 +++++------- koha-tmpl/intranet-tmpl/prog/img/note.png | Bin 0 -> 511 bytes 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/note.png 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 59011e2..9c97db1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1214,6 +1214,23 @@ div.message h5 { div.message ul+h4 { margin-top : .7em; } + +div.note { + background: #f4f6fa; + background-repeat : no-repeat; + background-position : left center; + background-image : url("../../img/note.png"); + background-image: url("../../img/note.png"), -moz-linear-gradient(top, #f4f6fa 0%, #e8edf6 100%); /* FF3.6+ */ + background-image: url("../../img/note.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f6fa), color-stop(100%,#e8edf6)); /* Chrome,Safari4+ */ + background-image: url("../../img/note.png"), -webkit-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Chrome10+,Safari5.1+ */ + background-image: url("../../img/note.png"), -o-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Opera11.10+ */ + background-image: url("../../img/note.png"), -ms-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f6fa', endColorstr='#e8edf6',GradientType=0 ); /* IE6-9 */ + background-image: url("../../img/note.png"), linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* W3C */ + border : 1px solid #BCBCBC; + padding : .5em .5em .5em 20px; + margin : .5em 0; +} div.results { padding : .7em 0; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index e72349a..f235634 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -50,6 +50,9 @@ [% IF ( action_add_value ) %]New authorized value[% END %] [% IF ( action_add_category ) %]New category[% END %] + + [% IF ( action_modify ) %]

NOTE: If you change an authorized value, existing records using it won't be updated.

[% END %] + @@ -173,15 +176,10 @@

Authorized values

These values can be used in many pull down menus throughout the Koha system. You can define as many categories as you want, and as many authorized values as you want in each category.

- -

When you define the MARC subfield structure, you can link a subfield to a authorized-value category. When the user ask for adding of modifying a biblio, the subfield is not entered through a free field, but though a list of authorized values

NOTE: If you change an authorized value, existing records using it won't be updated.

[% IF ( duplicate_category ) %] -

-Could not add value "[% duplicate_value %]" for category - "[% duplicate_category %]" — value already present. - +

Could not add value "[% duplicate_value %]" for category "[% duplicate_category %]" — value already present.

[% END %] Show Category: [% tab_list %] diff --git a/koha-tmpl/intranet-tmpl/prog/img/note.png b/koha-tmpl/intranet-tmpl/prog/img/note.png new file mode 100644 index 0000000000000000000000000000000000000000..5c3f8b6a5665888dabb6a8e442b622d40a77eb53 GIT binary patch literal 511 zcmeAS at N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeOS+ at 4BLl)!W at CNv=F5w>UtcfJ zaRs{5q$J2M_&@1@!8=?D6gVqAT^vIyZY3EUV_;xB(xAyA;J~3+<`&55D!{DJ at W4sw zl#I`rR|;Yd42mHuUl^X)&?LdY*dj0~X`(rUF#{8aqRL8bwnPRNff$bl$0+GTOdJY3 zCRi}f7i?h_a41mZ)eF_&2AN|u%K&J`!PXSZM4bkPCa#T|21SQkfCgx(oLPO8Ul^!w z#e_Kv77F=rC^Rf^vdMD#WuVx=a7f4kXq_vE!U2X?&#aDfC at +x!I-0 at L)z4*}Q$iB} DghJ`d literal 0 HcmV?d00001 -- 1.7.3 From oleonard at myacpl.org Fri Jul 8 18:25:35 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 8 Jul 2011 12:25:35 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 6484 - due date sorter on 'my summary' missing Message-ID: <1310142335-21279-1-git-send-email-oleonard@myacpl.org> Columns on the summary table are shown or hidden based on a variety of different settings, leading to convoluted if/else template constructions if we want to define header sorting in the [% INCLUDE 'calendar.inc' %] @@ -300,11 +301,7 @@ Confirm Deletion of Category [% categorycode |html %][% END %]

[% FOREACH loo IN loop %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - [% END %] [% IF ( EnhancedMessagingPreferences ) %] - [% END %] -- 1.7.3 From nengard at bywatersolutions.com Wed Jul 13 21:45:38 2011 From: nengard at bywatersolutions.com (Nicole C. Engard) Date: Wed, 13 Jul 2011 15:45:38 -0400 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Fix for 6426 - messaging not showing on patron categories Message-ID: <1310586338-15170-1-git-send-email-nengard@bywatersolutions.com> From: Owen Leonard T:T variable name problems were causing the problem. I used this opportunity to change the way the data is output: Now the messaging preferences are only output if there is a current setting. Also corrected the js table sorter configuration for the right columns and moved the template-based table row striping to the tablesorter plugin config. Signed-off-by: Nicole C. Engard --- .../prog/en/modules/admin/categorie.tt | 38 ++++++++++---------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index a916a4b..c2e5062 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -9,7 +9,8 @@ [% INCLUDE 'calendar.inc' %] @@ -300,11 +301,7 @@ Confirm Deletion of Category [% categorycode |html %][% END %] [% FOREACH loo IN loop %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - [% END %] [% IF ( EnhancedMessagingPreferences ) %] - [% END %] -- 1.7.2.3 From juan.sieira at xercode.es Fri Jul 15 12:00:37 2011 From: juan.sieira at xercode.es (Juan Romay Sieira) Date: Fri, 15 Jul 2011 12:00:37 +0200 Subject: [Koha-patches] [PATCH 35/35] [Bug 6590] - Removing hyphens from isbn and issn when cataloging a biblio. It removes hyphens from isbn and issn only in marcxml, not in the field isbn in biblioitems where it is in the original format Message-ID: <1310724037-15956-1-git-send-email-juan.sieira@xercode.es> --- C4/Biblio.pm | 43 ++++++++++++++++++++ C4/Search.pm | 2 +- admin/systempreferences.pl | 1 + installer/data/mysql/de-DE/mandatory/sysprefs.sql | 1 + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + installer/data/mysql/it-IT/necessari/sysprefs.sql | 1 + .../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql | 1 + installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 + ...m_preferences_full_optimal_for_install_only.sql | 1 + ...m_preferences_full_optimal_for_install_only.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 +++ .../en/modules/admin/preferences/cataloguing.pref | 6 +++ 13 files changed, 66 insertions(+), 1 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index d797f40..c026e76 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -3461,6 +3461,49 @@ sub ModBiblioMarc { # the previous version of the record $oldRecord = GetMarcBiblio($biblionumber); } + # + if (C4::Context->preference("IsbnIssnRemoveHyphens")){ + my $isbn; + my $issn; + if ( $encoding eq 'UNIMARC' ) { + if ( my $f010 = $record->field('010') ) { + if ( $f010->subfield('a') ) { + $isbn = $f010->subfield('a'); + $isbn =~ s/-//g; + $f010->update( 'a' => $isbn ); + } + } + if ( my $f011 = $record->field('011') ) { + if ( $f011->subfield('a') ) { + $issn = $f011->subfield('a'); + $issn =~ s/-//g; + $f011->update( 'a' => $issn ); + } + } + } elsif ($encoding eq 'MARC21') { + if ( my $f020 = $record->field('020') ) { + $isbn = $f020->subfield('a'); + $isbn =~ s/-//g; + $f020->update( 'a' => $isbn ); + } + if ( my $f022 = $record->field('022') ) { + $issn = $f022->subfield('a'); + $issn =~ s/-//g; + $f022->update( 'a' => $issn ); + } + } elsif ($encoding eq 'NORMARC') { + if ( my $f020 = $record->field('020') ) { + $isbn = $f020->subfield('a'); + $isbn =~ s/-//g; + $f020->update( 'a' => $isbn ); + } + if ( my $f022 = $record->field('022') ) { + $issn = $f022->subfield('a'); + $issn =~ s/-//g; + $f022->update( 'a' => $issn ); + } + } + } $sth = $dbh->prepare("UPDATE biblioitems SET marc=?,marcxml=? WHERE biblionumber=?"); $sth->execute( $record->as_usmarc(), $record->as_xml_record($encoding), $biblionumber ); $sth->finish; diff --git a/C4/Search.pm b/C4/Search.pm index c3cff65..069c55e 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1164,7 +1164,7 @@ sub buildQuery { $weight_fields, $fuzzy_enabled, $remove_stopwords ) = ( 0, 0, 0, 0, 0 ); - + $operand =~ s/-//g if (C4::Context->preference("IsbnIssnRemoveHyphens")); } if(not $index){ diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 87ecac4..884eafb 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -153,6 +153,7 @@ $tabsysprefs{'item-level_itypes'} = "Cataloging"; $tabsysprefs{OpacSuppression} = "Cataloging"; $tabsysprefs{SpineLabelFormat} = "Cataloging"; $tabsysprefs{SpineLabelAutoPrint} = "Cataloging"; +$tabsysprefs{IsbnIssnRemoveHyphens} = "Cataloging"; # Circulation $tabsysprefs{maxoutstanding} = "Circulation"; diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql index 6eb67a3..6fe546a 100755 --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql @@ -314,3 +314,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems' ,'','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice'); +INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo'); diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 0abf9d8..3b26b1a 100755 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -314,3 +314,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice'); +INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo'); 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 59a258f..cc59963 100755 --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql @@ -315,3 +315,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice'); +INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo'); diff --git a/installer/data/mysql/it-IT/necessari/sysprefs.sql b/installer/data/mysql/it-IT/necessari/sysprefs.sql index dcdf0ee..35b2790 100755 --- a/installer/data/mysql/it-IT/necessari/sysprefs.sql +++ b/installer/data/mysql/it-IT/necessari/sysprefs.sql @@ -301,3 +301,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice'); +INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo'); diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql index ca71769..1fbc993 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql @@ -321,3 +321,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo'); +INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo'); diff --git a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql index 58ba035..0493267 100755 --- a/installer/data/mysql/pl-PL/mandatory/sysprefs.sql +++ b/installer/data/mysql/pl-PL/mandatory/sysprefs.sql @@ -313,3 +313,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice'); +INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo'); 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 54c533c..53fb173 100755 --- 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 @@ -368,3 +368,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice'); +INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo'); 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 9f095ab..0dbebe1 100755 --- 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 @@ -393,3 +393,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/O pacHiddenItems.txt for more informations.','','Textarea'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacRenewalBranch','checkoutbranch','Choose how the branch for an OPAC renewal is recorded in statistics','itemhomebranch|patronhomebranch|checkoutbranch|null','Choice'); +INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8fb9656..975b64f 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4370,6 +4370,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = "3.05.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO `systempreferences` (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('IsbnIssnRemoveHyphens', '0', '', 'Remove or not hyphens from ISBN and ISSN', 'YesNo');"); + print "Upgrade to $DBversion done (Add SysPref to remove hyphens or not into isbn and issn)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 DropAllForeignKeys($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref index 4fc1305..0632cab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -84,6 +84,12 @@ Cataloging: annual: generated in the form <year>-0001, <year>-0002. hbyymmincr: generated in the form <branchcode>yymm0001. "OFF": not generated automatically. + - + - pref: IsbnIssnRemoveHyphens + choices: + yes: "Remove" + no: "Don't remove" + - hyphens from ISBN and ISSN Display: - - 'Separate multiple displayed authors, series or subjects with ' -- 1.7.1 From magnus at enger.priv.no Sat Jul 16 01:27:59 2011 From: magnus at enger.priv.no (Magnus Enger) Date: Sat, 16 Jul 2011 01:27:59 +0200 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] [Combined patch] Bug 5436: Extended patron attributes display improvements Message-ID: <1310772479-22805-1-git-send-email-magnus@enger.priv.no> From: Henri-Damien LAURENT This patch combines the changes pushed to new/awaiting_qa/bug_5436 with this follow-up patch: http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=4608 (MT #2262) member search improving if only one member is found, go directly to his details. change borrower link in return.pl go to circulation.pl instead of moremembers.pl (MT #2262) Show extended attributes in borrower toolbar This made some modifications to be more generic, and to show extended attributes in borrower "toolbar". It hide by default the borrower address, and the user have a toggle link to show/hide the user address. (bug #MT2262) don't show all attributes this hide non-active extended attributes in circulation. (MT2262) Followup : Enhancement to extended attributes display View/Hide address improvement in moremember.pl Signed-off-by: Henri-Damien LAURENT Bug 5436 Followup : expiry message was badly displayed This patch assigns the comment expressed Signed-off-by: Magnus Enger --- C4/Members.pm | 46 ++++++++- C4/Members/AttributeTypes.pm | 31 +++++- C4/Members/Attributes.pm | 3 +- admin/patron-attr-types.pl | 9 ++- circ/circulation.pl | 15 +-- .../0009-patron-attr-display-checkout.pl | 7 ++ installer/data/mysql/kohastructure.sql | 1 + .../intranet-tmpl/prog/en/css/staff-global.css | 35 ++++++- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 108 +++++++++++++------- .../prog/en/modules/admin/patron-attr-types.tt | 5 + .../prog/en/modules/circ/circulation.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 7 +- .../prog/en/modules/members/moremember.tt | 48 +++++---- .../intranet-tmpl/prog/img/more-right-arrow.gif | Bin 0 -> 81 bytes members/member.pl | 6 + members/moremember.pl | 4 +- 16 files changed, 242 insertions(+), 85 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/img/more-right-arrow.gif diff --git a/C4/Members.pm b/C4/Members.pm index 670042f..7fb14a7 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -26,12 +26,13 @@ use C4::Dates qw(format_date_in_iso); use Digest::MD5 qw(md5_base64); use Date::Calc qw/Today Add_Delta_YM/; use C4::Log; # logaction +use C4::Branch; use C4::Overdues; use C4::Reserves; use C4::Accounts; use C4::Biblio; use C4::SQLHelper qw(InsertInTable UpdateInTable SearchInTable); -use C4::Members::Attributes qw(SearchIdMatchingAttribute); +use C4::Members::Attributes qw(SearchIdMatchingAttribute GetBorrowerAttributes); our ($VERSION, at ISA, at EXPORT, at EXPORT_OK,$debug); @@ -91,6 +92,8 @@ BEGIN { &DeleteMessage &GetMessages &GetMessagesCount + + &SetMemberInfosInTemplate ); #Modify data @@ -1725,6 +1728,47 @@ sub DelMember { return $sth->rows; } +=head2 SetMemberInfosInTemplate + &SetMemberInfosInTemplate($borrowernumber, $template) + + +Settings borrower informations for template user + +=cut + +sub SetMemberInfosInTemplate { + my ($borrowernumber, $template) = @_; + + my $borrower = GetMemberDetails( $borrowernumber, 0 ); + foreach my $key (keys %$borrower){ + $template->param($key => $borrower->{$key}); + } + + # Computes full borrower address + my (undef, $roadttype_hashref) = &GetRoadTypes(); + my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'}; + $template->param(is_child => ($borrower->{'category_type'} eq 'C'), + address => $address, + branchname => GetBranchName($borrower->{'branchcode'}), + ); + + foreach (qw(dateenrolled dateexpiry dateofbirth)) { + my $userdate = $borrower->{$_}; + unless ($userdate) { + $borrower->{$_} = ''; + next; + } + $userdate = C4::Dates->new($userdate,'iso')->output('syspref'); + $borrower->{$_} = $userdate || ''; + $template->param( $_ => $userdate ); + } + + my $attributes = GetBorrowerAttributes($borrowernumber); + $template->param( + extendedattributes => $attributes, + ); +} + =head2 ExtendMemberSubscriptionTo (OUEST-PROVENCE) $date = ExtendMemberSubscriptionTo($borrowerid, $date); diff --git a/C4/Members/AttributeTypes.pm b/C4/Members/AttributeTypes.pm index 3a05268..e36557b 100644 --- a/C4/Members/AttributeTypes.pm +++ b/C4/Members/AttributeTypes.pm @@ -118,6 +118,7 @@ sub new { $self->{'opac_display'} = 0; $self->{'password_allowed'} = 0; $self->{'staff_searchable'} = 0; + $self->{'display_checkout'} = 0; $self->{'authorised_value_category'} = ''; bless $self, $class; @@ -152,6 +153,7 @@ sub fetch { $self->{'opac_display'} = $row->{'opac_display'}; $self->{'password_allowed'} = $row->{'password_allowed'}; $self->{'staff_searchable'} = $row->{'staff_searchable'}; + $self->{'display_checkout'} = $row->{'display_checkout'}; $self->{'authorised_value_category'} = $row->{'authorised_value_category'}; bless $self, $class; @@ -182,14 +184,15 @@ sub store { opac_display = ?, password_allowed = ?, staff_searchable = ?, - authorised_value_category = ? + authorised_value_category = ?, + display_checkout = ? WHERE code = ?"); } else { $sth = $dbh->prepare_cached("INSERT INTO borrower_attribute_types (description, repeatable, unique_id, opac_display, password_allowed, - staff_searchable, authorised_value_category, code) + staff_searchable, authorised_value_category, display_checkout, code) VALUES (?, ?, ?, ?, ?, - ?, ?, ?)"); + ?, ?, ?, ?)"); } $sth->bind_param(1, $self->{'description'}); $sth->bind_param(2, $self->{'repeatable'}); @@ -198,7 +201,8 @@ sub store { $sth->bind_param(5, $self->{'password_allowed'}); $sth->bind_param(6, $self->{'staff_searchable'}); $sth->bind_param(7, $self->{'authorised_value_category'}); - $sth->bind_param(8, $self->{'code'}); + $sth->bind_param(8, $self->{'display_checkout'}); + $sth->bind_param(9, $self->{'code'}); $sth->execute; } @@ -304,6 +308,25 @@ sub staff_searchable { @_ ? $self->{'staff_searchable'} = ((shift) ? 1 : 0) : $self->{'staff_searchable'}; } +=head2 display_checkout + +=over 4 + +my $display_checkout = $attr_type->display_checkout(); +$attr_type->display_checkout($display_checkout); + +=back + +Accessor. The C<$display_checkout> argument +is interpreted as a Perl boolean. + +=cut + +sub display_checkout { + my $self = shift; + @_ ? $self->{'display_checkout'} = ((shift) ? 1 : 0) : $self->{'display_checkout'}; +} + =head2 authorised_value_category my $authorised_value_category = $attr_type->authorised_value_category(); diff --git a/C4/Members/Attributes.pm b/C4/Members/Attributes.pm index 35d6702..29a31e6 100644 --- a/C4/Members/Attributes.pm +++ b/C4/Members/Attributes.pm @@ -72,7 +72,7 @@ sub GetBorrowerAttributes { my $opac_only = @_ ? shift : 0; my $dbh = C4::Context->dbh(); - my $query = "SELECT code, description, attribute, lib, password + my $query = "SELECT code, description, attribute, lib, password, display_checkout FROM borrower_attributes JOIN borrower_attribute_types USING (code) LEFT JOIN authorised_values ON (category = authorised_value_category AND attribute = authorised_value) @@ -89,6 +89,7 @@ sub GetBorrowerAttributes { value => $row->{'attribute'}, value_description => $row->{'lib'}, password => $row->{'password'}, + display_checkout => $row->{'display_checkout'}, } } return \@results; diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl index 1dfe442..c32b6c2 100755 --- a/admin/patron-attr-types.pl +++ b/admin/patron-attr-types.pl @@ -106,6 +106,9 @@ sub error_add_attribute_type_form { if ($input->param('staff_searchable')) { $template->param(staff_searchable_checked => 'checked="checked"'); } + if ($input->param('display_checkout')) { + $template->param(display_checkout_checked => 'checked="checked"'); + } $template->param( attribute_type_form => 1, @@ -147,6 +150,8 @@ sub add_update_attribute_type { $attr_type->authorised_value_category($authorised_value_category); my $password_allowed = $input->param('password_allowed'); $attr_type->password_allowed($password_allowed); + my $display_checkout = $input->param('display_checkout'); + $attr_type->display_checkout($display_checkout); if ($op eq 'edit') { $template->param(edited_attribute_type => $attr_type->code()); @@ -222,7 +227,9 @@ sub edit_attribute_type_form { if ($attr_type->staff_searchable()) { $template->param(staff_searchable_checked => 'checked="checked"'); } - + if ($attr_type->display_checkout()) { + $template->param(display_checkout_checked => 'checked="checked"'); + } authorised_value_category_list($template, $attr_type->authorised_value_category()); $template->param( diff --git a/circ/circulation.pl b/circ/circulation.pl index c34db54..1e19261 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -220,8 +220,8 @@ if ($borrowernumber) { # Warningdate is the date that the warning starts appearing my ( $today_year, $today_month, $today_day) = Today(); - my ($warning_year, $warning_month, $warning_day) = split /-/, $borrower->{'dateexpiry'}; - my ( $enrol_year, $enrol_month, $enrol_day) = split /-/, $borrower->{'dateenrolled'}; + my ($warning_year, $warning_month, $warning_day) = split (/-/, $borrower->{'dateexpiry'}); + my ( $enrol_year, $enrol_month, $enrol_day) = split (/-/, $borrower->{'dateenrolled'}); # Renew day is calculated by adding the enrolment period to today my ( $renew_year, $renew_month, $renew_day); if ($enrol_year*$enrol_month*$enrol_day>0) { @@ -622,10 +622,6 @@ if($lib_messages_loop){ $template->param(flagged => 1 ); } my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch ); if($bor_messages_loop){ $template->param(flagged => 1 ); } -# Computes full borrower address -my (undef, $roadttype_hashref) = &GetRoadTypes(); -my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'}; - my $fast_cataloging = 0; if (defined getframeworkinfo('FA')) { $fast_cataloging = 1 @@ -644,11 +640,9 @@ $template->param( printername => $printer, firstname => $borrower->{'firstname'}, surname => $borrower->{'surname'}, - dateexpiry => format_date($newexpiry), + newexpiry => format_date($newexpiry), expiry => format_date($borrower->{'dateexpiry'}), - categorycode => $borrower->{'categorycode'}, categoryname => $borrower->{description}, - address => $address, address2 => $borrower->{'address2'}, email => $borrower->{'email'}, emailpro => $borrower->{'emailpro'}, @@ -658,7 +652,6 @@ $template->param( zipcode => $borrower->{'zipcode'}, country => $borrower->{'country'}, phone => $borrower->{'phone'} || $borrower->{'mobile'}, - cardnumber => $borrower->{'cardnumber'}, amountold => $amountold, barcode => $barcode, stickyduedate => $stickyduedate, @@ -681,6 +674,8 @@ $template->param( fast_cataloging => $fast_cataloging, ); +SetMemberInfosInTemplate($borrowernumber, $template); + # save stickyduedate to session if ($stickyduedate) { $session->param( 'stickyduedate', $duedatespec ); diff --git a/installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl b/installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl new file mode 100644 index 0000000..44cfcfa --- /dev/null +++ b/installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl @@ -0,0 +1,7 @@ +#! /usr/bin/perl +use strict; +use warnings; +use C4::Context; +my $dbh=C4::Context->dbh; +$dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN `display_checkout` TINYINT(1) NOT NULL DEFAULT '0';"); +print "Upgrade done (Added a display_checkout field in borrower_attribute_types table)\n"; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e3c6f42..ba22027 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -284,6 +284,7 @@ CREATE TABLE `borrower_attribute_types` ( `password_allowed` tinyint(1) NOT NULL default 0, `staff_searchable` tinyint(1) NOT NULL default 0, `authorised_value_category` varchar(10) default NULL, + `display_checkout` tinyint(1) NOT NULL default 0, PRIMARY KEY (`code`), KEY `auth_val_cat_idx` (`authorised_value_category`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; 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 9c97db1..d4be5ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1953,6 +1953,38 @@ ul.budget_hierarchy li:last-child:after { ul.budget_hierarchy li:first-child:after { content: ""; } +#cartmenulink img { + background-image : none; + display : inline; + padding : 3px 6px 0 0; +} + +* html #cartmenulink { + border : 1px solid #336600; +} + +* html #listsmenulink { + border : 1px solid #006699; +} + +#collapsedaddress { + border: solid 1px #eee; + margin-right: 10px; + overflow: hidden; +} +#toggleaddress { + display: block; + padding: 2px 2px 2px 12px; + margin-right: 10px; + cursor: pointer; +} +.toggleaddress { + background: #eee url(../../img/more-right-arrow.gif) 0 50% no-repeat; +} +.toggleaddress2 { + background: #eee url(../../img/more-up-arrow.gif) 0 50% no-repeat; +} + .holdcount { font-size : 105%; line-height : 200%; } .holdcount a { border : 1px solid #a4bedd; background-color : #e4ecf5; font-weight : bold; -moz-border-radius: 4px; padding : .1em .4em; text-decoration : none; } .holdcount a:hover { background-color : #ebeff7; } @@ -2048,4 +2080,5 @@ fieldset.rows+h3 {clear:both;padding-top:.5em;} border : 1px solid #EEE; padding : 0.3em 0.4em; } - \ No newline at end of file + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 129bd66..2e84f2c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -4,6 +4,19 @@ +

[% IF ( address ) %] - [% address %] - [% ELSE %] - No address stored. - [% END %]
[% address2 %]
- [% IF ( city ) %] - [% city %][% IF ( state ) %], [% state %][% END %] - [% zipcode %][% IF ( country ) %], [% country %][% END %] - [% ELSE %] - No city stored. - [% END %]
[% IF ( phone ) %] - [% phone %] - [% ELSE %] - [% IF ( mobile ) %] - [% mobile %] - [% ELSE %] - [% IF ( phonepro ) %] - [% phonepro %] - [% ELSE %] - No phone stored. - [% END %] - [% END %] - [% END %]
[% email %]
[% emailpro %]
No email stored.
[% categoryname %] ([% categorycode %])
[% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]
Category: [% categoryname %] ([% categorycode %])
Home Library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]

+ [% IF ( address ) %] + [% address %] + [% ELSE %] + No address stored. + [% END %] + [% IF ( address2 ) %] + [% address2 %] + [% END %] + [% IF ( city ) %] + [% city %] + [% zipcode %] + [% IF ( country ) %], [% country %][% END %] + [% ELSE %] + No city stored. + [% END %] +

+ [% IF ( phone ) %] + [% phone %] + [% ELSE %] + [% IF ( mobile ) %] + [% mobile %] + [% ELSE %] + [% IF ( phonepro ) %] + [% phonepro %] + [% ELSE %] + No phone stored. + [% END %] + [% END %] + [% END %] +

+ [% IF ( email ) %] + [% email %] + [% ELSE %] + [% IF ( emailpro ) %] + [% emailpro %] + [% ELSE %] + No email stored. + [% END %] + [% END %] +

+ View/Hide address +

+ +

[% ELSE %]
[% END %]Check Out

Check to make this attribute staff_searchable in the staff patron search.

Display in check-out: + + Check to show this attribute in member check-out. +
Authorized value category:

Avail
You have nothing checked out
Total			[% total %][% total_active %]	[% totordered %][% totordered_active %]	[% totspent %][% totspent_active %]	[% totavail %][% totavail_active %]
Avail
Total			[% total %][% total_active %]	[% totordered %][% totordered_active %]	[% totspent %][% totspent_active %]	[% totavail %][% totavail_active %]

[% loo.categorycode \|html %]	[% loo.description \|html %] @@ -332,22 +329,25 @@ Confirm Deletion of Category [% categorycode \|html %][% END %]	[% IF ( loo.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]	[% loo.reservefee %]	+	[% IF ( loo.messaging_prefs ) %] - [% IF ( messaging_preference.Item_Due ) %]Item Due - [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance Notice - [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming Events - [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold Filled - [% ELSIF ( messaging_preference.Item_Check_in ) %]Item Check-in - [% ELSIF ( messaging_preference.Item_Checkout ) %]Item Checkout - [% ELSE %]Unknown - [% END %] : - [% FOREACH transport IN messaging_pref.transports %] - [% transport.transport %] - [% END %] - + [% FOREACH prefs IN loo.messaging_prefs %] + [% FOREACH transport IN prefs.transports %] + [% IF ( transport.transport ) %] + [% IF ( prefs.Item_Due ) %]Item Due + [% ELSIF ( prefs.Advance_Notice ) %]Advance Notice + [% ELSIF ( prefs.Upcoming_Events ) %]Upcoming Events + [% ELSIF ( prefs.Hold_Filled ) %]Hold Filled + [% ELSIF ( prefs.Item_Check_in ) %]Item Check-in + [% ELSIF ( prefs.Item_Checkout ) %]Item Checkout + [% ELSE %]Unknown + [% END %]: + [% transport.transport %] + [% ELSE %]None [% END %] + [% END %] + [% END %] [% ELSE %] - none + None [% END %]
[% loo.categorycode \|html %]	[% loo.description \|html %] @@ -332,22 +329,25 @@ Confirm Deletion of Category [% categorycode \|html %][% END %]	[% IF ( loo.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]	[% loo.reservefee %]	+	[% IF ( loo.messaging_prefs ) %] - [% IF ( messaging_preference.Item_Due ) %]Item Due - [% ELSIF ( messaging_preference.Advance_Notice ) %]Advance Notice - [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming Events - [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold Filled - [% ELSIF ( messaging_preference.Item_Check_in ) %]Item Check-in - [% ELSIF ( messaging_preference.Item_Checkout ) %]Item Checkout - [% ELSE %]Unknown - [% END %] : - [% FOREACH transport IN messaging_pref.transports %] - [% transport.transport %] - [% END %] - + [% FOREACH prefs IN loo.messaging_prefs %] + [% FOREACH transport IN prefs.transports %] + [% IF ( transport.transport ) %] + [% IF ( prefs.Item_Due ) %]Item Due + [% ELSIF ( prefs.Advance_Notice ) %]Advance Notice + [% ELSIF ( prefs.Upcoming_Events ) %]Upcoming Events + [% ELSIF ( prefs.Hold_Filled ) %]Hold Filled + [% ELSIF ( prefs.Item_Check_in ) %]Item Check-in + [% ELSIF ( prefs.Item_Checkout ) %]Item Checkout + [% ELSE %]Unknown + [% END %]: + [% transport.transport %] + [% ELSE %]None [% END %] + [% END %] + [% END %] [% ELSE %] - none + None [% END %]

- + [% FOREACH riloo IN riloop %] @@ -412,11 +412,10 @@ function Dopop(link) { [% riloo.itemtitle |html %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 6287611..40bc3ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -179,7 +179,7 @@ function validate1(date) { [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] -

[% streetnumber %] +

[% IF ( roaddetails ) %] [% roaddetails %], [% END %] @@ -212,9 +212,7 @@ function validate1(date) { [% END %]

Initials: [% initials %]

Date of birth:[% dateofbirth %]

Gender: - [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %] -

[% END %] +

Sex:[% sex %]

[% END %] [% IF ( printethnicityline ) %]

Ethnicity:[% ethnicity %]

Ethnicity notes: [% ethnotes %]

@@ -341,8 +339,8 @@ function validate1(date) { [% END %] [% IF ( sort1 ) %]

Sort field 1:[% lib1 %]

[% END %] [% IF ( sort2 ) %]

Sort field 2:[% lib2 %]

[% END %] -

Username: [% userid %]

Password: +

OPAC login: [% userid %]

OPAC password: [% IF ( password ) %] ******* [% ELSE %] @@ -399,7 +397,7 @@ function validate1(date) {

[% issuecount %] Checkout(s)
Relatives' Checkouts
Relatives issues
Fines & Charges
[% IF ( countreserv ) %] @@ -495,13 +493,9 @@ function validate1(date) { [% IF ( issueloo.return_failed ) %]

[% ELSE %] - [% IF ( issueloo.norenew_reason_on_reserve ) %] - - [% ELSE %] - [% END %] [% END %] [% END %] @@ -524,17 +518,21 @@ function validate1(date) { [% IF ( relissuecount ) %]

Relatives issues

Due Date	Title	Author	Barcode	Shelving Location	Call Number	Type	Patron	Note
Due Date	Title	Author	Barcode	Call Number	Type	Patron	Note
[% riloo.itemauthor %]	[% riloo.barcode %]	[% riloo.location %]	[% riloo.itemcallnumber %]	[% riloo.itemtype %] [% riloo.ccode %]	[% IF ( riloo.duedate ) %] - + [% riloo.borsurname %], [% riloo.borfirstname %] ([% riloo.borcategorycode %]) [% ELSE %]Not checked out[% END %]	Checkin Failed	On Hold

+ + + - + + - @@ -553,13 +551,16 @@ function validate1(date) { [% relissueloo.itemdamaged %] [% END %] - + + + + - - - - + + + + [% END %] @@ -609,15 +610,18 @@ function validate1(date) { - + [% END %]

Due date	Title	Collection	Stock number	Barcode	Item Type	Checked out on	Call no	Borrower	Call no	Charge	Price	Patron
[% relissueloo.title \|html %][% IF relissueloo.author %], by [% relissueloo.author %][% END %] [% IF relissueloo.publishercode %]; [% relissueloo.publishercode %] [% END %] [% IF relissueloo.publicationyear %], [% relissueloo.publicationyear %][% END %] [% relissueloo.barcode %]	[% relissueloo.title \|html %][% IF ( relissueloo.author ) %], by [% relissueloo.author %][% END %] [% IF ( relissueloo.publishercode ) %]; [% relissueloo.publishercode %] [% END %] [% IF ( relissueloo.publicationyear ) %], [% relissueloo.publicationyear %][% END %]	[% relissueloo.collection %]	[% relissueloo.stocknumber %]	[% relissueloo.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %][% END %][% END %][% relissueloo.itemtype_description %]	[% relissueloo.issuedate %]	[% relissueloo.itemcallnumber %]	[% relissueloo.charge %]	[% relissueloo.replacementprice %]	[% relissueloo.borrowername %] ([% relissueloo.cardnumber %])	[% relissueloo.borrowername %]	[% relissueloo.itemcallnumber %]	[% relissueloo.charge %]	[% relissueloo.replacementprice %]

- - [% ELSE %]

Patron has nothing on hold.

[% END %] +

+ + +

+ [% ELSE %]

Patron has nothing checked out.

[% END %] +

[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author |html %]. [% END %] [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place |html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode |html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear |html %] [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate |html %][% END %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt index de34e02..ec880d3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt @@ -1,7 +1,7 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog › Privacy management for [% firstname %] [% surname %] [% INCLUDE 'doc-head-close.inc' %] - +

[% INCLUDE 'masthead.inc' %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt index 70aac88..05b50dd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -67,7 +67,7 @@ You have never borrowed anything from this library. [% IF ( GoogleJackets ) %][% IF ( READING_RECOR.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] - [% IF ( BakerTaylorEnabled ) %][% IF ( READING_RECOR.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] + [% IF ( BakerTaylorEnabled ) %][% IF ( READING_RECOR.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %]

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt index 25e9a3a..bc46b28 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -152,7 +152,6 @@ }); // ]]> - @@ -330,7 +329,7 @@ Calendar.setup( { inputField : "reserve_date_[% bibitemloo.biblionumber %]", - ifFormat : "[% DHTMLcalendar_dateformat %]", + ifFormat : "[% bibitemloo.DHTMLcalendar_dateformat %]", button : "CalendarReserveDate[% bibitemloo.biblionumber %]", disableFunc : validate[% bibitemloo.biblionumber %], dateStatusFunc : validate[% bibitemloo.biblionumber %] @@ -338,8 +337,6 @@ ); //]]> -

- Clear Date

[% END %] [% END %] @@ -362,7 +359,7 @@ Calendar.setup( { inputField : "expiration_date_[% bibitemloo.biblionumber %]", - ifFormat : "[% DHTMLcalendar_dateformat %]", + ifFormat : "[% bibitemloo.DHTMLcalendar_dateformat %]", button : "CalendarExpirationDate_[% bibitemloo.biblionumber %]", disableFunc : validate1, dateStatusFunc : validate1 @@ -374,13 +371,11 @@ Clear Date

[% END %] - [% IF ( bibitemloo.holdable ) %] - - [% IF ( OPACItemHolds ) %] - + [% IF ( bibitemloo.holdable ) %][% IF ( OPACItemHolds ) %] -

+ + + + + + + +

[% UNLESS ( bibitemloo.holdable ) %] [% END %] Next available copy - -

[% UNLESS ( bibitemloo.holdable ) %] [% END %] A specific copy - - +

[% END %][% END %] @@ -442,8 +440,9 @@ [% IF ( OPACItemHolds ) %] [% IF ( bibitemloo.holdable ) %] - - + + + @@ -452,7 +451,7 @@ [% END %] - [% UNLESS ( singleBranchMode ) %] + [% UNLESS ( bibitemloo.singleBranchMode ) %] [% END %] @@ -467,7 +466,7 @@ [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt index 3e69614..338f174 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt @@ -11,7 +11,7 @@ [% IF ( cgi_debug ) %]alert(_('injecting OLD comment: ')+comment);[% END %] parent.opener.$('#c[% reviewid %] p').prev("small").prev("h5").html("Your Edited Comment (preview, pending approval)"); parent.opener.$('#c[% reviewid %] p').html(comment); - parent.opener.$('#c[% reviewid %] p').append("Edit<\/a>"); + parent.opener.$('#c[% reviewid %] p').append(" Edit<\/a>"); [% END %] return 1; }; @@ -21,7 +21,7 @@ parent.opener.$('#newcomment').html( "

Your Comment (preview, pending approval)<\/h5>" + "
"+comment+"<\/p>" + - "Edit<\/a><\/p>" + "Edit<\/a><\/p>" ); parent.opener.$("#addcomment").prev("p").remove(); parent.opener.$("#addcomment").remove(); @@ -66,7 +66,7 @@ [% END %]
- +
Comments on [% title |html %] [% subtitle %][% IF ( author ) %]by [% author %][% END %]
[% review %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt index 1085ae0..88b084e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tt @@ -20,30 +20,25 @@ [% END %] [% ELSE %] - [% IF ( invalidlist ) %] -
-
You do not have permission to send this list.
-
-
Back to lists
- [% ELSE %] - -
- Sending your list -

- Email Address: - -
-
- Comment: - -
-
- -
-
Cancel
- - [% END %] +
+ +
+Sending your list +

+ Email Address: + +
+
+ Comment: + +
+
+ +
+
Cancel
+ + [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt index 5d45b53..8d6b94b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt @@ -12,9 +12,9 @@

Issues for a subscription

- Normal View + Normal View Brief history - Full History + Full History

[% FOREACH subscription_LOO IN subscription_LOOP %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt index 9220367..93f9c16 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -343,7 +343,7 @@ $(function() { [% IF ( GoogleJackets ) %][% IF ( itemsloo.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] - [% IF ( BakerTaylorEnabled ) %][% IF ( itemsloo.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %] + [% IF ( BakerTaylorEnabled ) %][% IF ( itemsloo.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt index 2c6e179..6d53953 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt @@ -18,7 +18,7 @@ [% END %][% END %][% END %][% END %] -[% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %][% END %][% END %] +[% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %][% END %][% END %] [% IF ( review.author ) %]
By [% review.author |html %].
[% END %]
[% IF ( review.place ) %][% review.place |html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode |html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear |html %] [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate |html %][% END %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt index a50d825..e64fcae 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt @@ -46,11 +46,7 @@ $(document).ready(function(){ [% END %] [% IF ( review.copyrightdate ) %]Date:[% review.copyrightdate %][% END %]
-
- [% IF ( review.avatarurl ) %] - - [% END %] - [% review.review |html %] +
[% review.review |html %] Added [% review.datereviewed %] [% IF ( review.your_comment ) %] by you[% ELSE %] [% IF ( ShowReviewer ) %] by [% review.firstname %] [% review.surname %][% END %][% END %]
@@ -75,7 +71,7 @@ $(document).ready(function(){ [% IF ( GoogleJackets ) %][% IF ( review.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] - [% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %] + [% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt index 92bd44d..26c8670 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -4,7 +4,6 @@ [% BORROWER_INF.firstname %] [% BORROWER_INF.surname %] [% END %] [% INCLUDE 'doc-head-close.inc' %] - +[% IF (redirect) %] + +[% END %]
@@ -131,7 +171,7 @@ $.tablesorter.addParser({

Select a specific copy:
Item Type	Barcode	Home Library	Last Location
[% IF ( itemLoo.available ) %] - [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt index 2047a1b..e08e31b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt @@ -437,18 +437,18 @@ $(document).ready(function(){ Availability: - [% IF ( SEARCH_RESULT.available_items_loop.0 ) %] + [% IF ( SEARCH_RESULT.available_items_loop ) %] Copies available: [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %] [% UNLESS ( available_items_loo.hideatopac ) %] - [% IF ( singleBranchMode ) %] + [% IF ( available_items_loo.singleBranchMode ) %] [% available_items_loo.location %] [% ELSE %] [% available_items_loo.branchname %] [% END %] [% IF ( OPACItemsResultsDisplay ) %] - [% UNLESS ( singleBranchMode ) %][% available_items_loo.location %][% END %] + [% UNLESS ( available_items_loo.singleBranchMode ) %][% available_items_loo.location %][% END %] [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber %]][% END %] [% END %] ([% available_items_loo.count %]), @@ -499,7 +499,7 @@ $(document).ready(function(){ [% ELSIF ( loop.first ) %]Log in to add tags. [% END %] [% END %] - [% IF ( SEARCH_RESULT.TagLoop.size ) %] + [% IF ( SEARCH_RESULT.TagLoop ) %] [% END %] [% END %] [% END %][% END %] @@ -536,7 +536,7 @@ $(document).ready(function(){ [% IF ( GoogleJackets ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %] [% ELSE %]No cover image available[% END %][% END %] - [% IF ( BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %] + [% IF ( BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %]

- + @@ -161,20 +201,20 @@ $.tablesorter.addParser({

Holds Waiting
Title		Title		Hold date	Pick Up Library

- [% IF ( JacketImages ) %][% END %] - - + [% IF ( JacketImages ) %][% END %] + [% UNLESS ( item_level_itypes ) %] [% END %] [% IF ( show_barcode ) %][% END %] + [% IF ( OpacRenewalAllowed ) %] - [% UNLESS ( patron_flagged ) %][% END %] + [% UNLESS ( patron_flagged ) %][% END %] [% END %] [% IF ( OPACFinesTab ) %] [% END %] [% IF ( OPACMySummaryHTML ) %] - + [% END %] @@ -195,7 +235,7 @@ $.tablesorter.addParser({ [% IF ( GoogleJackets ) %][% IF ( ISSUE.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] -[% IF ( BakerTaylorEnabled ) %][% IF ( ISSUE.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] +[% IF ( BakerTaylorEnabled ) %][% IF ( ISSUE.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %]

@@ -207,14 +247,14 @@ $.tablesorter.addParser({ + [% UNLESS ( item_level_itypes ) %][% END %] + [% IF ( show_barcode ) %][% END %] + [% IF ( ISSUE.overdue ) %] [% ELSE %] [% END %] - [% UNLESS ( item_level_itypes ) %][% END %] - [% IF ( show_barcode ) %][% END %] - [% IF ( OpacRenewalAllowed ) %] [% UNLESS ( ISSUE.patron_flagged ) %] -[% IF ( JacketImages ) %][% END %] - +[% IF ( JacketImages ) %][% END %] + [% UNLESS ( item_level_itypes ) %] [% END %] [% IF ( show_barcode ) %][% END %] [% IF ( OpacRenewalAllowed ) %] - [% UNLESS ( patron_flagged ) %][% END %][% END %] + [% UNLESS ( patron_flagged ) %][% END %][% END %] [% IF ( OPACFinesTab ) %] [% END %] @@ -281,7 +321,7 @@ $.tablesorter.addParser({ [% IF ( GoogleJackets ) %][% IF ( OVERDUE.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] -[% IF ( BakerTaylorEnabled ) %][% IF ( OVERDUE.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] +[% IF ( BakerTaylorEnabled ) %][% IF ( OVERDUE.normalized_isbn ) %]

[% ELSE %]No cover image available[% END %][% END %] [% IF ( SyndeticsCoverImages ) %] [% IF ( using_https ) %] @@ -323,7 +363,7 @@ $.tablesorter.addParser({ - + @@ -331,7 +371,7 @@ $.tablesorter.addParser({ [% END %] - + [% FOREACH RESERVE IN RESERVES %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt index cb09184..6c4f0c3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt @@ -51,7 +51,7 @@ Card Number: -

[% issues_count %] Item(s) Checked Out
	Title	Due		Title	Item Type	Barcode	Call No.	Due	Renew	Renew
[% ISSUE.title \|html %] [% ISSUE.author %]	[% IF ( ISSUE.imageurl ) %][% END %] [% ISSUE.description %]	[% ISSUE.barcode %]	[% ISSUE.itemcallnumber %]	[% ISSUE.date_due %]	[% ISSUE.date_due %]	[% IF ( ISSUE.imageurl ) %][% END %] [% ISSUE.description %]	[% ISSUE.barcode %]	[% ISSUE.itemcallnumber %]	[% IF ( ISSUE.status ) %]Renew ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining) @@ -260,14 +300,14 @@ $.tablesorter.addParser({
	Title		Title	Item Type	Barcode	Call No.	Due	Renew	Renew	Fines
Title	Title	Placed On	Expires On	Pick Up Location	Priority	Status	Modify	Modify
[% cardnumber %]
DoB:	[% IF ( dateofbirth ) %][% dateofbirth %][% ELSE %] [% END %]
Gender:	[% IF ( sex ) %][% sex %][% ELSE %] [% END %]

+Sex:[% IF ( sex ) %][% sex %][% ELSE %] [% END %] [% IF ( contactname ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt index 9a68851..12fb53c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tt @@ -66,7 +66,7 @@

Date of Birth:
Gender: [% IF ( BORROWER_INF.sex == 'F' ) %][% ELSE %][% END %] [% IF ( BORROWER_INF.sex == 'M' ) %][% ELSE %][% END %]

Personal Information

Date of Birth: [% BORROWER_INF.dateofbirth %]
Gender: +
Sex: [% IF ( sex == 'F' ) %]Female[% END %] [% IF ( sex == 'M' ) %]Male[% END %]

-# -# This is an example of a crontab file for Debian. It may not work -# in other versions of crontab, like on Solaris 8 or BSD, for example. -# -# While similar in structure, -# this is NOT an example for cron (as root). Cron takes an extra -# argument per line to designate the user to run as. You could -# reasonably extrapolate the needed info from here though. -# -# WARNING: These jobs will do things like charge fines, send -# potentially VERY MANY emails to patrons and even debar offending -# users. DO NOT RUN OR SCHEDULE these jobs without being sure you -# really intend to. Make sure the relevant message templates are -# configured to your liking before scheduling messages to be sent. -# -# ENVIRONMENT: -# First, establish Koha's two important ENV variables. - PERL5LIB=/usr/share/koha/lib KOHA_CONF=/etc/koha/koha-conf.xml - -# Some additional variables to save you typing -KOHA_CRON_PATH = /usr/share/koha/bin/cronjobs -# -# MULTIPLE KOHA SUPPORT: -# You can still run jobs for this user's additional koha installs, -# by manipulating those variables in the command. -# -# For example, on the same codebase: -# */10 * * * * KOHA_CONF=/etc/koha/koha-conf.xml /usr/share/koha/bin/migration_tools/rebuild_zebra.pl -b -a -z >/dev/null -# -# For example, on a separate codebase: -# */10 * * * * KOHA_CONF=/etc/koha/koha-conf.xml PERL5LIB=/home/koha/kohaclone /home/koha/kohaclone/misc/migration_tools/rebuild_zebra.pl -b -a -z >/dev/null -# -# ADDITIONAL INFO: -# See the perldoc of individual scripts to determine what other options -# are available. Check the man page for crontab to understand the -# schedule syntax for your system. -# -# NOTE: Don't forget to keep the empty line at the bottom. -# Cron/crontab will choke without it. -# -# SCHEDULED JOBS: -# m h dom mon dow command - -# OVERDUE NOTICES +KOHA_CRON_PATH = /home/peter/kohaclone/bin/cronjobs 0 1 * * * $KOHA_CRON_PATH/overdue_notices.pl -t - -# FINES 5 1 * * * $KOHA_CRON_PATH/fines.pl - -# ADVANCE NOTICES 10 1 * * * $KOHA_CRON_PATH/advance_notices.pl -c - -# PROCESS LONG OVERDUES -# updates item status from available to longoverdue for items long overdue -# 19 1 * * * $KOHA_CRON_PATH/longoverdue.pl --lost 90=1 --confirm - -# SEND EMAILS 15 * * * * $KOHA_CRON_PATH/process_message_queue.pl - -# Hourly holds queue updated 52 * * * * $KOHA_CRON_PATH/holds/build_holds_queue.pl >/dev/null 2>&1 - -# Cancel expired holds 0 1 * * * $KOHA_CRON_PATH/holds/cancel_expired_holds.pl >/dev/null 2>&1 - -# ZEBRA INDEX UPDATES with -z option, incremental index updates throughout the day -# for both authorities and bibs -*/10 * * * * $KOHA_CRON_PATH/../migration_tools/rebuild_zebra.pl -b -a -z >/dev/null - -# services_throttle -- resets the xISBN service +*/2 * * * * $KOHA_CRON_PATH/../migration_tools/rebuild_zebra.pl -b -a -z >/dev/null 59 23 * * * $KOHA_CRON_PATH/services_throttle.pl > /dev/null 2>&1 - -# clean up databases nightly. Be sure not to run this with --sessions during a time when the system is in use! 16 1 * * * $KOHA_CRON_PATH/cleanup_database.pl --sessions --zebraqueue 10 - -# delete old purchase suggestions weekly. Replace XX with a number to define the age of suggestions to delete. - at weekly $KOHA_CRON_PATH/purge_suggestions.pl --days XX > /dev/null 2>&1 diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index e605451..bc97ecb 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -644,9 +644,6 @@ sub parse_letter { # FIXME: this code should probably be moved to C4::Letters:pa return unless exists $params->{$required}; } - my $todaysdate = C4::Dates->new()->output("syspref"); - $params->{'letter'}->{title} =~ s/<>/$todaysdate/g; - $params->{'letter'}->{content} =~ s/<>/$todaysdate/g; if ( $params->{'substitute'} ) { while ( my ( $key, $replacedby ) = each %{ $params->{'substitute'} } ) { diff --git a/misc/maintenance/remove_items_from_biblioitems.pl b/misc/maintenance/remove_items_from_biblioitems.pl index 9f30db0..0778b29 100755 --- a/misc/maintenance/remove_items_from_biblioitems.pl +++ b/misc/maintenance/remove_items_from_biblioitems.pl @@ -20,17 +20,15 @@ use strict; use warnings; -$|=1; use C4::Context; use C4::Biblio; use Getopt::Long; -my ($wherestring, $run, $silent, $want_help); +my ($wherestring, $run, $want_help); my $result = GetOptions( 'where:s' => \$wherestring, '--run' => \$run, - '--silent' => \$silent, 'help|h' => \$want_help, ); @@ -40,15 +38,11 @@ if ( not $result or not $run or $want_help ) { } my $dbh = C4::Context->dbh; -my $count = 0; my $querysth = qq{SELECT biblionumber from biblioitems }; $querysth .= " WHERE $wherestring " if ($wherestring); my $query = $dbh->prepare($querysth); $query->execute; while (my $biblionumber = $query->fetchrow){ - $count++; - print "." unless $silent; - print "\r$count" unless ($silent or ($count % 100)); my $record = GetMarcBiblio($biblionumber); if ($record) { @@ -59,8 +53,6 @@ while (my $biblionumber = $query->fetchrow){ } } -print "\n\n$count records processed.\n" unless $silent; - sub print_usage { print <<_USAGE_; $0: removes items from selected biblios @@ -74,7 +66,6 @@ should be run using rebuild_zebra.pl -b -r. Parameters: -where use this to limit modifications to selected biblios --run perform the update - --silent run silently --help or -h show this message _USAGE_ } diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl index dadf43f..5be01cf 100755 --- a/misc/migration_tools/rebuild_zebra.pl +++ b/misc/migration_tools/rebuild_zebra.pl @@ -191,7 +191,7 @@ sub index_records { my ($record_type, $directory, $skip_export, $process_zebraqueue, $as_xml, $noxml, $nosanitize, $do_not_clear_zebraqueue, $verbose_logging, $zebraidx_log_opt, $server_dir) = @_; my $num_records_exported = 0; - my $records_deleted; + my $num_records_deleted = 0; my $need_reset = check_zebra_dirs($server_dir); if ($need_reset) { print "$0: found broken zebra server directories: forcing a rebuild\n"; @@ -212,12 +212,12 @@ sub index_records { if ($process_zebraqueue) { my $entries = select_zebraqueue_records($record_type, 'deleted'); mkdir "$directory/del_$record_type" unless (-d "$directory/del_$record_type"); - $records_deleted = generate_deleted_marc_records($record_type, $entries, "$directory/del_$record_type", $as_xml); + $num_records_deleted = generate_deleted_marc_records($record_type, $entries, "$directory/del_$record_type", $as_xml); mark_zebraqueue_batch_done($entries); $entries = select_zebraqueue_records($record_type, 'updated'); mkdir "$directory/upd_$record_type" unless (-d "$directory/upd_$record_type"); $num_records_exported = export_marc_records_from_list($record_type, - $entries, "$directory/upd_$record_type", $as_xml, $noxml, $records_deleted); + $entries, "$directory/upd_$record_type", $as_xml, $noxml); mark_zebraqueue_batch_done($entries); } else { my $sth = select_all_records($record_type); @@ -239,7 +239,7 @@ sub index_records { my $record_fmt = ($as_xml) ? 'marcxml' : 'iso2709' ; if ($process_zebraqueue) { do_indexing($record_type, 'delete', "$directory/del_$record_type", $reset, $noshadow, $record_fmt, $zebraidx_log_opt) - if %$records_deleted; + if $num_records_deleted; do_indexing($record_type, 'update', "$directory/upd_$record_type", $reset, $noshadow, $record_fmt, $zebraidx_log_opt) if $num_records_exported; } else { @@ -320,7 +320,7 @@ sub export_marc_records_from_sth { ? GetXmlBiblio( $record_number ) : GetAuthorityXML( $record_number ); if ($record_type eq 'biblio'){ - my @items = GetItemsInfo($record_number); + my @items = GetItemsInfo($record_number, 'intra'); if (@items){ my $record = MARC::Record->new; my @itemsrecord; @@ -351,13 +351,8 @@ sub export_marc_records_from_sth { # strung together with no single root element. zebraidx doesn't seem # to care, though, at least if you're using the GRS-1 filter. It does # care if you're using the DOM filter, which requires valid XML file(s). - eval { - print OUT ($as_xml) ? $marc->as_xml_record(C4::Context->preference('marcflavour')) : $marc->as_usmarc(); - $num_exported++; - }; - if ($@) { - warn "Error exporting record $record_number ($record_type) ".($noxml ? "not XML" : "XML"); - } + print OUT ($as_xml) ? $marc->as_xml_record(C4::Context->preference('marcflavour')) : $marc->as_usmarc(); + $num_exported++; } } print "\nRecords exported: $num_exported\n" if ( $verbose_logging ); @@ -366,14 +361,12 @@ sub export_marc_records_from_sth { } sub export_marc_records_from_list { - my ($record_type, $entries, $directory, $as_xml, $noxml, $records_deleted) = @_; + my ($record_type, $entries, $directory, $as_xml, $noxml) = @_; my $num_exported = 0; open (OUT, ">:utf8 ", "$directory/exported_records") or die $!; my $i = 0; - - # Skip any deleted records. We check for this anyway, but this reduces error spam - my %found = %$records_deleted; + my %found = (); foreach my $record_number ( map { $_->{biblio_auth_number} } grep { !$found{ $_->{biblio_auth_number} }++ } @$entries ) { @@ -398,7 +391,7 @@ sub export_marc_records_from_list { sub generate_deleted_marc_records { my ($record_type, $entries, $directory, $as_xml) = @_; - my $records_deleted = {}; + my $num_exported = 0; open (OUT, ">:utf8 ", "$directory/exported_records") or die $!; my $i = 0; foreach my $record_number (map { $_->{biblio_auth_number} } @$entries ) { @@ -416,12 +409,11 @@ sub generate_deleted_marc_records { } print OUT ($as_xml) ? $marc->as_xml_record(C4::Context->preference("marcflavour")) : $marc->as_usmarc(); - - $records_deleted->{$record_number} = 1; + $num_exported++; } - print "\nRecords exported: $i\n" if ( $verbose_logging ); + print "\nRecords exported: $num_exported\n" if ( $verbose_logging ); close OUT; - return $records_deleted; + return $num_exported; } @@ -457,19 +449,15 @@ sub get_raw_marc_record { $fetch_sth->execute($record_number); if (my ($blob) = $fetch_sth->fetchrow_array) { $marc = MARC::Record->new_from_usmarc($blob); - unless ($marc) { - warn "error creating MARC::Record from $blob"; - } + $fetch_sth->finish(); + } else { + return; # failure to find a bib is not a problem - + # a delete could have been done before + # trying to process a record update } - # failure to find a bib is not a problem - - # a delete could have been done before - # trying to process a record update - - $fetch_sth->finish(); - return unless $marc; } else { eval { $marc = GetMarcBiblio($record_number); }; - if ($@ || !$marc) { + if ($@) { # here we do warn since catching an exception # means that the bib was found but failed # to be parsed diff --git a/misc/translator/tmpl_process3.pl b/misc/translator/tmpl_process3.pl index d862a97..46ceceb 100755 --- a/misc/translator/tmpl_process3.pl +++ b/misc/translator/tmpl_process3.pl @@ -274,21 +274,6 @@ if (defined $href) { # $charset_in = $candidate; # } # } - - # BUG6464: check consistency of PO messages - # - count number of '%s' in msgid and msgstr - for my $msg ( values %$href ) { - my $id_count = split(/%s/, $msg->{msgid}) - 1; - my $str_count = split(/%s/, $msg->{msgstr}) - 1; - next if $id_count == $str_count || - $msg->{msgstr} eq '""' || - grep { /fuzzy/ } @{$msg->{_flags}}; - warn_normal - "unconsistent %s count: ($id_count/$str_count):\n" . - " line: " . $msg->{loaded_line_number} . "\n" . - " msgid: " . $msg->{msgid} . "\n" . - " msgstr: " . $msg->{msgstr} . "\n", undef; - } } # set our charset in to UTF-8 diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl index c80d41c..b50947d 100755 --- a/opac/opac-ISBDdetail.pl +++ b/opac/opac-ISBDdetail.pl @@ -85,10 +85,7 @@ 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; -if ( $isbn or $ean or $oclc or $upc ) { - $content_identifier_exists = 1; -} +my $content_identifier_exists = 1 if ($isbn or $ean or $oclc or $upc); $template->param( normalized_upc => $upc, normalized_ean => $ean, @@ -127,7 +124,7 @@ $template->param( my $norequests = 1; my $res = GetISBDView($biblionumber, "opac"); -my @items = GetItemsInfo( $biblionumber ); +my @items = &GetItemsInfo($biblionumber, 'opac'); my $itemtypes = GetItemTypes(); for my $itm (@items) { diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl index 7544902..8e492aa 100755 --- a/opac/opac-MARCdetail.pl +++ b/opac/opac-MARCdetail.pl @@ -61,7 +61,7 @@ my $biblionumber = $query->param('biblionumber'); my $itemtype = &GetFrameworkCode($biblionumber); my $tagslib = &GetMarcStructure( 0, $itemtype ); my $biblio = GetBiblioData($biblionumber); -my $record = GetMarcBiblio($biblionumber, 1); +my $record = GetMarcBiblio($biblionumber); if ( ! $record ) { print $query->redirect("/cgi-bin/koha/errors/404.pl"); exit; diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl index acff077..a87030e 100755 --- a/opac/opac-authorities-home.pl +++ b/opac/opac-authorities-home.pl @@ -41,20 +41,18 @@ $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} - ) { - push @authtypesloop, - { value => $thisauthtype, - selected => $thisauthtype eq $authtypecode, - authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'}, - }; +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; } if ( $op eq "do_search" ) { diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl index 6610dfd..27ca8cc 100755 --- a/opac/opac-authoritiesdetail.pl +++ b/opac/opac-authoritiesdetail.pl @@ -170,14 +170,16 @@ foreach my $field (@fields) { } $template->param( "Tab0XX" => \@loop_data ); -my $authtypes = getauthtypes(); -my @authtypesloop = (); -foreach my $thisauthtype ( keys %{$authtypes} ) { - push @authtypesloop, - { value => $thisauthtype, - selected => $thisauthtype eq $authtypecode, +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; } $template->param( diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index e18e046..520804c 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -85,7 +85,7 @@ if (C4::Context->preference("OPACXSLTDetailsDisplay") ) { $template->param('OPACShowCheckoutName' => C4::Context->preference("OPACShowCheckoutName") ); # change back when ive fixed request.pl -my @all_items = GetItemsInfo( $biblionumber ); +my @all_items = &GetItemsInfo( $biblionumber, 'opac' ); my @items; # Getting items to be hidden @@ -177,6 +177,7 @@ for my $itm (@items) { $itm->{datedue} = format_date($itm->{datedue}); $itm->{datelastseen} = format_date($itm->{datelastseen}); + # get collection code description, too if ( my $ccode = $itm->{'ccode'} ) { $itm->{'ccode'} = $collections->{$ccode} if ( defined($collections) && exists( $collections->{$ccode} ) ); @@ -281,10 +282,7 @@ 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; -if ( $isbn or $ean or $oclc or $upc ) { - $content_identifier_exists = 1; -} +my $content_identifier_exists = 1 if ($isbn or $ean or $oclc or $upc); $template->param( normalized_upc => $upc, normalized_ean => $ean, @@ -298,12 +296,6 @@ $template->param( ocoins => GetCOinSBiblio($biblionumber), ); -my $libravatar_enabled = 0; -eval 'use Libravatar::URL'; -if (!$@ and C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowReviewerPhoto')) { - $libravatar_enabled = 1; -} - my $reviews = getreviews( $biblionumber, 1 ); my $loggedincommenter; foreach ( @$reviews ) { @@ -312,9 +304,6 @@ foreach ( @$reviews ) { $_->{title} = $borrowerData->{'title'}; $_->{surname} = $borrowerData->{'surname'}; $_->{firstname} = $borrowerData->{'firstname'}; - if ($libravatar_enabled and $borrowerData->{'email'}) { - $_->{avatarurl} = libravatar_url(email => $borrowerData->{'email'}, https => $ENV{HTTPS}); - } $_->{userid} = $borrowerData->{'userid'}; $_->{cardnumber} = $borrowerData->{'cardnumber'}; $_->{datereviewed} = format_date($_->{datereviewed}); @@ -593,5 +582,6 @@ my $defaulttab = @serialcollections > 0 ? 'serialcollection' : 'subscription'; $template->param('defaulttab' => $defaulttab); +$template->param('homebranch'=>C4::Branch->mybranch(), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl index 1057a16..ee9b0b1 100755 --- a/opac/opac-downloadshelf.pl +++ b/opac/opac-downloadshelf.pl @@ -48,59 +48,52 @@ my $shelfid = $query->param('shelfid'); my $format = $query->param('format'); my $dbh = C4::Context->dbh; -if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $shelfid, 'view' ) ) { - - if ($shelfid && $format) { +if ($shelfid && $format) { + + my @shelf = GetShelf($shelfid); + my ($items, $totitems) = GetShelfContents($shelfid); + my $marcflavour = C4::Context->preference('marcflavour'); + my $output; + + # CSV + if ($format =~ /^\d+$/) { + my @biblios; + foreach (@$items) { + push @biblios, $_->{biblionumber}; + } + $output = marc2csv(\@biblios, $format); + + # Other formats + } else { + foreach my $biblio (@$items) { + my $biblionumber = $biblio->{biblionumber}; - my @shelf = GetShelf($shelfid); - my ($items, $totitems) = GetShelfContents($shelfid); - my $marcflavour = C4::Context->preference('marcflavour'); - my $output; + my $record = GetMarcBiblio($biblionumber, 1); + next unless $record; - # CSV - if ($format =~ /^\d+$/) { - my @biblios; - foreach (@$items) { - push @biblios, $_->{biblionumber}; + if ($format eq 'iso2709') { + $output .= $record->as_usmarc(); } - $output = marc2csv(\@biblios, $format); - - # Other formats - } else { - foreach my $biblio (@$items) { - my $biblionumber = $biblio->{biblionumber}; - - my $record = GetMarcBiblio($biblionumber, 1); - next unless $record; - - if ($format eq 'iso2709') { - $output .= $record->as_usmarc(); - } - elsif ($format eq 'ris' ) { - $output .= marc2ris($record); - } - elsif ($format eq 'bibtex') { - $output .= marc2bibtex($record, $biblionumber); - } + elsif ($format eq 'ris' ) { + $output .= marc2ris($record); + } + elsif ($format eq 'bibtex') { + $output .= marc2bibtex($record, $biblionumber); } } + } - # If it was a CSV export we change the format after the export so the file extension is fine - $format = "csv" if ($format =~ m/^\d+$/); - - print $query->header( - -type => 'application/octet-stream', - -'Content-Transfer-Encoding' => 'binary', - -attachment=>"shelf.$format"); - print $output; + # If it was a CSV export we change the format after the export so the file extension is fine + $format = "csv" if ($format =~ m/^\d+$/); - } else { - $template->param(csv_profiles => GetCsvProfilesLoop()); - $template->param(shelfid => $shelfid); - output_html_with_http_headers $query, $cookie, $template->output; - } + print $query->header( + -type => 'application/octet-stream', + -'Content-Transfer-Encoding' => 'binary', + -attachment=>"shelf.$format"); + print $output; } else { - $template->param(invalidlist => 1); + $template->param(csv_profiles => GetCsvProfilesLoop()); + $template->param(shelfid => $shelfid); output_html_with_http_headers $query, $cookie, $template->output; -} \ No newline at end of file +} diff --git a/opac/opac-main.pl b/opac/opac-main.pl index 177d812..aeba92b 100755 --- a/opac/opac-main.pl +++ b/opac/opac-main.pl @@ -19,6 +19,7 @@ use strict; use warnings; use CGI; +use CGI::Session; use C4::Auth; # get_template_and_user use C4::Output; use C4::VirtualShelves; @@ -27,9 +28,13 @@ use C4::Members; # GetMember use C4::NewsChannels; # get_opac_news use C4::Acquisition; # GetRecentAcqui use C4::Languages qw(getTranslatedLanguages accept_language); +use Data::Dumper::Simple; + + +my $input = new CGI; +my $dbh = C4::Context->dbh; +my $branch; # = C4::Context->userenv->{branch}; -my $input = new CGI; -my $dbh = C4::Context->dbh; my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { @@ -47,6 +52,8 @@ $template->param( ); + + my $borrower = GetMember( borrowernumber=>$borrowernumber ); $template->param( textmessaging => $borrower->{textmessaging}, @@ -95,4 +102,28 @@ if (C4::Context->preference('GoogleIndicTransliteration')) { $template->param('GoogleIndicTransliteration' => 1); } + +if (defined $input->param("library")) +{ + C4::Context->userenv->{branch} = $input->param("library"); + $template->param(branch=>C4::Context->userenv->{branch}); + my $session = C4::Auth::get_session(""); + C4::Context->set_userenv($session->param('branch',$input->param("library"))); + +} + +my $xx; +if ($template->{VARS}{loggedinusername} eq '') +{ + + print $input->redirect("/index.htm"); +} + + output_html_with_http_headers $input, $cookie, $template->output; + + + + + + diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl index dd3dcf2..68abed0 100755 --- a/opac/opac-renew.pl +++ b/opac/opac-renew.pl @@ -3,7 +3,7 @@ #written 18/1/2000 by chris at katipo.co.nz # adapted for use in the hlt opac by finlay at katipo.co.nz 29/11/2002 # script to renew items from the web -# Parts Copyright 2010,2011 Catalyst IT +# Parts Copyright 2010 Catalyst IT # This file is part of Koha. # @@ -27,8 +27,7 @@ use warnings; use CGI; use C4::Circulation; use C4::Auth; -use C4::Items; -use C4::Members; + my $query = new CGI; my ( $template, $borrowernumber, $cookie ) = get_template_and_user( @@ -49,27 +48,7 @@ my $errorstring=''; for my $itemnumber ( @items ) { my ($status,$error) = CanBookBeRenewed( $borrowernumber, $itemnumber ); if ( $status == 1 && $opacrenew == 1 ) { - my $renewalbranch = C4::Context->preference('OpacRenewalBranch'); - my $branchcode; - if ($renewalbranch eq 'itemhomebranch'){ - my $item = GetItem($itemnumber); - $branchcode=$item->{'homebranch'}; - } - elsif ($renewalbranch eq 'patronhomebranch'){ - my $borrower = GetMemberDetails($borrowernumber); - $branchcode = $borrower->{'branchcode'}; - } - elsif ($renewalbranch eq 'checkoutbranch'){ - my $issue = GetOpenIssue($itemnumber); - $branchcode = $issue->{'branchcode'}; - } - elsif ($renewalbranch eq 'NULL'){ - $branchcode=''; - } - else { - $branchcode='OPACRenew' - } - AddRenewal( $borrowernumber, $itemnumber, $branchcode); + AddRenewal( $borrowernumber, $itemnumber ); } else { $errorstring .= $error ."|"; diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index a92a976..d50480a 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -477,11 +477,11 @@ if ( $numBibsAvailable == 0 || !$anyholdable) { $template->param( none_available => 1 ); } -my $itemTableColspan = 7; -if (! $template->{VARS}->{'OPACItemHolds'}) { +my $itemTableColspan = 5; +if (!$template->param('OPACItemHolds')) { $itemTableColspan--; } -if (! $template->{VARS}->{'singleBranchMode'}) { +if ($template->param('singleBranchMode')) { $itemTableColspan--; } $template->param(itemtable_colspan => $itemTableColspan); diff --git a/opac/opac-search.pl b/opac/opac-search.pl index cd34610..43a62ea 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -39,6 +39,7 @@ use C4::Branch; # GetBranches use POSIX qw(ceil floor strftime); use URI::Escape; use Storable qw(thaw freeze); +use Data::Dumper::Simple; my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold"); @@ -46,6 +47,7 @@ my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold"); # FIXME: no_undef_params needs to be tested use CGI qw('-no_undef_params'); my $cgi = new CGI; +my @newresults1; BEGIN { if (C4::Context->preference('BakerTaylorEnabled')) { @@ -207,19 +209,15 @@ if ( $template_type && $template_type eq 'advsearch' ) { $template->param(outer_sup_servers_loop => $secondary_servers_loop,); # set the default sorting - 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 ); - } + 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); # 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 # box should only appear on the last, etc. my @search_boxes_array; - my $search_boxes_count = 3; # begin whith 3 boxes + my $search_boxes_count = C4::Context->preference("OPACAdvSearchInputCount") || 3; for (my $i=1;$i<=$search_boxes_count;$i++) { # if it's the first one, don't display boolean option, but show scan indexes if ($i==1) { @@ -277,13 +275,8 @@ $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; -if ( C4::Context->preference('OPACdefaultSortField') - && C4::Context->preference('OPACdefaultSortOrder') ) { - $default_sort_by = - C4::Context->preference('OPACdefaultSortField') . '_' - . C4::Context->preference('OPACdefaultSortOrder'); -} +my $default_sort_by = C4::Context->preference('OPACdefaultSortField')."_".C4::Context->preference('OPACdefaultSortOrder') + if (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); @@ -440,7 +433,6 @@ if ($facets) { foreach my $f (@$facets) { $f->{facets} = [ sort { uc($a->{facet_title_value}) cmp uc($b->{facet_title_value}) } @{ $f->{facets} } ]; } - @$facets = sort {$a->{expand} cmp $b->{expand}} @$facets; } # use Data::Dumper; print STDERR "-" x 25, "\n", Dumper($results_hashref); @@ -472,6 +464,7 @@ for (my $i=0;$i<@servers;$i++) { @newresults = searchResults('opac', $query_desc, $hits, $results_per_page, $offset, $scan, @{$results_hashref->{$server}->{"RECORDS"}},, C4::Context->preference('hidelostitems')); } + @newresults1 = @newresults; my $tag_quantity; if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnList')) { @@ -577,13 +570,8 @@ for (my $i=0;$i<@servers;$i++) { my $pages = ceil($hits / $results_per_page); # default page number my $current_page_number = 1; - 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; - } + $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 $next_page_offset = $offset + $results_per_page; # If we're within the first 10 pages, keep it simple #warn "current page:".$current_page_number; @@ -597,14 +585,11 @@ 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 => $this_page_number == $current_page_number, - sort_by => join ' ', @sort_by - }; - + push @page_numbers, { offset => $this_offset, pg => $this_page_number, highlight => $highlight, sort_by => join " ", at sort_by }; + } } @@ -613,13 +598,9 @@ 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; - 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 - }; + 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 }; } } @@ -696,3 +677,9 @@ if (C4::Context->preference('GoogleIndicTransliteration')) { } output_with_http_headers $cgi, $cookie, $template->output, $content_type; + + + + + + \ No newline at end of file diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index df1b4c5..0042c42 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -81,7 +81,7 @@ if ( $email_add ) { my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); - my @items = GetItemsInfo( $biblionumber ); + my @items = &GetItemsInfo( $biblionumber, 'opac' ); my $hasauthors = 0; if($dat->{'author'} || @$marcauthorsarray) { diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl index b571e07..6a376c4 100755 --- a/opac/opac-sendshelf.pl +++ b/opac/opac-sendshelf.pl @@ -51,8 +51,6 @@ my $email = $query->param('email'); my $dbh = C4::Context->dbh; -if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $shelfid, 'view' ) ) { - if ( $email ) { my $email_from = C4::Context->preference('KohaAdminEmailAddress'); my $comment = $query->param('comment'); @@ -88,7 +86,7 @@ if ( $email ) { my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); - my @items = GetItemsInfo( $biblionumber ); + my @items = &GetItemsInfo( $biblionumber, 'opac' ); $dat->{MARCNOTES} = $marcnotesarray; $dat->{MARCSUBJCTS} = $marcsubjctsarray; @@ -179,10 +177,3 @@ END_OF_BODY ); output_html_with_http_headers $query, $cookie, $template->output; } - -} else { - $template->param( invalidlist => 1, - url => "/cgi-bin/koha/opac-sendshelf.pl", - ); - output_html_with_http_headers $query, $cookie, $template->output; -} \ No newline at end of file diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl index 3a74270..f1e0b53 100755 --- a/opac/opac-showreviews.pl +++ b/opac/opac-showreviews.pl @@ -65,12 +65,6 @@ if($format eq "rss"){ ); } -my $libravatar_enabled = 0; -eval 'use Libravatar::URL'; -if (!$@ and C4::Context->preference('ShowReviewer') and C4::Context->preference('ShowReviewerPhoto')) { - $libravatar_enabled = 1; -} - my $reviews = getallreviews(1,$offset,$results_per_page); my $marcflavour = C4::Context->preference("marcflavour"); my $hits = numberofreviews(); @@ -98,10 +92,6 @@ for my $result (@$reviews){ $result->{timestamp} = $bib->{'timestamp'}; $result->{firstname} = $borr->{'firstname'}; $result->{surname} = $borr->{'surname'}; - if ($libravatar_enabled and $borr->{'email'}) { - $result->{avatarurl} = libravatar_url(email => $borr->{'email'}, size => 40, https => $ENV{HTTPS}); - } - if ($result->{borrowernumber} eq $borrowernumber) { $result->{your_comment} = 1; } diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl index 6899215..80e7c35 100755 --- a/opac/opac-topissues.pl +++ b/opac/opac-topissues.pl @@ -127,11 +127,13 @@ $template->param( branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'} my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; $itemtypes = GetItemTypes; my @itemtypesloop; +my $selected=1; if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { 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 => $thisitemtype eq $itemtype, + selected => $selected, ); push @itemtypesloop, \%row; } @@ -140,7 +142,7 @@ if (!$advanced_search_types or $advanced_search_types eq 'itemtypes') { for my $thisitemtype (@$advsearchtypes) { my $selected = 1 if $thisitemtype->{authorised_value} eq $itemtype; my %row =( value => $thisitemtype->{authorised_value}, - selected => $thisitemtype eq $itemtype, + selected => $selected, description => $thisitemtype->{'lib'}, ); push @itemtypesloop, \%row; diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 2c31ce7..5a5355f 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -35,6 +35,7 @@ use C4::Items; use C4::Dates qw/format_date/; use C4::Letters; use C4::Branch; # GetBranches +use Data::Dumper::Simple; use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE'; @@ -64,6 +65,8 @@ my $patronupdate = $query->param('patronupdate'); # get borrower information .... my ( $borr ) = GetMemberDetails( $borrowernumber ); + + for (qw(dateenrolled dateexpiry dateofbirth)) { ($borr->{$_}) and $borr->{$_} = format_date($borr->{$_}); } @@ -193,17 +196,13 @@ $template->param( show_barcode => 1 ) if $show_barcode; # load the branches my $branches = GetBranches(); my @branch_loop; -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} ) ); - } +for my $branch_hash (sort keys %$branches ) { + my $selected=(C4::Context->userenv && ($branch_hash eq C4::Context->userenv->{branch})) if (C4::Context->preference('SearchMyLibraryFirst')); 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 ); @@ -327,5 +326,16 @@ $template->param( dateformat => C4::Context->preference("dateformat"), ); + + + +if ($borr->{userid} eq $borr->{branchcode}) +{ + $template->param(redirect=>1); + #print $query->redirect('/cgi-bin/koha/opac-main.pl'); +} + + output_html_with_http_headers $query, $cookie, $template->output; + diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 2488f67..b36ff64 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -92,7 +92,7 @@ my $issuer = GetMemberDetails($issuerid); my $item = GetItem(undef,$barcode); if (C4::Context->preference('SelfCheckoutByLogin') && !$patronid) { my $dbh = C4::Context->dbh; - my ($resval, $patronid) = checkpw($dbh, $patronlogin, $patronpw); + my $resval, $patronid = checkpw($dbh, $patronlogin, $patronpw); } my $borrower = GetMemberDetails(undef,$patronid); diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl index 50bbbf4..449e82a 100755 --- a/patroncards/edit-batch.pl +++ b/patroncards/edit-batch.pl @@ -60,7 +60,7 @@ my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number'); my @borrower_numbers = $cgi->param('borrower_number') if $cgi->param('borrower_number'); my $errstr = $cgi->param('error') || ''; -my $branch_code = get_branch_code_from_name($template->{VARS}->{'LoginBranchname'}); +my $branch_code = get_branch_code_from_name($template->param('LoginBranchname')); if ($op eq 'remove') { $batch = C4::Patroncards::Batch->retrieve(batch_id => $batch_id); diff --git a/patroncards/manage.pl b/patroncards/manage.pl index 71e1b82..2a449ba 100755 --- a/patroncards/manage.pl +++ b/patroncards/manage.pl @@ -73,7 +73,7 @@ my $display_columns = { layout => [ # db column => {col label }; my $errstr = ($cgi->param('error') ? $cgi->param('error') : ''); -my $branch_code = ($card_element eq 'batch' ? get_branch_code_from_name($template->{VARS}->{'LoginBranchname'}) : ''); +my $branch_code = ($card_element eq 'batch' ? get_branch_code_from_name($template->param('LoginBranchname')) : ''); if ($op eq 'delete') { my $err = 0; diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl index 8220148..26e85d5 100755 --- a/reports/acquisitions_stats.pl +++ b/reports/acquisitions_stats.pl @@ -134,7 +134,13 @@ else { -multiple => 0 ); - $req = $dbh->prepare("SELECT DISTINCTROW itemtype,description FROM itemtypes ORDER BY description"); + if (C4::Context->preference("searchMyLibraryOnly")) + { + $req = $dbh->prepare("SELECT DISTINCTROW itemtype,description FROM itemtypes WHERE itemtype LIKE '" . C4::Branch->mybranch() . "%' ORDER BY description"); + } + else { + $req = $dbh->prepare("SELECT DISTINCTROW itemtype,description FROM itemtypes ORDER BY description"); + } $req->execute; undef @select; undef %select; @@ -153,7 +159,14 @@ else { -multiple => 0 ); + if (C4::Context->preference("searchMyLibraryOnly")) + { + $req = $dbh->prepare("SELECT DISTINCTROW budget_code, budget_name FROM aqbudgets WHERE budget_code LIKE '" . C4::Branch->mybranch() . "%' ORDER BY budget_name"); + } + else { $req = $dbh->prepare("SELECT DISTINCTROW budget_code, budget_name FROM aqbudgets ORDER BY budget_name"); + } + $req->execute; undef @select; undef %select; diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl index 95fc287..f45664f 100755 --- a/reports/bor_issues_top.pl +++ b/reports/bor_issues_top.pl @@ -137,7 +137,17 @@ foreach (sort keys %$labels) { my %row =(value => $_, description => $labels->{$_}, ); - push @borcatloop, \%row; + + if (C4::Context->preference("searchMyLibraryOnly") && not C4::Branch->mybranch() eq 'NO_LIBRARY_SET') + { + if (substr($labels->{$_},0,3) eq C4::Branch->mybranch()) + { + push @borcatloop, \%row; + } + } + else { + push @borcatloop, \%row; + } } $template->param( diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl index 0a135e1..3dfde49 100755 --- a/reports/borrowers_out.pl +++ b/reports/borrowers_out.pl @@ -124,11 +124,23 @@ if ($do_it) { my ($codes,$labels) = GetborCatFromCatType(undef,undef); my @borcatloop; - foreach my $thisborcat (sort keys %$labels) { - my %row =(value => $thisborcat, - description => $labels->{$thisborcat}, + foreach (sort keys %$labels) { + my %row =(value => $_, + description => $labels->{$_}, ); - push @borcatloop, \%row; + + + if (C4::Context->preference("searchMyLibraryOnly") && not C4::Branch->mybranch() eq 'NO_LIBRARY_SET') + { + if (substr($labels->{$_},0,3) eq C4::Branch->mybranch()) + { + push @borcatloop, \%row; + } + } + else { + push @borcatloop, \%row; + } + } $template->param( CGIextChoice => $CGIextChoice, diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl index c17a326..950330b 100755 --- a/reports/borrowers_stats.pl +++ b/reports/borrowers_stats.pl @@ -147,7 +147,16 @@ if ($do_it) { output_html_with_http_headers $input, $cookie, $template->output; sub catcode_aref() { - my $req = C4::Context->dbh->prepare("SELECT categorycode, description FROM categories ORDER BY description"); + my $req; + + if ( C4::Context->preference("searchMyLibraryOnly") && not C4::Branch->mybranch() eq 'NO_LIBRARY_SET' ) + { + $req = C4::Context->dbh->prepare("SELECT categorycode, description FROM categories WHERE categorycode LIKE '" . C4::Branch->mybranch() . "%' ORDER BY description"); + } + else { + $req = C4::Context->dbh->prepare("SELECT categorycode, description FROM categories ORDER BY description"); + } + $req->execute; return $req->fetchall_arrayref({}); } diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl index 606106d..12f630a 100755 --- a/reports/cat_issues_top.pl +++ b/reports/cat_issues_top.pl @@ -140,11 +140,22 @@ if ($do_it) { #borcat my ($codes,$labels) = GetborCatFromCatType(undef,undef); my @borcatloop; - foreach my $thisborcat (sort {$labels->{$a} cmp $labels->{$b}} keys %$labels) { - my %row =(value => $thisborcat, - description => $labels->{$thisborcat}, + foreach (sort {$labels->{$a} cmp $labels->{$b}} keys %$labels) { + my %row =(value => $_, + description => $labels->{$_}, ); - push @borcatloop, \%row; + + if (C4::Context->preference("searchMyLibraryOnly") && not C4::Branch->mybranch() eq 'NO_LIBRARY_SET') + { + if (substr($labels->{$_},0,3) eq C4::Branch->mybranch()) + { + push @borcatloop, \%row; + } + } + else { + push @borcatloop, \%row; + } + } #Day diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl index 11dff4d..4c68f5d 100755 --- a/reports/catalogue_stats.pl +++ b/reports/catalogue_stats.pl @@ -142,7 +142,15 @@ if ($do_it) { my $hascote = 1; my $highcote = 5; + if ( C4::Context->preference("searchMyLibraryOnly") && not C4::Branch->mybranch() eq 'NO_LIBRARY_SET' ) + { + $req = $dbh->prepare("select itemtype, description from itemtypes WHERE itemtype LIKE '" . C4::Branch->mybranch() . "%' order by description"); + } + else { + $req = $dbh->prepare("select itemtype, description from itemtypes order by description"); + } + $req->execute; my $CGIitemtype = $req->fetchall_arrayref({}); diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index f5667a2..600ac29 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -21,7 +21,6 @@ use strict; #use warnings; FIXME - Bug 2505 use CGI; use Text::CSV; -use URI::Escape; use C4::Reports::Guided; use C4::Auth qw/:DEFAULT get_session/; use C4::Output; @@ -522,9 +521,6 @@ elsif ($phase eq 'Run this report'){ my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0); my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report&phase=Run%20this%20report"; - if (@sql_params) { - $url = join('&sql_params=', $url, map { URI::Escape::uri_escape($_) } @sql_params); - } $template->param( 'results' => \@rows, 'sql' => $sql, @@ -625,7 +621,7 @@ sub header_cell_loop { } foreach (1..6) { - $template->{VARS}->{'build' . $_} and $template->{VARS}->{'buildx' . $_} and last; + $template->param('build' . $_) and $template->param(buildx => $_) and last; } $template->param( 'referer' => $input->referer(), 'DHTMLcalendar_dateformat' => C4::Dates->DHTMLcalendar(), diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl index c6a3859..a74b885 100755 --- a/reports/issues_avg_stats.pl +++ b/reports/issues_avg_stats.pl @@ -119,7 +119,15 @@ if ($do_it) { my %labels; my %select; my $req; + + if ( C4::Context->preference("searchMyLibraryOnly") && not C4::Branch->mybranch() eq 'NO_LIBRARY_SET' ) + { + $req = $dbh->prepare("select distinctrow categorycode,description from categories where categorycode like '" . C4::Branch->mybranch() . "%' order by description"); + } + else { $req = $dbh->prepare("select distinctrow categorycode,description from categories order by description"); + } + $req->execute; my @select; push @select,""; @@ -135,7 +143,13 @@ if ($do_it) { -size => 1, -multiple => 0 ); - $req = $dbh->prepare( "select distinctrow itemtype,description from itemtypes order by description"); + if ( C4::Context->preference("searchMyLibraryOnly") && not C4::Branch->mybranch() eq 'NO_LIBRARY_SET' ) + { + $req = $dbh->prepare( "select distinctrow itemtype,description from itemtypes where itemtype like '" . C4::Branch->mybranch() . "%' order by description"); + } + else { + $req = $dbh->prepare( "select distinctrow itemtype,description from itemtypes order by description"); + } $req->execute; undef @select; undef %select; @@ -554,23 +568,8 @@ sub calculate { # and the number matches the number of columns my $colcount=0; foreach my $col ( @loopcol ) { - 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} - }; - } + 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}}); + $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}}"; @@ -578,16 +577,12 @@ sub calculate { push @loopcell, {value => ($value)?sprintf("%.2f",$value):0 } ; } #warn "row : $row colcount:$colcount"; - 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 - }; + 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 + }; $hilighted = -$hilighted; } # @@ -622,3 +617,6 @@ sub calculate { } 1; + + + diff --git a/reports/reservereport.pl b/reports/reservereport.pl index 42a1d20..67f384c 100755 --- a/reports/reservereport.pl +++ b/reports/reservereport.pl @@ -96,7 +96,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) { # FIXME still need to shift the text to the template so its translateable if ( $data->[$i]) { # find if its on issue - my @items = GetItemsInfo( $line{biblionumber} ); + my @items = GetItemsInfo($line{'biblionumber'}, 'intra' ); my $onissue = 0; foreach my $item (@items) { if ( $item->{'datedue'} eq 'Reserved' ) { diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl index 19d76be..bc3fc74 100755 --- a/reserve/placerequest.pl +++ b/reserve/placerequest.pl @@ -44,14 +44,14 @@ my @bibitems=$input->param('biblioitem'); # and probably remove the reserveconstraint table as well, I never could fill anything in this table. my @reqbib=$input->param('reqbib'); my $biblionumber=$input->param('biblionumber'); -my $borrowernumber=$input->param('borrowernumber'); +my $borrower=$input->param('member'); my $notes=$input->param('notes'); my $branch=$input->param('pickup'); my $startdate=$input->param('reserve_date') || ''; my @rank=$input->param('rank-request'); my $type=$input->param('type'); my $title=$input->param('title'); -my $borrower=GetMember('borrowernumber'=>$borrowernumber); +my $borrowernumber=GetMember('cardnumber'=>$borrower); my $checkitem=$input->param('checkitem'); my $expirationdate = $input->param('expiration_date'); @@ -81,7 +81,7 @@ if ($checkitem ne ''){ } } -if ($type eq 'str8' && $borrower){ +if ($type eq 'str8' && $borrowernumber ne ''){ foreach my $biblionumber (keys %bibinfos) { my $count=@bibitems; @@ -100,18 +100,18 @@ if ($type eq 'str8' && $borrower){ if ($multi_hold) { my $bibinfo = $bibinfos{$biblionumber}; - AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',[$biblionumber], + AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',[$biblionumber], $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found); } else { if ($input->param('request') eq 'any'){ # place a request on 1st available - AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found); + AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found); } elsif ($reqbib[0] ne ''){ # FIXME : elsif probably never reached, (see top of the script) # place a request on a given item - AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found); + AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'o',\@reqbib,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found); } else { - AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found); + AddReserve($branch,$borrowernumber->{'borrowernumber'},$biblionumber,'a',\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem, $found); } } } @@ -124,10 +124,8 @@ if ($type eq 'str8' && $borrower){ } else { print $input->redirect("request.pl?biblionumber=$biblionumber"); } -} elsif ($borrower eq ''){ +} elsif ($borrowernumber eq ''){ print $input->header(); - print "Invalid borrower number please try again"; -# Not sure that Dump() does HTML escaping. Use firebug or something to trace -# instead. -# print $input->Dump; + print "Invalid card number please try again"; + print $input->Dump; } diff --git a/reserve/request.pl b/reserve/request.pl index 79ff6b5..0b3bebc 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -85,7 +85,7 @@ my $CGIbranch = CGI::scrolling_list( my $findborrower = $input->param('findborrower'); $findborrower = '' unless defined $findborrower; $findborrower =~ s|,| |g; -my $borrowernumber_hold = $input->param('borrowernumber') || ''; +my $cardnumber = $input->param('cardnumber') || ''; my $borrowerslist; my $messageborrower; my $warnings; @@ -117,19 +117,21 @@ if ($findborrower) { my @borrowers = @$borrowers; - if ( !@borrowers ) { + if ( $#borrowers == -1 ) { + $input->param( 'findborrower', '' ); $messageborrower = "'$findborrower'"; } - elsif ( @borrowers == 1 ) { - $borrowernumber_hold = $borrowers[0]->{'borrowernumber'}; + elsif ( $#borrowers == 0 ) { + $input->param( 'cardnumber', $borrowers[0]->{'cardnumber'} ); + $cardnumber = $borrowers[0]->{'cardnumber'}; } else { $borrowerslist = \@borrowers; } } -if ($borrowernumber_hold) { - my $borrowerinfo = GetMemberDetails( $borrowernumber_hold ); +if ($cardnumber) { + my $borrowerinfo = GetMemberDetails( 0, $cardnumber ); my $diffbranch; my @getreservloop; my $count_reserv = 0; @@ -141,7 +143,7 @@ if ($borrowernumber_hold) { my $number_reserves = GetReserveCount( $borrowerinfo->{'borrowernumber'} ); - if ( C4::Context->preference('maxreserves') && ($number_reserves >= C4::Context->preference('maxreserves')) ) { + if ( C4::Context->preference('maxreserves') && $number_reserves >= C4::Context->preference('maxreserves') ) { $warnings = 1; $maxreserves = 1; } @@ -162,25 +164,24 @@ if ($borrowernumber_hold) { } $template->param( - borrowernumber => $borrowerinfo->{'borrowernumber'}, - borrowersurname => $borrowerinfo->{'surname'}, - borrowerfirstname => $borrowerinfo->{'firstname'}, - borrowerstreetaddress => $borrowerinfo->{'address'}, - borrowercity => $borrowerinfo->{'city'}, - borrowerphone => $borrowerinfo->{'phone'}, - borrowermobile => $borrowerinfo->{'mobile'}, - borrowerfax => $borrowerinfo->{'fax'}, - borrowerphonepro => $borrowerinfo->{'phonepro'}, - borroweremail => $borrowerinfo->{'email'}, - borroweremailpro => $borrowerinfo->{'emailpro'}, - borrowercategory => $borrowerinfo->{'category'}, - borrowerreservs => $count_reserv, - cardnumber => $borrowerinfo->{'cardnumber'}, - maxreserves => $maxreserves, - expiry => $expiry, - diffbranch => $diffbranch, - messages => $messages, - warnings => $warnings + borrowernumber => $borrowerinfo->{'borrowernumber'}, + borrowersurname => $borrowerinfo->{'surname'}, + borrowerfirstname => $borrowerinfo->{'firstname'}, + borrowerstreetaddress => $borrowerinfo->{'address'}, + borrowercity => $borrowerinfo->{'city'}, + borrowerphone => $borrowerinfo->{'phone'}, + borrowermobile => $borrowerinfo->{'mobile'}, + borrowerfax => $borrowerinfo->{'fax'}, + borrowerphonepro => $borrowerinfo->{'phonepro'}, + borroweremail => $borrowerinfo->{'email'}, + borroweremailpro => $borrowerinfo->{'emailpro'}, + borrowercategory => $borrowerinfo->{'category'}, + borrowerreservs => $count_reserv, + maxreserves => $maxreserves, + expiry => $expiry, + diffbranch => $diffbranch, + messages => $messages, + warnings => $warnings ); } @@ -199,18 +200,18 @@ if ($borrowerslist) { } @{$borrowerslist} ) { - push @values, $borrower->{borrowernumber}; + push @values, $borrower->{cardnumber}; - $labels{ $borrower->{borrowernumber} } = sprintf( + $labels{ $borrower->{cardnumber} } = sprintf( '%s, %s ... (%s - %s) ... %s', - $borrower->{surname} ||'', $borrower->{firstname} || '', - $borrower->{cardnumber} || '', $borrower->{categorycode} || '', - $borrower->{address} || '', + $borrower->{surname}, $borrower->{firstname}, + $borrower->{cardnumber}, $borrower->{categorycode}, + $borrower->{address}, ); } $CGIselectborrower = CGI::scrolling_list( - -name => 'borrowernumber', + -name => 'cardnumber', -values => \@values, -labels => \%labels, -size => 7, @@ -219,7 +220,7 @@ if ($borrowerslist) { } # FIXME launch another time GetMemberDetails perhaps until -my $borrowerinfo = GetMemberDetails( $borrowernumber_hold ); +my $borrowerinfo = GetMemberDetails( 0, $cardnumber ); my @biblionumbers = (); my $biblionumbers = $input->param('biblionumbers'); @@ -237,7 +238,7 @@ foreach my $biblionumber (@biblionumbers) { my $dat = GetBiblioData($biblionumber); - unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) { + if ( not CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) { $warnings = 1; $maxreserves = 1; } @@ -428,14 +429,11 @@ foreach my $biblionumber (@biblionumbers) { $item->{'holdallowed'} = $branchitemrule->{'holdallowed'}; if ( $branchitemrule->{'holdallowed'} == 0 || - ( $branchitemrule->{'holdallowed'} == 1 && - $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) { + ( $branchitemrule->{'holdallowed'} == 1 && $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) { $policy_holdallowed = 0; } - if (IsAvailableForItemLevelRequest($itemnumber) and - not $item->{cantreserve} and - CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) { + if (IsAvailableForItemLevelRequest($itemnumber) and not $item->{cantreserve} and CanItemBeReserved($borrowerinfo->{borrowernumber}, $itemnumber) ) { if ( $policy_holdallowed ) { $item->{available} = 1; $num_available++; @@ -566,6 +564,7 @@ foreach my $biblionumber (@biblionumbers) { date => $date, biblionumber => $biblionumber, findborrower => $findborrower, + cardnumber => $cardnumber, title => $dat->{title}, author => $dat->{author}, holdsview => 1, diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl index 64849b5..5d57c13 100755 --- a/serials/routing-preview.pl +++ b/serials/routing-preview.pl @@ -65,7 +65,7 @@ if($ok){ # get biblio information.... my $biblio = $subs->{'biblionumber'}; my ($count2, at bibitems) = GetBiblioItemByBiblioNumber($biblio); - my @itemresults = GetItemsInfo( $subs->{biblionumber} ); + my @itemresults = GetItemsInfo($subs->{'biblionumber'}, 'intra'); my $branch = $itemresults[0]->{'holdingbranch'}; my $branchname = GetBranchName($branch); diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl index db7620c..fbf9ad5 100755 --- a/serials/serials-edit.pl +++ b/serials/serials-edit.pl @@ -176,7 +176,6 @@ foreach my $subscriptionid (@subscriptionids) { $cell->{serialsadditems} = 1; } $cell->{'subscriptionid'} = $subscriptionid; - $cell->{biblionumber} = $serialdatalist[0]->{'biblionumber'}; $cell->{'itemid'} = 'NNEW'; $cell->{'serialid'} = 'NEW'; $cell->{'issuesatonce'} = 1; diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index 9acee7b..7fcccdf 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -43,7 +43,7 @@ my @budgets; # Permission needed if it is a modification : edit_subscription # Permission needed otherwise (nothing or dup) : create_subscription -my $permission = ($op eq "modify") ? "edit_subscription" : "create_subscription"; +my $permission = ($op eq "mod") ? "edit_subscription" : "create_subscription"; my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "serials/subscription-add.tmpl", @@ -66,12 +66,12 @@ my $subs; my $firstissuedate; my $nextexpected; -if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { +if ($op eq 'mod' || $op eq 'dup' || $op eq 'modsubscription') { my $subscriptionid = $query->param('subscriptionid'); $subs = GetSubscription($subscriptionid); ## FIXME : Check rights to edit if mod. Could/Should display an error message. - if ($subs->{'cannotedit'} && $op eq 'modify'){ + if ($subs->{'cannotedit'} && $op eq 'mod'){ carp "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed"; print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); } @@ -91,7 +91,7 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { letter_loop($subs->{'letter'}, $template); $nextexpected = GetNextExpected($subscriptionid); $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ; - $subs->{nextacquidate} = $nextexpected->{planneddate}->output() if($op eq 'modify'); + $subs->{nextacquidate} = $nextexpected->{planneddate}->output() if($op eq 'mod'); unless($op eq 'modsubscription') { foreach my $length_unit qw(numberlength weeklength monthlength){ if ($subs->{$length_unit}){ @@ -107,7 +107,7 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { $op => 1, "subtype_$sub_on" => 1, sublength =>$sub_length, - history => ($op eq 'modify'), + history => ($op eq 'mod'), "periodicity".$subs->{'periodicity'} => 1, "numberpattern".$subs->{'numberpattern'} => 1, firstacquiyear => substr($firstissuedate,0,4), @@ -160,7 +160,7 @@ if ($op eq 'addsubscription') { } $template->param(subtype => \@sub_type_data); - letter_loop( '', $template ) if ($op ne 'modsubscription' && $op ne 'dup' && $op ne 'modify'); + letter_loop( '', $template ) if ($op ne 'modsubscription' && $op ne 'dup' && $op ne 'mod'); my $new_biblionumber = $query->param('biblionumber_for_new_subscription'); if (defined $new_biblionumber) { diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index d00b632..aa8fad0 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -288,16 +288,10 @@ my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG",$$suggestion_ref{'patron $template->param(patron_reason_loop=>$patron_reason_loop); #Budgets management -my $budgets = []; -if ($branchfilter) { - my $searchbudgets = { budget_branchcode => $branchfilter }; - $budgets = GetBudgets($searchbudgets); -} else { - $budgets = GetBudgets(undef); -} +my $searchbudgets={ budget_branchcode=>$branchfilter} if $branchfilter; +my $budgets = GetBudgets($searchbudgets); -foreach my $budget ( @{$budgets} ) { -## Please see file perltidy.ERR +foreach my $budget (@$budgets){ $budget->{'selected'}=1 if ($$suggestion_ref{'budgetid'} && $budget->{'budget_id'} eq $$suggestion_ref{'budgetid'}) }; diff --git a/t/db_dependent/Biblio.t b/t/db_dependent/Biblio.t index dd827f0..6012f5f 100755 --- a/t/db_dependent/Biblio.t +++ b/t/db_dependent/Biblio.t @@ -5,7 +5,7 @@ use strict; use warnings; -use Test::More tests => 9; +use Test::More tests => 6; use MARC::Record; use C4::Biblio; @@ -34,40 +34,6 @@ my $itemdata = &GetBiblioItemData($biblioitemnumber); is($itemdata->{title},$title,'First test of GetBiblioItemData to get same result of previous two GetBiblioData tests.'); is($itemdata->{isbn},$isbn,'Second test checking it returns the correct isbn.'); -my $success = 0; -$field = MARC::Field->new( - 655, ' ', ' ', - 'a' => 'Auction catalogs', - '9' => '1' - ); -eval { - $marc_record->append_fields($field); - $success = ModBiblio($marc_record,$biblionumber,''); -} or do { - diag($@); - $success = 0; -}; -ok($success, "ModBiblio handles authority-linked 655"); - -eval { - $field->delete_subfields('a'); - $marc_record->append_fields($field); - $success = ModBiblio($marc_record,$biblionumber,''); -} or do { - diag($@); - $success = 0; -}; -ok($success, "ModBiblio handles 655 with authority link but no heading"); - -eval { - $field->delete_subfields('9'); - $marc_record->append_fields($field); - $success = ModBiblio($marc_record,$biblionumber,''); -} or do { - diag($@); - $success = 0; -}; -ok($success, "ModBiblio handles 655 with no subfields"); # clean up after ourselves DelBiblio($biblionumber); diff --git a/tools/export.pl b/tools/export.pl index 4a09868..d858f44 100755 --- a/tools/export.pl +++ b/tools/export.pl @@ -184,17 +184,16 @@ else { push @itemtypesloop, \%row; } my @branchloop; - for my $thisbranch ( - sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } - keys %{$branches} - ) { - push @branchloop, - { value => $thisbranch, - selected => $thisbranch eq $branch, + 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; } - + $template->param( branchloop => \@branchloop, itemtypeloop => \@itemtypesloop, diff --git a/tools/holidays.pl b/tools/holidays.pl index 90ef56a..eb3bc9c 100755 --- a/tools/holidays.pl +++ b/tools/holidays.pl @@ -65,20 +65,18 @@ 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} ) { - push @branchloop, - { value => $thisbranch, - selected => $thisbranch eq $branch, - branchname => $branches->{$thisbranch}->{'branchname'}, - }; +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; } - # 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/import_borrowers.pl b/tools/import_borrowers.pl index 74a5889..6141998 100755 --- a/tools/import_borrowers.pl +++ b/tools/import_borrowers.pl @@ -66,7 +66,7 @@ my $columnkeystpl = [ map { {'key' => $_} } grep {$_ ne 'borrowernumber' && $_ my $input = CGI->new(); our $csv = Text::CSV->new({binary => 1}); # binary needed for non-ASCII Unicode -#push @feedback, {feedback=>1, name=>'backend', value=>$csv->backend, backend=>$csv->backend}; #XXX +# push @feedback, {feedback=>1, name=>'backend', value=>$csv->backend, backend=>$csv->backend}; my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ template_name => "tools/import_borrowers.tmpl", @@ -193,9 +193,6 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) { } if ($extended) { my $attr_str = $borrower{patron_attributes}; - $attr_str =~ s/\xe2\x80\x9c/"/g; # fixup double quotes in case we are passed smart quotes - $attr_str =~ s/\xe2\x80\x9d/"/g; - push @feedback, {feedback=>1, name=>'attribute string', value=>$attr_str, filename=>$uploadborrowers}; delete $borrower{patron_attributes}; # not really a field in borrowers, so we don't want to pass it to ModMember. $patron_attributes = extended_attributes_code_value_arrayref($attr_str); } @@ -249,8 +246,6 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) { } unless (ModMember(%borrower)) { $invalid++; - # untill we have better error trapping, we have no way of knowing why ModMember errored out... - push @errors, {unknown_error => 1}; $template->param('lastinvalid'=>$borrower{'surname'}.' / '.$borrowernumber); next LINE; } @@ -259,7 +254,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) { my $old_attributes = GetBorrowerAttributes($borrowernumber); $patron_attributes = extended_attributes_merge($old_attributes, $patron_attributes); #TODO: expose repeatable options in template } - push @errors, {unknown_error => 1} unless SetBorrowerAttributes($borrower{'borrowernumber'}, $patron_attributes); + SetBorrowerAttributes($borrower{'borrowernumber'}, $patron_attributes); } $overwritten++; $template->param('lastoverwritten'=>$borrower{'surname'}.' / '.$borrowernumber); @@ -281,7 +276,6 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) { $template->param('lastimported'=>$borrower{'surname'}.' / '.$borrowernumber); } else { $invalid++; - push @errors, {unknown_error => 1}; $template->param('lastinvalid'=>$borrower{'surname'}.' / AddMember'); } } diff --git a/tools/inventory.pl b/tools/inventory.pl index 5e7b198..cc7e8a7 100755 --- a/tools/inventory.pl +++ b/tools/inventory.pl @@ -77,8 +77,6 @@ my @authorised_value_list; my $authorisedvalue_categories = ''; my $frameworks = getframeworks(); -$frameworks->{''} = {frameworkcode => ''}; # Add the default framework - for my $fwk (keys %$frameworks){ my $fwkcode = $frameworks->{$fwk}->{'frameworkcode'}; my $authcode = GetAuthValCode('items.location', $fwkcode); @@ -196,7 +194,7 @@ if ( ! ($uploadbarcodes && length($uploadbarcodes)>0 ) || ( $input->param('compa if ( defined $input->param('compareinv2barcd') && ( ( $input->param('compareinv2barcd') eq 'on' ) && ( scalar @brcditems != scalar @$res ) ) && length($uploadbarcodes) > 0 ){ if ( scalar @brcditems > scalar @$res ){ for my $brcditem (@brcditems) { - if (! grep( $_->{barcode} =~ /$brcditem->{barcode}/ , @$res) ){ + if (! grep(/$brcditem->{barcode}/, @$res) ){ $brcditem->{notfoundkoha} = 1; push @$res, $brcditem; } @@ -204,7 +202,7 @@ if ( ! ($uploadbarcodes && length($uploadbarcodes)>0 ) || ( $input->param('compa } else { my @notfound; for my $item (@$res) { - if ( ! grep( $_->{barcode} =~ /$item->{barcode}/ , @brcditems) ){ + if ( ! grep(/$item->{barcode}/, @brcditems) ){ $item->{notfoundbarcode} = 1; push @notfound, $item; } diff --git a/tools/koha-news.pl b/tools/koha-news.pl index afc5268..2451934 100755 --- a/tools/koha-news.pl +++ b/tools/koha-news.pl @@ -79,7 +79,7 @@ if ( $op eq 'add_form' ) { op => 'edit', id => $new_detail->{'idnew'} ); - $template->{VARS}->{'new_detail'} = $new_detail; + $template->param($new_detail); } else { $template->param( op => 'add' ); diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl index bfb233e..f4c75d8 100755 --- a/tools/picture-upload.pl +++ b/tools/picture-upload.pl @@ -78,10 +78,7 @@ 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; - if ( $uploadfilename =~ m/(\..+)$/i ) { - my $filesuffix = $1; - } + my $filesuffix = $1 if $uploadfilename =~ m/(\..+)$/i; ( $tfh, $tempfile ) = File::Temp::tempfile( SUFFIX => $filesuffix, UNLINK => 1 ); $debug and warn "tempfile = $tempfile"; my ( @directories, $errors ); @@ -257,11 +254,8 @@ sub handle_file { undef $srcimage; # This object can get big... } $debug and warn "Image is of mimetype $mimetype"; - 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 + 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 $count{count}++; push @{ $count{filenames} }, { source => $filename, cardnumber => $cardnumber }; } elsif ( $dberror ) { diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl index 16ada89..d902398 100755 --- a/virtualshelves/sendshelf.pl +++ b/virtualshelves/sendshelf.pl @@ -85,7 +85,7 @@ if ( $email ) { my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour ); my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); - my @items = GetItemsInfo( $biblionumber ); + my @items = &GetItemsInfo( $biblionumber, 'opac' ); $dat->{MARCNOTES} = $marcnotesarray; $dat->{MARCSUBJCTS} = $marcsubjctsarray; -- 1.7.4.1 From lrea at nekls.org Wed Jul 27 20:33:08 2011 From: lrea at nekls.org (Liz Rea) Date: Wed, 27 Jul 2011 13:33:08 -0500 Subject: [Koha-patches] [PATCH] Bug 6632 [Signed Off] add html filter to prevent XSS Message-ID: <1311791588-23003-1-git-send-email-lrea@nekls.org> From: Fr?re S?bastien Marie The filter 'html' have been added on all occurences of shelvename, which come from user input. http://bugs.koha-community.org/show_bug.cgi?id=6632 --- .../prog/en/modules/virtualshelves/shelves.tt | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 103757c..3e2b3d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › [% IF ( viewshelf ) %]Lists › Contents of [% shelfname %][% ELSE %]Lists[% END %][% IF ( shelves ) %] › Create New List[% END %][% IF ( edit ) %] › Edit List [% shelfname %][% END %] +Koha › [% IF ( viewshelf ) %]Lists › Contents of [% shelfname | html %][% ELSE %]Lists[% END %][% IF ( shelves ) %] › Create New List[% END %][% IF ( edit ) %] › Edit List [% shelfname | html %][% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -92,32 +97,11 @@

Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]

Check All | Uncheck All

- - -

+ +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index b92ad52..7b79aa8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -163,24 +163,9 @@ [% IF ( MESSAGE10 ) %]

Library cannot be deleted because there are items held by that library

[% END %] [% IF ( MESSAGE11 ) %]

Library cannot be deleted because there are patrons registered at that library

[% END %] [% IF ( branches ) %] - +

+[% INCLUDE 'table-pager.inc' perpage='10' %] +

Library

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt index c2e5062..7a98164 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt @@ -265,24 +265,9 @@ Confirm Deletion of Category [% categorycode |html %][% END %] [% IF ( searchfield ) %] You Searched for [% searchfield %] [% END %] - +

+[% INCLUDE 'table-pager.inc' perpage='20' %] +

Name

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 2e9bdd2..9a90923 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -114,24 +114,9 @@ [% END %] [% IF ( loop ) %] - +

+[% INCLUDE 'table-pager.inc' perpage='20' %] +

Code

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 9174247..13ece6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -285,24 +285,9 @@ Item Types Administration [% IF ( else ) %]

Item Types Administration

-[% IF ( loop ) %] +[% IF ( loop ) %]

+[% INCLUDE 'table-pager.inc' perpage='10' %] +

City ID

[% UNLESS ( noItemTypeImages ) %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 275f232..c889820 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -157,24 +157,9 @@ $(document).ready(function() { [% END %]

- +

+[% INCLUDE 'table-pager.inc' perpage='20' %] +

Image

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt index c61006b..1ab1130 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -32,24 +32,9 @@

Circulation History

- +

+[% INCLUDE 'table-pager.inc' perpage='20' %] +

Tag

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index e3df4e2..88b52c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -124,23 +124,9 @@ canned reports and writing custom SQL reports.

[% IF ( saved1 ) %] [% IF ( savedreports ) %]

Saved Reports

- +

+[% INCLUDE 'table-pager.inc' perpage='20' %] +

Date

-- 1.7.4.1 From Katrin.Fischer.83 at web.de Wed Jul 27 23:05:51 2011 From: Katrin.Fischer.83 at web.de (Katrin Fischer) Date: Wed, 27 Jul 2011 23:05:51 +0200 Subject: [Koha-patches] [PATCH] Bug 6080: Add id to total line in funds table Message-ID: <1311800751-7523-1-git-send-email-Katrin.Fischer.83@web.de> Alternate patch for bug 6080. Instead of removing the line altogether make it possible to hide it easily by adding an id. To test: - apply patch - check your funds table for the last line labelled 'Total' - add to IntranetUserCss: #funds_total {display:none;} - check again, line should be hidden now Reason: The totals is only confusing for multi-level funds, but not wrong. If you are using only 1 level of funds, it works all ok. --- .../prog/en/modules/acqui/acqui-home.tt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index a274365..86650eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -99,7 +99,7 @@ $(document).ready(function() { - + -- 1.7.4.1 From srdjan at catalyst.net.nz Thu Jul 28 06:09:15 2011 From: srdjan at catalyst.net.nz (Srdjan Jankovic) Date: Thu, 28 Jul 2011 16:09:15 +1200 Subject: [Koha-patches] [PATCH 1/1] Bug 4222 - allow nonpublicnote to be a mapped DB column In-Reply-To: References: Message-ID: <1311826155-691-1-git-send-email-srdjan@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 | 10 +++++++++- catalogue/moredetail.pl | 1 + installer/data/mysql/kohastructure.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 8 ++++++++ .../prog/en/modules/catalogue/detail.tt | 4 ++++ .../prog/en/modules/catalogue/moredetail.tt | 1 + 6 files changed, 25 insertions(+), 1 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 8738737..f8feec5 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -223,6 +223,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|
|g; + $itemfields{$f} = 1; + } + } + push @itemloop, $item; } @@ -240,7 +247,8 @@ $template->param( itemdata_uri => $itemfields{uri}, itemdata_copynumber => $itemfields{copynumber}, volinfo => $itemfields{enumchron}, - itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_nonpublicnote => $itemfields{nonpublicnote}, z3950_search_params => C4::Search::z3950_search_args($dat), holdcount => $holdcount, C4::Search::enabled_staff_search_views, diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index d848188..364c26c 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -145,6 +145,7 @@ foreach my $item (@items){ } else { $item->{'issue'}= 0; } + $item->{nonpublicnote} =~ s|\n|
|g if $item->{nonpublicnote}; } $template->param(count => $data->{'count'}, subscriptionsnumber => $subscriptionsnumber, diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e3c6f42..62bbf51 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -761,6 +761,7 @@ CREATE TABLE `deleteditems` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, `marc` longblob, PRIMARY KEY (`itemnumber`), KEY `delitembarcodeidx` (`barcode`), @@ -1028,6 +1029,7 @@ CREATE TABLE `items` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, PRIMARY KEY (`itemnumber`), UNIQUE KEY `itembarcodeidx` (`barcode`), KEY `itemstocknumberidx` (`stocknumber`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9cbc8db..8b65080 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4370,6 +4370,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = '3.05.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT"); + $dbh->do("ALTER TABLE deleteditems 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.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 2ea7091..a801686 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -243,6 +243,8 @@ function verify_images() { + [% IF itemdata_itemnotes %][% END %] + [% IF itemdata_nonpublicnote %][% END %] [% IF ( volinfo ) %][% END %] [% IF ( itemdata_uri ) %][% END %] [% IF ( itemdata_copynumber ) %][% END %] @@ -355,6 +357,8 @@ function verify_images() { + [% IF itemdata_itemnotes %][% END %] + [% IF itemdata_nonpublicnote %][% END %] [% IF ( volinfo ) %] [% END %] [% IF ( itemdata_copynumber ) %][% END %] [% IF ( itemdata_itemnotes ) %][% END %] - [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] + [% IF itemdata_nonpublicnote %][% END %] + [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] [% FOREACH itemloo IN itemloop %] @@ -370,6 +371,7 @@ function verify_images() { [% END %] [% IF ( itemdata_itemnotes ) %][% END %] + [% IF itemdata_nonpublicnote %][% END %] [% IF ( itemloo.type ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 86c8a3f..db251fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -174,6 +174,7 @@ [% IF ( ITEM_DAT.card2 ) %]

Previous Borrower: [% ITEM_DAT.card2 %]

[% END %]

Paid for?: [% ITEM_DAT.paidfor %]

Serial enumeration: [% ITEM_DAT.enumchron %]

Non-public Note: [% ITEM_DAT.nonpublicnote %]

Public Note: [% IF ( CAN_user_editcatalogue_edit_items ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 9dcb16d..2776948 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -701,7 +701,7 @@ No patron matched [% message %] [% IF ( todayissue.od ) %]

- + [% IF ( todayissue.multiple_borrowers ) %][% END %] @@ -773,7 +773,7 @@ No patron matched [% message %] [% IF ( previssue.od ) %] - + @@ -879,7 +879,7 @@ No patron matched [% message %] [% END %] [% IF ( relissue.overdue ) %] - + @@ -899,7 +899,7 @@ No patron matched [% message %] [% IF ( relprevissue.overdue ) %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index c02be49..3cab835 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -422,6 +422,7 @@ function Dopop(link) { [% ELSE %]Not checked out[% END %] [% END %] -- 1.6.5 From nengard at bywatersolutions.com Wed Jul 27 06:40:27 2011 From: nengard at bywatersolutions.com (Nicole C. Engard) Date: Wed, 27 Jul 2011 00:40:27 -0400 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 4222 - allow nonpublicnote to be a mapped DB column Message-ID: <1311741627-4833-1-git-send-email-nengard@bywatersolutions.com> From: Srdjan Jankovic 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. Signed-off-by: Nicole C. Engard --- catalogue/detail.pl | 10 +++++++++- catalogue/moredetail.pl | 1 + circ/returns.pl | 1 + installer/data/mysql/kohastructure.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 8 ++++++++ .../prog/en/modules/catalogue/detail.tt | 4 +++- .../prog/en/modules/catalogue/moredetail.tt | 1 + .../prog/en/modules/circ/circulation.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 + 9 files changed, 30 insertions(+), 6 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 8738737..f8feec5 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -223,6 +223,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|
|g; + $itemfields{$f} = 1; + } + } + push @itemloop, $item; } @@ -240,7 +247,8 @@ $template->param( itemdata_uri => $itemfields{uri}, itemdata_copynumber => $itemfields{copynumber}, volinfo => $itemfields{enumchron}, - itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_nonpublicnote => $itemfields{nonpublicnote}, z3950_search_params => C4::Search::z3950_search_args($dat), holdcount => $holdcount, C4::Search::enabled_staff_search_views, diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index d848188..364c26c 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -145,6 +145,7 @@ foreach my $item (@items){ } else { $item->{'issue'}= 0; } + $item->{nonpublicnote} =~ s|\n|
|g if $item->{nonpublicnote}; } $template->param(count => $data->{'count'}, subscriptionsnumber => $subscriptionsnumber, diff --git a/circ/returns.pl b/circ/returns.pl index bb5230b..afaf5b2 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -573,6 +573,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{itemcallnumber} = $biblio->{'itemcallnumber'}; $ri{itemtype} = $biblio->{'itemtype'}; $ri{itemnote} = $biblio->{'itemnotes'}; + $ri{nonpublicnote} = $biblio->{'nonpublicnote'}; $ri{ccode} = $biblio->{'ccode'}; $ri{itemnumber} = $biblio->{'itemnumber'}; $ri{barcode} = $bar_code; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e3c6f42..62bbf51 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -761,6 +761,7 @@ CREATE TABLE `deleteditems` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, `marc` longblob, PRIMARY KEY (`itemnumber`), KEY `delitembarcodeidx` (`barcode`), @@ -1028,6 +1029,7 @@ CREATE TABLE `items` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, PRIMARY KEY (`itemnumber`), UNIQUE KEY `itembarcodeidx` (`barcode`), KEY `itemstocknumberidx` (`stocknumber`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9cbc8db..8b65080 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4370,6 +4370,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = '3.05.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT"); + $dbh->do("ALTER TABLE deleteditems 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.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 2ea7091..ec1ba1d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -247,7 +247,8 @@ function verify_images() { [% IF ( itemdata_uri ) %][% END %] [% IF ( itemdata_copynumber ) %][% END %] [% IF ( itemdata_itemnotes ) %][% END %] - [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] + [% IF itemdata_nonpublicnote %][% END %] + [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] [% FOREACH itemloo IN itemloop %] @@ -370,6 +371,7 @@ function verify_images() { [% END %] [% IF ( itemdata_itemnotes ) %][% END %] + [% IF itemdata_nonpublicnote %][% END %] [% IF ( itemloo.type ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 86c8a3f..db251fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -174,6 +174,7 @@ [% IF ( ITEM_DAT.card2 ) %]

Previous Borrower: [% ITEM_DAT.card2 %]

[% END %]

Paid for?: [% ITEM_DAT.paidfor %]

Serial enumeration: [% ITEM_DAT.enumchron %]

Non-public Note: [% ITEM_DAT.nonpublicnote %]

- + [% IF ( todayissue.multiple_borrowers ) %][% END %] @@ -773,7 +773,7 @@ No patron matched [% message %] [% IF ( previssue.od ) %] - + @@ -879,7 +879,7 @@ No patron matched [% message %] [% END %] [% IF ( relissue.overdue ) %] - + @@ -899,7 +899,7 @@ No patron matched [% message %] [% IF ( relprevissue.overdue ) %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index c02be49..3cab835 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -422,6 +422,7 @@ function Dopop(link) { [% ELSE %]Not checked out[% END %] [% END %] -- 1.7.2.3 From nengard at gmail.com Thu Jul 28 13:46:06 2011 From: nengard at gmail.com (Nicole Engard) Date: Thu, 28 Jul 2011 07:46:06 -0400 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 4222 - allow nonpublicnote to be a mapped DB column In-Reply-To: <1311741627-4833-1-git-send-email-nengard@bywatersolutions.com> References: <1311741627-4833-1-git-send-email-nengard@bywatersolutions.com> Message-ID: Oops - ignore this. Updated ticket with one small problem. Nicole On Wed, Jul 27, 2011 at 12:40 AM, Nicole C. Engard wrote: > From: Srdjan Jankovic > > 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. > > Signed-off-by: Nicole C. Engard > --- > ?catalogue/detail.pl ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 10 +++++++++- > ?catalogue/moredetail.pl ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?1 + > ?circ/returns.pl ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?1 + > ?installer/data/mysql/kohastructure.sql ? ? ? ? ? ? | ? ?2 ++ > ?installer/data/mysql/updatedatabase.pl ? ? ? ? ? ? | ? ?8 ++++++++ > ?.../prog/en/modules/catalogue/detail.tt ? ? ? ? ? ?| ? ?4 +++- > ?.../prog/en/modules/catalogue/moredetail.tt ? ? ? ?| ? ?1 + > ?.../prog/en/modules/circ/circulation.tt ? ? ? ? ? ?| ? ?8 ++++---- > ?.../intranet-tmpl/prog/en/modules/circ/returns.tt ?| ? ?1 + > ?9 files changed, 30 insertions(+), 6 deletions(-) > > diff --git a/catalogue/detail.pl b/catalogue/detail.pl > index 8738737..f8feec5 100755 > --- a/catalogue/detail.pl > +++ b/catalogue/detail.pl > @@ -223,6 +223,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|
|g; > + ? ? ? ? ? ?$itemfields{$f} = 1; > + ? ? ? ?} > + ? ?} > + > ? ? push @itemloop, $item; > ?} > > @@ -240,7 +247,8 @@ $template->param( > ? ? ? ?itemdata_uri ? ? ? ?=> $itemfields{uri}, > ? ? ? ?itemdata_copynumber => $itemfields{copynumber}, > ? ? ? ?volinfo ? ? ? ? ? ? ? ? ? ? ? ? => $itemfields{enumchron}, > - ? ?itemdata_itemnotes ?=> $itemfields{itemnotes}, > + ? ? ? itemdata_itemnotes ?=> $itemfields{itemnotes}, > + ? ? ? itemdata_nonpublicnote ?=> $itemfields{nonpublicnote}, > ? ? ? ?z3950_search_params ? ? => C4::Search::z3950_search_args($dat), > ? ? holdcount ? ? ? ? ? => $holdcount, > ? ? ? ?C4::Search::enabled_staff_search_views, > diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl > index d848188..364c26c 100755 > --- a/catalogue/moredetail.pl > +++ b/catalogue/moredetail.pl > @@ -145,6 +145,7 @@ foreach my $item (@items){ > ? ? } else { > ? ? ? ? $item->{'issue'}= 0; > ? ? } > + ? ?$item->{nonpublicnote} =~ s|\n|
|g if $item->{nonpublicnote}; > ?} > ?$template->param(count => $data->{'count'}, > ? ? ? ?subscriptionsnumber => $subscriptionsnumber, > diff --git a/circ/returns.pl b/circ/returns.pl > index bb5230b..afaf5b2 100755 > --- a/circ/returns.pl > +++ b/circ/returns.pl > @@ -573,6 +573,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { > ? ? ? ? $ri{itemcallnumber} ? = $biblio->{'itemcallnumber'}; > ? ? ? ? $ri{itemtype} ? ? ? ? = $biblio->{'itemtype'}; > ? ? ? ? $ri{itemnote} ? ? ? ? = $biblio->{'itemnotes'}; > + ? ? ? ?$ri{nonpublicnote} ? ?= $biblio->{'nonpublicnote'}; > ? ? ? ? $ri{ccode} ? ? ? ? ? ?= $biblio->{'ccode'}; > ? ? ? ? $ri{itemnumber} ? ? ? = $biblio->{'itemnumber'}; > ? ? ? ? $ri{barcode} ? ? ? ? ?= $bar_code; > diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql > index e3c6f42..62bbf51 100644 > --- a/installer/data/mysql/kohastructure.sql > +++ b/installer/data/mysql/kohastructure.sql > @@ -761,6 +761,7 @@ CREATE TABLE `deleteditems` ( > ? `enumchron` text default NULL, > ? `copynumber` varchar(32) default NULL, > ? `stocknumber` varchar(32) default NULL, > + ?`nonpublicnote` mediumtext default NULL, > ? `marc` longblob, > ? PRIMARY KEY ?(`itemnumber`), > ? KEY `delitembarcodeidx` (`barcode`), > @@ -1028,6 +1029,7 @@ CREATE TABLE `items` ( > ? `enumchron` text default NULL, > ? `copynumber` varchar(32) default NULL, > ? `stocknumber` varchar(32) default NULL, > + ?`nonpublicnote` mediumtext default NULL, > ? PRIMARY KEY ?(`itemnumber`), > ? UNIQUE KEY `itembarcodeidx` (`barcode`), > ? KEY `itemstocknumberidx` (`stocknumber`), > diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl > index 9cbc8db..8b65080 100755 > --- a/installer/data/mysql/updatedatabase.pl > +++ b/installer/data/mysql/updatedatabase.pl > @@ -4370,6 +4370,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > ? ? SetVersion($DBversion); > ?} > > +$DBversion = '3.05.00.XXX'; > +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > + ? ?$dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT"); > + ? ?$dbh->do("ALTER TABLE deleteditems 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.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt > index 2ea7091..ec1ba1d 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt > @@ -247,7 +247,8 @@ function verify_images() { > ? ? ? ? ? ? ? ? [% IF ( itemdata_uri ) %][% END %] > ? ? ? ? ? ? ? ? [% IF ( itemdata_copynumber ) %][% END %] > ? ? ? ? ? ? ? ? [% IF ( itemdata_itemnotes ) %][% END %] > - ? ? ? ? ? ? ? [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] > + ? ? ? ? ? ? ? ?[% IF itemdata_nonpublicnote %][% END %] > + ? ? ? ? ? ? ? ?[% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] > ? ? ? ? ? ? > ? ? ? ? ? ? [% FOREACH itemloo IN itemloop %] > ? ? ? ? ? ? ? ? > @@ -370,6 +371,7 @@ function verify_images() { > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?[% END %] > ? ? ? ? ? ? ? ? [% IF ( itemdata_itemnotes ) %][% END %] > + ? ? ? ? ? ? ? ?[% IF itemdata_nonpublicnote %][% END %] > ? ? ? ? ? ? ? ? [% IF ( itemloo.type ) %] > ? ? ? ? ? ? ? ? ? ? > ? ? ? ? ? ? ? ? [% END %] > diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt > index 86c8a3f..db251fd 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt > @@ -174,6 +174,7 @@ > ? ? ? ? ? ? ? ?[% IF ( ITEM_DAT.card2 ) %]

Previous Borrower: [% ITEM_DAT.card2 %]

[% END %] > ? ? ? ? ? ? ? ?

Paid for?: [% ITEM_DAT.paidfor %]

> ? ? ? ? ? ?

Serial enumeration: [% ITEM_DAT.enumchron %]

> + ? ? ? ? ? ?

Non-public Note: [% ITEM_DAT.nonpublicnote %]

> ? ? ? ? ? ?

Public Note: > ? ? ? ? ? ? ? ? [% IF ( CAN_user_editcatalogue_edit_items ) %] > ? ? ? ? ? ? ? > diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt > index 9dcb16d..2776948 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt > @@ -701,7 +701,7 @@ No patron matched [% message %] > ? ? ? ? [% IF ( todayissue.od ) %]

> - ? ? ? ? > + ? ? ? ? > ? ? ? ? > ? ? ? ? > ? ? ? ? [% IF ( todayissue.multiple_borrowers ) %][% END %] > @@ -773,7 +773,7 @@ No patron matched [% message %] > ? ? ? ? [% IF ( previssue.od ) %] > - ? ? ? ? > + ? ? ? ? > ? ? ? ? > @@ -879,7 +879,7 @@ No patron matched [% message %] > ? ? [% END %] > ? ? ? ? [% IF ( relissue.overdue ) %] > - ? ? ? ? > + ? ? ? ? > ? ? ? ? > ? ? ? ? > ? ? ? ? > @@ -899,7 +899,7 @@ No patron matched [% message %] > ? ? ? ? [% IF ( relprevissue.overdue ) %] > - ? ? ? ? > + ? ? ? ? > ? ? ? ? > ? ? ? ? > ? ? ? ? > diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt > index c02be49..3cab835 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt > @@ -422,6 +422,7 @@ function Dopop(link) { > ? ? ? ? ? ? [% ELSE %]Not checked out[% END %] > ? ? ? ? ? ? > ? ? ? ? ? ? > ? ? ? ? [% END %] > -- > 1.7.2.3 > > _______________________________________________ > 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 nengard at bywatersolutions.com Wed Jul 27 06:55:25 2011 From: nengard at bywatersolutions.com (Nicole C. Engard) Date: Wed, 27 Jul 2011 00:55:25 -0400 Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 6080: Add id to total line in funds table Message-ID: <1311742525-5123-1-git-send-email-nengard@bywatersolutions.com> From: Katrin Fischer Alternate patch for bug 6080. Instead of removing the line altogether make it possible to hide it easily by adding an id. To test: - apply patch - check your funds table for the last line labelled 'Total' - add to IntranetUserCss: #funds_total {display:none;} - check again, line should be hidden now Reason: The totals is only confusing for multi-level funds, but not wrong. If you are using only 1 level of funds, it works all ok. Signed-off-by: Nicole C. Engard --- .../prog/en/modules/acqui/acqui-home.tt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index a274365..86650eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -99,7 +99,7 @@ $(document).ready(function() { - + -- 1.7.2.3 From oleonard at myacpl.org Thu Jul 28 22:15:07 2011 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 28 Jul 2011 16:15:07 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 6638, Columns misaligned on serials claims Message-ID: <1311884107-27545-1-git-send-email-oleonard@myacpl.org> T:T variable scope error. Also correcting placement of calendar include in the source to avoid JavaScript error. --- .../prog/en/modules/serials/claims.tt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt index b31cd73..2d4cf10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -1,5 +1,4 @@ [% INCLUDE 'doc-head-open.inc' %] -[% INCLUDE 'calendar.inc' %] Koha › Serials › Claims [% INCLUDE 'doc-head-close.inc' %] @@ -145,6 +144,7 @@ //]]> +[% INCLUDE 'calendar.inc' %] [% INCLUDE 'header.inc' %] @@ -281,7 +281,7 @@ [% FOREACH missingissue IN missingissues %] - [% IF ( missingissue.letter ) %] + [% IF ( letter ) %] -- 1.7.3 From ian.walls at bywatersolutions.com Thu Jul 28 22:27:43 2011 From: ian.walls at bywatersolutions.com (Ian Walls) Date: Thu, 28 Jul 2011 16:27:43 -0400 Subject: [Koha-patches] [PATCH] Fix for Bug 6638, Columns misaligned on serials claims In-Reply-To: <1311884107-27545-1-git-send-email-oleonard@myacpl.org> References: <1311884107-27545-1-git-send-email-oleonard@myacpl.org> Message-ID: Signed off and passed QA. On Thu, Jul 28, 2011 at 4:15 PM, Owen Leonard wrote: > T:T variable scope error. Also correcting placement of calendar > include in the source to avoid JavaScript error. > --- > .../prog/en/modules/serials/claims.tt | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.ttb/koha-tmpl/intranet-tmpl/prog/en/modules/serials/ > claims.tt > index b31cd73..2d4cf10 100644 > --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt > +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt > @@ -1,5 +1,4 @@ > [% INCLUDE 'doc-head-open.inc' %] > -[% INCLUDE 'calendar.inc' %] > Koha › Serials › Claims > [% INCLUDE 'doc-head-close.inc' %] > > @@ -145,6 +144,7 @@ > > //]]> > > +[% INCLUDE 'calendar.inc' %] > > > [% INCLUDE 'header.inc' %] > @@ -281,7 +281,7 @@ > > [% FOREACH missingissue IN missingissues %] > > - [% IF ( missingissue.letter ) %] > + [% IF ( letter ) %] > > -- > 1.7.3 > > _______________________________________________ > 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: From lrea at nekls.org Thu Jul 28 23:02:45 2011 From: lrea at nekls.org (Liz Rea) Date: Thu, 28 Jul 2011 16:02:45 -0500 Subject: [Koha-patches] [PATCH 2/2] Bug 6643 -- Able to download patron card batches as an unauthorized user Message-ID: <1311886965-19096-1-git-send-email-lrea@nekls.org> Making sure permissions are checked on label creator --- patroncards/create-pdf.pl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/patroncards/create-pdf.pl b/patroncards/create-pdf.pl index f063e9b..961dfbf 100755 --- a/patroncards/create-pdf.pl +++ b/patroncards/create-pdf.pl @@ -21,6 +21,7 @@ use strict; use warnings; use CGI; +use C4::Auth; use Graphics::Magick; use XML::Simple; use POSIX qw(ceil); @@ -34,6 +35,16 @@ use C4::Patroncards 1.000000; my $cgi = new CGI; +my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ + template_name => "labels/label-home.tt", + query => $cgi, + type => "intranet", + authnotrequired => 0, + flagsrequired => { tools => 'label_creator' }, + debug => 1, + }); + + my $batch_id = $cgi->param('batch_id') if $cgi->param('batch_id'); my $template_id = $cgi->param('template_id') || undef; my $layout_id = $cgi->param('layout_id') || undef; -- 1.7.2.5 From lrea at nekls.org Thu Jul 28 23:16:44 2011 From: lrea at nekls.org (Liz Rea) Date: Thu, 28 Jul 2011 16:16:44 -0500 Subject: [Koha-patches] [PATCH 12/12] Bug 6641 -- Specially crafted URL can allow unauthorized download of MARC files from staff client Message-ID: <1311887804-19434-1-git-send-email-lrea@nekls.org> Making sure permissions are checked on download of MARC files from staff client --- catalogue/export.pl | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/catalogue/export.pl b/catalogue/export.pl index 9bd49de..3efdb21 100755 --- a/catalogue/export.pl +++ b/catalogue/export.pl @@ -8,9 +8,19 @@ use C4::Auth; use C4::Output; use C4::Biblio; use CGI; -use C4::Auth; + + my $query = new CGI; +my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ + template_name => "tools/export.tt", + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => { tools => 'export_catalog' }, + debug => 1, + }); + my $op=$query->param("op"); my $format=$query->param("format"); if ($op eq "export") { -- 1.7.2.5 From chrisc at catalyst.net.nz Fri Jul 29 00:09:02 2011 From: chrisc at catalyst.net.nz (Chris Cormack) Date: Fri, 29 Jul 2011 10:09:02 +1200 Subject: [Koha-patches] [PATCH] Bug 5887 : Adding link for batch modification of biblios Message-ID: <1311890942-19052-1-git-send-email-chrisc@catalyst.net.nz> From: Paul Poulain Rebased for TT by Chris C --- koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 6 ++++++ .../intranet-tmpl/prog/en/modules/basket/basket.tt | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js index 9946cf7..03dc306 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/basket.js @@ -433,4 +433,10 @@ $(document).ready(function(){ if(basketcount){ updateBasket(basketcount); } }); +function batchEdit(){ + var valCookie = readCookie(nameCookie); + var strCookie = nameParam + "=" + valCookie; + var loc = CGIBIN + "tools/batchedit.pl?" + strCookie; + window.opener.location = loc; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index 38b25e2..f4f8e4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -81,6 +81,13 @@ function placeHold () {

+ + Batch Edit + +
[% IF ( verbose ) %]Brief Display[% ELSE %]More Details[% END %] -- 1.7.4.1 From srdjan at catalyst.net.nz Fri Jul 29 06:52:25 2011 From: srdjan at catalyst.net.nz (Srdjan Jankovic) Date: Fri, 29 Jul 2011 16:52:25 +1200 Subject: [Koha-patches] [PATCH 1/1] Bug 4222 - allow nonpublicnote to be a mapped DB column In-Reply-To: References: Message-ID: <1311915145-1895-1-git-send-email-srdjan@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 | 10 +++++++++- catalogue/moredetail.pl | 1 + circ/returns.pl | 1 + installer/data/mysql/kohastructure.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 8 ++++++++ .../prog/en/modules/catalogue/detail.tt | 4 +++- .../prog/en/modules/catalogue/moredetail.tt | 1 + .../prog/en/modules/circ/circulation.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 + 9 files changed, 30 insertions(+), 6 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 8738737..f8feec5 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -223,6 +223,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|
|g; + $itemfields{$f} = 1; + } + } + push @itemloop, $item; } @@ -240,7 +247,8 @@ $template->param( itemdata_uri => $itemfields{uri}, itemdata_copynumber => $itemfields{copynumber}, volinfo => $itemfields{enumchron}, - itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_nonpublicnote => $itemfields{nonpublicnote}, z3950_search_params => C4::Search::z3950_search_args($dat), holdcount => $holdcount, C4::Search::enabled_staff_search_views, diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index d848188..364c26c 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -145,6 +145,7 @@ foreach my $item (@items){ } else { $item->{'issue'}= 0; } + $item->{nonpublicnote} =~ s|\n|
|g if $item->{nonpublicnote}; } $template->param(count => $data->{'count'}, subscriptionsnumber => $subscriptionsnumber, diff --git a/circ/returns.pl b/circ/returns.pl index bb5230b..afaf5b2 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -573,6 +573,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{itemcallnumber} = $biblio->{'itemcallnumber'}; $ri{itemtype} = $biblio->{'itemtype'}; $ri{itemnote} = $biblio->{'itemnotes'}; + $ri{nonpublicnote} = $biblio->{'nonpublicnote'}; $ri{ccode} = $biblio->{'ccode'}; $ri{itemnumber} = $biblio->{'itemnumber'}; $ri{barcode} = $bar_code; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e3c6f42..62bbf51 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -761,6 +761,7 @@ CREATE TABLE `deleteditems` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, `marc` longblob, PRIMARY KEY (`itemnumber`), KEY `delitembarcodeidx` (`barcode`), @@ -1028,6 +1029,7 @@ CREATE TABLE `items` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, PRIMARY KEY (`itemnumber`), UNIQUE KEY `itembarcodeidx` (`barcode`), KEY `itemstocknumberidx` (`stocknumber`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9cbc8db..8b65080 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4370,6 +4370,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = '3.05.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT"); + $dbh->do("ALTER TABLE deleteditems 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.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 2ea7091..ec1ba1d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -247,7 +247,8 @@ function verify_images() { [% IF ( itemdata_uri ) %]

[% END %] [% IF ( itemdata_copynumber ) %][% END %] [% IF ( itemdata_itemnotes ) %][% END %] - [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] + [% IF itemdata_nonpublicnote %][% END %] + [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] [% FOREACH itemloo IN itemloop %] @@ -370,6 +371,7 @@ function verify_images() { [% END %] [% IF ( itemdata_itemnotes ) %][% END %] + [% IF itemdata_nonpublicnote %][% END %] [% IF ( itemloo.type ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 86c8a3f..e9d483d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -174,6 +174,7 @@ [% IF ( ITEM_DAT.card2 ) %]

Previous Borrower: [% ITEM_DAT.card2 %]

[% END %]

Paid for?: [% ITEM_DAT.paidfor %]

Serial enumeration: [% ITEM_DAT.enumchron %]

+ [% IF ITEM_DAT.nonpublicnote %]

Non-public Note: [% ITEM_DAT.nonpublicnote %]

[% END %]

- + [% IF ( todayissue.multiple_borrowers ) %][% END %] @@ -773,7 +773,7 @@ No patron matched [% message %] [% IF ( previssue.od ) %] - + @@ -879,7 +879,7 @@ No patron matched [% message %] [% END %] [% IF ( relissue.overdue ) %] - + @@ -899,7 +899,7 @@ No patron matched [% message %] [% IF ( relprevissue.overdue ) %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index c02be49..3cab835 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -422,6 +422,7 @@ function Dopop(link) { [% ELSE %]Not checked out[% END %] [% END %] -- 1.6.5 From srdjan at catalyst.net.nz Fri Jul 29 07:09:12 2011 From: srdjan at catalyst.net.nz (Srdjan Jankovic) Date: Fri, 29 Jul 2011 17:09:12 +1200 Subject: [Koha-patches] [PATCH 1/1] Bug 4222 - allow nonpublicnote to be a mapped DB column In-Reply-To: References: Message-ID: <1311916152-10138-1-git-send-email-srdjan@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 | 10 +++++++++- catalogue/moredetail.pl | 1 + circ/returns.pl | 1 + installer/data/mysql/kohastructure.sql | 2 ++ installer/data/mysql/updatedatabase.pl | 8 ++++++++ .../prog/en/modules/catalogue/detail.tt | 4 +++- .../prog/en/modules/catalogue/moredetail.tt | 1 + .../prog/en/modules/circ/circulation.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 1 + 9 files changed, 30 insertions(+), 6 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 8738737..f8feec5 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -223,6 +223,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|
|g; + $itemfields{$f} = 1; + } + } + push @itemloop, $item; } @@ -240,7 +247,8 @@ $template->param( itemdata_uri => $itemfields{uri}, itemdata_copynumber => $itemfields{copynumber}, volinfo => $itemfields{enumchron}, - itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_nonpublicnote => $itemfields{nonpublicnote}, z3950_search_params => C4::Search::z3950_search_args($dat), holdcount => $holdcount, C4::Search::enabled_staff_search_views, diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index d848188..364c26c 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -145,6 +145,7 @@ foreach my $item (@items){ } else { $item->{'issue'}= 0; } + $item->{nonpublicnote} =~ s|\n|
|g if $item->{nonpublicnote}; } $template->param(count => $data->{'count'}, subscriptionsnumber => $subscriptionsnumber, diff --git a/circ/returns.pl b/circ/returns.pl index bb5230b..afaf5b2 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -573,6 +573,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{itemcallnumber} = $biblio->{'itemcallnumber'}; $ri{itemtype} = $biblio->{'itemtype'}; $ri{itemnote} = $biblio->{'itemnotes'}; + $ri{nonpublicnote} = $biblio->{'nonpublicnote'}; $ri{ccode} = $biblio->{'ccode'}; $ri{itemnumber} = $biblio->{'itemnumber'}; $ri{barcode} = $bar_code; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e3c6f42..62bbf51 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -761,6 +761,7 @@ CREATE TABLE `deleteditems` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, `marc` longblob, PRIMARY KEY (`itemnumber`), KEY `delitembarcodeidx` (`barcode`), @@ -1028,6 +1029,7 @@ CREATE TABLE `items` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, PRIMARY KEY (`itemnumber`), UNIQUE KEY `itembarcodeidx` (`barcode`), KEY `itemstocknumberidx` (`stocknumber`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9cbc8db..8b65080 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4370,6 +4370,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = '3.05.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT"); + $dbh->do("ALTER TABLE deleteditems 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.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 2ea7091..d374e3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -247,7 +247,8 @@ function verify_images() { [% IF ( itemdata_uri ) %][% END %] [% IF ( itemdata_copynumber ) %][% END %] [% IF ( itemdata_itemnotes ) %][% END %] - [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] + [% IF itemdata_nonpublicnote %][% END %] + [% IF ( SpineLabelShowPrintOnBibDetails ) %][% END %] [% FOREACH itemloo IN itemloop %] @@ -370,6 +371,7 @@ function verify_images() { [% END %] [% IF ( itemdata_itemnotes ) %][% END %] + [% IF itemdata_nonpublicnote %][% END %] [% IF ( itemloo.type ) %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 86c8a3f..e9d483d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -174,6 +174,7 @@ [% IF ( ITEM_DAT.card2 ) %]

Previous Borrower: [% ITEM_DAT.card2 %]

[% END %]

Paid for?: [% ITEM_DAT.paidfor %]

Serial enumeration: [% ITEM_DAT.enumchron %]

+ [% IF ITEM_DAT.nonpublicnote %]

Non-public Note: [% ITEM_DAT.nonpublicnote %]

[% END %]

[% END %] - [% INCLUDE 'intranet-bottom.inc' %] + [% INCLUDE 'popup-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt index 7aeac7f..1cd7aef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt @@ -124,4 +124,5 @@ to add to Batch [% batch_id %]

Cancel

-[% INCLUDE 'intranet-bottom.inc' %] + +[% INCLUDE 'popup-bottom.inc' %] -- 1.7.3 From robin at catalyst.net.nz Sun Jul 31 04:29:48 2011 From: robin at catalyst.net.nz (Robin Sheat) Date: Sun, 31 Jul 2011 14:29:48 +1200 Subject: [Koha-patches] [PATCH] Bug 6651 - fix splitting of names when updating to 3.4 Message-ID: <1312079388-9875-1-git-send-email-robin@catalyst.net.nz> This affects only koha package installations that have multiple instances running. After this patch, it's worth running the upgrade again to ensure that everything happened correctly the first time. --- debian/scripts/koha-upgrade-to-3.4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/scripts/koha-upgrade-to-3.4 b/debian/scripts/koha-upgrade-to-3.4 index 45650c1..190d841 100755 --- a/debian/scripts/koha-upgrade-to-3.4 +++ b/debian/scripts/koha-upgrade-to-3.4 @@ -37,7 +37,7 @@ Koha will be upgraded for the following instances: $TO_UPGRADE This may take some time to run. Go make a coffee. EOH -for name in "$TO_UPGRADE" +for name in $TO_UPGRADE do echo "Upgrading $name..." sudo -u "$name-koha" -H \ -- 1.7.4.1 From bogus@does.not.exist.com Fri Jul 29 16:50:56 2011 From: bogus@does.not.exist.com () Date: Fri, 29 Jul 2011 14:50:56 -0000 Subject: No subject Message-ID: Select an item to edit Edit the item as you see fit Verify that all values are saved in correct fields, and your changes are correct. (they are) Verify that you cannot set 'lost' status from the edit item interface. (You cannot) longoverdue.pl backdate an item so it will be long overdue run longoverdue.pl to set your item as long overdue. verify that the item is not removed from the patron's checked out items. Long Overdue does not charge the patron for the replacement. --- C4/Accounts.pm | 77 ++++++++------------------- C4/Circulation.pm | 40 ++++++++++++++- C4/Items.pm | 8 +++- catalogue/updateitem.pl | 3 +- cataloguing/additem.pl | 38 ++++++++----- misc/cronjobs/longoverdue.pl | 3 +- t/db_dependent/lib/KohaTest/Accounts.pm | 1 - t/db_dependent/lib/KohaTest/Circulation.pm | 1 + tools/batchMod.pl | 7 ++- 9 files changed, 100 insertions(+), 78 deletions(-) diff --git a/C4/Accounts.pm b/C4/Accounts.pm index 2352e9e..860e187 100644 --- a/C4/Accounts.pm +++ b/C4/Accounts.pm @@ -23,8 +23,7 @@ use strict; use C4::Context; use C4::Stats; use C4::Members; -use C4::Items; -use C4::Circulation qw(MarkIssueReturned); +use C4::Circulation qw(ReturnLostItem); use vars qw($VERSION @ISA @EXPORT); @@ -218,7 +217,7 @@ sub makepayment { #check to see what accounttype if ( $data->{'accounttype'} eq 'Rep' || $data->{'accounttype'} eq 'L' ) { - returnlost( $borrowernumber, $data->{'itemnumber'} ); + ReturnLostItem( $borrowernumber, $data->{'itemnumber'} ); } } @@ -278,64 +277,34 @@ EOT =cut -sub returnlost{ - my ( $borrowernumber, $itemnum ) = @_; - C4::Circulation::MarkIssueReturned( $borrowernumber, $itemnum ); - my $borrower = C4::Members::GetMember( 'borrowernumber'=>$borrowernumber ); - my @datearr = localtime(time); - my $date = ( 1900 + $datearr[5] ) . "-" . ( $datearr[4] + 1 ) . "-" . $datearr[3]; - my $bor = "$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; - ModItem({ paidfor => "Paid for by $bor $date" }, undef, $itemnum); -} - - sub chargelostitem{ # lost ==1 Lost, lost==2 longoverdue, lost==3 lost and paid for # FIXME: itemlost should be set to 3 after payment is made, should be a warning to the interface that # a charge has been added # FIXME : if no replacement price, borrower just doesn't get charged? - my $dbh = C4::Context->dbh(); - my ($itemnumber) = @_; - my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title - FROM issues - JOIN items USING (itemnumber) - JOIN biblio USING (biblionumber) - WHERE issues.itemnumber=?"); - $sth->execute($itemnumber); - my $issues=$sth->fetchrow_hashref(); - - # if a borrower lost the item, add a replacement cost to the their record - if ( $issues->{borrowernumber} ){ - - # first make sure the borrower hasn't already been charged for this item - my $sth1=$dbh->prepare("SELECT * from accountlines - WHERE borrowernumber=? AND itemnumber=? and accounttype='L'"); - $sth1->execute($issues->{'borrowernumber'},$itemnumber); - my $existing_charge_hashref=$sth1->fetchrow_hashref(); - - # OK, they haven't - unless ($existing_charge_hashref) { - # This item is on issue ... add replacement cost to the borrower's record and mark it returned - # Note that we add this to the account even if there's no replacement price, allowing some other - # process (or person) to update it, since we don't handle any defaults for replacement prices. - my $accountno = getnextacctno($issues->{'borrowernumber'}); - my $sth2=$dbh->prepare("INSERT INTO accountlines - (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber) - VALUES (?,?,now(),?,?,'L',?,?)"); - $sth2->execute($issues->{'borrowernumber'},$accountno,$issues->{'replacementprice'}, - "Lost Item $issues->{'title'} $issues->{'barcode'}", - $issues->{'replacementprice'},$itemnumber); - $sth2->finish; - # FIXME: Log this ? - } - #FIXME : Should probably have a way to distinguish this from an item that really was returned. - #warn " $issues->{'borrowernumber'} / $itemnumber "; - C4::Circulation::MarkIssueReturned($issues->{borrowernumber},$itemnumber); - # Shouldn't MarkIssueReturned do this? - C4::Items::ModItem({ onloan => undef }, undef, $itemnumber); + my ($borrowernumber, $itemnumber, $amount, $description) = @_; + + # first make sure the borrower hasn't already been charged for this item + my $sth1=$dbh->prepare("SELECT * from accountlines + WHERE borrowernumber=? AND itemnumber=? and accounttype='L'"); + $sth1->execute($borrowernumber,$itemnumber); + my $existing_charge_hashref=$sth1->fetchrow_hashref(); + + # OK, they haven't + unless ($existing_charge_hashref) { + # This item is on issue ... add replacement cost to the borrower's record and mark it returned + # Note that we add this to the account even if there's no replacement price, allowing some other + # process (or person) to update it, since we don't handle any defaults for replacement prices. + my $accountno = getnextacctno($borrowernumber); + my $sth2=$dbh->prepare("INSERT INTO accountlines + (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding,itemnumber) + VALUES (?,?,now(),?,?,'L',?,?)"); + $sth2->execute($borrowernumber,$accountno,$amount, + $description,$amount,$itemnumber); + $sth2->finish; + # FIXME: Log this ? } - $sth->finish; } =head2 manualinvoice diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 520c116..589b5c5 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -59,8 +59,9 @@ BEGIN { # FIXME subs that should probably be elsewhere push @EXPORT, qw( - &FixOverduesOnReturn &barcodedecode + &LostItem + &ReturnLostItem ); # subs to deal with issuing a book @@ -2943,8 +2944,43 @@ sub DeleteBranchTransferLimits { $sth->execute(); } +sub ReturnLostItem{ + my ( $borrowernumber, $itemnum ) = @_; - 1; + MarkIssueReturned( $borrowernumber, $itemnum ); + my $borrower = C4::Members::GetMember( 'borrowernumber'=>$borrowernumber ); + my @datearr = localtime(time); + my $date = ( 1900 + $datearr[5] ) . "-" . ( $datearr[4] + 1 ) . "-" . $datearr[3]; + my $bor = "$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}"; + ModItem({ paidfor => "Paid for by $bor $date" }, undef, $itemnum); +} + + +sub LostItem{ + my ($itemnumber, $mark_returned) = @_; + + my $dbh = C4::Context->dbh(); + my $sth=$dbh->prepare("SELECT issues.*,items.*,biblio.title + FROM issues + JOIN items USING (itemnumber) + JOIN biblio USING (biblionumber) + WHERE issues.itemnumber=?"); + $sth->execute($itemnumber); + my $issues=$sth->fetchrow_hashref(); + $sth->finish; + + # if a borrower lost the item, add a replacement cost to the their record + if ( my $borrowernumber = $issues->{borrowernumber} ){ + + C4::Accounts::chargelostitem($borrowernumber, $itemnumber, $issues->{'replacementprice'}, "Lost Item $issues->{'title'} $issues->{'barcode'}"); + #FIXME : Should probably have a way to distinguish this from an item that really was returned. + #warn " $issues->{'borrowernumber'} / $itemnumber "; + MarkIssueReturned($borrowernumber,$itemnumber) if $mark_returned; + } +} + + +1; __END__ diff --git a/C4/Items.pm b/C4/Items.pm index bc36dd1..9e7167d 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -397,6 +397,8 @@ Note that only columns that can be directly changed from the cataloging and serials item editors are included in this hash. +Returns item record + =cut my %default_values_for_mod_from_marc = ( @@ -446,7 +448,8 @@ sub ModItemFromMarc { } my $unlinked_item_subfields = _get_unlinked_item_subfields( $localitemmarc, $frameworkcode ); - return ModItem($item, $biblionumber, $itemnumber, $dbh, $frameworkcode, $unlinked_item_subfields); + ModItem($item, $biblionumber, $itemnumber, $dbh, $frameworkcode, $unlinked_item_subfields); + return $item; } =head2 ModItem @@ -495,6 +498,9 @@ sub ModItem { }; $item->{'itemnumber'} = $itemnumber or return undef; + + $item->{onloan} = undef if $item->{itemlost}; + _set_derived_columns_for_mod($item); _do_column_fixes_for_mod($item); # FIXME add checks diff --git a/catalogue/updateitem.pl b/catalogue/updateitem.pl index e8ce20d..345d0c8 100755 --- a/catalogue/updateitem.pl +++ b/catalogue/updateitem.pl @@ -26,7 +26,6 @@ use C4::Biblio; use C4::Items; use C4::Output; use C4::Circulation; -use C4::Accounts; use C4::Reserves; my $cgi= new CGI; @@ -75,6 +74,6 @@ if (defined $itemnotes) { # i.e., itemnotes parameter passed from form ModItem($item_changes, $biblionumber, $itemnumber); -C4::Accounts::chargelostitem($itemnumber) if ($itemlost==1) ; +LostItem($itemnumber, 'MARK RETURNED') if ($itemlost==1) ; print $cgi->redirect("moredetail.pl?biblionumber=$biblionumber&itemnumber=$itemnumber#item$itemnumber"); diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 0db2d2d..4b99654 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -26,6 +26,7 @@ use C4::Auth; use C4::Output; use C4::Biblio; use C4::Items; +use C4::Circulation; use C4::Context; use C4::Koha; # XXX subfield_is_koha_internal_p use C4::Branch; # XXX subfield_is_koha_internal_p @@ -206,28 +207,33 @@ sub generate_subfield_form { } } - $subfield_data{marc_value} =CGI::scrolling_list( # FIXME: factor out scrolling_list - -name => "field_value", - -values => \@authorised_values, - -default => $value, - -labels => \%authorised_lib, - -override => 1, - -size => 1, - -multiple => 0, - -tabindex => 1, - -id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield, - -class => "input_marceditor", - ); + if ($subfieldlib->{'hidden'}) { + $subfield_data{marc_value} = qq( $authorised_lib{$value}); + } + else { + $subfield_data{marc_value} =CGI::scrolling_list( # FIXME: factor out scrolling_list + -name => "field_value", + -values => \@authorised_values, + -default => $value, + -labels => \%authorised_lib, + -override => 1, + -size => 1, + -multiple => 0, + -tabindex => 1, + -id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield, + -class => "input_marceditor", + ); + } - # it's a thesaurus / authority field } + # it's a thesaurus / authority field elsif ( $subfieldlib->{authtypecode} ) { $subfield_data{marc_value} = " {authtypecode}."&index=$subfield_data{id}','$subfield_data{id}'); return false;\" title=\"Tag Editor\">... "; - # it's a plugin field } + # it's a plugin field elsif ( $subfieldlib->{value_builder} ) { # opening plugin my $plugin = C4::Context->intranetdir . "/cataloguing/value_builder/" . $subfieldlib->{'value_builder'}; @@ -498,7 +504,7 @@ if ($op eq "additem") { if ($exist_itemnumber && $exist_itemnumber != $itemnumber) { push @errors,"barcode_not_unique"; } else { - my ($oldbiblionumber,$oldbibnum,$oldbibitemnum) = ModItemFromMarc($itemtosave,$biblionumber,$itemnumber); + ModItemFromMarc($itemtosave,$biblionumber,$itemnumber); $itemnumber=""; } $nextop="additem"; @@ -608,6 +614,8 @@ if($itemrecord){ next if subfield_is_koha_internal_p($subfieldtag); next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10"); + $subfieldlib->{hidden} = 1 + if $tagslib->{$tag}->{$subfieldtag}->{authorised_value} eq 'LOST'; my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i); push @fields, "$tag$subfieldtag"; diff --git a/misc/cronjobs/longoverdue.pl b/misc/cronjobs/longoverdue.pl index 651b9d2..2179d10 100755 --- a/misc/cronjobs/longoverdue.pl +++ b/misc/cronjobs/longoverdue.pl @@ -35,7 +35,6 @@ BEGIN { } use C4::Context; use C4::Items; -use C4::Accounts; use Getopt::Long; my $lost; # key=lost value, value=num days. @@ -155,7 +154,7 @@ foreach my $startrange (sort keys %$lost) { printf ("Due %s: item %5s from borrower %5s to lost: %s\n", $row->{date_due}, $row->{itemnumber}, $row->{borrowernumber}, $lostvalue) if($verbose); if($confirm) { ModItem({ itemlost => $lostvalue }, $row->{'biblionumber'}, $row->{'itemnumber'}); - chargelostitem($row->{'itemnumber'}) if( $charge && $charge eq $lostvalue); + LostItem($row->{'itemnumber'}) if( $charge && $charge eq $lostvalue); } $count++; } diff --git a/t/db_dependent/lib/KohaTest/Accounts.pm b/t/db_dependent/lib/KohaTest/Accounts.pm index 703d478..ac3a78e 100644 --- a/t/db_dependent/lib/KohaTest/Accounts.pm +++ b/t/db_dependent/lib/KohaTest/Accounts.pm @@ -15,7 +15,6 @@ sub methods : Test( 1 ) { my @methods = qw( recordpayment makepayment getnextacctno - returnlost manualinvoice fixcredit refund diff --git a/t/db_dependent/lib/KohaTest/Circulation.pm b/t/db_dependent/lib/KohaTest/Circulation.pm index 7d5e69d..b3a1ff8 100644 --- a/t/db_dependent/lib/KohaTest/Circulation.pm +++ b/t/db_dependent/lib/KohaTest/Circulation.pm @@ -47,6 +47,7 @@ sub methods : Test( 1 ) { CheckSpecialHolidays CheckRepeatableSpecialHolidays CheckValidBarcode + ReturnLostItem ); can_ok( $self->testing_class, @methods ); diff --git a/tools/batchMod.pl b/tools/batchMod.pl index 9d4431b..a7848b9 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -25,6 +25,7 @@ use C4::Auth; use C4::Output; use C4::Biblio; use C4::Items; +use C4::Circulation; use C4::Context; use C4::Koha; # XXX subfield_is_koha_internal_p use C4::Branch; # XXX subfield_is_koha_internal_p @@ -173,7 +174,11 @@ if ($op eq "action") { if ($values_to_modify || $values_to_blank) { my $localmarcitem = Item2Marc($itemdata); UpdateMarcWith( $marcitem, $localmarcitem ); - eval{ my ( $oldbiblionumber, $oldbibnum, $oldbibitemnum ) = ModItemFromMarc( $localmarcitem, $itemdata->{biblionumber}, $itemnumber ) }; + eval{ + if ( my $item = ModItemFromMarc( $localmarcitem, $itemdata->{biblionumber}, $itemnumber ) ) { + LostItem($itemnumber, 'MARK RETURNED') if $item->{itemlost} == 1; + } + }; } } $i++; -- 1.7.2.5

Avail
Total		Status	Last seen	Barcode	Public Note	Non-public Note	Publication Details	url	Copy No.	[% itemloo.datelastseen %]	[% itemloo.barcode %]	[% itemdata_itemnotes %]	[% itemdata_nonpublicnote %]	[% IF ( itemdata_enumchron ) %] [% IF ( itemloo.enumchron ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 86c8a3f..db251fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -174,6 +174,7 @@ [% IF ( ITEM_DAT.card2 ) %] Previous Borrower: [% ITEM_DAT.card2 %] [% END %] Paid for?: [% ITEM_DAT.paidfor %] Serial enumeration: [% ITEM_DAT.enumchron %] + Non-public Note: [% ITEM_DAT.nonpublicnote %] Public Note: [% IF ( CAN_user_editcatalogue_edit_items ) %] -- 1.6.5 From srdjan at catalyst.net.nz Thu Jul 28 07:46:10 2011 From: srdjan at catalyst.net.nz (Srdjan Jankovic) Date: Thu, 28 Jul 2011 17:46:10 +1200 Subject: [Koha-patches] [PATCH 1/1] Bug 4222 - allow nonpublicnote to be a mapped DB column In-Reply-To: References: Message-ID: <1311831970-10326-1-git-send-email-srdjan@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 \| 10 +++++++++- catalogue/moredetail.pl \| 1 + circ/returns.pl \| 1 + installer/data/mysql/kohastructure.sql \| 2 ++ installer/data/mysql/updatedatabase.pl \| 8 ++++++++ .../prog/en/modules/catalogue/detail.tt \| 4 +++- .../prog/en/modules/catalogue/moredetail.tt \| 1 + .../prog/en/modules/circ/circulation.tt \| 8 ++++---- .../intranet-tmpl/prog/en/modules/circ/returns.tt \| 1 + 9 files changed, 30 insertions(+), 6 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 8738737..f8feec5 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -223,6 +223,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\| \|g; + $itemfields{$f} = 1; + } + } + push @itemloop, $item; } @@ -240,7 +247,8 @@ $template->param( itemdata_uri => $itemfields{uri}, itemdata_copynumber => $itemfields{copynumber}, volinfo => $itemfields{enumchron}, - itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_itemnotes => $itemfields{itemnotes}, + itemdata_nonpublicnote => $itemfields{nonpublicnote}, z3950_search_params => C4::Search::z3950_search_args($dat), holdcount => $holdcount, C4::Search::enabled_staff_search_views, diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index d848188..364c26c 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -145,6 +145,7 @@ foreach my $item (@items){ } else { $item->{'issue'}= 0; } + $item->{nonpublicnote} =~ s\|\n\| \|g if $item->{nonpublicnote}; } $template->param(count => $data->{'count'}, subscriptionsnumber => $subscriptionsnumber, diff --git a/circ/returns.pl b/circ/returns.pl index bb5230b..afaf5b2 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -573,6 +573,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { $ri{itemcallnumber} = $biblio->{'itemcallnumber'}; $ri{itemtype} = $biblio->{'itemtype'}; $ri{itemnote} = $biblio->{'itemnotes'}; + $ri{nonpublicnote} = $biblio->{'nonpublicnote'}; $ri{ccode} = $biblio->{'ccode'}; $ri{itemnumber} = $biblio->{'itemnumber'}; $ri{barcode} = $bar_code; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index e3c6f42..62bbf51 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -761,6 +761,7 @@ CREATE TABLE `deleteditems` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, `marc` longblob, PRIMARY KEY (`itemnumber`), KEY `delitembarcodeidx` (`barcode`), @@ -1028,6 +1029,7 @@ CREATE TABLE `items` ( `enumchron` text default NULL, `copynumber` varchar(32) default NULL, `stocknumber` varchar(32) default NULL, + `nonpublicnote` mediumtext default NULL, PRIMARY KEY (`itemnumber`), UNIQUE KEY `itembarcodeidx` (`barcode`), KEY `itemstocknumberidx` (`stocknumber`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 9cbc8db..8b65080 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4370,6 +4370,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = '3.05.00.XXX'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE items ADD COLUMN nonpublicnote MEDIUMTEXT"); + $dbh->do("ALTER TABLE deleteditems 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.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 2ea7091..ec1ba1d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -247,7 +247,8 @@ function verify_images() { [% IF ( itemdata_uri ) %]	url	Copy No.	Public notes	Spine Label	Non-public Note	Spine Label
[% itemloo.copynumber %]	[% itemloo.itemnotes %]	[% itemdata_nonpublicnote %]	Fix Itemtype	[% ELSE %]	[% END %] [% todayissue.dd %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %] [% todayissue.barcode %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %][% IF ( todayissue.nonpublicnote ) %]- [% todayissue.nonpublicnote %][% END %] [% todayissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %][% END %][% END %][% todayissue.itemtype %]	[% todayissue.checkoutdate %]	[% todayissue.borrowername %]	[% ELSE %]	[% END %] [% previssue.dd %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] [% previssue.barcode %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] [% previssue.barcode %]	[% previssue.itemtype %]	[% ELSE %]	[% END %] [% relissue.dd %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %][% IF ( relissue.nonpublicnote ) %]- [% relissue.nonpublicnote %][% END %] [% relissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %]	[% relissue.displaydate %]	[% relissue.itemcallnumber %]	[% ELSE %]	[% END %] [% relprevissue.dd %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] [% relprevissue.barcode %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %] [% relprevissue.barcode %]	[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %][% END %][% END %][% relprevissue.itemtype %]	[% relprevissue.displaydate %]	[% relprevissue.itemcallnumber %]	[% IF ( riloo.bornote ) %][% riloo.bornote %] [% END %] [% IF ( riloo.itemnote ) %][% riloo.itemnote %][% END %] + [% IF ( riloo.nonpublicnote ) %][% riloo.nonpublicnote %][% END %]
url	Copy No.	Public notes	Spine Label	Non-public Note	Spine Label
[% itemloo.copynumber %]	[% itemloo.itemnotes %]	[% itemdata_nonpublicnote %]	Fix Itemtype	[% ELSE %]	[% END %] [% todayissue.dd %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %] [% todayissue.barcode %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %][% IF ( todayissue.nonpublicnote ) %]- [% todayissue.nonpublicnote %][% END %] [% todayissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %][% END %][% END %][% todayissue.itemtype %]	[% todayissue.checkoutdate %]	[% todayissue.borrowername %]	[% ELSE %]	[% END %] [% previssue.dd %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] [% previssue.barcode %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] [% previssue.barcode %]	[% previssue.itemtype %]	[% ELSE %]	[% END %] [% relissue.dd %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %][% IF ( relissue.nonpublicnote ) %]- [% relissue.nonpublicnote %][% END %] [% relissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %]	[% relissue.displaydate %]	[% relissue.itemcallnumber %]	[% ELSE %]	[% END %] [% relprevissue.dd %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] [% relprevissue.barcode %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %] [% relprevissue.barcode %]	[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %][% END %][% END %][% relprevissue.itemtype %]	[% relprevissue.displaydate %]	[% relprevissue.itemcallnumber %]	[% IF ( riloo.bornote ) %][% riloo.bornote %] [% END %] [% IF ( riloo.itemnote ) %][% riloo.itemnote %][% END %] + [% IF ( riloo.nonpublicnote ) %][% riloo.nonpublicnote %][% END %]
url	Copy No.	Public notes	Spine Label	Non-public Note	Spine Label
[% itemloo.copynumber %]	[% itemloo.itemnotes %]	[% itemdata_nonpublicnote %]	Fix Itemtype	[% ELSE %]	[% END %] > ? ? ? ? [% todayissue.dd %] > ? ? ? ?	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %] [% todayissue.barcode %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %][% IF ( todayissue.nonpublicnote ) %]- [% todayissue.nonpublicnote %][% END %] [% todayissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %][% END %][% END %][% todayissue.itemtype %]	[% todayissue.checkoutdate %]	[% todayissue.borrowername %]	[% ELSE %]	[% END %] > ? ? ? ? [% previssue.dd %] > ? ? ? ?	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] [% previssue.barcode %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] [% previssue.barcode %]	> ? ? ? ? ? ? [% previssue.itemtype %] > ? ? ? ?	[% ELSE %]	[% END %] > ? ? ? ? ? ? [% relissue.dd %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %][% IF ( relissue.nonpublicnote ) %]- [% relissue.nonpublicnote %][% END %] [% relissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %]	[% relissue.displaydate %]	[% relissue.itemcallnumber %]	[% ELSE %]	[% END %] > ? ? ? ? [% relprevissue.dd %] > ? ? ? ?	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] [% relprevissue.barcode %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %] [% relprevissue.barcode %]	[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %][% END %][% END %][% relprevissue.itemtype %]	[% relprevissue.displaydate %]	[% relprevissue.itemcallnumber %]	[% IF ( riloo.bornote ) %][% riloo.bornote %] [% END %] > ? ? ? ? ? ? [% IF ( riloo.itemnote ) %][% riloo.itemnote %][% END %] > + ? ? ? ? ? ?[% IF ( riloo.nonpublicnote ) %][% riloo.nonpublicnote %][% END %] > ? ? ? ? ? ?
Avail
Total

> >	url	Copy No.	Public notes	Spine Label	Non-public Note	Spine Label
[% itemloo.copynumber %]	[% itemloo.itemnotes %]	[% itemdata_nonpublicnote %]	Fix Itemtype	[% ELSE %]	[% END %] [% todayissue.dd %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %] [% todayissue.barcode %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %][% IF ( todayissue.nonpublicnote ) %]- [% todayissue.nonpublicnote %][% END %] [% todayissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %][% END %][% END %][% todayissue.itemtype %]	[% todayissue.checkoutdate %]	[% todayissue.borrowername %]	[% ELSE %]	[% END %] [% previssue.dd %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] [% previssue.barcode %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] [% previssue.barcode %]	[% previssue.itemtype %]	[% ELSE %]	[% END %] [% relissue.dd %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %][% IF ( relissue.nonpublicnote ) %]- [% relissue.nonpublicnote %][% END %] [% relissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %]	[% relissue.displaydate %]	[% relissue.itemcallnumber %]	[% ELSE %]	[% END %] [% relprevissue.dd %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] [% relprevissue.barcode %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %] [% relprevissue.barcode %]	[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %][% END %][% END %][% relprevissue.itemtype %]	[% relprevissue.displaydate %]	[% relprevissue.itemcallnumber %]	[% IF ( riloo.bornote ) %][% riloo.bornote %] [% END %] [% IF ( riloo.itemnote ) %][% riloo.itemnote %][% END %] + [% IF ( riloo.nonpublicnote ) %][% riloo.nonpublicnote %][% END %]
url	Copy No.	Public notes	Spine Label	Non-public Note	Spine Label
[% itemloo.copynumber %]	[% itemloo.itemnotes %]	[% itemloo.nonpublicnote %]	Fix Itemtype	[% ELSE %]	[% END %] [% todayissue.dd %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %] [% todayissue.barcode %]	[% todayissue.title \|html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %][% IF ( todayissue.nonpublicnote ) %]- [% todayissue.nonpublicnote %][% END %] [% todayissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %][% END %][% END %][% todayissue.itemtype %]	[% todayissue.checkoutdate %]	[% todayissue.borrowername %]	[% ELSE %]	[% END %] [% previssue.dd %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] [% previssue.barcode %]	[% previssue.title \|html %][% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %][% IF ( previssue.nonpublicnote ) %]- [% previssue.nonpublicnote %][% END %] [% previssue.barcode %]	[% previssue.itemtype %]	[% ELSE %]	[% END %] [% relissue.dd %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %]	[% relissue.title \|html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %][% IF ( relissue.nonpublicnote ) %]- [% relissue.nonpublicnote %][% END %] [% relissue.barcode %]	[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %]	[% relissue.displaydate %]	[% relissue.itemcallnumber %]	[% ELSE %]	[% END %] [% relprevissue.dd %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] [% relprevissue.barcode %]	[% relprevissue.title \|html %][% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %][% IF ( relprevissue.nonpublicnote ) %] - [% relprevissue.nonpublicnote %][% END %] [% relprevissue.barcode %]	[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %][% END %][% END %][% relprevissue.itemtype %]	[% relprevissue.displaydate %]	[% relprevissue.itemcallnumber %]	[% IF ( riloo.bornote ) %][% riloo.bornote %] [% END %] [% IF ( riloo.itemnote ) %][% riloo.itemnote %][% END %] + [% IF ( riloo.nonpublicnote ) %][% riloo.nonpublicnote %][% END %]

Issues for a subscription

Notices

Add a new notice

- How do I schedule overdue notices?

Adding Notices

Notice Markup

Existing Notices

Edit Items

Billing Place:

Delivery Place:

Error analysis:

Local Login

- - - - - : - - - - - - [ - - ] - - - / - - - - ; - - + + + + + + + + + [ + + ] + + + = + + + + : + + + + / + + + + ; + + + + , + + + +

Authorized values

Relatives issues

Add New Definition

Add New Definition

Add New Definition

Add New Definition

Add New Definition

Add New Definition

Confirm Definition

Add New Definition

Add New Definition

Add New Definition

Add New Definition

Add New Definition

Add New Definition

Add New Definition

Confirm Definition

Add New Definition

Authorized values for category [% category %]:

Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]

Item Types Administration

Circulation History

Saved Reports

Authorized values for category [% category %]:

Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]

Item Types Administration

Circulation History

Saved Reports

+ Defining transport costs between libraries +

System Preferences

Koha Release Team

Koha Development Team

Contributing Companies and Institutions

Contributing Companies

Authorized values

Checkout

Check-in

Filter On:

Checked-In items

Dictionary

Current Terms

Current Terms

Serial Edition [% bibliotitle %] - [% IF location %] ( [% location %] ) [% END %] + i[% IF location %] ( [% location %] ) [% END %] [% IF ( callnumber ) %] callnumber: [% callnumber %][% END %]

Issues for a subscription

Policy for [% codes_loo.limit_phrase %]: [% codes_loo.code %]

Item Types Administration

Circulation History

Saved Reports