Commit Graph

14827 Commits

Author SHA1 Message Date
Adrien Saurat ffcbecdbbb Bug 6374: default value for Size in result pages
When no size info is available, an empty string is
sent to the TT (if nothing is sent, the TT engine
will display another information, irrelevant for Koha).

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Works beautifully!

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

Backported to 3.4.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-21 00:12:33 -05:00
Owen Leonard e28854ed82 Bug 3651 Follow-up, Require patron login to send shelves and baskets
The fix for Bug 4289, "Add a syspref 'OpacPublic', to hide OPAC
search-bar and force authentication on all OPAC pages" incorrectly
made some page permissions dependent on the value of the OpacPublic
setting. Some pages should require authentication no matter what.

This patch returns opac-sendbasket.pl to the state it was in before
Bug 4289, Bug 4274 notwithstanding. I have added the authentication
requirement to opac-sendshelf.pl to match.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) sending cart requires login
2) sending shelf requires login
3) updating personal details requires login

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 54ed58310d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-21 00:06:08 -05:00
Chris Hall b4a1595234 Bug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c2837b39a4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit a0cccb3967)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-21 00:05:55 -05:00
Duncan Tyler 5cee5bc63a Fix to make date obviously editable - bug 7193
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes all date fields on subscription entry to be
obvious input fields. This makes it more obvious that you
can enter dates manually and is more consistent with how
we handle dates in other places.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 8c5189d68d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:58:26 -05:00
Duncan Tyler 92455b2df8 Bug 7341 - [SIGNED-OFF] Patch to fix error produced when clicking cancel in system preferences search results - bug 7341
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4f16da0d31)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 253ffbe2c6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:58:12 -05:00
Katrin Fischer c317567504 Bug 7338: Follow up: show link only when there is more than 1 subscription
To be tested together with
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6690

1) Create a subscription for a title
- check the link 'Show any subscription...' doesn't show now
- check the serials collection page works correctly and shows all
necessary information

2) Create a second subscription for the same title
- check a new link 'Show any subscription...' shows up now
- use links in the issue table to change between viewing the single subscription
and the overview page
- check it works correctly and all information shows up

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

It works. With this patch, on Serials Collection page, the link, 'See any
subscription attached to this biblio' appears only when there are more than one
subscription attached to the biblio record.
(cherry picked from commit 42265ef217)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit d5f95757c0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:57:59 -05:00
Frédéric Demians 68a2318b19 Bug 7338 Links on Serial Collection page
Don't display link to the serial, when the collection page displays just
one subscription. Display it when several subscriptions. Alway display a
link for displaying biblio record other subscriptions.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works nicely, but always shows link to 'any subscriptions'.
I did a follow-up so the link would only show if there was more
than 1 subscription for the record.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 5ad6d9a72c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:57:45 -05:00
Christophe Croullebois 77c3694a2b Bug 6147 : Correcting invalid RSS
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Feed validates using http://feed1.w3.org/ with the following recommendations:

This feed is valid, but interoperability with the widest range of feed readers could be improved by implementing the following recommendations.
line 12, column 149: Relative href value on self link: /cgi-bin/koha/opac-search.pl?idx=kw&q=some&sort_by=acqdate_dsc&format=rss2 [help]
... p;sort_by=acqdate_dsc&amp;format=rss2"/>
                                             ^
line 12, column 149: Self reference doesn't match document location [help]
... p;sort_by=acqdate_dsc&amp;format=rss2"/>
                                             ^
line 20, column 158: Unregistered link relationship: search (10 occurrences) [help]
... _by=&amp;format=opensearchdescription"/>
                                             ^
line 40, column 9: description should not contain relative URL references: /cgi-bin/koha/opac-reserve.pl?biblionumber=10 (10 occurrences) [help]
						]]></description>
         ^
line 22, column 5: Misplaced Item (9 occurrences) [help]
     <item>

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 5ab88df697)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:53:34 -05:00
Ian Walls 1dea14d4f8 Bug 6975: OPACBaseurl instead of OPACBaseURL
Updates OPAC templates to refer to OPACBaseURL (the properly capitalized name) instead
of OPACBaseurl

