Commit graph

13407 commits

Author SHA1 Message Date
Paul Poulain
04869d0fd0 Bug 4330 : fixing copyright mail from chris c 2010-12-16 on patches ML 2011-03-21 10:39:06 +13:00
975aea1372 Bug 3735: Wrong search results for a few fields in ccl.properties
This patch corrects a syntax error in the definition of bath attributes in
ccl.properties. In particular, it adds the search prefixes 'isbn', 'issn',
'name', and 'notes'. In order to make use of this patch, ccl.properties must be
updated.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 11:17:24 +13:00
1b57668d7e 5622: Improve display of MARC21 773 field in XSLT detail view
Applies change to OPAC and staff detail view.
Chops punctuation. Adds 773g. Strips MARC org code from URL.
Utils code is used as basis for patches #5662 and #5663 too.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 11:05:11 +13:00
Colin Campbell
7f0a326da5 Bug 5890 Correct Mismatched operator in comparison
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:47:52 +13:00
Chris Cormack
1a5270bdd0 Merge remote branch 'kc/new/enh/bug_5848' into kcmaster 2011-03-18 10:46:01 +13:00
Julian Maurice
465ff64825 Bug 5848: Remove duplicated tabs in opac details for Unimarc
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:45:22 +13:00
Chris Cormack
b61afbee79 Merge remote branch 'kc/new/bug_5879' into kcmaster 2011-03-18 10:38:56 +13:00
Chris Cormack
2ea6fdec15 Merge remote branch 'kc/new/bug_4218' into kcmaster 2011-03-18 10:38:40 +13:00
4b1fe1c9c3 Follow-up fix for Bug 4218 - Staff client detail page doesn't show hold status
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:38:07 +13:00
Paul Poulain
620ae78f84 Bug 5879 : Biblio.pm : fix isbd syspref and default location
- the systempreference is isbd, not ISBD
- when preparing the ItemRecord (for acq or serials recieving), there was no default value calculated for location. Fixing that

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 10:35:02 +13:00
Sophie Meynieux
6282f652b2 Bug 5889: Messages name in english for notifications on public interface.
Modification of template to allow multilanguage support. Alsa fixing columns
overflow.

BibLibre bug #5939

Tests: It works. Messages strings can now be extracted and placed in .po file
for translation.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:25:08 +13:00
1411a92936 Bug 5646: Translated sql files break messaging
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:18:57 +13:00
Paul Poulain
e28e34fbbb Bug 5882 : catalogue/moredetails (minor) changes
MT3288 moredetail.tmpl Lost and Damaged first choice is empty

    First choice was the first value of the authorised value list
    This is not handy for users.
    Rather than showing the first value, inserting a new empty value for users to see what to do

Term "Total Renewals" misleading, change to "Current Renewals"

    In koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl under History,
    there's a Total Renewals entry: seems to indicate a cumulative count of renewals on
    the item, which it is not, contrary to "Total Issues" just below.
    Moved the line up outside "history", and renamed it "Current Renewals".

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:15:21 +13:00
Julian Maurice
b1e3b6753e Follow up for bug 5880: Improved unit test
The unit test Koha.t now skip tests of the two subroutines if the insert
query failed.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:10:43 +13:00
Julian Maurice
1eb9d9e581 Follow up for bug 5880: Added unit tests for the two new subroutines
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-18 09:10:40 +13:00
Paul Poulain
d057f65743 Bug 5880 : C4/Koha.pm : adding two functions GetAutorisedValueByCode and GetKohaImageurlFromAuthorisedValues
just for convenience

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:44:38 +13:00
Chris Cormack
c78387b7d0 Merge remote branch 'kc/new/enh/bug_5869' into kcmaster 2011-03-17 14:37:00 +13:00
Katrin Fischer
15126b1108 Bug 5861: items.stocknumber not saved correctly
The field was missing in Items.pm.
It will still act strangely if you enter a stocknumber that
already exists in the database. (see Bug 5860)
Adding/editing items with stocknumbers you have not used before
should work as expected.

[F. Demians] Was able to reproduce the bug on an UNIMARC DB. The patch works.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:36:26 +13:00
Nicole C. Engard
3141202764 Follow Up Bug 5869 Update Report Page Title
The title said Checkout Stats - updated to say Holds Stats

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:13 +13:00
Nicole C. Engard
e05bb4ef85 Follow Up Bug 5869 Fix String Errors
This patch fixes all occurences of 'reserves' to 'holds.' It also
added Holds to the menu include and updates capitalization and spacing.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:11 +13:00
Chris Cormack
2b1de0948d Bug 5869 - Follow up patch, fixing copyring and s/reserves/holds/
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:09 +13:00
Paul Poulain
99b0a074eb Bug 5869 : Adding a reserve report
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 14:33:08 +13:00
Colin Campbell
5f7b1a58f0 Bug 5485: Add script to run Test::Perl::Critic
Tests are run if TEST_QA environment variable is set
and Test::Perl::Critic is installed
e.g.
TEST_QA=1 prove =l t/00-testcritic.t

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:35:58 +13:00
Jared Camins-Esakov
de4619b849 Bug 5816: XSLT doesn't display enhanced contents
This patch corrects and standardizes the display of enhanced contents (MARC 505
with ind2='0').

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:32:41 +13:00
6b0a84c26d Bug 5863: Add to Your Cart disappeared if login disabled on opac detail
Resolving an error in ready function by additional conditionals.
Moving a line from ready to html just as in other view templates, correcting the order of menu options at the same time.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 12:28:05 +13:00
Chris Cormack
6f4e7fc971 Merge remote branch 'kc/new/bug_3326' into kcmaster 2011-03-17 09:22:46 +13:00
Jared Camins-Esakov
e18ddca9d4 Follow up for Bug 3326: previous fix broke searches when
This fix ensures that searches will still work when -x is not used when
reindexing Zebra.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Magnus Enger <magnus@bibkat.no>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-17 09:21:54 +13:00
Colin Campbell
cf28bf4785 Bug 3810: Ensure all calls to Mail::Sendmail handled consistently
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-16 20:57:12 +13:00
ruth@bywatersolutions.com
784b9df4f2 Bug 3595 (partial): Items seen at checkin are not filling holds well
In Liz's second comment on this bug, she points out that local-only
holds (and also no-holds) items are being used to fill the first hold
in the queue, no matter where located, transitting if necessary.  If
all the items on a biblio are set to no-holds types, this problem
would never arise, as no holds could be *placed*.  But if you have
one or more unlimitedor local-hold items, then holds are getting
filled by the first item to cross a scanner, no matter what.

