Commit graph

3116 commits

Author SHA1 Message Date
Christopher Hall
c190d93a12 Merge branch 'master' into template_toolkit 2010-11-19 10:11:47 +13:00
Christopher Hall
673b62d66b now ready for testing 2010-11-18 16:55:21 +13:00
Chris Cormack
84d7a0e3ef Merge remote branch 'kc/master' 2010-11-10 12:15:32 +13:00
Katrin Fischer
9f688ad92b Bug 5370: Fix all references to koha.org
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 09:41:47 +13:00
Nahuel ANGELINETTI
363c1ca9f9 (MT 2985) simplify CanBookBeReserved
The function was too complex for so simple stuff, not we check if one of all items of the record can be issued.

[Note by Galen Charlton: not only does this patch simplify the routine,
 it also makes it behave correctly.]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-06 07:14:13 +13:00
Chris Cormack
414b2ace4f Merge remote branch 'kc/new/signoffs' into kcmaster
Conflicts:
	installer/data/mysql/updatedatabase.pl

Updated updatedatabase.pl to handle new version number
2010-11-04 20:14:28 +13:00
Chris Cormack
c836b63a7d Bug 5363 - Removing unused module (C4::Cache::FastMemcached)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-04 20:05:36 +13:00
Chris Cormack
ef087b0006 Merge remote branch 'kc/new/bug_4991' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-03 14:49:13 +13:00
Chris Cormack
ae6ae0b39d Merge remote branch 'kc/new/bug_5301' into kcmaster 2010-11-03 06:54:50 +13:00
9bd16d23b2 bug 5243: avoid crash when saving authority records on certain setups
This does not seem to occur on all platforms - C4::Search
exports SimpleSearch() by default - but adding the 'C4::Search::'
qualifier certainly doesn't hurt things.

Patch by Fridolyn Somers <fridolyn.somers@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 16:13:27 +13:00
ByWater Solutions
321eed9833 Bug 4254 - adding new patron advanced notice doesn't save
This was due to poorly constructed SQL which returned duplicate values for
certain fields. This patch corrects that SQL.

NOTE: There is also a formatting problem with the message prefs display table
when it is displayed in moremember.pl. This is due to there being no logic to
tell the table in that context to display checkboxes as appropriate. This patch
does not fix that. Bug 5328 has been opened for this problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 15:17:35 +13:00
1117f6920c Fix for Bug 4991, Overhaul of Calendar interface
- Put hints, key, and existing holidays into right column
- Style entry form for added clarity and consistency with other
  forms in Koha
- Change the way dynamically displayed hints are shown to better
  match existing static hints in Koha's interface
- Add branch name (instead of branch code) for clarity
- Add the ability to add and edit holiday titles (previously
  only description could be edited).
- Add links to the list of existing single-day holidays and
  exceptions which opens the calendar to that month/year

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-02 15:02:54 +13:00
f2e4fa7b1b Fix for Bug 5221 - Preselect tab containing itemtype/authval image in use
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:19:50 +13:00
f88f88dcc5 bug 5301: improve escaping of XML characters in bib output
<, >, ', or " in an item call number will no longer make
the bib displays break when using XSLT mode.

Added a new routine to C4::Koha, xml_escape(), to implement
converting &, <, >, ', and " to their corresponding
entities.

Patch loosely based on work done by Daniel Latrémolière <daniel.latremoliere@bulac.fr>

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 08:31:47 +13:00
Chris Cormack
f9299b1a76 Merge remote branch 'kc/master' 2010-11-01 10:56:05 +13:00
12b4402760 bug 3597: DelItemCheck now refuses to delete items in transit for holds
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 23:01:34 -04:00
ce5e2429db fixing various links to point to *.koha-community.org
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 22:08:24 -04:00
2b8470ddf8 bug 3756: start removing references to disused sysprefs
holdCancelLength
PINESISBN
sortbynonfiling
TemplateEncoding

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 20:35:35 -04:00
49e13b9417 remove two disused functions
html2marc and html2marcxml are not used, and html2marcxml
is the last user of the dead syspref TemplateEncoding

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 20:31:51 -04:00
Henri-Damien LAURENT
45604b8d17 (bug 3536) fix homeorholdingbranch on return
this patch create a new systempreference "homeorholdingbranch"-like used only for returns.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

