]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoBug 7628 - Required format is not enforced for Patron Categories
Marc Veron [Wed, 18 Jul 2012 05:57:36 +0000 (07:57 +0200)]
Bug 7628 - Required format is not enforced for Patron Categories

Enforces category code with allowed characters only.

Test plan:

- Before applying patch, create a category code like Test+

- Try to delete category with this code -> does not work

- Apply patch

- Try to create category with code containg other characters than letters, numbers, - and _

- Result: You are not allowed to do so, appropriate message pops up

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 601228f6585b6b942a31a8cfa642216925b09148)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8455 - Check ins processed through "Check Out" tab of the Patron Record ignore...
David Cook [Tue, 17 Jul 2012 08:30:13 +0000 (18:30 +1000)]
Bug 8455 - Check ins processed through "Check Out" tab of the Patron Record ignore Circulation System Preferences

If you check-in an item through the "Check Out" tab of the Patron Record, the return/check-in ignores the "InProcessingToShelvingCart" and "ReturnToShelvingCart" circulation system preferences. Or rather, there just isn't any logic to handle them in the renewscript.pl file.

I'm pretty much just bringing the code straight across from returns.pl, although some minor changes need to be made due to context.

Both system preferences are important to include, since you can check-out an in processing item to a patron. While a regular check-in will clear the in processing status, a check-in through the Patron module will cause the item to have its status returned to "In Processing" rather than going to "Shelving Cart", if the preference is set, of course.

To test the scenario, turn on one of (or both of) these settings and try checking books in through the Circulation module and the Patron module.

Before the patch, you will see that only the Circulation module will change the shelving location.

After the patch, you should see identical behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8da4f376b4bdd66df966060536ee80adb672a643)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8421 : Added a URI filter to encode a cardnumber for borrowers as to not break...
Elliott Davis [Wed, 11 Jul 2012 10:52:53 +0000 (05:52 -0500)]
Bug 8421 : Added a URI filter to encode a cardnumber for borrowers as to not break patronimage.pl

To Test:

Add a + (or any char that would need to be encoded) to a card number of a patron with an image attached.
Go to member/moremember.pl.
If the patrons image is there, you are golden.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c6e83d1156cc0ac2d2d299df43cc57a31e2249ef)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 6655 - Sorting order of serial issues in OPAC
Meenakshi.R [Wed, 23 May 2012 05:07:19 +0000 (10:37 +0530)]
Bug 6655 - Sorting order of serial issues in OPAC

Works as advertised.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ce015d0e470a76e3d714358f07cd7e6eb2012c2e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 6267: [SIGNED-OFF]Fix a typo 3.6.x-rmaint/testing
Frédéric Demians [Fri, 25 May 2012 06:10:19 +0000 (08:10 +0200)]
Bug 6267: [SIGNED-OFF]Fix a typo

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8caef646802d390b7c7fe3d6c7b618ef5067127b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8518 - Self checkout does not display debt amount if syspref AllowFineOverride...
Marc Veron [Sun, 29 Jul 2012 07:30:54 +0000 (09:30 +0200)]
Bug 8518 - Self checkout does not display debt amount if syspref AllowFineOverride is set to allow

If the patron has depts that prevent issuing and the system preference 'AllowFineOverride' is set to 'allow', the amount is not displayed in the user message.

Additionally, patch adds currency symbol to amount.

Test plan:
Do self checkout with patron who has debts that are over the limit.
Test with and without preference 'AllowFineOverride' set.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5fdf80afe8626579963626b82e2200497a8e853c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8503: Software error in edit items with EasyAnalyticalRecords
Fridolyn SOMERS [Wed, 25 Jul 2012 12:11:08 +0000 (14:11 +0200)]
Bug 8503: Software error in edit items with EasyAnalyticalRecords

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Solves software error when editing items for record with invalid
analytic.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c4d6ad75182694515d611f3f08172ef3d3fcf7aa)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7143: Updating history and about file
Chris Cormack [Thu, 26 Jul 2012 11:00:18 +0000 (23:00 +1200)]
Bug 7143: Updating history and about file

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years ago7368 Adjustments for Perl dependencies
Marcel de Rooy [Wed, 18 Jul 2012 13:03:36 +0000 (15:03 +0200)]
7368 Adjustments for Perl dependencies

HTML::FormatText is used by Template::Plugin::HtmlToText which is called in the template for opac-sendbasket.pl.
This is not a core Perl 5.10 module. I had to install it additionally on a test server. So I am adding it to PerlDependencies.
I just picked an old version 1.23 that I still could find as min_ver.

Changed the version information for Test::Strict too (not required, only for tests).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a4ce9af8289fd79e436d4c36e8bce0ee8204ed93)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7153 - Show Open Library as Search Target in "More Searches" in OPAC detail page
Savitra sirohi [Sat, 5 Nov 2011 04:21:03 +0000 (00:21 -0400)]
Bug 7153 - Show Open Library as Search Target in "More Searches" in OPAC detail page

Update syspref OPACSearchForTitleIn to include Open Library as a target in More Searches in the OPAC detail page

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7de33d3773d9b85739f437d1f822b0775d388c6b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8470: remove depreciated H:T:P test
Mason James [Wed, 18 Jul 2012 05:24:29 +0000 (17:24 +1200)]
Bug 8470: remove depreciated H:T:P test

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 682d6a0a8bdec5db52cd8003e3a745b2a78c873f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7367 - One "the" too many
Magnus Enger [Mon, 23 Jul 2012 11:26:19 +0000 (13:26 +0200)]
Bug 7367 - One "the" too many

