Commit Graph

3109 Commits

Author SHA1 Message Date
Robin Sheat d39aef7de1 Bug 5084 - hide funds that are part of an inactive budget
Prevents inactive funds from showing in the aquisitions module, they
still show in the administration.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 00dd0ae627)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:40:46 -05:00
Srdjan Jankovic 0b32d910d7 Bug 2965: Allow due date in the past
Raise warning rather than disallowing
Remove due date js validation when checking out

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4d1762f5ec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:40:30 -05:00
Colin Campbell 08c2668ee2 Variable redeclared in same scope
lexical variable declared twice causing run time warnings

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 51dc5b060b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-14 21:39:52 -05:00
Katrin Fischer 9ded7c9f72 Bug 3381 - Add an IntranetUserCSS system preference
Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 23:01:49 -05:00
Owen Leonard 77b824a00d Fix for Bug 4173 - Statuses not appearing in the OPAC
This adds display of "Use restrictions" authorized values
to the OPAC and the staff client for available and
not-for-loan items.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bdf4dd13af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-13 22:34:30 -05:00
Frédéric Demians e1cf24e89c Bug 5475 Wrong messages date formating on Check Out page
On the Check Out page, messages related to the borrower are displayed on the
right side. Message text is preceded by a date and library code. The date is
displayed in US format (mm/dd/YYY). Is should be displayed formated depending
on 'dateformat' syspref.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37a17d8fad)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:26:53 -05:00
Colin Campbell 5ce340e8ba Bug 5022 Supplements were not saved correctly
No subscription id was set
Also entered a default arrived date on the supplement
And removed errors due to bad dates returned from GetSerials

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aa6ce934d9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-12 14:26:51 -05:00
Owen Leonard d941d85712 Incremental fix for Bug 3285 - Location on Add Subscription should be pull down
- Adds location dropdown to subscription edit form
- Pulls authorised value for display on subscription detail page
- Adds function for pulling authorised value description based
  on category and value

This patch does NOT implement automatic preselection of the shelving
location form field on the serial add item screen. This must be
worked out in order for the bug to be closed.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e54169ba0f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-06 17:19:13 -05:00
Colin Campbell 288cbb1f57 Fix some compile time errors reported in test suite
redeclaration of itemnumber in RotatingCollections
A couple of errors caused by retaining commas in qw()

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bc3dcdd733)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-01 16:55:44 -05:00
Colin Campbell ae0387e21e Bug 5448: Refactor Boolean.pm
Remove unnecesssary export
Use Exporter according to best practices
Use Carp not warn so we know where the error string came from
Don't create warnings manipulating undefined input
Replace package variables by lexicals

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f08b33a912)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-01 16:54:52 -05:00
Ian Walls faead6cbd2 Fixes bug 5232: Shelfname won't display on high-numbered lists
This bugfix adds an explicit GetShelf for the specific shelfnumber when viewing that individual shelfnumber.  This captures the
shelfname, which was originally pulled from shelflist->{$shelfnumber}, which may not have been populated if the List in question was
beyond the 20th private or public list in the system.

Also adds a more explicit sort: the sort from the CGI takes top priority, then it falls back to the default sort for the list, and
ultimate falls to 'title' if neither CGI nor default sort exist.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 31439fc51a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-12-01 16:54:51 -05:00
Colin Campbell bd5e6e9d89 Bug 5450 Avoid a name clash in ILSDI modules
C4::ILSDI::Utility exports a subroutine CanBookBeReserved
Both ILSDI were also importing a subroutine of that name from
C4::Reserves Remove conflict by listing subroutines
imported from C4::Reserves explicitly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b9ccc51841)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-30 16:24:42 -05:00
Galen Charlton 19e494bcd5 bug 4211: ensure that suggestion emails have full details
Because of how the ModFoo routines work, if you are only
changing selected columns but are also using the change
as a trigger to place a message in the queue, you need
to fetch the full row before generating the message.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit d3df54d052)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-29 15:01:37 -05:00
Galen Charlton 38927a4406 bug 4211: more fixes to suggestion letter template handling
* Now displays the correct list of fields to choose
  for suggestion letters.
* Clean up mixture of old and new column selection code
  introduced in commit 88bb1b63, thereby restoring
  the intent of the patch for bug 3522.
* Enable suggestion library to be used in suggestion
  letter templates

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 994d6e2aac)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-29 15:01:37 -05:00
Chris Cormack 5bb5216f82 Bug 4211: This patch should provide a working way to send out mail from suggestions
Your suggestion notices template needs to contain things like
<<suggestions.title>>
<<suggestions.author>>
etc

