Commit graph

3007 commits

Author SHA1 Message Date
J. David Bavousett
172cd6fe92 Correct URL for Baker & Taylor ContentCafe
This patch updates the URL for image links in ContentCafe

Sponsored by Plano Independent School District, Plano, TX, USA

[RM note: the previous book cover URL was for a varient of Baker
 and Taylor's service that has to do with 'bookstore integration',
 and if I remember correctly, the main difference is that the
 book jacket image had "buy now" text.  The version supplied
 in this patch should work for normal use of ContentCafe.]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
Paul Poulain
7b2b05e793 stocknumber not saved properly
if you have a marc field, mapped to items.stocknumber, it's not saved properly in items.stocknumber

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:33 +12:00
Chris Cormack
92f35aee3b wr-70205 Rental discount not being respected
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:32 +12:00
Colin Campbell
b4eb19b6d3 Do not declare variables within (bogus) conditionals
if $index is unnecessary as we have made this true 5 lines above
variables should not be declared in conditionals if used outside of them
set $struct_attr to a sensible default to avoid generating warnings
in this assigment and elsewhere

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:31 +12:00
e339df410d Fix for Bug 3666, Overriding renewal limit means negative count in OPAC
Setting "renewalsleft" variable to zero if it comes out negative.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 07:22:31 +12:00
e7f8cc8f5e bug 4403: look in appropriate theme/lang for bib display XSL
Note: approach used can be described as a hack at best; the current
language should probably become a session attribute.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-08 18:59:41 -04:00
Nahuel ANGELINETTI
6626e8fcca (MT #2966) fix opac-user.pl function problem
This uncomment a uselessly commented function that is needed by opac-user. And fix this function that doesn't work properly.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-07 13:10:59 -04:00
Colin Campbell
1f56a04cad Bug 4450 Use more consistent error returns in C4/Creators/*
A lot of routines were defaulting to return -1 in error conditions
but calling code was expecting a ref or object
use return with explicit undef (or emptyness in array context)
for these cases. Extended this to cases where return was not tested
( -1 might in some cases be legit data).

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
(cherry picked from commit 5cf2b78b6f)
[RM note: ... thereby undoing the revert]
2010-05-07 13:04:58 -04:00
Lars Wirzenius
d06333fb9d Convert to UTF-8.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 17:58:39 -04:00
84c2db9f6d Revert "Bug 4450 Use more consistent error returns in C4/Creators/*"
[Reverted per request of Chris Nighswonger - callers of the affected
 methods need to be updated.]

This reverts commit 5cf2b78b6f.
2010-05-06 14:41:45 -04:00
Colin Campbell
5cf2b78b6f Bug 4450 Use more consistent error returns in C4/Creators/*
A lot of routines were defaulting to return -1 in error conditions
but calling code was expecting a ref or object
use return with explicit undef (or emptyness in array context)
for these cases. Extended this to cases where return was not tested
( -1 might in some cases be legit data).

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 14:25:43 -04:00
46737a702c fixed Syndetics breakage
Reverts part of commit 7b12e07 that removed references
to the Syndetics sysprefs in C4::Auth for no apparent reason.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 12:11:30 -04:00
Ian Walls
b86e4e5700 Fixes bug 4448: &'s in itemcallnumber
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:35:34 -04:00
Michael Hafen
ea0c76af7f on checkout ask for confirmation if borrower from different branch
With IndependantBranches on check that the borrower is from the same branch as
the librarian.  If not then ask for confirmation.  This check is skipped for
SuperLibrarians.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:17:19 -04:00
Ian Walls
2d3722b5a3 Fixes bug 4369: Local use does not update datelastseen
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:04:23 -04:00
d08cd6bfc0 Merge branch 'bug4036' of git://git.librarypolice.com/git/koha-galen into to-push 2010-05-03 07:46:33 -04:00
d575278cba bug 4036, 4405: overdue and fine day block improvements
* Adopted wording suggested by Kyle Hall for the
  USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE circulation blocks
* Updated IsMemberBlocked so that if a patron has accrued
  fine days, that will be tested for first before testing
  to see if the patron has current overdue items; this solves
  a problem introduced in the patch series for bug 4505 where
  accrued fine days would be ignored if (a) the patron has
  current overdue items but (b) the library has chosen to
  set the OverduesBlockCirc syspref to noblock.
* Now correctly assigns the USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE
  blocks; prior to this patch, they had been swapped.

FIXME: IsMemberBlock ought to be split into two functions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:46:26 -04:00
a445e956eb bug 4429: do not include items due today in overdue count
Use curdate() instead of now() in GetMemberIssuesAndFines.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:46:25 -04:00
2568e165e6 bug 4036: do not count item overdue if it is due today
* use curdate() instead of now() to test whether item is overdue
* enhanced POD of IsMemberBlocked

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:46:25 -04:00
96a70655aa bug 4396: clarify return of itemtype-level notforloan flag
* GetItemsInfo now includes a notforloan_per_itemtype key
  with the value of the item type's notforloan setting, correctly
  set based on the value of the item-level_itypes syspref
* Adjusted OPAC details item status display to use that
  notforloan_per_itemtype key

NOTE: one of the assumptions of item-level_itypes is that
      you can have either bib-level item types or item-level
      item types, but not both in the same database.  In particular,
      it does not establish a hierarchy where Koha checks the
      item-level itemtype first, then the bib-level.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:45:19 -04:00
Garry Collum
fbd04fab63 Bug 3883: Fixes blank line in routing list.
The blank line was being caused by the SELECT statement in the getroutinglist fuction of C4::Serials.  The LEFT join in the select statement was creating a single row result of NULL.  Changed the LEFT join to an INNER join.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:38 -04:00
50dc9e5cf8 bug 4405 followup - fix typo
As much as circ staff may want to block circulation to
over-rude patrons, Koha probably shouldn't be trying to make
that determination on its own. :)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:39:11 -04:00
Chris Cormack
86fbe2ec21 Bug 4405 - Overdues block check out
[Documentation note by RM:

This patch adds a new system preference, OverduesBlockCirc,
that can take one of three values:

  - noblock:      checkouts permitted even if patrons
                  have overdue items (default)
  - confirmation: circ operator asked to confirm checkout
  - block:        checkouts to patrons who have overdue
                  items are forbidden

]

Squashed commit of the following:

commit 6a1f66e0686a14d8a89abfc3fe5978dabd0b7af7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:27:39 2010 +1200

    Tidy up ready to send patch

commit 4d1398df18dcce4fd888cf17a0e2955fdf6ee1e4
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:26:15 2010 +1200

    Bug 4405 - tidy up

commit 3daeb71bc6b690e18dda96aa3c767c2bb0521038
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:02:04 2010 +1200

    Bug 4405 - Overdues block checkout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:39:11 -04:00
Henri-Damien LAURENT
2a0c82652b (bug #4319) allow reserves on waiting items
This add a function to check the reserve status, and add a check in IsAvailableForItemLevelRequest() to allow request on items that are waiting

Conflicts solved:

	C4/Reserves.pm

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:27:27 -04:00
Paul Poulain
4cc7b7e59d MT3228 : trailing space block search
Removing trailing searchs befor operands which block searches

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:50:34 -04:00
d114ebe80a bug 4256: fix patron replication when using LDAP with auth_by_bind
Patch compiled from diffs created by Dobrica Pavlinušić <dpavlin@rot13.org> to:

* enable patron replication when using LDAP with auth_by_bind
* not scribble over extended patron attributes
* fix failure logging in to OPAC if patron has no extended attributes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 17:05:38 -04:00
1cd4f42ae4 bug 1532: ensure that empty hold request expiration is represented as NULL
Fixes bug reported by Colin Campbell where reserves.expiratedate
was defaulting to '0000-00-00' instead of NULL.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 09:51:16 -04:00
Chris Cormack
6c75d21f23 Bug 3785 - Fixing a bug that was stopping holds if no maximum number was set
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 08:19:37 -04:00
Kyle M Hall
a1336175fd Bugfix 4123 - CanBookBeRenewed fixed.
In Circulation::CanBookBeRenewed categorycode and itemtype were not being checked for * wildcard
if a specific code was not given.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 08:08:41 -04:00
Ian Walls
aef52b8585 Fixes bug 4201: Holds priority listings assigning large numbers
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 06:00:47 -04:00
Ian Walls
2f4f4bdff6 Fixes bug 4326: Items marked as returned yesterday
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:16:31 -04:00
J. David Bavousett
e2da272840 Bug 3619 - C4::Letters::_send_message_by_email does not obey AutoEmailPrimaryAddress
This enhancement would cause C4::Letters::_send_message_by_email to obey the
syspref.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:10:15 -04:00
David Birmingham
816dbb2420 Fix to ORDER BY SQL in lists feature
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:07:40 -04:00
Sébastien Hinderer
3b39195500 Perl documentation fixup in C4/Items.pm.
The documentation of the DelItem function did not menton the $dbh.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:06:22 -04:00
Colin Campbell
e7bdbd0583 Bug 4248 Rework Cities dropdown for members entry
Garry Collum's patch correctly identified the core flaw in operation
looking closer revealed some other flaws (2 "blank" options, some vars
and documentation belonging to a superceded version, etc.
Changed GetCities to return a structure rather than the messy two returns
Let the template do the concatenation and removed the CGI::Popup

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:20:36 -04:00
066850a13a Revert "Bug 4248: Fixes zip code in cities town pull down list."
This reverts commit 2eac2e7242.
2010-04-29 22:20:12 -04:00
Garry Collum
2eac2e7242 Bug 4248: Fixes zip code in cities town pull down list.
Adds zip code to the GetCities function.  This function is only used in memberentry.pl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:19:16 -04:00
Jane Wagner
cdc46d0a2a Bug 4210 Acq suggestions don't have LibraryName value passed
Updated to current head.  The various acquisitions suggestion templates have a LibraryName field, but no value is passed for that field.  Added a parameter for that data.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:14:10 -04:00
Jane Wagner
6ecb2ddbb5 Bug 3788 XSLT does not obey viewISBD syspref
Modified XSLT.pm and MARC21slim2OPACDetail.xsl to obey the viewISBD syspref
setting in the OPAC.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:09:59 -04:00
Chris Cormack
8478586cf1 Bug 4372 - Fix for bookcount.pl not counting started transfers as seeing an item
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:03:42 -04:00
Matthias Meusburger
4dd2086deb MT 2269 : Do not display all the items if there is a large amount of items
Also fix the barcode not found problem (due to empty lines)

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:52:15 -04:00
Nahuel ANGELINETTI
67f9ea0264 (MT #3007) update hold transfer slip datas
This patch add information to hold transfer slip:
 * itemcallnumber
 * location
 * waiting date

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:42:43 -04:00
Alex Arnaud
e594317f4d (BUG #4332) Changed the display of ordered search results
Changing the display of the basket column: changing "basketNumber" to "my
basket (basketNumber)".
Adding the Basket group column with fallowing display: "my group (group
Number)"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:20:10 -04:00
86c82d0aaa Fix to enable Amazon cover images in the staff client.
Since this fix enables the previously-missing variable
'AmazonEnabled' in Auth.pm, this will also enable other
Amazon content in the staff client like Product
Descriptions and Amazon Similar Items (See Bug 3863)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:03:58 -04:00
c9ba8c899d Merge branch 'bug2505_patches' of git://git.catalyst.net.nz/koha into to-push
* 'bug2505_patches' of git://git.catalyst.net.nz/koha: (24 commits)
  Bug 2505 - use strict and warnings in sax_parser_test
  Bug 2505 - enable warnings for link_bibs_to_authorities
  Bug 2505 - add strict and warnings to perlmodule_ls
  Bug 2505 - add strict and warnings to check_sysprefs
  Bug 2505 - Add commented use warnings where missing in *.t
  Bug 2505 - Add commented use warnings where missing in *.pm
  Bug 2505 - Add commented use warnings where missing in the cataloguing/ directory
  Bug 2505 - Add commented use warnings where missing in the misc/ directory
  Bug 2505 - Add commented use warnings where missing in the tools/ directory
  Bug 2505 - Add commented use warnings where missing in the installer/ directory
  Bug 2505 - Add commented use warnings where missing in the rotating_collections/ directory
  Bug 2505 - Add commented use warnings where missing in the C4/ directory
  Bug 2505 - Add commented use warnings where missing in the serials/ directory
  Bug 2505 - Add commented use warnings where missing in the catalogue/ directory
  Bug 2505 - Add commented use warnings where missing in the sms/ directory
  Bug 2505 - Add commented use warnings where missing in the opac/ directory
  Bug 2505 - Add commented use warnings where missing in the virtualshelves/ directory
  Bug 2505 - Add commented use warnings where missing in the suggestion/ directory
  Bug 2505 - Add commented use warnings where missing in the admin/ directory
  Bug 2505 - Add commented use warnings where missing in the circ/ directory
  ...

Conflicts:
	C4/Auth_with_cas.pm
	acqui/supplier.pl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 07:13:37 -04:00
Paul Poulain
36ffef127b unconditional warning changed to if $DEBUG
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 07:03:24 -04:00
Matthias Meusburger
ee06b581ce MT3186: Remove warnings from Auth_with_cas
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 06:55:13 -04:00
Alex Arnaud
e4addf296f (BUG #4388) aqbudgets.pl: add a column in the table for display the total spent of level and sublevels
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 06:42:51 -04:00
Cindy Murdock Ames
f9e007762c Fix ampersand problem in non-XSLT Intranet search results
Quick fix for ampersand display issue in non-xslt intranet search results,
related to bug 3326.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-22 06:17:49 -04:00
Donovan Jones
593a7d8e6a Bug 2505 - Add commented use warnings where missing in *.pm 2010-04-21 20:28:51 +12:00