On line 123 it says "of the the last". One "the" is probably enough.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ba3ed923064aa0c8cfd513bb0893108daa524775)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8062 Followup for HTML::FormatText
Marcel de Rooy [Wed, 18 Jul 2012 13:58:37 +0000 (15:58 +0200)]
Bug 8062 Followup for HTML::FormatText

The dependency is not used in opac-sendbasket. But there is a require of HTML::FormatText in the code of Template::Plugin::HTMLToText.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4de7f6b143a25dcfa0084072862a5a8c37e9402c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8439 - Printing basketgroup does not work on plack
Dobrica Pavlinusic [Mon, 16 Jul 2012 10:43:24 +0000 (12:43 +0200)]
Bug 8439 - Printing basketgroup does not work on plack

scope $input CGI object with our for plack

Signed-off-by: Mirko Tietgen <5p4m@gmx.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fdcd1f72dd4785f1a12465d3d3b42b27da89ddf8)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8476: Little bug in OPAC XSLT on OPACURLOpenInNewWindow
Fridolyn SOMERS [Thu, 19 Jul 2012 13:29:12 +0000 (15:29 +0200)]
Bug 8476: Little bug in OPAC XSLT on OPACURLOpenInNewWindow

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I know where it comes from: vim cut-and-paste...

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8750e787f8b8cc06b3dd9ce6bb2f695add4b715a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8458 - $stemmed_operand in C4::Search _build_stemmed_operand is not initialized...
Mark Tompsett [Tue, 17 Jul 2012 12:53:57 +0000 (20:53 +0800)]
Bug 8458 - $stemmed_operand in C4::Search _build_stemmed_operand is not initialized. Added =q{} to initialize it to the empty string at declaration time.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 696789bae552a6cdf2d5a46c92e3ff9a51586c93)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8422 - Fix impossible warning in circulation.pl when OverduesBlockCirc set to...
David Cook [Thu, 12 Jul 2012 01:26:56 +0000 (11:26 +1000)]
Bug 8422 - Fix impossible warning in circulation.pl when OverduesBlockCirc set to Block

Previously, the message Patron has x overdue item(s). Checkout anyway? was shown when syspref OverduesBlockCirc was set to Ask for confirmation or Block.

This patch changes the message for Block to: Checkouts are BLOCKED because patron has overdues.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0594a89f0fbd60984f631c65df8de0a0ce9284ee)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8351: Update wording on staged marc
Nicole C. Engard [Tue, 3 Jul 2012 04:53:37 +0000 (00:53 -0400)]
Bug 8351: Update wording on staged marc

When undoing an import the 'success' message was
poorly worded. This patch fixes that.

Signed-off-by: Mirko Tietgen <5p4m@gmx.de>
works as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1a60179dcb9cee6ccf6a02c907ecf9d9f3b7a308)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agobug 8322 removing additional spaces before fullstop on catalogue/detail and opac...
Chris Hall [Tue, 12 Jun 2012 04:28:56 +0000 (16:28 +1200)]
bug 8322 removing additional spaces before fullstop on catalogue/detail and opac-detail pages.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 509c4b01351fea23db68969b1c344c29533d0001)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8398 - Missing image file in staff global css
Owen Leonard [Mon, 9 Jul 2012 19:48:23 +0000 (15:48 -0400)]
Bug 8398 - Missing image file in staff global css

This patch fixes a regression introduced by the fix for
Bug 6855 (bullet point showing in wrong place on error message)
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6855

The patch removes the re-introduced reference to a
background image which has since been removed. Testers should
check that this patch does not re-introduce Bug 6855.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked the styling of the error messages in Chromium and Firefox.
The logs are no longer complaining about the missing image.
Looks good to me.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6b80d0d681c7f6d9fbb3f0897a59d96de78f4e4f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoFix for Bug 6855 - List bullet showing in wrong place on error message
Owen Leonard [Mon, 12 Sep 2011 19:50:18 +0000 (15:50 -0400)]
Fix for Bug 6855 - List bullet showing in wrong place on error message

Added some more specific CSS to help Webkit browsers display
the lists bullets correctly.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased 9 June 2012. Signing off as well, since the rebase and test
were trivial.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bfcb15eeedf7c709c95af569bedd39a68879b312)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8375 - Patch for Common diacritics not shown correctly when exporting batch label...
wajasu [Fri, 6 Jul 2012 01:02:28 +0000 (20:02 -0500)]
Bug 8375 - Patch for Common diacritics not shown correctly when exporting batch label to PDF

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e66b380ead21f5d614f57c1840e8a1633f9aaf39)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 6394: purchase order has French strings hard coded in
Katrin Fischer [Mon, 9 Jul 2012 20:23:27 +0000 (22:23 +0200)]
Bug 6394: purchase order has French strings hard coded in

On the purchase order it said 'publié par' - instead of 'published by'.

The layout files for PDF generation in basket groups contain lots of English
strings, this change makes the template more consistent.

Currently the files are not translatable. The only way is to add translated
files to your installation.

To test:
Print a basket group as PDF. Verify string is ok for both possible settings
of system preference OrderPdfFormat:
- pdfformat::layout3pages
- pdfformat::layout2pages

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fa238b185614df773d66fb74601b72aa0abaa568)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8315 - remove use C4::* version
Dobrica Pavlinusic [Thu, 12 Jul 2012 16:01:17 +0000 (18:01 +0200)]
Bug 8315 - remove use C4::* version

This patch touches a lot of code, but basically it removes version
information from use C4::* in our code.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
All script still compiles after the patch (confirmed by pre-applypatch hook)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8235 - allow a whitelist of modules that aren't in Debian
Robin Sheat [Mon, 11 Jun 2012 15:04:06 +0000 (16:04 +0100)]
Bug 8235 - allow a whitelist of modules that aren't in Debian

