Commit graph

11854 commits

Author SHA1 Message Date
Colin Campbell
70af459372 Bug 4331 Remove cruft from acqui-home script
Remove unnecessary db calls and processing from acqui-home.pl
Do not duplicate processing of fields
Declare variables closer to use
Remove unnecessary holding vars
Replace some anonymous var names by something more meaningful
Do not generate a toggle variable use Template's LOOP vars

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:15:07 -04:00
Colin Campbell
ea67f3e81a Bug 4331 Index aqorders by budget_id
Calculation of budget spent and encumbered is done by
queries on aqorders by budget_id
Index budget_id to speed these queries

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:14:26 -04:00
Cindy Murdock Ames
7c7794d838 Fix for ampersand display problem in OPAC search results
This is a quick fix to XSLTParse4Display to make ampersands display
correctly in OPAC search results.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:12:34 -04:00
Henri-Damien LAURENT
5c99c47efa MT3204 : Fix unstranslatable strings in JavaScript
For an explanation, see:

http://wiki.koha.org/doku.php?id=en:development:codingguidelines#translatable_text

This bug blocks entirely serials module. It isn't possible
to create/edit a subscription. Brocken JavaScript prevents
Search for a vendor and Search for Biblio dialog box
to pop-up.

Problem with new strings and new html tags inside the strings
this patch removes them

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:07:19 -04:00
Ian Walls
d282b8d2b1 Fixes bug 4365 hidelostitem syspref language reversed
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 10:59:36 -04:00
d20305cca1 tweak display of issuing library on staff reading history
Following idea in patch submitted by Kyle Hall on 1 April 2010,
use issues.branchcode instead of issues.issuingbranch to set
displayed issuing library.  Also tweaked wording.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 10:57:47 -04:00
Nicole Engard
402b2ab435 bug 4375 - update koha link on auth template
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 10:31:58 -04:00
548899d962 fix POD for GetAllIssues
Please remember to update the POD if you change a
core function.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 10:27:57 -04:00
956e0e9c62 bug 4358: remove disused ReadingHistory syspref and related code
The ReadingHistory sytem preference is no longer used, and possibly
was used by only one library anyway.  Removed references to it; note
that had it been turned on, a patron viewing checkout history would have
seen old loans showing up twice.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 10:27:56 -04:00
Henri-Damien LAURENT
c3e808baf6 Bug Fixing opac/opac-readingrecord.pl
There was some rebase issues on this script
Fixing Error 500
two calls to $issues as an array ref where it is now a hash ref

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 09:58:50 -04:00
Nahuel ANGELINETTI
a5cc4d4979 (bug #4358) fix sql query in C4::Members::GetAllIssues
This fix the use of oldissues instead of old_issues table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 09:58:04 -04:00
Paul Poulain
b7ce86240e [MT3191] follow-up, removing warn
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 09:57:11 -04:00
Paul Poulain
c6e04e8b40 [MT3191] various perl errors in script (merge conflict)
and SQL error solved

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 09:57:03 -04:00
Jean-André Santoni
732e1f954d [MT2195] Display issuing branch in reading record
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 09:56:54 -04:00
Henri-Damien LAURENT
a2eb5852d3 Followup (MT #2920) fix reading record scripts:members/readingrec.pl
Fixing Merge problem on opac/opac-readingrecord.pl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 09:56:43 -04:00
Nahuel ANGELINETTI
c5c83ed8d7 (MT #2920) fix reading record scripts
This patch fix some perl ugly code to be more readable and lesser complex.
And it allow in intranet to order by issues.timestamp.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 09:56:33 -04:00
Jean-André Santoni
576e544d02 [MT2358] Display issue date in member reading record
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 09:56:23 -04:00
Nicole Engard
92e3506f6d bug 4322 update typos on web services preferences
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 08:43:34 -04:00
Lars Wirzenius
160e01daa3 Update copyright license to GPL version 2 or later for two cronjobs.
See http://lists.koha.org/pipermail/koha-devel/2010-March/011067.html
for confirmation that this is OK.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 08:43:31 -04:00
Chris Cormack
1a1d50fb44 Trapping fatal error that occurs if you call GetCOinsBiblio with a biblionumber that doesn't exist in the Koha database
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 08:43:29 -04:00
Nicole Engard
d4705a2f3e bug 4317 fix typo in cataloging plugin
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 08:43:27 -04:00
Nicole Engard
ce2eb943ec update patron help files
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 08:43:15 -04:00
Lars Wirzenius
0c3fc4aade Lower dependency on Storable to 2.20.
The Debian squeeze system has only 2.20, and the 2.21 does not
seem to be required for all tests to pass. Also, checked with
Galen Charlton and Henri-Damien LAURENT (who added the 2.21
dependency) on IRC that 2.21 did not have anything that was
required, compared to 2.20.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 08:43:13 -04:00
Colin Campbell
142cccdc4c Bug 4361 Return Patron Expired to Sip Process
Identify Patron Expiry so that it is returned in Patron Info Response

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 06:56:31 -04:00
Colin Campbell
590514ca12 Bug 4364 - SIP Checkout dates incorrect
Change timestamp routine to do the right thing when passed an iso date
Otherwise was generating an epoch date of 0

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 06:56:27 -04:00
Henri-Damien LAURENT
ce4a85f0db SIP Patron management
Using Flag EXPIRED to notice whether Patron CAN or CANNOT checkout a book

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 06:56:24 -04:00
Colin Campbell
f7f3dadd2e Bug 2653 Protect against sending End of Message in Text
Remove any carriage returns in text data as they will be
interpreted as end of message by clients and cause communication failure

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 06:54:18 -04:00
Chris Cormack
34dbeb135e Updating history
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 06:46:17 -04:00
Chris Cormack
73cdb73c7c Adding when software.coop started supporting Koha to the history
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 06:46:15 -04:00
777e5d53cd fix typo in variable name
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:15:45 -04:00
Nicolas Morin
d1235852e4 text for SCO Finish button
Simplifying finish button on SCO screen: it was a long sentence with a button saying "click here if you're done". Changed to "Finish". Changed the help accordingly.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:12:10 -04:00
Srdjan Jankovic
863938f16c Escape input that goes in HTML; Reworked search history insert SQL
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:12:01 -04:00
79616840b1 Fix for Bug 4244, Use "checkouts" instead of "issues"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-17 09:11:58 -04:00
Jane Wagner
c11273624f Bug 3663 current head version changes to OPAC advanced search
Copy Search button to top of screen, rearrange order of indexes in search
pulldown list (to Keyword, Title, Subject, then Author & the rest)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:32:09 -04:00
Nahuel ANGELINETTI
b41e6e0f73 (MT #2962) add converted chars from ISO5426
This add 0xBE and 0xBD conversion to char table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:30:43 -04:00
Nahuel ANGELINETTI
4b5483c61e (MT #3075) fix oe char from iso5426
this add oe conversion in chartable for iso5426.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:30:42 -04:00
Paul Poulain
c3fe3af209 Using only default framework for koha2marclinks
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:27:20 -04:00
Nicole Engard
c08e0f7d2d bug 4291 - template edits to koha to marc mapping
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:27:19 -04:00
a136920f30 Improve display of information on Transfers to your library report
- Use GetRecordValue() to show subtitle
- Show author
- Separate branch and call number display for better sorting
- Correct teriminology (reserve -> hold)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:12:20 -04:00
Garry Collum
a828095d6d Bug 4316: Fixes leading and trailing spaces in barcode for cki.
Copies the regexp from circulation.pl to strip leading and trailing spaces from barcodes to returns.pl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:09:31 -04:00
Chris Cormack
7de93a4093 Fixes for syndetics, some variables needed by the template were not being set
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:08:34 -04:00
c34c8720bc Fix for Bug 4301, OPAC RSS feed link doesn't include sort parameter
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:05:23 -04:00
188725952f Fix for Bug 4296, label search printing titles between buttons
- Reformating display for readability
- Converting select/clear all buttons to links to match existing patterns
- Fixing "Results x of x" display which was broken for single-page sets

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:05:21 -04:00
91990d783a additional improvement to POD for CanBookBeIssued()
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:03:45 -04:00
Lars Wirzenius
ea06cc504b Fix pod documentation for CanBookBeIssued method to refer to the right variable.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:02:20 -04:00
Koha
d60383e0b9 Bug 4190: messages in patron account did not work with branchcodes >4
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:58:54 -04:00
Jean-André Santoni
d4260af339 Fixed an encoding bug in the documentation
Moved the binmode pragma to the end of the file, so it won't affect documentation templates. So no more double encoding.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:54:45 -04:00
Henri-Damien LAURENT
9428e750f0 Fixed an encoding bug in the documentation
Moved the binmode pragma to the end of the file, so it won't affect documentation templates. So no more double encoding.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:54:43 -04:00
48491cb1c7 fix syntax error present in previous ILS-DI patch series
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:52:08 -04:00
e195e18a2c bump DBrev to 126
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:40:22 -04:00