Commit graph

12042 commits

Author SHA1 Message Date
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
Henri-Damien LAURENT
825a6abf3e C4/ILSDI/Services.pm Fixing rebasing and merge problems
Previous patches introduced many merge conflicts.
This patch fixes them all

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:50 -04:00
Henri-Damien LAURENT
711c649315 (MT 2563) : ILSDI PatronLookUp Problem
owed to the change in C4::Members API, GetMember had to be adapted

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:48 -04:00
Henri-Damien LAURENT
f3581a594e ILS-DI Messages uniformization
[MT2306_2271] ILS-DI Message codes consistence

The services now returns ILSDI error codes in a <code> tag, plus details in a <message> tag.

Exemple:

<LookupPatron>
<code>MissingParameter</code>
<message>The required parameter patron_id is missing.</message>
</LookupPatron>

[MT2306_2271] Minor changes in HTML

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:31 -04:00
Jean-André Santoni
09221f7006 ILS-DI Code cleaning
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:26 -04:00
Jean-André Santoni
aa17eef42f Fixes access permissions to ILS-DI
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:24 -04:00
Henri-Damien LAURENT
47fb8168b7 Followup adding ILS-DI System-preferences
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:22 -04:00
Henri-Damien LAURENT
09895c5fe6 Bug 4194 : Adding ILS-DI System preferences
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:39:21 -04:00
Jane Wagner
d61f7801f1 Bug 4314 Flag for SSL Enabled to fix 3rd Party Enhanced Content in OPAC
Duplicates gmcharlt's earlier change to Auth.pm to add a check for SSL-enabled.
Modifies the various template calls to Syndetics and Library things to use an
https URL if SSL is in use.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:25:30 -04:00
b340fb834c bug 4314: add using_https environment variable
Added new HTML template variable, using_https, for use
of OPAC or staff-side templates that may need to know
whether to use http:// or https:// links to off-site
content.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:23:35 -04:00
05cbb9295c fix typos in history.txt
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:22:13 -04:00
eaefb265e5 History update
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:21:37 -04:00
Lars Wirzenius
7279f55b60 Fix FSF address in directory C4/
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:56 -04:00