This allows modules that aren't in the main debian repos to be handled
by the list-deps script when building a control file.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5cb0834f4d05361e9d584f340aebf83093aabf19)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8383: Add test to check that Perl scripts compile
Jared Camins-Esakov [Mon, 9 Jul 2012 02:06:28 +0000 (22:06 -0400)]
Bug 8383: Add test to check that Perl scripts compile

This patch adds t/db_dependent/00-strict.pl which tests that all Perl
scripts compile. I chose to use Test::Strict so that in the future we
can also have the test check that "use strict" and "use warnings" are
enabled.

To test:
1. Run t/db_dependent/00-strict.pl.
2. Run around waving your arms in the air that we have a couple of
   scripts that don't compile.
3. Actually, that's about it. You could test my patch for bug 8384 next.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Moved test to t/db_dependent

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:

C4/Installer/PerlDependencies.pm
(cherry picked from commit 4e2b90506d3b9570987e95918370e07d04df9091)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7143 – Bug for tracking changes to the about page
Mirko Tietgen [Sat, 7 Jul 2012 23:10:20 +0000 (01:10 +0200)]
Bug 7143 – Bug for tracking changes to the about page

This patch updates the German translators. To be applied after attachment 10681.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 67ead476aa7fb083347e3f4b2798d09850252074)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7143 : Adding Stacey Walker to the history
Chris Cormack [Fri, 6 Jul 2012 21:35:03 +0000 (09:35 +1200)]
Bug 7143 : Adding Stacey Walker to the history

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8356 - moveitem.tt and linkitem.tt have cataloging typo Changed urls from catalog...
Mark Tompsett [Wed, 4 Jul 2012 15:21:31 +0000 (23:21 +0800)]
Bug 8356 - moveitem.tt and linkitem.tt have cataloging typo Changed urls from cataloging to cataloguing

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
correct typo

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2c2f919b8a344c674cd318de754aa307bde44023)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8384: Some Perl scripts do not compile
Jared Camins-Esakov [Mon, 9 Jul 2012 02:28:56 +0000 (22:28 -0400)]
Bug 8384: Some Perl scripts do not compile

Fix syntax errors preventing the scripts misc/translator/text-extract2.pl
and misc/cronjobs/thirdparty/TalkingTech_itiva_inbound.pl from compiling.

Remove misc/migration_tools/build6xx.pl entirely since it refers to
columns that no longer exist in the Koha database, and has seemingly
had broken encoding since Koha switched from CVS to git (or before!).

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:

misc/cronjobs/thirdparty/TalkingTech_itiva_inbound.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Rebased as the TalkingTech code doesn't exist in 3.8.x
(cherry picked from commit f6e45171bacaefa6ca83c0796eadf8fab8b67a8b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7299 pass itemnumber in ILSDI holditem service
Alex Arnaud [Sat, 9 Jun 2012 10:36:55 +0000 (12:36 +0200)]
Bug 7299 pass itemnumber in ILSDI holditem service

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bc42bf97cb9ba34a4020b2224fb2028f8139797a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8335 - Missing Icon PR.png or typo in MARC21slim2OPACDetail.xsl
Marc Veron [Fri, 29 Jun 2012 18:21:56 +0000 (20:21 +0200)]
Bug 8335 - Missing Icon PR.png or typo in MARC21slim2OPACDetail.xsl

Add PR.png (renamed file music.png from http://famfamfam.com/lab/icons/ )

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 29b1860526e40bb51376c996efa429b7c5005f06)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8323 fixing year sorting of a list
Chris Hall [Thu, 21 Jun 2012 22:36:45 +0000 (10:36 +1200)]
Bug 8323 fixing year sorting of a list

Signed-off-by: Marc Veron <veron@veron.ch>
Works as expected.

Caveat: If you edit the list in Opac, change the sort and then klick 'Save',
the List always is displayed in title order. This is du to the fact that
save calls opac-shelves.pl?viewshelf=4 without the sort parameter (defaults
to 'title').
If you go back to lists, choose the list from List name, the param is
correct and the list displays in expected order.

It took quite a time to track  that down, I first thought that opac-shelves.pl
was broken.

However, current bug 8323 is not affected, signing off.

Marc

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2b8b926783d4426d4a569fdc717e546d12e88ce5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8314 Add MARCISBNs parameter to opac-detail.pl to show multiple isbns in OPAC
David Cook [Fri, 29 Jun 2012 06:53:14 +0000 (16:53 +1000)]
Bug 8314 Add MARCISBNs parameter to opac-detail.pl to show multiple isbns in OPAC

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 5327 : Follow up for TTParser test
Chris Cormack [Fri, 6 Jul 2012 23:35:47 +0000 (11:35 +1200)]
Bug 5327 : Follow up for TTParser test
(cherry picked from commit 0351ea525e36855c896db8a9f4d4f8cc36945896)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 5327 : Added coverage to unit test for TTParser
Duncan Tyler [Thu, 8 Dec 2011 22:29:53 +0000 (11:29 +1300)]
Bug 5327 : Added coverage to unit test for TTParser

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 796127e4b9aed7c1d8cad9c2275e5d3f0bbfa39d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agobug 5327: added some tests for C4/Items.pm
Stacey Walker [Mon, 11 Jun 2012 16:06:00 +0000 (17:06 +0100)]
bug 5327: added some tests for C4/Items.pm

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a44b3652d21895a78fe4e82a41ed2817b4cc6c57)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agobug 7630 follow-up : welcome #186 Mark Tompsett
Paul Poulain [Tue, 3 Jul 2012 16:20:07 +0000 (18:20 +0200)]
bug 7630 follow-up : welcome #186 Mark Tompsett

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fc28be8ac385ffefd812e9e2a8945ea6e23e808e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7630 - Warning on moremember.pl about param without key Move "$error => 1," to...
Mark Tompsett [Fri, 29 Jun 2012 13:54:44 +0000 (21:54 +0800)]
Bug 7630 - Warning on moremember.pl about param without key Move "$error => 1," to its own conditional $template->param()

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8489: Revise Ubuntu install files
Mark Tompsett [Sat, 21 Jul 2012 14:04:23 +0000 (22:04 +0800)]
Bug 8489: Revise Ubuntu install files