This patch will check during C4::Reserves::CheckReserves to make sure
that the hold being handed back to AddReturn is actually fillable by
the item just scanned.  One caveat:  If CircControl is set to "the library
you are logged in at", this will cause items checked in at
other-than-their-home-library to fill local holds at the library where
scanned.  This is, however, an edge case!

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-16 20:53:20 +13:00
Jared Camins-Esakov
d52f3680f4 Bug 3326: Work around Zebra's handling of &amp; entities
When using XSLT mode, the OPAC results display will show "&amp;" instead of "&"
when Zebra is indexing in XML mode. This patch works around this by replacing
"&amp;" with "&" and then extends the previous fix to apply to all occurrences
of "& " instead of just the first.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-16 20:48:50 +13:00
Chris Cormack
74c37aeeb6 Revert "Merge remote branch 'kc/new/bug_5734' into kcmaster"
This reverts commit b18ae6dee6, reversing
changes made to a52d4e8a70.
2011-03-16 16:28:00 +13:00
Stéphane Delaune
7b61eadf50 Bug 5750: (MT #4095) add exact matching filter for categorycode and branchcode fields in search members's result
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

No searching borrowers by categorycode or branchcode will only bring up
exact matches. Before searches for Staff (S) would also bring up
Students and Schools (SC, ST). Same for branchcodes.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 22:07:50 +13:00
Chris Cormack
1e98195b10 Merge remote branch 'kc/new/enh/bug_3495' into kcmaster 2011-03-15 22:01:45 +13:00
Katrin Fischer
9dfc9d4d12 Bug 3495: Fast bib record add at circulation
The link to the Fast add framework was never shown.
Now the link is shown if you have the right permissions (fast cataloging or superlibrarian).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 22:00:23 +13:00
Chris Nighswonger
5a924cc530 Bug 5865 - Labels wrap incorrectly when paper width is greater than height
This is due to the incorrect use of string comparators to compare numeric values.
This patch corrects that.

Note: This should be backported to 3.2.x

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 21:52:32 +13:00
Chris Cormack
76d52d89e4 Merge remote branch 'kc/new/enh/bug_3659' into kcmaster 2011-03-15 15:58:26 +13:00
251e2c4d74 Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Revision fixes some markup and corrects an error that would lead
to the hold being initiated for the remembered patron when this
was not intended.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 15:48:09 +13:00
Chris Cormack
fc2fe083fc Merge remote branch 'kc/new/bug_5693' into kcmaster 2011-03-15 10:04:38 +13:00
Chris Cormack
9b5e18c4ee Bug 5693 : Follow up patch, escaping HTML in limit_cgi so "" dont break hrefs
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 10:02:37 +13:00
Chris Cormack
7051352955 Bumping database version 2011-03-14 21:11:30 +13:00
Nicole Engard
07b9125861 Bug 3670: change 'Item DUE' to 'Item Due' in English dbs
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 21:05:41 +13:00
Janusz Kaczmarek
d6e580439b Bug 5819 : No toolbar in record view when quotes present in title - fix
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Was able to reproduce problem by surrounding 245$a with "".
Patch fixed the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:57:15 +13:00
1ff13b5aa6 Bug 5848: Same position for the tabs of Normal, MARC and ISBD view in opac detail
Adjusts three opac detail templates. Moves few styles to css.
Removes duplicate view info from XSLT file.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:50:03 +13:00
Chris Cormack
2c470899b3 Merge remote branch 'kc/new/bug_4438' into kcmaster 2011-03-14 20:48:50 +13:00
Henri-Damien LAURENT
3e297c6cb8 bug4438/MT5496 budget Exceeds total allocation
This is a followup :
When editing a budget, the check for the total allocation would take into account the budget itself.
Showing an improper error message
The problem was solved when adding a child budget but not when editing the same budget.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 20:45:58 +13:00
Chris Cormack
f463d241d2 Bumping db version 2011-03-14 16:22:28 +13:00
Chris Cormack
c88f43fc67 Bug 5669: Adding a system preference to control whether a user can select a pick branch for their hold or not
Default is on

Part of bug 5609

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-14 16:18:08 +13:00
Chris Cormack
c8c62e2fa1 Merge remote branch 'kc/new/bug_5595' into kcmaster 2011-03-13 20:31:38 +13:00
Chris Cormack
8215cc8bad Bug 5595 : Fixing a security glitch (please always use placeholders or
dbh->quote and fixing the tests
2011-03-13 20:30:13 +13:00
Chris Cormack
6e97b98a88 Bumping the database version 2011-03-13 15:19:31 +13:00