Also fixes some T:T scope errors when OPACBaseURL was called within a loop

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Backporting to 3.4.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:52:48 -05:00
Paul Poulain 17a05e9faf Bug 6627 follow-up
in installer, some lines where forgotten, and can also be commented
(cherry picked from commit a60101bea0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 29043d5660)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:40:57 -05:00
Duncan Tyler 1b290c5f1a Bug 6627 [Signed Off] - Update to improve security in specified log files - bug 6627
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified sessionlog file is not written to /tmp when patch is applied. Also verified original bug - logging in did in fact log to /tmp.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit a220304a8d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:40:44 -05:00
Katrin Fischer d6358d64f8 Bug 5369: Follow up fixing quotes
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Confirm that this works. My only remark would be that &quot; could have been used.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 3b8e95ddf1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:40:30 -05:00
Jared Camins-Esakov f52d80a12a Bug 5369: Make series tracings use phrase indexes
By definition, series tracings should search for other records in the same
series, i.e., those with the exact same series title. This patch forces the
tracings to use phrase indexes for series tracings.

Note that this patch DOES NOT respect TraceCompleteSubfields. While that may be
desirable, it is outside the scope of the current patch. An additional follow-up
patch could be written to add support for TraceCompleteSubfields, if community
concensus is that series tracings should obey TraceCompleteSubfields.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for the follow up and sign off Jared :)
(cherry picked from commit 9b3e1552c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4709e7e177)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:40:17 -05:00
Katrin Fischer 9158441356 Bug 5369: se queries with paranthesis fail
This patch does several things to make the search work better:

1) Adding "" around search terms for queries on index se.
2) Make links for 8xx obey the UseControlNumber system preference
3) Fix the indexing for 8xx fields, as they were not included in the se index before

Note: Make sure you copy the new record.abs into your koha-dev directory and reindex
before testing.

To test:
1) Add records using the following fields:
440$a
490$a ind. 1 = empty or 0
490$a ind. 1 = 1
800$a, 810$a, 811$a or 830$a

Example value taken form bug description, should only work after applying the patch:
DHEW publication no. (HSM) 73-1804

Please also test with other examples.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 4cd81a8d0f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 7a54bc53f6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:40:03 -05:00
Katrin Fischer 13a4668839 Bug 929: Follow up - showing fund code instead of internal number
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 71d2d81e34)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 5c1621bf83)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:39:49 -05:00
Chris Cormack 29820c834c Bug 929 : Followup fixing date formatting
This patch introduces a Filter (KohaDates) for use in templates
[% USE KohaDates %]
[% somevariable | $KohaDates %]

This will format the date in the format specified by the systempreference

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 01875b565d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 0942a21db2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:39:35 -05:00
Chris Cormack 0daec46302 Bug 929 : Last follow up, implementing the last of Katrins suggestions
Date formatting
Links
Nomenclature changes

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit ddb6883b57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 6790357243)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:39:22 -05:00
Chris Cormack ac9aac7b89 Bug 929 : Follow up, making some improvements to the spent page More to come
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c64322e48d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit fa6b504e4c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:39:08 -05:00
Chris Cormack ce536c2cc9 Bug 929 : Reinstating the breakdown of budgets
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 9638053a25)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 95a44070fd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:38:54 -05:00
Katrin Fischer e1dbb445d0 Bug 3184: Show creator and budget on order receive page
Reimplementing 3.0.x patch from
Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>

To test:
1) Create basket
2) Order something, note your fund
3) Receive title
> Verify your name and selected fund display correctly

Additional tests:
1) Set borrowernumber in aqbasket.authorisedby to a nonexistant borrowernumber (like something really big)
> Created by should show "No name"
2) Set borrowernumber to NULL / empty
> Created by should show "No name"

Signed-off-by: Duncan Tyler <duncan@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 37e1f05e8f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 0b9c0b7528)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:38:40 -05:00
Liz Rea baf6d27040 Bug 7333 - Fixing up db_dependent/Search.t to use sample data Thanks to Chris N. for helping figure out that it was because there were no French stopwords in the DB that the test was failing.
Patch changes the French string (with French stopwords) to an English string with English stopwords, as only English stopwords are installed in the default data.