1) Changed ubuntu-pkg-check.sh to use lsb_release to determine version
   of ubuntu.{version}.packages file. If a versioned file does not
   exist, the user is warned, and ubuntu.packages is used. Told the
   user which file is being used. Caught apt-cache policy errors nicely.
   NOTE: ubuntu.packages MUST BE A COPY OF THE
   LATEST ubuntu.{version}.packages FILE!
2) Moved: ubuntu.packages -> ubuntu.10.04.packages
          ubuntu_maverick.packages -> ubuntu.10.10.packages
          ubuntu.precise.packages -> ubuntu.12.04 packages
             (last file created new, but effectively supersedes bug 8488)
3) Tweaked ubuntu.12.04.packages:
   * changed yaz3 references to yaz4
   * dropped libmysqlclient16-dev
   * changed libmysqlclient16 to libmysqlclient18
4) Copied the ubuntu.12.04.packages file to ubuntu.packages

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoDon't run testcritic on directories that can't pass
Jared Camins-Esakov [Fri, 13 Jul 2012 13:09:45 +0000 (09:09 -0400)]
Don't run testcritic on directories that can't pass

12 years agobug 6350 (history.txt) fixing typo
Paul Poulain [Fri, 29 Jun 2012 14:52:20 +0000 (16:52 +0200)]
bug 6350 (history.txt) fixing typo

decmember is not a month afaik ;-)
(cherry picked from commit 9285b2899f4814d3e47f7ff6c1f9dc86bc62b750)

12 years agoBug 6350 : Updating history
Chris Cormack [Sat, 23 Jun 2012 07:35:55 +0000 (19:35 +1200)]
Bug 6350 : Updating history

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:

docs/history.txt
(cherry picked from commit 42a46b481a3ad6cba36211ade81faf83fb214427)

12 years agoBug 8315 - fix 'C4::Output 3.02' errors in Koha
Mason James [Tue, 26 Jun 2012 03:58:30 +0000 (15:58 +1200)]
Bug 8315 - fix 'C4::Output 3.02' errors in Koha

modified:   opac/opac-ratings-ajax.pl
modified:   opac/opac-tags.pl
modified:   tags/review.pl

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8191 : Adding a new value to 8 position of coded data field 100
Sophie Meynieux [Tue, 5 Jun 2012 15:44:25 +0000 (17:44 +0200)]
Bug 8191 : Adding a new value to 8 position of coded data field 100

From july 2012, unimarc norm evolves and the value k "monograph with both publication date and print date" must be added for this position.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked the new value shows up and is correctly copied into the field.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 83874c62142b99f3a09ec9a7384e4ac6bfe8a1c2)

12 years agoBug 7143 Followup for timeline
Marcel de Rooy [Thu, 21 Jun 2012 09:01:15 +0000 (11:01 +0200)]
Bug 7143 Followup for timeline

Fixes few tabs within date; adds a regex to fix mistakes with spaces.

Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ee53a0c6fae18ca247a589e485455dfc6d333d04)

12 years agoBug 8282: Bug in modules list in about.pl
Matthias Meusburger [Thu, 21 Jun 2012 13:41:54 +0000 (15:41 +0200)]
Bug 8282: Bug in modules list in about.pl

  Last modules were not displayed if the number of modules did not match the number of rows of the table (when $number_of_modules % 4 != 0)

Signed-off-by: Marc Veron <veron@veron.ch>
Added some code to about.tt to have empty the last remaining cells, not sure if an other signoff is needed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7d237f22adc9b8f3b2ba927995dc307e58e6a1e1)

12 years agoBug 8289 Upgrading from 2.2 does not work anymore
Paul Poulain [Fri, 22 Jun 2012 09:10:18 +0000 (11:10 +0200)]
Bug 8289 Upgrading from 2.2 does not work anymore

The updatedatabase22to30.pl script update the engine from MyISAM to InnoDB for most tables.

However, the TYPE=InnoDB was deprecated, and is not removed.
The correct syntax is now ENGINE=InnoDB

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4cb0aa5d30dd044f50b9caacb59cd7bf39226070)

12 years agoBug 6634 : 3 more cases of manager_id not populated
Maxime Pelletier [Wed, 28 Mar 2012 21:26:01 +0000 (17:26 -0400)]
Bug 6634 : 3 more cases of manager_id not populated

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d43ec92b6cb3fe33fe8dbd626aec2a005a212c5d)

12 years agoFixing whitespace issues. Note to Paul, docs/history.txt is a tab
Chris Cormack [Sat, 23 Jun 2012 07:24:58 +0000 (19:24 +1200)]
Fixing whitespace issues. Note to Paul, docs/history.txt is a tab
separated text file.
(cherry picked from commit e4acd9e24f186ce5fc5cf629c672fba26d74ee54)

