Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 410975a7f7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
selection of items to be listed in an overdue notice included
both limits (upper and lower). So items with an overdue equal
to a limit appeared on both notices. This patch fix this,
including lower limit and excluding upper limit for the selection.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit d86d62adba)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
To test:
Create 4 holds on a bib, for patrons A, B, C, and D,
Check in the item to mark hold as waiting for patron A
Check out the item to patron B -> reserve for patron B should be removed
Check in the item to mark hold as waiting for patron A
Check out the item to Patron A, hold should complete normally
Check in the item to mark hold as waiting for patron C
Check out the item to patron D -> reserve for patron D should be removed.
Check in the item to mark hold as waiting for patron C
Check out the item to patron C, hold should complete normally
Check in the item -> there should be no more reserves.
We also tested:
Created 4 holds on a bib with two items, for patrons A, B, C, and D
All worked as expected.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6e07fd7b00)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=7361
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This patch changes the pull down for encodings in staged marc import.
Before patch:
- Character encoding preselected was 'Default'
- 'Default' broke diacritics in utf-8 encoded files and was reported
to not work correctly
- Selecting 'UTF-8' from the drop down worked
After patch:
- Character encoding preselected is 'UTF-8 (Default)'
- There is no longer a 'Default' option and no separate 'UTF-8'
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 86d6e6d3de)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Sorting by cardnumber now works (removed a client-side
sort, the server-side sort is enough).
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
1) Verified that before applying this patch, when searching patrons with cardnumber as order by preference, patrons are sorted ny name.
2) Verified that after applying this patch, when searching with cardnumber as order by preference, patrons are correctly sorted by cardnumber.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1de55f6f08)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3ae23cd6cf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- ensure that without cookie, language selection is based on browser
preferences
- refactor function to obtain langugage for stem in search (opac + intranet)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
To reproduce the bug:
- Activate en and fr-FR for OPAC
- Clear your browser cookies
- Select your language preference in your browser: fr, fr-fr, en
- Load OPAC main page
- OPAC is displayed in English, rather than French as asked by browser
preferences
Apply the patch and test:
- Clear your browser cookies
- Load OPAC main page
- Pages are displayed in French
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0ad7e76cb7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Changing title and breadcrumbs so that they correctly reflect
the curent stage of the process.
To test: Add to an order from an external source. When filling
out the Z39.50 search form the title and breadcrumbs should read
"Order from external sources." After searching they should read
"Order from external sources -> Search results"
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8a87f15605)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
UPDATE 2011-12-15
Fixed wrong div that broke the patron account display.
Thank you Paul for catching this!
Changes made to the patron detail tab:
- alternate email shows as mailto: link
- labels for following fields only show when field is filled
- initials
- date of birth
- gender
- country (alternate address)
- email (alternate address)
- state (alternative contact)
- country (alternative contact)
- phone (alternative contact)
To test:
1) Add new patron with minimal data and check the labels don't show
2) Change patron to have data in changed fields and check labels show
3) Check all email addresses are shown as mailto: links now
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified tests 1-3, looks good to me.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 52dca0f433)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Marc Balmer <marc@msys.ch>
http://bugs.koha-community.org/show_bug.cgi?id=7346
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d9f7922ad7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- 'no address stored' is now only displayed when first and second line
of the address are empty
- added id's to all 3 possible messages so people can change or hide
them
To test:
1) Check 'no address stored' shows only up when address fields are both
empty
2) Check address is still correctly displayed
Note: make sure you check the 'checkouts' and other tabs, because there
are 2 different include files used here.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm the bug and the solution. Text messages identification for
customization with JavaScript is a plus.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit ac139f8f63)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
To test:
Create a fresh koha db with all of the sample data (if you have one that has the sample branches in it, that will work too)
run the test: prove t/db_dependent/Members.t
All subtests should complete.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests complete successfully with my database created from
sample data and with the database provided on the bug.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b955692c84)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fixed error in C4::Dates causing unneeded warnings
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c2bba3ffc8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Adding a check for an empty value in a couple of places
which seem to always get one.
As far as I can tell these places in the script are looping
over ALL the data in the pref files, and sometimes an empty
value comes through. I wonder if this is because of a minor
syntax error in the pref file?
My correction is a stab in the dark since I haven't determined
where the empty value is actually coming from. This change
quiets the errors in the log and doesn't seem to affect
preference search results.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
No more messages in the logs. Yay!
Ran unit tests on this (t, xt/author, xt, t/db_dependent)- nothing out of the ordinary in any.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0817902956)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Adds --maxdays command line flag to longoverdue.pl to allow the user to specify
their own $endrange value. Because sometimes 366 isn't enough!
Also adds help documentation for both --quiet and --maxdays params
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Simple change, works well
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1f5f4981c0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Checking for variables before trying to use them in
building the pagination menu
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 17df078261)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Correcting check for empty shelf name to prevent
javascript error.
Also correcting unescaped ampersand.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2cfb3398cf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
While testing bug 7013 I noticed a lot of warns in the koha error log.
This patch is silencing them.
To test:
Add or edit an authorised value and check your log files before and after
applying the patch.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d831a03fde)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Changed the javascript to include markup for translation _(...) in result
list and detail page tool bars.
Also changed the text shown for each result to match the text in the toolbar
to make things more consistent.
To test:
- Apply patch
- Run "perl translate update <your language code>"
- Open .po file for staff and check for "Place hold on" and "Forget"
- Translate those
- Run "perl translate install <your language code>"
- Activate "Search for hold" feature in patron account
- Do a search and check tool bar on top of result list
- Check link text shown in result list
- Check detail page
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8374ecbcd6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test requires a database installed using the sample data.
All tests pass.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 06c822c37c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 64a9c64100)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit dfa4b73737)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Removed unneeded self=shift from unshift_token
(as peek and next do not take a self, makes interface more consistent)
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 18bb9c2210)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 47b514cf56)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bb79d37b87)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
http://bugs.koha-community.org/show_bug.cgi?id=5327
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test passes.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7876d4fa8d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Adds two files, to enable XSLT for the detail view in the intranet:
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
To test:
- Set sysprefs: marcflavour = NORMARC and XSLTDetailsDisplay = "using XSLT stylesheet"
- Make sure OPACBaseURL is set correctly
- Check that detail display looks ok
- Check that automatic links for author, subjects etc work
- Check that the "Open in new window" link works as expected
- Empty the OPACBaseURL syspref and check that "Open in new window" does not display
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Great test plan, could reproduce problem and can confirm patch fixes it.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e4c6f1fc20)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a1e3174668)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9b9093d225)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Just adding a check on imageurl in the template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a8ddf6acae)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nice patch, making use of the Template::Toolkit filters
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a8f3860149)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
When creating an item in acquisitions while ordering and not filling out
any fields, there is no longer shown a perl error message.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 48f25fec43)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Using the delete all items function should now redirect back to the
biblio view specified in the BiblioDefaultView system preference.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8121f5581f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit edd8e5767d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7fd5098b98)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch
(cherry picked from commit 373e49576d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
* in history.txt, added a tab for Stephane Delaune, for display consistency
* fixed a small mistake in about.pl that was resulted in a perlcritic failure
(cherry picked from commit 82ed469632)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Includes follow up by Chris Cormack fixing formatting in docs/history.txt
[MINOR EDIT] Added html filter to output for validity's sake
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
(cherry picked from commit 6bc414a3d4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The call to ReturnLostItem in C4/Accounts was not properly namespaced to
come from C4::Circulation. That prefix is added to the call.
To test:
Pay a fine, and confirm the error disappears (and the fines is still paid)
Signed-off-by: Brendan <brendan@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit afd2098f3c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
I had a typo where I put Ian Walls as Release Manager - I have fixed to QA.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I put in another missing space for Colin Campbell.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 04f8dfec9b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>