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>
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>
- modifies opac-showreviews.pl to display recent comments for all
titles, sorted in descending order by date.
- includes RSS feed
- includes (thanks to Chris N.):
[Enhancement][3.4] Add RFC822 Format to C4::Dates
This patch adds RFC822 formatting to C4::Dates. It also updates Dates.t
appropriately. Consult the POD for this module for how to use
this format.
Please note that this module *does not* handle TZ conversion at this point.
This means that the TZ portion of a RFC822 time will be truncated and the converted
time will be in the same TZ as was passed in. When generating an RFC822 time,
the local TZ offset will be included since none of the other supported formats
provide a means for including their TZ. This is not a problem introduced by the
addition of RFC822 formatting. Rather it is due to this module not having TZ
support to begin with.
Also note that the dow, moy abbreviations are English as required by
RFC822 section 3.3 (thanks to self for pointing that out).
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
In India a ILS product called Libsuite8 prints barcodes like b0007432. The barcode is not stored anywhere in libsuite8's database. Neither is barcode available in any of the reports generated by the software.
The barcode 'b0007432' when scanned into the libsuite8 software is de-constructed like 'b' which is the itemtype i.e. Book in this instance, and '7432' which is the 'Accession Number'. The software then takes the logged in staff's branchcode and does a join on three tables 'Location', 'Media_Type', and 'Books' to retrieve the particular record from the database.
There is no possibility of recreating the barcodes for insertion in Koha while doing a retrospective conversion, because of arbitrary length of the barcode string AND arbitrary number of zeros in the numeric part of the printed barcode AND the fact that there are no reports available from the software which contain barcodes AND the fact that the barcode is not stored in the database.
But most importantly due to the simple fact that printed barcodes are duplicated among branches.
Therefore this patch emulates the functionality of Libsuite8 software of converting the scanned barcode into one stored in Koha using the itemBarcodeInputFilter system preference.
To use this new itemBarcodeInputFilter systempreference choice called 'libsuite8', the barcodes stored in Koha must match the pattern of <branchcode>-<itemtype_code>-<accession_number>. This is easy to achieve while doing retrospective conversion from Libsuite8 to Koha.
As expected the itemBarcodeInputFilter will return unmodified barcode if presented with a barcode of pattern <branchcode>-<itemtype_code>-<accession_number>
This revision corrects the way updatedatabase.pl is changed in order to correctly update version and insert the libsuite8 option in the database. Also kohaversion.pl is changed in the recommended format of 3.0X.0X.XXX to reflect database has changed.
This revision also changes the erronorous itemBarcodeInputFilter description in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref from 'scanned patron barcodes' to 'scanned item barcodes' there by eliminating need for a separate patch for bug 5417.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
1) applied patch to HEAD
2) set next database number in kohaversion.pl and updatedatabase.pl
3) webinstaller kicked in, update ok
4) typed the barcodes from test cases into check-in
Barcodes used my local branch code, everything seemed ok to me.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
- 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>
redeclaration of itemnumber in RotatingCollections
A couple of errors caused by retaining commas in qw()
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
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>
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>
* 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>
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>
Makes {CONTROLNUMBER} available as new placeholder in
system preference OPACSearchForTitleIn.
{CONTROLNUMBER} will be replaced by the number in tag 001.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
- 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>
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>
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>
Use of switch generates errors in perl 12 and above
Replaced uses of the Switch module by if- else constructs
Removed some mixed space+tab indentation around these where
it generated visual confusion
As of perl 10 you can use given/when constructs but this is not
supported in earlier perls.
Reports Guided : removing \n when reading columns.def
Adding some more fields to columns.def
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
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>
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>
- 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>
<, >, ', 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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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.
Routine was checking undefinedness but such dates were
normalized on retrieval to 0000-00-00
Also planned/received date should also be checked
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
On a basket or a basket download, or csv export, if Koha cannot get a biblio, then it failed with error 500.
This patch fixes that behaviour skipping the faulty record in order to present the user with the biblios which are not causing trouble.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
The PDF templates for purchase orders now live in the
directory koha-tmpl/intranet-tmpl/prog/pdf to separate
them from code. As no automatic translation system for
PDF files is currently implemented, I'm keeping them out
of the language subdirectories for now.
At present, there are two choices of templates for printing
purchase orders (AKA basket groups), controlled by setting
the OrderPdfFormat syspref:
pdfformat::layout2pages (two-page layout)
pdfformat::layout3pages (three-page layout)
To customize a template or to add a new one requires two steps:
* modifying the PDF; note that OpenOffice source files
are included as a way of generating the PDF
* modifying the code in acqui/pdfformat/layout*.pm to
position the order text onto the template
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Calls to VERSION were generating errors when called on a string.
Use a bit of sleight of hand to avoid this
Added a couple of tests on Installer/PerlModules
Module needs better coverage testing (esp on newer perls)
Sorted to list of modules to make koha_perl_deps.pl more
human-friendly
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This patch defines a new values of reserves.found, 'T', to indicate that
an item has been allocated to fill a hold request and is currently
in transit from one branch to another. This explicit value is meant
to filter out hold requests from processing by holds queue batch
job.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
- Adding material type icons from the OPAC side
- Adding OPAC View link
- Copying revised handling of MU from the OPAC
- Removing OPAC-specific markup
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Per the following koha-devel thread, the use of
staff user subpermissions, AKA granular permissions, is
now the default behavior in Koha. This patch removes
the GranularPermissions system preference.
[1] http://lists.koha-community.org/pipermail/koha-devel/2010-February/033670.html
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Should fix any remaining warnings with 'podchecker'
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
If these are acceptable I'll continue - target is to get rid of all warnings
and errors with podcheck and make sure that any man and html formatted pod
docs look 'OK'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
The canonical list of Perl module dependencies are in
C4::Installer::PerlDependencies::PERL_DEPS now. Add a script
(debian/list-deps) to turn that into a list of Debian package names.
Because that is a slow process, and the output rarely changes, do
not do that at build time. Also, doing it at build time would require
modifying debian/control in evil ways.
Instead, add another tool, debian/update-control, which reads the
new file debian/control.in, and adds the output of debian/list-deps to
Build-Depends and creates a new debian/control.
debian/control.in is the master file. If changes are needed, that should
be edited. For performance and convenience reasons, the output is also kept
in git, but don't edit debian/control directly, please. Such changes
might get lost by the next commit by someone else.
Whenever PERL_DEPS changes, debian/update-control should be run as well
and the result committed to git.
This is not quite as automatic as it might be, but should be good enough.
It avoids keeping the list of Perl modules in two places.
Note that since it seems impossible to automatically figure out the Debian
package version that corresponds to a Perl module version, I have not
tried to do that at all.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Removed instances of 'use YAML' that were either completely
unnecessary or which were used only in debug code. Also
removed a needless import of Data::Dumper.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Check OPACXSLTResultsDisplay instead of XSLTResultsDisplay when
determining whether to use the XSLT bib results stylesheet for
OPAC search results.
In the process, added a new $search_context parameter to
C4::Search::searchResults() to specify whether results
are to be served up for the staff interface or for the
OPAC.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Fixed glitch where the first page of bibs in a batch (or the first
page of import batches) was displaying the entire list instead
of the correct number of records per page.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This brings the required version into line with the latest version available in the Debian and Ubuntu repos.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This patch adds two modules: C4::Installer::PerlModule and C4::Installer::PerlDependencies. The latter provides a single point
of reference for cataloging Koha Perl dependencies. The former provides an OO style interface to the dependency catalog.
The format of C4::Installer::PerlDependencies is very simply an anonymous hash of hashes. Each second level hash takes this form:
'Foo::Bar' => {
'usage' => 'FooBar Feature',
'required' => '1', # 0 if optional
'min_ver' => '0.01',
},
New modules can be appended to C4::Installer::PerlDependencies as needed and will be picked up by every piece of code which needs
this information.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This system preference never worked; also, as far as I can tell,
the PINES oISBN service was experimental, not meant for production
use, and is not currently advertised.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
The empty vendor created by the select if any subscriptions
have no associated vendor generates a 'wrong-looking' display
and selecting it gives no options
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This reverts commit 1f56a04cad.
[RM note: I confirm Chris Nighswonger's testing that shows that
the patch causes regressions, including breaking creating new
label layouts.]
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
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>
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>
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>
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>
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>
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]
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>
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>
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>
* 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>
* 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>
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>
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>
[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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
* '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>
While the idea of showing the number of late serials against the
vendor name was nice it does not scale and on large sites selecting claims
was just timing out. Improved the speed of the initial query but have removed
the big query for each user just to get a count.
Check for 0000-00-00 dates so that C4::Dates does not log error
Removed a variable that was never set and the bit of template used
if the impossible happened
Ensured returns were documented
Fixed some language issues
Removed the host of podchecker warnings about missing lists
added a couple of explicit returns when subroutines
'fell off the end' to remove any ambiguity
Change obvious warning generators:
( use of string comparisons in numeric comparison)
( declaration of variable in comnditional )
also some errors caused by undefined values:
abouttoexpire was not checking for undef values
Pass a valid planneddate in generation of next expected
(undef here causes odd results)
Add a basic test script
test is minimal but I fell over a bug this would have caught
Removed some useless counts from serials-edit / Serials interfaces
Removed old commented out code. Unrequired variables
Reformatted some code so that improving logic can be done
more easily
Also cleaned the interface to the claims related functions
in C4::Serials so they do not return an extra count variable
moved generation of dropdown to template instead of inline code
This is a quick fix to XSLTParse4Display to make ampersands display
correctly in OPAC search results.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
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>
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>
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>
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>
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>
[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>
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>
* 'Bug3482' of git://github.com/ptfs/Koha-PTFS:
Bug 3482: Updated DB version
Bug 3482 changed name of notices file
Bug 3482 Allow hold notices to be sent in print form
Add expiration date, today to hold notices
Modified to use dirspec only
Bug 3482 Print Notices via HTML
This is done by saving the notices in the message_queue table with
type 'print'. The notices are generated from a notice named
HOLD_PRINT. At the end of the day, they are dumped to an HTML file and
marked as sent by a new cronjob.
This setup is intended to be temporary; modules/batch/ shouldn't be around
forever.
Mandatory SQL:
INSERT INTO message_transport_types (message_transport_type) values ('print');