12 years agoAdding Claire Hernandez as contributor + adding missing contributors in about.tt
Paul Poulain [Wed, 20 Jun 2012 19:49:40 +0000 (21:49 +0200)]
Adding Claire Hernandez as contributor + adding missing contributors in about.tt

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7994: Fix pref yaml errors
Claire Hernandez [Mon, 11 Jun 2012 13:52:10 +0000 (15:52 +0200)]
Bug 7994: Fix pref yaml errors

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7994: scripts to check yaml files
Claire Hernandez [Mon, 23 Apr 2012 13:11:46 +0000 (15:11 +0200)]
Bug 7994: scripts to check yaml files

$ prove yaml_valid.t
checks a closed list of files
$ perl yaml_valid.pl -f myfile.yaml
try to load a yaml file with YAML::LoadFile and show errors

(both files pertidied)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5cb8c9f6e44aa9874231bae5a909cb4a4f3473b5)

12 years agoBug 8216: Allow SIP modules to pass critic tests
Colin Campbell [Sat, 9 Jun 2012 09:40:19 +0000 (10:40 +0100)]
Bug 8216: Allow SIP modules to pass critic tests

Add C4/SIP to perlcritic tests. Fix those issues that were
generating perlcritic errors

Signed-off-by: Stacey Walker <stacey@catalyst-eu.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 6720: show authority type in auth details
Jared Camins-Esakov [Fri, 15 Jun 2012 14:40:59 +0000 (10:40 -0400)]
Bug 6720: show authority type in auth details

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Authority type on detail page in staff now shows correctly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4b38fb0d4346480f7acefaf3d6976952bb2307c3)

12 years agoBug 8232: Comments in OPAC contain untranslatable javascript messages
Katrin Fischer [Mon, 11 Jun 2012 14:09:00 +0000 (15:09 +0100)]
Bug 8232: Comments in OPAC contain untranslatable javascript messages

To test:
- add a new comment to a record in the OPAC
- Your comment (preview, pending approval) is not translatable
- update po files by running 'perl translate update <language>'
- Open po file and check if strings are there, translate
- install language again by running 'perl translate install <language>'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 7367 Followup for opac-suggestions template
Marcel de Rooy [Thu, 14 Jun 2012 06:31:46 +0000 (08:31 +0200)]
Bug 7367 Followup for opac-suggestions template

This small typo was found by Albert Oller.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Very trivial fix.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 89e115c4d9f5ae55d824200464e9541ece2eec0e)

12 years agoBug 7368 Followup for history.txt Only correcting whitespace for correct placement...
Marcel de Rooy [Mon, 11 Jun 2012 12:18:02 +0000 (14:18 +0200)]
Bug 7368 Followup for history.txt Only correcting whitespace for correct placement in about form

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Very trivial.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:

docs/history.txt

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 8222 - make the zipcode no longer mandatory
Robin Sheat [Sun, 10 Jun 2012 14:56:21 +0000 (15:56 +0100)]
Bug 8222 - make the zipcode no longer mandatory

Having the zipcode field mandatory by default is a bit annoying for
places where no one cares about it. This patch stops it being the case
on new installs.

Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fe5214ba5e326d23a2b689cd945012325107b9e0)

12 years agopatch for Bug 8226 - 'OpacFooter' markup/css improvements
Mason James [Mon, 11 Jun 2012 04:40:04 +0000 (16:40 +1200)]
patch for Bug 8226 - 'OpacFooter' markup/css improvements

Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4b1666e0bd4038e05a45acd42982a0f55f97be31)

12 years agoBug 8136 Changes the expected lenght of 100$a in rebuild_zebra.pl
christophe croullebois [Tue, 22 May 2012 11:59:33 +0000 (13:59 +0200)]
Bug 8136 Changes the expected lenght of 100$a in rebuild_zebra.pl

In rebuild_zebra.pl, if we are in "unimarc" ("marcflavour" syspref), the sub "fix_unimarc_100" is called and checks if 100$a lenght is equal to 35.
If it is not the case, the sub inserts the localtime and more, so we loose the datas in reindexing.
The standart lenght is 36.
I have just changed 35 to 36.

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 68c6e00f1659e66a3fcf60752d5ed7a67688b119)

12 years agoBug 7329 [Followup] : when reverting an import, keep matching biblionumber in batch...
Sophie Meynieux [Sun, 10 Jun 2012 15:01:26 +0000 (17:01 +0200)]
Bug 7329 [Followup] : when reverting an import, keep matching biblionumber in batch table, if items are not deleted because they are issued.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d92874095256058756b08aec4fcaf7b4316bca7f)

12 years agoBug 7329 [Followup] : when reverting an import, keep matching biblionumber in batch...
Sophie Meynieux [Sun, 10 Jun 2012 10:23:20 +0000 (12:23 +0200)]
Bug 7329 [Followup] : when reverting an import, keep matching biblionumber in batch table, if items are not deleted beacause on loan.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 45784a7183095bc9bbe4761fd26e385386d822d1)

12 years agoBug 7329: Items onloan are deleted when undoing import into catalog
Christophe Croullebois [Wed, 7 Dec 2011 10:54:29 +0000 (11:54 +0100)]
Bug 7329: Items onloan are deleted when undoing import into catalog

this patch checks the "on loan" and "reserved" status before deleting item, and
do noting in this case, so the record can't be deleted due to existing item.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0b39f30a69da728586d9cb27ed6f50983e3336d9)

12 years agoBug 6141 - html glitches causing problems to translator - 3.8.x
Kyle M Hall [Sat, 9 Jun 2012 11:04:48 +0000 (07:04 -0400)]
Bug 6141 - html glitches causing problems to translator - 3.8.x