This patch will allow Search.t to run on the database attached to this bug.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 0668963124)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:33:10 -05:00
Alex Arnaud 539317b390 Bug #6142 - Delete sub CanBookBeReserved and delete function's reference on @EXPORT
Original-Author:    Alex Arnaud <alex.arnaud@biblibre.com>, Stéphane Delaune <stephane.delaune@biblibre.com>
Original-Signed-off-by: MJ Ray <mjr@phonecoop.coop>

Correct use statement bug found by Ian Walls

Backporting to 3.6.x

Author: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 93cb222de2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:29:59 -05:00
Sophie Meynieux 4635b30681 BUG 5607 : Adds parsing of issues fields in overdue letters
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch makes it possible to add fields from the issues table to overdue notices.

Template used for testing:
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> , Checkout date: <<issues.issuedate>>, Due date: <<issues.date_due>> Fine: <fine>GBP</fine> Checkout date from items: <<items.onloan>></item>

Possible improvements:
- Dates are not formatted according to dateformat system preference

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit f2adf05026)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:28:52 -05:00
Frédéric Demians 742d731a98 Bug 5565 UNIMARC to DC XSL tidy up
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 34e99cf478)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 12c4cdb244)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:28:38 -05:00
Frédéric Demians fef6926660 Bug 5565 Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a6eb507475)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 0ff647b6e4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:28:24 -05:00
Owen Leonard ef9bab6758 Bug 1623 - Provide view of approved comments
This patch creates two tabs on the comments administration page:
one for approved comments and one for unapproved comments. Each
display is paginated according to the numSearchResults preference.
The list of approved comments has, instead of a link to approve,
a link to unapprove.

The JavaScript table sorter has been removed since it doesn't make
sense to sort individual pages of a multi-page result set.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bc2a1d18e2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit bad8eea9e1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:28:10 -05:00
Chris Cormack 7763a356ad Bug 7370 : Missing use call
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 525c7bc4af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 19c7059573)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:27:57 -05:00
Frédérick Capovilla fc37c59432 Use MARCAuthorityControlField008 in AddAuthority for empty 008s
The old default value for field 008 didn't have the correct length,
which could potentially cause data corruptions.

Uses the MARCAuthorityControlField008 preference added by BUG4839.

http://bugs.koha-community.org/show_bug.cgi?id=7072
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6408547cc0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit df6f4d0c34)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:21:58 -05:00
Chris Cormack b444177688 Test to check for XXX in kohaversion.pl or updatedatabase.pl
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended the original patch of Chris to add two exceptions for a line in SetVersion and TransferToNum.

http://bugs.koha-community.org/show_bug.cgi?id=6700
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bb92ac1ee0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 28c00dd146)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:21:45 -05:00
Marcel de Rooy aa6a201495 6700: Better handling of version numbers in updatedatabase
Contains a few lines of code for updatedatabase routines SetVersion and TransformToNum in order to facilitate testing new db revisions which are still marked XXX.
Currently, the XXX as added in a proposed patch generates an error in the version compare. Additionally, running SetVersion while testing the upgrade is annoying and not needed. In testing stage you would like to keep your version number as is. The version number should of course be incremented when the patch is pushed. A simple test accomplishes that.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c8982e1ab4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit ec259212b3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:21:31 -05:00
Tomas Cohen Arazi 0c83cd4bc2 Bug 6193 - Use memcached cache koha-conf.xml configuration variables
Basically I add some code to Context.pm so it stores koha-conf.xml config vars
in memcached server. It is arguable whether this is an improvement or not,
tests are needed to conclude something about this.

Error handling was an issue with Cache::Memcached, I tried to do it the
simplest I could.

Note: As it was pointless to read the xml file to get the memcached
server info for accessing them for retreiving the info in the koha-conf.xml
file... I passed those values through apache's SetEnv. These variables
are set acordingly through the install scripts and commented out if koha
was setup not to use it.

Bug 6193 - Properly comment the code

Required by slef.

Regards
To+

