Commit graph

15243 commits

Author SHA1 Message Date
Srdjan Jankovic
6e07fd7b00 bug_2830: Remove reserve when checking out if the borrower is not the first one in the reserve queue
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>
2011-12-16 16:21:38 +01:00
Duncan Tyler
86d6e6d3de Bug 7361 Fix default option in encoding dropdown
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>
2011-12-16 16:15:59 +01:00
Adrien Saurat
1de55f6f08 Bug 7349: corrects sort order for Patron search
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>
2011-12-16 16:13:55 +01:00
Paul Poulain
a1ec828453 Merge remote-tracking branch 'origin/new/bug_5327' 2011-12-16 15:45:12 +01:00
Duncan Tyler
3ae23cd6cf Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm
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>
2011-12-16 15:43:04 +01:00
Frère Sébastien Marie
0ad7e76cb7 Bug 7282 - invalid language selection
- 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>
2011-12-16 14:20:11 +01:00
8a87f15605 Bug 7319 - Improving title and breadcrumbs on acquisitions Z39.50 search pages
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>
2011-12-16 10:43:39 +01:00
Katrin Fischer
52dca0f433 Bug 7324: Show alternate email as mailto: / hide labels when field is empty
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>
2011-12-16 10:25:52 +01:00
Paul Poulain
42d6b17851 welcome to Marc Balmer, #167 2011-12-15 18:37:39 +01:00
Paul Poulain
9880b3ad05 Merge remote-tracking branch 'origin/new/bug_7346' 2011-12-15 18:33:55 +01:00
Marc Balmer
d9f7922ad7 Bail out early if an invalid language is used.
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>
2011-12-15 18:33:36 +01:00
Katrin Fischer
c04e6e3c8f Bug 7334: Improve 'no address stored' and similar messages in patron account
- '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>
2011-12-15 18:32:23 +01:00
Katrin Fischer
ac139f8f63 Bug 7334: Improve 'no address stored' and similar messages in patron account
- '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>
2011-12-15 18:16:14 +01:00
Liz Rea
b955692c84 Bug 7333 - modifying Members.t to use a branchcode that exists in the sample data
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>
2011-12-15 18:13:29 +01:00
Duncan Tyler
c2bba3ffc8 Bug 7331 - Circulation.pl generates errors in the log
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>
2011-12-15 17:38:39 +01:00
0817902956 Bug 7330 - System preferences editor generates errors in the log with each search
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>
2011-12-15 17:24:44 +01:00
Ian Walls
1f5f4981c0 Bug 7326: longoverdue.pl hardcoded to 366 days maximum
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>
2011-12-15 17:13:24 +01:00
17df078261 Bug 7325 - Editing a list generates errors in the log
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>
2011-12-15 17:09:15 +01:00
2cfb3398cf Bug 7323 - Javascript error when editing list
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>
2011-12-15 16:57:47 +01:00
Katrin Fischer
d831a03fde Bug 7321: Silence some warns in Koha.pm
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>
2011-12-15 16:53:32 +01:00
Katrin Fischer
8374ecbcd6 Bug 7313: Untranslatable strings in 'Search to hold' feature
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>
2011-12-15 16:46:38 +01:00
Paul Poulain
7698ce6e01 Merge remote-tracking branch 'origin/new/bug_5327' 2011-12-15 16:17:44 +01:00
Paul Poulain
8df873c1a2 Revert "Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm"
This reverts commit 06c822c37c.
2011-12-15 16:14:35 +01:00
Paul Poulain
62914dfd83 Revert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"
This reverts commit 18bb9c2210.
2011-12-15 16:13:43 +01:00
Paul Poulain
746deb5127 Revert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token"
This reverts commit 18bb9c2210.
2011-12-15 16:11:47 +01:00
Paul Poulain
6ca007a923 Merge remote-tracking branch 'origin/new/bug_5327' 2011-12-15 13:53:39 +01:00
Duncan Tyler
06c822c37c Bug 5327: Added unit test for C4/SIP/ILS/Transaction/RenewAll.pm
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>
2011-12-15 13:52:50 +01:00
Chris Hall
64a9c64100 Added missing reference case to Boolean.t and corrected count
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>
2011-12-15 13:50:41 +01:00
Paul Poulain
e12fca0eb8 Merge remote-tracking branch 'origin/master' into new/bug_5327 2011-12-15 13:49:47 +01:00
Paul Poulain
e60e1cba00 welcome to Duncan Tyler, developer 166 ! 2011-12-15 13:45:21 +01:00
Paul Poulain
4f0da07de6 Merge remote-tracking branch 'origin/new/bug_5327' 2011-12-15 13:43:58 +01:00
Chris Hall
dfa4b73737 Added missing reference case to Boolean.t and corrected count
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>
2011-12-15 13:41:47 +01:00
Chris Hall
18bb9c2210 Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token
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>
2011-12-15 13:41:45 +01:00
Duncan Tyler
47b514cf56 Added unit tests for Scrubber
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>
2011-12-15 13:41:43 +01:00
Duncan Tyler
bb79d37b87 Added unit test for AuthoritiesMarc/UNIMARC.pm
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>
2011-12-15 13:41:41 +01:00
Duncan Tyler
7876d4fa8d Added unit tests for Sip Checksum.pm
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>
2011-12-15 13:41:37 +01:00
6dc234a001 7185 Fixing typo in release notes
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Trivial typo fix in text file.
2011-12-15 13:33:12 +01:00
Magnus Enger
e4c6f1fc20 Bug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet
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>
2011-12-14 18:17:57 +01:00
Sophie Meynieux
a1e3174668 Bug 7287 : Fix overdue notification if a branch given as parameter does not have rules
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-14 18:10:45 +01:00
Juan Romay Sieira
9b9093d225 Bug 7275 - Pagination lost when click in the option "Show more" of facets column
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-14 18:05:20 +01:00
a8ddf6acae Bug 7270: Removing double itemtype on shelve contents page when no icon is shown
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>
2011-12-14 18:03:45 +01:00
Juan Romay Sieira
a8f3860149 Bug 7262 - No calendar present in holidays module when there are quotes in title or description
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>
2011-12-14 17:51:12 +01:00
Chris Hall
48f25fec43 bug 7239 fix to avoid error being thrown even though a record is created
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>
2011-12-14 17:37:41 +01:00
8121f5581f Fix for Bug 7227, "Delete all items" action should redirect to the detail view
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>
2011-12-14 16:20:34 +01:00
Paul Poulain
f9e4c6424a Merge remote-tracking branch 'origin/new/bug_7135' 2011-12-14 15:54:34 +01:00
edd8e5767d Bug 7135 - in addbiblio, make save button floating to have it on always on screen
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>
2011-12-14 15:52:55 +01:00
7fd5098b98 Bug 7202 - z39.50 search on bib edit not working
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>
2011-12-14 15:48:26 +01:00
Robin Sheat
373e49576d Bug 7197 - add a Spanish readme file to the packages
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
2011-12-14 15:38:04 +01:00
Paul Poulain
3f2fe181af Merge branch 'master' into new/bug_7164 2011-12-14 15:35:39 +01:00
Paul Poulain
82ed469632 Bug 7164 follow-up history.txt and perlcritic compliance
* 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
2011-12-14 15:10:28 +01:00