* opac-topissue.pl = untranslatable string removed
* authorities.pl missing _() in javascript

Rewrite of patch authored by Julian Maurice.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8403c9d2c74694dd482b1d020d847defb8e8c4f7)

12 years agoBug 7952 - followup to fix t/Creators.t
Dobrica Pavlinusic [Thu, 14 Jun 2012 12:00:16 +0000 (14:00 +0200)]
Bug 7952 - followup to fix t/Creators.t

Since we are now using temporary file, we are creating test.pdf
at end of test and checking if it exists and have non-zero size.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7526cc10421aed4f11a6583f6f627096a9559d0c)

12 years agoBug 7952 - PDF::Reuse under plack writes to console STDOUT instead to browser
Dobrica Pavlinusic [Thu, 12 Apr 2012 22:20:00 +0000 (00:20 +0200)]
Bug 7952 - PDF::Reuse under plack writes to console STDOUT instead to browser

Without name option to prFile, PDF::Reuse opens '-' file which is real
console STDOUT on plack so pdf file gets emited to terminal instead of
sending it to browser.

This change creates temporary file using File::Temp, pass it to PDF::Reuse
and then reads it back and prints it out for plack (or CGI) to pick up.

Test secenario:

1. Home › Tools › Patron Card Creator › Manage Card Batches
2. select batch checkbox and click Export
3. select template and click Export
4. click on pdf file to download it

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e2e80737d354323be820e4176c2a965440ff089b)

12 years agoBug 8171 - Improper escaping of quotes during z39.50 queries leads to broken html
Owen Leonard [Mon, 4 Jun 2012 19:23:30 +0000 (15:23 -0400)]
Bug 8171 - Improper escaping of quotes during z39.50 queries leads to broken html

Implementing fix as suggested by Chris Cormack:

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8171#c4

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dc0cf0b3290e642b33f44ff465976ac915d952d7)

12 years agoBug 4838 Fix repeated authorities selection
Frédéric Demians [Tue, 5 Jun 2012 10:06:23 +0000 (12:06 +0200)]
Bug 4838 Fix repeated authorities selection

How to test:

Create an authority, with more than one heading, for example a
UNIMARC multilingual author:

  200 $7 da
      $a 原
      $b 純輔
  200 $7 ba
      $a Hara
      $b Junsuke

In data entry form, on 700 field, you click on ... Search for the above author.
In auhtority search result page, you just have a 'Choose' link, and so you just
can select the first heading (in Chinesse writing).

Apply the patch. Repeat. Now you have, on result page, you have two links, and
can select one heading or the other.

Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c215ba8117e727ed8b91e55dde30f5256c0f3064)

12 years agoBug 8166 - Adding new currencies & exchange rates
Amit Gupta [Wed, 30 May 2012 07:07:33 +0000 (12:37 +0530)]
Bug 8166 - Adding new currencies & exchange rates

if not fill any field it save blank record

To Test:
1) Go to Currencies & Exchange rates.
2) Create New currency
3) If you not fill any field for ex: (Currency, rate, symbol)
   it will not save the record.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 42dbe025d953ef9809a1330be4517e393d49ea4a)

12 years agoFixing tabs in docs/history.txt
Chris Cormack [Thu, 14 Jun 2012 06:39:53 +0000 (18:39 +1200)]
Fixing tabs in docs/history.txt

NOTE: This is a tab separated file, please do not switch tabs for
spaces
(cherry picked from commit 4688e3df3777795c3ed70cd8cd4192841d4aadd3)

12 years agoAdding Shari Perkins as contributor
Paul Poulain [Sun, 10 Jun 2012 11:56:26 +0000 (13:56 +0200)]
Adding Shari Perkins as contributor

(she submitted some patches for online help)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e844ce66504ba950746d174947bfb6ce0d2cc2e6)

12 years agoBug 7815 : Order pickup libraries list by name rather than by code
Sophie Meynieux [Fri, 23 Mar 2012 14:02:22 +0000 (15:02 +0100)]
Bug 7815 : Order pickup libraries list by name rather than by code

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 317479ff433b7098a10a02a37a70353e57e645f9)

12 years agoBug 8009: Followup Item descriptive data not populated on pay.pl
Jonathan Druart [Tue, 15 May 2012 14:29:46 +0000 (16:29 +0200)]
Bug 8009: Followup Item descriptive data not populated on pay.pl

Separation of title from the description.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c3b69a6f9ce800e999cc9e1276bb402863953c85)

12 years agoBug 8009: Item descriptive data not populated on pay.pl
D Ruth Bavousett [Wed, 25 Apr 2012 13:06:31 +0000 (06:06 -0700)]
Bug 8009: Item descriptive data not populated on pay.pl

GetBorNotifyAcctRecord was not populating the {title} element of the
hash, which pay.tt will use.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 985e89fc09f36707f562dba68e1dfb4f55ed804e)

12 years agoBug 8197 : Software error when you have cleaned cookies and try to past the url to...
christophe croullebois [Wed, 6 Jun 2012 13:14:15 +0000 (15:14 +0200)]
Bug 8197 : Software error when you have cleaned cookies and try to past the url to opac-topissues.pl

Try to delete cookies and paste the url to opac-topissues.pl.
Without the patch we have a Software error.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fa00315b2b61c3c1824b7af185317c1b3503c66f)

12 years agoBUG5312 XHTML correction in authority summary
Fridolyn SOMERS [Mon, 22 Aug 2011 13:14:24 +0000 (15:14 +0200)]
BUG5312 XHTML correction in authority summary

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fd2a52bda95b54d94df6fc870d002baff0d5f27b)