Squashed commit of the following:

commit 3f4278bbe8d4c68be9f72d50e1eef6a411dc873d
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:41:34 2010 +1200

    bug 4211 parsing the letter before we enqueue it

commit ecdc0ff34c1aa9b96b68d541423ca693e2d63e67
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:32:09 2010 +1200

    Changing the query to fetch suggestions data, this is needed for suggestion mail to be sent

commit ece11d015b945ce119cf7cbc5e2563f4bc8aecf9
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:36:26 2010 -0400

    Fix for Bug 4211, Acquisitions actions on suggestions don't generate email

    Assuming 1) The patch for Bug 5126 is approved and 2) Suggestions
    notices are added by hand (or from default sql--see Bug 5127) this
    correction should get suggestions notices properly enqueued.

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

commit 5c3bbe7d557b1994be72518746217fc6fc4e5b83
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:27:33 2010 -0400

    Fix for Bug 5126 - Suggestions module missing from "add notice" form

    - Adding "suggestions" entry
    - Re-ordering options in alphabetical order

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

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit b1c2d560b6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-29 15:01:36 -05:00
Tomás Cohen Arazi 920b2d5d60 Bug 5412 double quotes break coins and thus search results in some scenarios
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d13d96614b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-17 21:12:39 -05:00
Marcel de Rooy e1523e21d5 Bug 5066 (Log timestamp consistently in _session_log)
Small fix with thanks to Galen.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1bd67e28e5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-17 17:01:07 -05:00
Colin Campbell f50c566b88 Bug 4074 Fix fail to parse simple qualified search
Searches such as au,phr and kw,wrdl were passing through the regexes
that should replace colon with equals
add wrdl and phr
use trn so not just rtrn is spotted
Where we were checking for multiple spaces specify that in the
regex not just two spaces

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b97c4dba7a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-17 01:01:21 -05:00
Owen Leonard 41e99198db Fix for Bug 4359, noItemTypeImages not active in OPAC
- Auth.pm put the noItemTypeImages preference under "intranet only."
  Moved it to "OPAC or intranet."
- Added check for the preference on the OPAC advanced search page.
- Improved logic for displaying images on the reading history page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d4f02c469b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-13 08:58:11 -05:00
Galen Charlton dab153a622 bug 5389: mark Business::ISBN as a required dependency
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 11d54188f8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 20:46:08 -05:00
Chris Cormack fc78b73764 Bug 5385 - Fixing an error that crept in with the POD cleanup
(cherry picked from commit 9c6db56a3f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:15 -05:00
Colin Campbell c82169bc32 Bug 4305 Improve code flow
Use the ISBN Object's method to format the string
rather than add extra code to do it
Clean up the code flow for clarity
Benchmarking shows its a bit faster too
Don't add to the number of Test::Perl::Critic warnings
 for no benefit

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c95b5153e0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:15 -05:00
Andrew Elwell 78a598f509 Bug 5385: POD Cleanups (part 1)
working through the master branch to eliminate all
podchecker warnings/errors

Actual improvement to the quality of the POD will
come later (hopefully with assistance of others)

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9fa574f609)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-11 19:48:14 -05:00
Chris Cormack b2af1f850d Merge remote branch 'kc/master' into new/bug_5105
Conflict fixed

Conflicts:
	opac/opac-detail.pl
(cherry picked from commit dcb86689f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-10 18:04:39 -05:00
Katrin Fischer 4882a4351f Bug 5370: Fix all references to koha.org
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9f688ad92b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-07 16:20:32 -05:00
Nahuel ANGELINETTI a8e207df36 (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>
(cherry picked from commit 363c1ca9f9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-05 15:08:14 -04:00
ByWater Solutions 047e38e8a7 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>
(cherry picked from commit 321eed9833)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 20:17:11 -04:00
Chris Cormack e74fc14914 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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-04 19:17:19 -04:00
Owen Leonard 16039eae5a 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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 22:11:38 -04:00
Galen Charlton d6edcfa85e 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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 20:18:26 -04:00
Galen Charlton e1bb59fc08 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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-02 20:17:13 -04:00
Owen Leonard 0fac953b97 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>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2010-11-01 21:04:19 -04:00
Galen Charlton 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
Galen Charlton 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
Galen Charlton 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
Galen Charlton 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
Frédéric Demians 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
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
Galen Charlton 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
Galen Charlton 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
Marcel de Rooy 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