Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8caef64680)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 5fdf80afe8)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 c4d6ad7518)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
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 a4ce9af828)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 7de33d3773)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 682d6a0a8b)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 ba3ed92306)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 4de7f6b143)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 fdcd1f72dd)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 8750e787f8)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 696789bae5)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 0594a89f0f)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 1a60179dcb)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 509c4b0135)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 6b80d0d681)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 bfcb15eeed)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 e66b380ead)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 fa238b1856)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
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 5cb0834f4d)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 4e2b90506d)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 67ead476aa)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 2c2f919b8a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 f6e45171ba)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 bc42bf97cb)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 29b1860526)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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 2b8b926783)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
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 796127e4b9)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a44b3652d2)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fc28be8ac3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
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>
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 83874c6214)
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 ee53a0c6fa)
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 7d237f22ad)
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 4cb0aa5d30)
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>
$ 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 5cb8c9f6e4)
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>