12 years agoBug 7586 - Search: Language restriction does NOT show expected results (no items...
Marc Veron [Fri, 8 Jun 2012 11:40:31 +0000 (13:40 +0200)]
Bug 7586 - Search: Language restriction does NOT show expected results (no items shown)

modified:   etc/zebradb/marc_defs/marc21/biblios/record.abs

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 57ff55a84dfcf1c7b4d9851ccafe842ff074e4e0)

12 years agoBug 8062 [SIGNED-OFF] Perl module dependency Template::Plugin::HtmlToText
Frédéric Demians [Mon, 4 Jun 2012 08:06:22 +0000 (10:06 +0200)]
Bug 8062 [SIGNED-OFF] Perl module dependency Template::Plugin::HtmlToText

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ee3ffc006cd574eae85c8cd20d885133a9ffde3a)

12 years agoBug 8062 [SIGNED-OFF] Cart email broken for non english templates
Frédéric Demians [Mon, 14 May 2012 07:57:50 +0000 (09:57 +0200)]
Bug 8062 [SIGNED-OFF] Cart email broken for non english templates

Fix basket email sent from OPAC. The email body is now generated HTML
(to be translatable), and converted into TEXT before beeing sent by
email.

To test that it works in other language than English, you have to update
your language .po file:

  perl translate update de-DE

Then, translated strings coming from opac-sendbasket.tt, and install the
translation:

  perl translate install de-DE

New dependency: Template::Plugin::HtmlToText

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
 (Conflicts in koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
  resolved by replacing the file with the version from 3.8.x)

12 years agobug_8138: added 773$t field to search results
Srdjan [Mon, 28 May 2012 00:12:34 +0000 (12:12 +1200)]
bug_8138: added 773$t field to search results

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
12 years agoBug 7834: order search at the top of acq does nothing
Katrin Fischer [Mon, 9 Apr 2012 07:48:46 +0000 (09:48 +0200)]
Bug 7834: order search at the top of acq does nothing

Entering a search term for 'title' or 'vendor' at the top search
form in acq (tab 'Orders search') did redirect to the advanced
search form, but didn't start the search.

After applying the patch the search will bring back results immediately
or redirect to the form, when there are no results.

To test:
- Check all searches still work as expected by searching for title,
vendor, order name and invoice number
- Check advanced search still has the search terms prepopulated
- Check searches with and without results are ok

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d55cde8ae5b09bce0d93c2bfac26de6d27a4507a)

12 years agoBug 2505 follow-up: C4::Ris not ready for use strict;use warnings;
Paul Poulain [Tue, 10 Apr 2012 13:08:47 +0000 (15:08 +0200)]
Bug 2505 follow-up: C4::Ris not ready for use strict;use warnings;

The patch pushed a few hours ago is a good 1st step in the right direction.
however, many things are still to do to have the script OK with strict/warning, so commenting them

Errors if you have them:

Global symbol "$utf" requires explicit package name at C4/Ris.pm line 111.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 350.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 350.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 353.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 363.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 389.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 431.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 438.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 439.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 440.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 441.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 442.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 443.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 464.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 465.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 466.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 479.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 480.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 483.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 484.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 485.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 501.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 505.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 527.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 530.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 539.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 540.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 556.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 557.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 561.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 562.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 578.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 579.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 583.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 584.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 613.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 614.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 629.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 630.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 645.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 646.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 674.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 706.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 707.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 707.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 710.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 715.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 721.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 725.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 729.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 730.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 730.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 731.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 734.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 735.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 738.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 772.
Global symbol "@kwsubfields" requires explicit package name at C4/Ris.pm line 776.
Global symbol "@kwsubfields" requires explicit package name at C4/Ris.pm line 779.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 789.
Global symbol "@notesubfields" requires explicit package name at C4/Ris.pm line 892.
Global symbol "@notesubfields" requires explicit package name at C4/Ris.pm line 895.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 901.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 935.
Global symbol "$utf" requires explicit package name at C4/Ris.pm line 962.
Global symbol "$uniout" requires explicit package name at C4/Ris.pm line 966.
C4/Ris.pm had compilation errors.
(cherry picked from commit 5d9c7dfe040ca0302095a5641060388b14b9e984)

12 years agoBug 6679 :[SIGNED-OFF] Fixing some perlcritic violations in the opac
Chris Cormack [Thu, 5 Apr 2012 03:40:46 +0000 (15:40 +1200)]
Bug 6679 :[SIGNED-OFF] Fixing some perlcritic violations in the opac

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit 6f3123bbc65b1087e18bd8212d1ca01ed1087181)

12 years agoBug 7807: [SIGNED-OFF] Fix call to GetSuggestionFromBiblionumber
Julian Maurice [Thu, 22 Mar 2012 16:20:01 +0000 (17:20 +0100)]
Bug 7807: [SIGNED-OFF] Fix call to GetSuggestionFromBiblionumber

This sub only takes one parameter

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 680e92115f109bec50562de7043df17add8b26eb)

12 years agoBug 7886 follow-up DBRev number
Paul Poulain [Tue, 10 Apr 2012 09:53:15 +0000 (11:53 +0200)]
Bug 7886 follow-up DBRev number

12 years agoBug 7886 - C4/ShelfBrowser slow SQL performance
Dobrica Pavlinusic [Wed, 4 Apr 2012 23:03:30 +0000 (01:03 +0200)]
Bug 7886 - C4/ShelfBrowser slow SQL performance

ShelfBrowser uses two SQL queries with syntax

WHERE ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?)
AND homebranch = ? AND location = ? AND ccode = ?