Signed-off-by: Federico Rinaudo <frinaudo@infocpt.com.ar>
Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22dca58cba)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 9a314c90b1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:21:17 -05:00
Owen Leonard c7f61d9a0d Bug 6880- Reason for suggestions do not save
The fix for Bug 1883 seems to have lacked the necessary
update to the database to add the "patronreason" column
to the suggestions table. This patch does so.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch adds database update and change to kohastructure.
After this patch is applied, the patron's reason for
making a suggestion (form in opac) is saved to the database
correctly. The reason is also shown in the detail view
of the suggestion.

Backporting to 3.6.x

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

Backporting to 3.4.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:17:47 -05:00
Owen Leonard 9c5f1e6a2f Fix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch
Plus several other fixes for this report no one uses:

- Clarifying titles and breadcrumbs
- Correcting terminology: branch -> library
- Sorting library select field by library name
- Displaying library name instead of code on output
- Sorting results by itemtype description
- Adding tablesorter to results

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4d0d49d7c7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:13:30 -05:00
Owen Leonard 98ad59b1c4 Bug 2307 - Calendar widget cannot be translated
Implementing the same fix in the OPAC which we now
use in the staff client.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 00abf91bef)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:13:18 -05:00
Owen Leonard aeb174f5ac Bug 7226 - can't add tags on list
Incorrect check for TagsInputOnList was preventing the
right JavaScript from being triggered, and markup was
nested inside the wrong logic for the confirmation
message to be displayed consistently.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0b9d4902de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit d415484470)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:13:05 -05:00
Marcel de Rooy 8caf0ff10d 6302 follow up
Updates to_address in message queue when sending an email (when needed).

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2ab11c4892)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit d3e191b9c6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:12:53 -05:00
Katrin Fischer f13bd799d8 Bug 6302: Separate AutoEmailPrimaryAdress and AutoEmailOpacUser
AutoEmailPrimaryAddress is not only used for the patron account mails, but
also for overdues and other email notices to patrons.

This patch separates the system preferences in the system preference editor.

To test:
- Check Patrons tab shows both system preferences separated
- Check you can still change the settings

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
(cherry picked from commit a5a8d78f0d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4d9220623f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:12:40 -05:00
Sophie Meynieux b38f9dbac3 Bug 6292 : Followup 2. several letters where generated if a borrower had overdues with different due_date triggering the same level
This patch fixes the SQL request giving the list of borrowers

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit a7ef90ff87)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:12:28 -05:00
Chris Cormack caba5cf369 Bug 6292 : Overdue notices not being generated when borrower had an overdue older than the max value of the notice triggers
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 410975a7f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit f497930d66)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:12:15 -05:00
Sophie Meynieux d1296ac394 Bug 6292 followup
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>
(cherry picked from commit 7d9ca3f1e4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:12:03 -05:00
Srdjan Jankovic 1430e4a987 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>
(cherry picked from commit 6e07fd7b00)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit da99978777)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:11:51 -05:00
Duncan Tyler c3cd9b12c5 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>
(cherry picked from commit 86d6e6d3de)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit b5fddf5cee)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:11:38 -05:00
Adrien Saurat 31fe9c628c 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>
(cherry picked from commit 1de55f6f08)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 7e34d437cc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:11:25 -05:00
Duncan Tyler c6fe08496d 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>
(cherry picked from commit 3ae23cd6cf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 4e64d14700)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 23:11:11 -05:00
Owen Leonard 5f8c9b4367 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>
(cherry picked from commit 8a87f15605)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 3d0e8cf506)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 15:38:32 -05:00
Katrin Fischer 9e49663770 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>
(cherry picked from commit 52dca0f433)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 7a14823fa3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 15:38:19 -05:00
Paul Poulain e9bfc62358 welcome to Marc Balmer, #167
(cherry picked from commit 42d6b17851)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 9ed382a203)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 15:38:05 -05:00
Marc Balmer 2b1b6c5128 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>
(cherry picked from commit d9f7922ad7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit a284baee17)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 15:37:51 -05:00
Liz Rea 984c0a7115 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>
(cherry picked from commit b955692c84)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(cherry picked from commit 3a42ff5d67)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 15:31:01 -05:00
Duncan Tyler d566f7168d 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>
(cherry picked from commit c2bba3ffc8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2012-01-20 15:27:38 -05:00