An additional edit was made to circ/returns.pl by Ian Walls of ByWater Solutions to force the dialog message for the return to
use the branch specified by the new HomeOrHoldingBranchReturn system preference, rather than always Homebranch.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 20:04:30 -04:00
4a7bb77e4f Bug 5303 Overdue notices subject is improperly encoded
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 19:52:05 -04:00
Robin Sheat
e81bc5ce81 Bug 4305 - prevent errors when handling invalid ISBN13 values
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-21 18:36:35 -04:00
Chris Cormack
f57ceeb8c5 Merge remote branch 'kc/master' 2010-10-15 09:50:18 +13:00
Jean-André Santoni
5cb133d9a3 (MT #3697) Fixed GetAuthorityRecords
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-13 10:40:48 -04:00
Jean-André Santoni
1ccee83124 (MT #3698) Fixed ILSDI GetRecords
(cherry picked from commit f69061357a75a5e024fe6379a1a48f8755a2b6db)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-13 10:39:23 -04:00
7041f19ee1 Merge remote branch 'koha-fbc/k_bug_5284' into master
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 13:38:44 -04:00
Chris Nighswonger
04a0d94295 Bug 5284 - Generic report covering various problems with the labels/patron card tests
This patch fixes the C4::Labels::Template tests
2010-10-06 13:33:16 -04:00
Chris Nighswonger
04601a3b4d Bug 5284 - Generic report covering various problems with the labels/patron card tests
This patch fixes the C4::Labels::Profile tests
2010-10-06 13:28:18 -04:00
Chris Nighswonger
a115a474c1 Bug 5284 - Generic report covering various problems with the labels/patron card tests
This patch fixes the C4::Labels::Layout tests
2010-10-06 13:17:32 -04:00
Ian Walls
0d768b482e Followup to Bug 4305: multiple ISBNS in biblioitems.isbn breaks patron
This patch adds a scrub for ' | ' when the ISBN comes from the
biblioitems table, in the event that Koha has attempted to store
multiple ISBNs in the field.  The ISBN presented to Business::ISBN will
now be something it can handle.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 12:56:12 -04:00
Chris Nighswonger
49f7faf34a Bug 5284 - Generic report covering various problems with the labels/patron card tests
This patch fixes the C4::Labels::Batch tests
2010-10-06 12:52:55 -04:00
552a648648 removed AddToShelfFromBiblio from C4::VirtualShelves
Back in the day, lists could contain item records instead or in addition
to bibs, but that hasn't been the case for a while.  Therefore, removed
AddToShelfFromBiblio, which does exactly the same thing that AddToShelf does.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 10:39:36 -04:00
e9c0a11d41 Bug 5264 (Retain additional bibliographic subfields when merging authorities) [for master only]
The current code in AuthoritiesMarc.pm rewrites all subfields from the report
tag in the authority record to fields in related bibliographic records when
merging authorities. Additional subfields in the biblio records (e.g. relator
code or term) are lost in the process.

This patch retains the original algorithm but restores the additional subfields
from the original biblio record when rewriting the linked marc fields.

The problem also exists in 3.0. Two separate patches have been submitted.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 08:47:28 -04:00
Chris Cormack
23a210ade2 Fixing non placeholder sql in UpdateGuarantees
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 08:42:01 -04:00
91206d185c Bug 3630 Impossible to perform Scan Indexes search
This is a quick fix. The way scan indexes performs should be improved in
3.4. There are several issues:

  - No paging
  - The interface is the same as for biblio records search result and so
    is unusable: for example you have a button to place a hold or you
    can sort by Popularity which is irrelevant for index terms.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 08:18:17 -04:00
3baefb7f24 Avoid to add a warning in log
... each time GetMemberDetails function is called

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 08:17:28 -04:00
Ian Walls
a897931313 Update VOKAL icon set
The Green Mountain Library Consortium has updated the 'vokal' item type
image set to include new and updated icons, including:
Puzzles and Games
BLURAY
Hardware
Educational Media
Fiction, Nonfiction, New and Holiday books
ILL materials

Smaller versions of all the icons (32 px) are included as well.

Sorting of the icons has been included in this patch to group
large and small versions of these icons together, as well as make large
icon sets easier to visually scan (the 'bridge' set benefits from this,
as well) .

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 08:09:22 -04:00
27bb768cad bug 5086: fix setting claim date
Also removed a locus for SQL injection.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 07:45:41 -04:00
a85bd68b8e Merge remote branch 'koha-fbc/k_bug_5247' into to-push
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 07:11:05 -04:00
07ae6c6cd6 Merge remote branch 'koha-fbc/k_bug_5249' into to-push
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 07:10:36 -04:00
Colin Campbell
c19a56f9cd bug_5245 Fix SQL syntax in GetItems
Routine never executed query due to syntax error
and returned undef
made the call to fetchrow_array explicit as the old fetchrow alias
is no longer documented in perldoc DBI

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 07:05:33 -04:00
Ian Walls
7f40eb3f6b Fixes bug 5231: bad call to GetAuthType in BiblioAddAuthorities()
If systempreference BiblioAddsAuthorities is on, this could lead to error messages when trying to add records
to a basket from an external source.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 07:02:25 -04:00
3a3b6ba5d8 Fix for Bug 5265, error message on lists is misleading
The check to see if an item exists always evaluates as true.
Correcting this lets the script handle the error as it
was designed to.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:18:56 -04:00
e4f37fde48 Bug 4305 Get Amazon book covers for ISBN13
The way Koha get book cover from Amazon doesn't work from biblio records
having ISBN13 because Amazon expect an ISBN10. This patch transforms
ISBN13 into ISBN10 before sending it to Amazon.

Warning! On some devel installations, you will have to install by hand a
new CPAN depency:

  Business::ISBN

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:18:48 -04:00
08fb9eadc3 Bug 5194 - Patron notification on new issues not working
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:13:50 -04:00
Nahuel ANGELINETTI
d990e2cd32 (bug #4084) fix offline circ
this add the function C4::Circulation::GetOpenIssue and delete \r chars when processing koc files.

Cherry picked from 3.0.x commit 5af80ab

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-09-29 18:17:36 -04:00
Chris Nighswonger
947b47954e Bug 5249 - Guide boxes do not print when selected for a layout 2010-09-24 14:42:42 -04:00
Chris Nighswonger
7ac26f73f4 Bug 5247 - Text does not wrap properly on labels
The apparent fix is to have the text wrap alogrithm to calculate based
on a label width reduced by approx. 3/16" when there is no left text margin.

This is probably not the proper fix as it appears that this algorithm is being
affected by adjustments in the label width for label creep and perhaps offset
as well. But this does fix the symptom and is all the time available for this
problem at present.

Documentation Changes:

It might be good to add a note to the effect that if the user does not supply
a left text margin in the layout, a 3/16" (13.5 point) left text margin will
apply by default.
2010-09-24 10:48:24 -04:00
Chris Nighswonger
fe99800a2e Bug 5182 - Attempting to export a patron card with no text causes an error to be thrown
Can't use an undefined value as an ARRAY reference at /home/koha/koha.prod/C4/Patroncards/Patroncard.pm line 86.

This is caused by testing for text at line 87 rather than line 85. This patch moves the test to line 85.
2010-09-10 18:28:30 -04:00
Chris Cormack
c6a38d75b3 Merge remote branch 'kc/master' 2010-07-29 09:35:42 +12:00