homebranch already has index, and adding indexes on ccode and location
improves performance by 30% for each query since MySQL is able to use
index_merge intersect(items_ccode,homebranch,items_location)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d8e702dd25dfb09f99620ea9f5d3251033d16864)

12 years agoBug 7900: Link to vendor from subscription detail is broken
Katrin Fischer [Fri, 6 Apr 2012 15:09:30 +0000 (17:09 +0200)]
Bug 7900: Link to vendor from subscription detail is broken

To test:
- Add a serial subscription with a link to a vendor
- Check the subscription detail page for the name and link to the vendor
- Check that the link works correctly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bd52531d69e0f86093a16101f87743a9f8b0c892)

12 years agoBug 2505 : Switch on warnings in circ/returns.pl
Colin Campbell [Wed, 15 Jun 2011 11:15:14 +0000 (12:15 +0100)]
Bug 2505 : Switch on warnings in circ/returns.pl

Removed a compile time warning caused by a void context
in a bit of too clever obscure code

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e7971380e8ff699b57d0c02b2406eca254dfd04a)

12 years agoBug 2505 : use warnings in smart_rules.pl
Colin Campbell [Tue, 7 Jun 2011 13:34:18 +0000 (14:34 +0100)]
Bug 2505 : use warnings in smart_rules.pl

Fix some careless code redeclaring a variable
declaring a variable in a condition
so that these don't generate errors

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6078c1acf699f51c127e853203e35cadae99005d)

12 years agoBug 2505 - enable Perl warnings in all modules and scripts
Mason James [Thu, 15 Mar 2012 08:06:22 +0000 (21:06 +1300)]
Bug 2505 - enable Perl warnings in all modules and scripts

enable warnings, and correct perlcritic's 'Loop iterator is not lexical' errors in C4/Ris.pm

modified:   C4/Ris.pm

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
12 years agoAdd sponsor list to 3.6.x
Jared Camins-Esakov [Wed, 11 Jul 2012 12:10:10 +0000 (08:10 -0400)]
Add sponsor list to 3.6.x

Sponsored-by: Los Gatos Public Library
Sponsored-by: NEKLS
Sponsored-by: East Brunswick Public Library
Sponsored-by: Athens County Public Libraries
Sponsored-by: Horowhenua Library Trust
Sponsored-by: Halton Borough Council
Sponsored-by: South Taranaki District Council
Sponsored-by: Arcadia Public Library
12 years agoFix markup error
Jared Camins-Esakov [Thu, 14 Jun 2012 20:46:35 +0000 (16:46 -0400)]
Fix markup error

12 years agoBug 7548: Missing arguments when receiving orders
Katrin Fischer [Sat, 9 Jun 2012 18:20:52 +0000 (19:20 +0100)]
Bug 7548: Missing arguments when receiving orders

Patch redone for 3.6.x to fix TT scoping problems and taking care
of changed variable names (booksellerid vs supplierid).

To test:
Check pagination works correctly when receiving orders.
Invoice number and date received should always appear in your URL
and be shown at the top of the website.

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8201: Receive date not passed through correctly
Katrin Fischer [Sun, 10 Jun 2012 13:52:08 +0000 (14:52 +0100)]
Bug 8201: Receive date not passed through correctly

Separate patch for 3.6.x because variable name got changed between versions.
(supplieried instead of booksellerid)

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agobug 7894 [SIGNED-OFF]: crude fix: convert results array into an arrayref
MJ Ray [Wed, 4 Apr 2012 09:23:06 +0000 (10:23 +0100)]
bug 7894 [SIGNED-OFF]: crude fix: convert results array into an arrayref

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This patch fixes the problem with the first record on the second
page, but there is still a problem with the next/previous links,
as described in comments 3 and 4 in the bug report. I'm signing
off since it's unclear wether that problem is directly linked to
the "first record on the second page" problem, and a partial fix
seems better than no fix at all.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 8176 [SIGNED-OFF] Assign an intial value to $sqlwhere
Colin Campbell [Fri, 1 Jun 2012 07:10:21 +0000 (08:10 +0100)]
Bug 8176 [SIGNED-OFF] Assign an intial value to $sqlwhere

warnings in log because of undefined value in
string concatenation
variable should be initialized to empty string rather
than left undefined

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Removes a warning in logs

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 3638 : Captured Holds may need to generate a transfer
Colin Campbell [Thu, 18 Aug 2011 15:48:44 +0000 (16:48 +0100)]
Bug 3638 : Captured Holds may need to generate a transfer

If a discharged item is captured for a hold at another branch
the selfcheck should generate a branchtransfer for it.
This was complicated as the checkin routine was setting its own
location from a field not set in many scm machines (e.g. 3M)
also in ILS::Transaction the test for location was incorrect
assuming that an empty string or undefined was a valid location

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 3638 Self Check Should Capture Hold Items
Colin Campbell [Mon, 4 Jul 2011 15:44:16 +0000 (16:44 +0100)]
Bug 3638 Self Check Should Capture Hold Items

Shelf Check was receiving messages saying item was wanted
for a hold but the item was discharged to the shelf
not associated with the hold or transited to
the pickup location. The message was also being sent
on discharge of items when a suitable item had already
been captured.
Checkin now associates the item with the hold and sets
the appropriate data for a correct checkin response

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
12 years agoBug 5327 : Fix for XISBN test, thingisbn is now handing back different results
Chris Cormack [Fri, 1 Jun 2012 22:29:52 +0000 (10:29 +1200)]
Bug 5327 : Fix for XISBN test, thingisbn is now handing back different results

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>