Commit graph

3455 commits

Author SHA1 Message Date
Jared Camins-Esakov
0a1f05a5a2 Bug 5390: OPAC loses library selection
This patch ensures that the OPAC library selection masthead will always default
to the branch that is currently being searched. This only applies to systems
with multiple branches and OpacAddMastheadLibraryPulldown turned on.

To test: do a search in the OPAC, limiting by branch. The search results will
still have that branch selected in the masthead dropdown.

This patch also fixes bug 5852 and bug 3778.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-22 14:59:16 +13:00
Chris Cormack
01f7ea0d28 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-21 20:51:47 +13:00
Katrin Fischer
e1654e1aa1 Bug 5834: Holds link missing when 942$c is not for loan
Adds a check for item-level_itypes system preference. Note that this only
applies to the search results screens.

To test:
1) Set item-level_itypes to 'specific item'
2) Create record and set 942$c to an itype that is marked not for loan
3) Create item with itype not marked 'not for loan'
Current behaviour: Holds link is not shown, sys pref setting doesn't matter

After patch: Holds link is shown
- when item-level_itype is 'specific item'
- when item-level_itype is 'biblio record' and 942$c itype is for loan

Holds link is not shown
- when item-level_itype is 'biblio record' and 942$c is not for loan

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 20:49:17 +13:00
Chris Cormack
7a71d2c5e8 Merge remote branch 'kc/master' into new/enh/bug_5917 2011-03-21 20:39:05 +13:00
b9cee99da4 Bug 5065 Add ability to choose framework on import
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 20:36:35 +13:00
Chris Cormack
03890c90ac Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
	installer/data/mysql/en/mandatory/sysprefs.sql
2011-03-21 19:54:11 +13:00
Paul Poulain
ddbedbfc2f Bug 4330 : Adding some copyright BibLibre statements 2011-03-21 10:57:20 +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
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
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
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
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
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
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
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
Jared Camins-Esakov
4bc293c3aa Bug 5810: Subject tracings search complete subfields
This patch adds the syspref TraceCompleteSubfields. When TraceCompleteSubfields
is set to "force," clicking on links in non-authority controlled subject
tracings will only find other records where the entire subfields match. Leaving
it at "don't force" keeps the current behavior of doing a keyword search of the
subject indexes.

This patch implements complete-subfield subject tracings in MARC21 XSLTs (OPAC
and Staff) and all Normal mode interfaces. UNIMARC XSLTs have not been updated.

This patch also adds the syspref UseAuthoritiesForTracings. When set to "Do not"
tracings in the XSLT detail displays will never generate links using authority
numbers, but rather use the heading strings (NB: the tracings currently use only
subfield 'a' for generating links).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-13 15:02:59 +13:00
326222e3f1 Bug 4072 Lost items aren't hidden on OPAC result page
When hidelostitems system preference is enabled, lost items are hidden on OPAC
detail page but are shown on result page. This patch modify MARC21/UNIMARC XSL
in order to take into account hidelostitems syspref on OPAC result page.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 12:52:57 +13:00
Stéphane Delaune
0ee0cc18b3 Bug 5595: (MT #5757)adding additional attributes support on patrons's search
Restores ability to search on extended borrower attributes that are configured to be searchable

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 12:46:05 +13:00
Colin Campbell
0d082204ea Bug5063: C4::Bookseller Changes
Merge unfao changes to C4::Bookseller
Enable warnings in Bookseller.pm
Some cleanups in Bookseller code
Do not export everything by default
Display vendors more rationally
    Was displaying by id make it name as the searchstring is for all
    embedded substrings
Have removed "if mysql" logic as we want to deal with this by
    abstracting the DB interaction and it makes cleaner code until then

Sponsered by UN FAO, Rome

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 08:42:26 +13:00
Frédérick Capovilla
b39466c965 Bug 5703: Hide the $9 subfield (linked authid) when showing series for a MARC record in normal view.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-12 08:22:15 +13:00
d163e7e578 Bug 5830 Using XSLT on OPAC Lists page
On OPAC Lists page (opac-shelves.pl), biblio records are now displayed
accordingly to OPACXSLTResultsDisplay system preference.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-08 08:53:56 +13:00
04f78e57c3 bug 5783: follow-up - fix logging of modifications
Fix so that modifying an authority record is not logged
as both an ADD and a MODIFY.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:04:20 +13:00
8af91c079a bug 5783: Authorities edit logging
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-07 15:04:12 +13:00
Reed Wade
c84dad3b18 bug 5693 - mc-ccode parens fix
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-06 08:35:29 +13:00
0ba9aab76b Fix for Bug 4290 - search for author in repository
Reimplementation of Nahuel's patch from 2010-03-02

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-06 08:22:06 +13:00
Frédérick Capovilla
dbe3780fc0 Bug 3341: Fines calculation erroneous when a repeatable holiday is added
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-06 08:15:44 +13:00
Robin Sheat
87ec412648 Bug 4852 - rewrite the query to include limits if using ccl=
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 12:58:52 +13:00
Jared Camins-Esakov
83ab549724 Bug 5811: Add sysprefs to control overriding fines
This patch adds two sysprefs to allow libraries more fine-grained control over
when fines can and can't be overridden. The two sysprefs are:
* AllFinesNeedOverride - when this syspref is set to "Require" (default) any
    fine will require a staffmember to override the fine in order to check out a
    book.  When set to "Don't require," fines below noissuescharge will not need
    any override.
* AllowFineOverride - when this syspref is set to "Allow," staff will be able to
    override fines that are above noissuescharge. When set to "Don't allow"
    (default), staff will not be able to check out items to patrons with fines
    greater than noissuescharge.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-04 09:33:18 +13:00
439d2224e1 Bug 1953 - Follow up fix on security patch
Fixing: Undefined subroutine prepare called on line 722.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-28 21:34:40 +13:00
MJ Ray
74cdd57ecb bug 1953: Reduce risk of possible tainted supplierid call to C4::Serials::GetLateIssues
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-26 20:02:25 +13:00
Chris Nighswonger
b0f60221f4 Security Bugfix: Bug 1953 Adding Placeholders to SQL To Avoid Potential Injection Attacks
This patch addresses both security issues mentioned in the summary of the report
submitted by Frère Sébastien Marie included below.

---------------------------
The problem is here: 'C4/AuthoritiesMarc.pm' in the function 'DelAuthority':
The argument $authid is included directly (not via statement) in the SQL.

For the exploit of this problem, you can use 'authorities/authorities-home.pl'
with authid on the URL and op=delete (something like
"authorities/authorities-home.pl?op=delete&authid=xxx").

This should successfully call DelAuthority, without authentification...
(DelAuthority is call BEFORE get_template_and_user, so before authentification
[This should be an issue also...]).

Please note that the problem isn't only that anyone can delete an authority of
this choose, it is more general: with "authid=1%20or%1=1" (after inclusion sql
will be like: "delete from auth_header where authid=1 or 1=1") you delete all
authorities ; with "authid=1;delete%20from%xxx" it is "delete from auth_header
where authid=1;delete from xxx" and so delete what you want...

SQL-INJECTION is very permissive: you can redirect the output in a file (with
some MySQL function), so write thea file of you choose in the server, in order
to create a backdoor, and compromise the server.

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-25 07:08:39 +13:00
Chris Cormack
92f52dc850 Merge remote branch 'kc/new/bug_5682' into kcmaster 2011-02-18 10:42:28 +13:00
Paul Poulain
4117b293f6 NormalizeString POD Fixing and variable renaming
POD was mistakenly telling that NFD was supposed to be the default
    encoding.  In fact, it is not, it is NFC.
    So the variable $nfc to change to the not default encoding was misleading.
    Renaming it into $nfd

(written by hdl)

Refactored by Chris Cormack

Signed-off-by: Davi <davi@gnu.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-18 10:39:56 +13:00
Chris Cormack
6a37aaf010 Merge remote branch 'kc/new/enh/bug_5462' into kcmaster 2011-02-17 08:56:43 +13:00
Ian Walls
b2c56dfe62 Follow up on Bug 5462: fixing variable names breaks messaging preference form
The messaging prefs form was hardcoded to use 'transport-$transport_type', rather than
'transport_$transport_type'.  The result was an uneditable messaging preferences form.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-17 08:50:26 +13:00
50c0ae09a1 Partial fix for Bug 5745, Overdues with fines report not showing titles
- Adding title, subtitle, and author to output
- Reworking display of shelving location selection

Patch does not address the contents of 'overdue status' and 'notified by'

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-15 10:12:36 +13:00
311d051f77 bug 4306: respect item-level_itypes when displaying item label batches
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Salvador Zaragoza Rubio <salvazm@masmedios.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:09:05 +13:00
bfec5ef4c1 Bug 5727 Warning in log due to XSLT.pm
XSLT.pm add few syspref to MARCXML record send to be transformed by XSLT. If
one of those syspref doesn't exist, it generated a warning.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:46:20 +13:00
Colin Campbell
1a0b6ded11 Bug 4263: Remove duplicated lines from C4::Items
Merge of bug 4263 duplicates the bulk of
ModItemFromMarc causing compile time errors

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:05:36 +13:00
Chris Cormack
083fd5776a Merge remote branch 'kc/new/enh/bug_5462' into kcmaster 2011-02-08 21:05:14 +13:00
6709d0e4f7 Follow-up correction for Bug 5462 - Fix variable names for template::toolkit
Previous commit modified checks for the item-level_itypes preference
to look for a different variable name but didn't update where that
variable is set in Auth.pm.

Other scripts perform a direct check of item-level_itypes and must
continue to use the name of the variable in the database.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-08 21:03:28 +13:00
Chris Cormack
a4cc394508 Bug 5691 - Delete all items respects independentbranches system preferences
Squashed commit of the following:

commit 66cdb8804136803a3f626d183c8f192f61f3c7b1
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Feb 4 12:55:10 2011 +1300

    Bug 5691: Updating copyright statement

commit 79ef6c269afc9c644c51709a7657542a0fc6d7d6
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Feb 4 12:52:13 2011 +1300

    Bug 5691 - Fixing a syntax error and tidying up some formatting

commit a66485dba113c05ed51a3b4ff19f788e335aa1f6
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Tue Oct 5 17:23:55 2010 +0200

    (MT #1365) Delete all items

    Using DelItemCheck in cataloguing/additem.pl
    when deleting all items

commit fe845fd48ab22ff82ad6d8971c468c327b49f3c4
Author: Christophe Croullebois <christophe.croullebois@biblibre.com>
Date:   Wed Sep 22 11:39:28 2010 +0200

    (MT #1365) Delete all items

    Now if IndependantBranches is on and a user try to delete all items, only the items of his branch will be deleted.
    A message explain this fact.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Followup: (MT #1365) Fixing up the English idiom
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-05 07:41:29 +13:00
Christopher Hall
bd151a4fd8 template::param handles empty array/hash refs better 2011-02-04 15:10:59 +13:00
Henri-Damien LAURENT
60dd25b5c2 Bug 5690
MT3947: items.timestamp were not updated on edition

If items.timestamp is used in the framework and hidden
the fact that it is NOT deleted before update is done would input the previous timestamp,
which is not the desired behaviour.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-04 13:22:02 +13:00
Chris Cormack
e29aca325d Fixing a syntax error, that snuck in with a merge 2011-02-03 22:52:36 +13:00
f1f36a0c94 Bug 3212 Force leader 9 position to 'a' for new biblios
When Creating a new biblio record, if the cataloguer doesn't use the leader
plugin, a biblio record can be saved with a leader not containing a 'a' in 9
position. If the biblio contains UTF-8 characters, its decoding can fail.

This issue applies to MARC-21 not UNIMARC.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:15:25 +13:00
Ian Walls
f692123bf1 Bug 2341: items marked 'on order' not reserveable from search results
Items created as part of the acquisitions process, and assigned the temporary notforloan value of -1,
cannot be placed on hold from the search results in either the OPAC or staff client (the link is missing).

This patch changes the evaluation of items->notforloan from a Boolean (if $items->{notforloan}) to a comparison
(if $items->{notforloan} > 0).  Any notforloan status with a negative value can therefore be reserved.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:00:01 +13:00
Chris Cormack
aa398ed055 Bug: 4263 - Repeatable subfields in items
Squashed commit of the following:

commit f441094d5095d165eab18340c983a831cce8f6e0
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Mon Jul 5 20:33:23 2010 +0200

    bug4263 followup : Can't blank subfields

    Previous bug4263 reintroduced bug 2466: fix clearing item field
    This keeps bug4263 followup to be assigned (donot blank dateaccessioned)
    But also allow to blank item subfields.

commit 92889b766c41b48bdd0e3a33ca4b183b1e259805
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Fri Apr 23 13:54:30 2010 +0200

    (bug #4263) dateaccessionned is cleaned on item modification

    Every item modification, date accessionned is cleaned, if there is no modification made, we must'nt reset to "undef" the value.

commit 5abb2db16b2564d32e84b7cc680acbc301d73179
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Tue Mar 2 09:57:33 2010 +0100

    (bug #4263) fix the edition of items with repeatable subfields

    The subfield management in item level is broken, fields are concatenated in one field, and if the librarian edit it, the values are not selected.
    This big patch fix three things:
     1) saving fields that are stocked in SQL(using koha2marc mapping) are now well cut and separated in _REAL_ subfields
     2) loading records with repeatable subfields are now well returned
     3) Editing items with repeatable fields works well

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 4263 Removing extranious block of code
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 16:08:08 +13:00
Chris Cormack
35b47b6ff7 Bug 4931: Stocking can be by homebranch or holding branch
Squashed commit of the following:

commit 105de81639cbac5084e4a5c099b19569043e69ff
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Tue Jul 13 11:58:01 2010 +0200

    (bug #4931) fix forgottens input in buttons

    the previous patch missed an hidden input in next buttons that break next page. This fix it.

commit db00295a6b9d1d36fc888ba6a0558011fd6884ba
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Fri Jul 2 15:27:59 2010 +0200

    (bug #4931) add the ability to choose home or holding branch in stocktaking

    This add radio box in stocktaking to base it on home or holdingbranch

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 4391 Followup: Adding back lost declaration of $branchcode
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 13:50:57 +13:00
Frédérick Capovilla
079796ed18 Bug 5661 Fix a problem when doing an authority search with no sort order
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 10:32:40 +13:00
Paul Poulain
4f7bcdcbae Bug 5681: Fixes leading zeroes in Add Mulpiple Copies
From Biblibre:
I don't know why, but removing sprintf solves the problems with leading zeroes
and the problems with large values.

(written by jean-andré santoni)

Note from Chris:

The width is never set, so the sprintf always defaults to a float, which
trims the leading zeros. I am not smart enough to figure out how to set
a valid width when calling it, and removing the sprintf seems to work
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5681 for
test results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 10:08:50 +13:00
Jared Camins-Esakov
428556cd13 Bug 5683 - it is possible to save corrupt records
This patch makes it impossible to save records with variables fields that don't
contain any subfields. Prior to this patch, link_bibs_to_authorities.pl would
sometimes corrupt records.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 09:34:51 +13:00
Christopher Hall
7e5b71b011 needed in template params for utf8 data, seems to not mind being in two places 2011-02-01 11:42:44 +13:00
51f067fcb2 For catalyst/template_test branch. There are still issues with displaying biblios.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-01 09:36:19 +13:00
Ian Walls
a0dc124a95 Bug 3881: OPAC Privacy reimplementation
Reimplements Paul Poulain's original OPAC Privacy patch, with some minor improvements and changes to wording

If the library enables the OPACPrivacy system preference along with the opacreadinghistory preference, and sets
an AnonymousPatron (must be a valid patron number in the database), the user will see a new tab upon login to
the OPAC, My Privacy.  From there, the user can:

- Set their OPAC Privacy to one of three values
  0 - Forever.  This keeps their reading history unless they explicitly delete it; the bulk anonymiser won't touch it
  1 - Default.  Keep reading history until either they delete it or the library does
  2 - Never.    Instantly anonymises reading history upon item return

- Instantly delete their reading history
  There is a warning and a popup to confirm.  I've removed Paul's extra confirm checkbox, which seemed redundant

A note of which preference the patron has selected is added to the Patorn Details page in the staff client.  This is read-only.

This patch also consolidates Privacy system preferences into the Privacy section of the OPAC tab.

Thank you to BibLibre for the original implmentation of this patch, and Los Gatos Public Library for funding and
testing the reimplementation.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-31 22:23:50 +13:00
Christopher Hall
4c5d2915b1 oops again, should be encode not decode 2011-01-25 15:29:55 +13:00
Christopher Hall
24d04b5bbd oops, utf8 not utf 2011-01-25 15:27:18 +13:00
Christopher Hall
03c20af354 better fix for utf8 problems, also fixed search 2011-01-25 15:26:36 +13:00
Christopher Hall
c0c4eb4f50 fixed XSLT utf8 bugs 2011-01-25 15:14:52 +13:00
Colin Campbell
a8e1e54430 Bug 4309 Do not throw error on auth search of multiple fields
Ensures the multiple search does not throw a 500 error but
allows a single search to be used as well

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-24 20:15:51 +13:00
Chris Cormack
4656f32305 Merge remote branch 'kc/new/enh/bug_5551' into kcmaster 2011-01-24 07:24:40 +13:00
Chris Cormack
93ffca4eef Merge remote branch 'kc/new/bug_5586' into kcmaster 2011-01-24 07:21:47 +13:00
Robin Sheat
1bf3dd45df Bug 5551 - allow shelf browser filters to be changed
This adds three system preferences: ShelfBrowserUsesLocation,
ShelfBrowserUsesHomeBranch, and ShelfBrowserUsesCcode. These can be
toggled to determine whether the shelf browser will ensure that the
items being show will match against location, homebranch, or collection
code, respectively.

Note that this also involves a bit of a refactor to clean up the shelf
browser code.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-21 11:08:42 +13:00
Chris Cormack
a787b54bd9 Merge remote branch 'kc/new/enh/bug_5628' into kcmaster 2011-01-21 09:20:41 +13:00
Paul Poulain
129f05a5ec Bug 5634: BZ5634 order branch list alphabetically, without taking care of uc/lc
Perl separates uc & lc in cmp. So we just uc() to have list properly ordered

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-20 19:49:34 +13:00
Chris Cormack
be1a194d6c New icon set, renaming and making files in the intranet too 2011-01-19 14:42:46 +13:00
Mason James
f46b03cf2d Bug 4289: 'OpacPublic' feature
applied to git tag 'v3.02.00-rc'

Frédéric Demians:

  - Rebased this patch to HEAD
  - Solved a merge conflict
  - The patch works as described here:
    http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4289

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-19 14:30:34 +13:00
Colin Campbell
d22a4d2038 Bug 5026 Undefined dates formatted poorly in serials-edit
Don't display junk in empty fields
Don't generate errors

Merged some changes to make variable names moremeaningful in loops ( within loops)

Thanks to M De Rooy for spotting a couple of issues in the original patch

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-17 21:22:14 +13:00
Colin Campbell
a61db4986d Bug 5403 Remove DisplayISBN and GetPublisherNameFromIsbn
These two subroutines were no longer being used by any other code
removed them from their respective modules
If we need any ISBN in future we should use Business::ISBN directly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-17 19:40:08 +13:00
Zach Sim
53a301b8f2 Bug 5327 - Adding UNIT Tests.
Squashed commit of the following:

commit 146d14665c52edaa85e38b70aabc9d52be5d64b6
Author: Zach Sim <joseph.zachariah.sim@gmail.com>
Date:   Mon Jan 17 16:07:24 2011 +1300

    Edited DisplayISBN to cleanup the ISBN using _isbn_cleanup if it is not 13 or 10 digits long.

commit ba97b26d9a25470b0717cdd60a3d4f7a5c459ca9
Author: Zach Sim <joseph.zachariah.sim@gmail.com>
Date:   Mon Jan 17 16:06:14 2011 +1300

    Added extra unit tests to test C4::Koha::DisplayISBN.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-17 16:25:08 +13:00
a660b25aa0 Fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view
Fixed by doing a pretty dumb copy of GetMarcNotes. Functional,
but it could be there is a more efficient way to do it given
we want one repeating tag rather than a range of tags?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- fixed small typo in opac-detail
- corrected isbd punctuation in opac-detail
- tested with 0, 1, 2, 3 isbns in 020, MARC21
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-14 10:48:47 +13:00
Chris Cormack
be37db49fb Bug 5611: Simple typo fix in the comments 2011-01-13 08:17:27 +13:00
Colin Campbell
073fb1aee6 Bug 5611 Tidy up C4::Scrubber
Remove the unneeded package variables
Remove unnecessary variables
Removed some cargo-cult programming
Tidied the indentation from mix of tabs & spaces
Add a Test that we actually return the required class
of object

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-13 06:44:46 +13:00
Bryce Sanchez
e0d76bd88d Bug 5611 INIT block causes failure with mod perl
Per module INIT Blocks are not run in mod_perl so their
variables are not visible. A lexical var is adequate
for this purpose

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-13 06:42:57 +13:00
Colin Campbell
d4842d4560 Bug 5601 Fix processing of DueDate return
item duedate is not a datetime entity but a string retrieved
direct from the db that only needs restructuring
checkout was doing so but item_info was pretending it was in secs
(actually Item.pm manipulated then overwrote it!!)
assume the date in the db is correct (otherwise madness ensues)
dont try to second guess it
As duedates do not yet include a time element assume end of day
as a safety first

[F. Demians] I confirm Joe Atzberger diagnostic. That's a bug reported by a
library. I've tested Colin Campell solution. It fixes the bug.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 19:30:25 +13:00
Ian Walls
8185db4787 Bug 5603: advance_notice.pl uninitialized element in hash
Changings one of the LEFT JOINS in C4::Members::Messaging::GetMessagingPreferences
to a JOIN to prevent NULL message_transport_types from being returned

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 08:58:21 +13:00
Nahuel ANGELINETTI
15334926ad (bug #3737) fix title search in order history
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-11 08:57:07 +13:00
Chris Cormack
c0441ebbfb Merge remote branch 'kc/new/bug_5186' into kcmaster 2011-01-10 09:14:22 +13:00
Chris Cormack
9eaf969dfd Merge remote branch 'kc/new/enh/bug_5560' into kcmaster 2011-01-10 09:11:50 +13:00
Colin Campbell
d1172b98d9 Bug 5589: Remove duplicated Exports in Suggestions.pm
Rather bizarrely Suggestions.pm was setting up @EXPORT, @ISA
and $VERSION twice. Have removed one invocation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-10 09:00:34 +13:00
bbd50b2d12 Fix for Bug 5570 - item types not showing on other editions
The item type which shows on other editions is the biblio-level
itemtype. XISBN.pm had some item-handling code, but I'm
removing it because it is unused. The editions tab should
now display item type only if item-level itemtypes are not
enabled.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 14:18:09 +13:00
Joe Atzberger
3480ae1cac Bug 5586: Set SIP line-endings to proper SPEC-compliant \r
Line-endings have been a longstanding problem because
of variations in implementations.  But we should still try
to default to the correct thing.

This harmonizes part of Koha's SIP code with the current
SIPServer version, used in common with Evergreen.  Repo at:
    https://github.com/atz/SIPServer

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-07 10:05:11 +13:00
6d8f4f8868 Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl
Changes to list contents view to make it consistent with search results

My intention is to make the OPAC more consistent in the way it displays
lists of items, whether it be in search results, lists, etc. This patch
adds data to the list contents output and reformats it to that end.

The other significant change is the removal of jQuery table sorting.
Since list contents are both sorted and paginated on the server
side. Adding a client-side sort to one page of many doesn't make sense.

Other changes include:

- Change "Your lists" to "Your private lists"
- Remove "sort by" column because it seems unnecessary
- Adding logic to control display of count (item or items
  rather than item(s)
- Styling pagination bar and placing at the bottom of the page,
  consistent with other instances of pagination navigation

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-06 08:40:49 +13:00
1190833149 Bug 5375 (Update date/time last transaction (MARC 005) when saving authority record)
Update 005 date/time when saving authority record for MARC21 and UNIMARC.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 08:44:05 +13:00
76338220dd Bug 5374 (update transaction date when saving biblio) RESENT with small fix
Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.

I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 08:42:47 +13:00
4dda0b1ba0 Fix for Bug 5560 - pagination option for lists
This patch doesn't enable per-list pagination options,
but makes OPAC and staff client list display obey
the OPACnumSearchResults and numSearchResults system
preferences instead

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-01 07:30:55 +13:00
Chris Cormack
c5b55d1c40 Bug 5526: Follow up patch removing a warn statement 2010-12-29 20:36:37 +13:00
cdbf872bd5 Fix for Bug 5526, List of lists should be in alphabetical order by list name
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-29 20:35:16 +13:00
Chris Cormack
79fb4a8134 Bug 5542: Availability code commented out - Uncommenting
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-29 20:31:00 +13:00
Chris Cormack
28d9f9a398 Merge remote branch 'kc/new/enh/bug_5530' into kcmaster 2010-12-22 11:37:09 +13:00
Paul POULAIN
bea80d2948 mybranch not exported (merge pb) 2010-12-21 21:18:12 +13:00
Robin Sheat
8e5ee007db Bug 5186 - allow tax rates to be set to zero (master)
This allows the tax rate for a vendor to be set to zero. Previously, a
zero meant that the system default was used. Now, zero means no tax, and
to have it be the default the field should simply be left empty.
Additionally:
* this will now show on the vendor display if the tax value is from the
  system default
* this includes a database update that changes all the existing 0.00 tax
  settings to be NULL, which preserves existing behaviour.
* this now saves the tax value supplied for new vendors

Note: this patch applies against master

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 14:34:05 +13:00
Christopher Hall
023d6b9e36 fix for umlauts in templates, XSLT still buggy 2010-12-21 11:14:59 +13:00
Amit Gupta
21cae2609d Bug 5489: Send hold email to branch email address if it exists instead of koha email address
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-20 10:24:53 +13:00
324991fefd Fix for Bug 4946 - hold warning needs rewording
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:

- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out

I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:45:03 +13:00
Chris Cormack
2529527597 Bug 5508 : Updating copyright statements 2010-12-16 11:49:36 +13:00
Henri-Damien LAURENT
9bfcf01abd MT3801: Serials not received issues cannot be claimed
waiting issues which where planned for an old date were not "claimable"
This also fixes a bug from commit

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 16:52:56 +00:00
Henri-Damien LAURENT
63a8c5bc9d MT3801 followup : Cannot claim for issues
was missing an opening (
Adding test script

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:30:47 +00:00
Paul POULAIN
c401514b95 MT2743 : add filter on subscription branch to subscription claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:17:13 +00:00
Nahuel ANGELINETTI
99c0d2bf74 (MT #3110) fix repetable titles
This fix in serials search, for repeatables titles.
Now we use biblionumber to detect repeated serials.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:13:04 +00:00
Henri-Damien LAURENT
04dbd152f8 (MT 3035) subscription created expired
Subscription expiration date was not calculated on creation of a subscription
(cherry picked from commit 263e9217c8cd736924f66d699981949e29b4c200)

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 11:55:00 +00:00
Chris Cormack
718473bdd2 Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506 2010-12-14 21:07:15 +13:00
Robin Sheat
00dd0ae627 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>
2010-12-14 15:07:51 +13:00
Srdjan Jankovic
4d1762f5ec 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>
2010-12-14 13:49:15 +13:00
Colin Campbell
51dc5b060b Variable redeclared in same scope
lexical variable declared twice causing run time warnings

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:21:06 +13:00
Chris Cormack
2b25835464 Merge remote branch 'katrin/3381_intranetusercss' into new/enh/bug_3381
Conflicts:
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	kohaversion.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 12:24:59 +13:00
Chris Cormack
5278aa0ca4 Merge remote branch 'kc/new/biblibre_reports' into kcmaster 2010-12-14 06:31:00 +13:00
Katrin Fischer
c6a9141413 Bug 3381 - Add an IntranetUserCSS system preference
Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.
2010-12-13 08:01:41 +01:00
bdf4dd13af 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>
2010-12-13 09:51:15 +13:00
f36747f5e8 Fix for Bug 4473 - Recent comments view for the OPAC
- 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>
2010-12-13 09:43:01 +13:00
Koustubha Kale
e4cbc4f421 Bug 5418: Rev-5 patch new itemBarcodeInputFilter for libsuite8 style barcodes
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>
2010-12-12 20:39:20 +13:00
37a17d8fad 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>
2010-12-12 20:24:42 +13:00
Colin Campbell
aa6ce934d9 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>
2010-12-12 20:13:59 +13:00
Katrin Fischer
baf3f605ec Bug 4506: Add index Record-control-number = rcn for indexing of $w subfields
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-08 12:45:08 +00:00
e54169ba0f 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>
2010-12-07 09:29:05 +13:00
Colin Campbell
bc3dcdd733 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>
2010-12-02 08:53:53 +13:00
Colin Campbell
f08b33a912 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>
2010-12-02 08:51:33 +13:00
Ian Walls
31439fc51a 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>
2010-12-02 08:33:12 +13:00
Colin Campbell
b9ccc51841 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>
2010-12-01 10:05:51 +13:00
Chris Cormack
9c303a4e95 Merge remote branch 'kc/new/enh/bug_5430' into kcmaster 2010-11-30 07:02:18 +13:00
Katrin Fischer
f90f92f80f Bug 5430: Follow-up, fixes error message when no 001 exists
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 07:01:17 +13:00
d3df54d052 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>
2010-11-30 06:47:52 +13:00
994d6e2aac 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>
2010-11-30 06:47:52 +13:00
Chris Cormack
b1c2d560b6 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>
2010-11-30 06:47:52 +13:00
Katrin Fischer
703156daee Bug 5430: Add Control number as option to OPACSearchForTitleIn
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>
2010-11-25 08:26:33 +13:00
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
d13d96614b 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>
2010-11-18 14:22:56 +13:00
1bd67e28e5 Bug 5066 (Log timestamp consistently in _session_log)
Small fix with thanks to Galen.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-18 09:00:10 +13:00
Colin Campbell
b97c4dba7a 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>
2010-11-17 17:03:04 +13:00
d4f02c469b 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>
2010-11-13 20:19:12 +13:00
11d54188f8 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>
2010-11-12 14:31:56 +13:00
Chris Cormack
9c6db56a3f Bug 5385 - Fixing an error that crept in with the POD cleanup 2010-11-12 10:42:19 +13:00
Colin Campbell
c95b5153e0 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>
2010-11-12 10:26:56 +13:00
Andrew Elwell
9fa574f609 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>
2010-11-12 10:06:55 +13:00
Colin Campbell
a9010530a3 Bug 5105 - Remove use of depreciated Switch module
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.
2010-11-11 11:32:02 +13:00
Paul Poulain
84dbc926c0 MT2268 : Guided Reports Fix columns.def
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>
2010-11-10 19:38:03 +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
Colin Campbell
55b5d8a48e Bug 5023 Remove unused Serials Modules
Modules possibly added in error
Neither is called elsewhere in the system

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-20 16:05:37 -04:00
Chris Cormack
4d6b38c794 Merge remote branch 'kc/master' 2010-07-19 13:30:33 +12:00
Colin Campbell
ebf7f0cad0 Bug 5021 Formatting of undefined serials dates
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>
2010-07-16 08:34:44 -04:00
Chris Cormack
b2112eac49 Merge remote branch 'kc/master' 2010-07-15 09:08:57 +12:00
Ian Walls
f74e86ca30 Bugfix 3419: fixes typo in inequality.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-12 16:47:41 -04:00
Chris Cormack
4b26c389ef Merge commit 'kc/master' 2010-07-12 09:56:25 +12:00
Ian Walls
766e1475ab Fixes Bug 4978: longoverdues.pl claims undefined subroutine ModItem
Adds an explicit C4::Items:: prefix to the ModItem call on line 323

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-08 18:43:27 -04:00
Chris Cormack
89afee2810 Merge commit 'kc/master' 2010-07-08 15:02:45 +12:00
Henri-Damien LAURENT
6e0c124c9c error 500 when record cannot be loaded
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>
2010-07-07 12:38:26 -04:00
Chris Cormack
f46abf8b90 Merge commit 'kc/master' 2010-07-05 10:54:22 +12:00
64afbf1416 bug 3902: item class source can now be set during serials receiving
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 15:15:12 -04:00
573ac9488f remove a bunch of unconditional debug warns
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 10:57:08 -04:00
1457256b98 bug 4188: move PDF templates for printed purchase orders
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>
2010-07-02 08:49:44 -04:00
31d9011ebb Fix for Bug 3683 - 'Sort by' column in list interface is not translatable
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-25 13:23:43 -04:00
7c0e441d50 replace references to defunct info email address
Now links to Koha project website.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-25 05:18:44 -04:00
b1317464ec remove old revision history notes from a couple files
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-25 05:18:44 -04:00
Chris Cormack
f245998ac9 Merge commit 'kc/master'
Conflicts:
	docs/history.txt
2010-06-25 10:43:18 +12:00
Colin Campbell
6a1191bb3f Bug 4905 Runtime errors in about.pl
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>
2010-06-24 14:16:36 -04:00
360f985307 fix two broken calls to _FixPriority
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 07:55:39 -04:00
fcb21ec94c bug 4224: explicitly mark hold requests as being handled by item in transit
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>
2010-06-24 07:55:12 -04:00
d3b07c1889 More fixes for Bug 4423, Staff Client XSLT is just a copy of the OPAC one
- 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>
2010-06-23 22:50:29 -04:00
Ian Walls
6ba2b9c87c Fixes bug 3619: _send_message_by_email not respecting AutoEmailPrimaryAddress = 'OFF'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:14:27 -04:00
0700a8b732 bug 4896: granular permissions now always on (DB rev 138)
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>
2010-06-19 07:56:03 -04:00
Chris Cormack
4c14cd317e Merge commit 'kc/master' 2010-06-14 09:15:00 +12:00
Andrew Elwell
4370a19d75 Final batch of POD cleanups.
Should fix any remaining warnings with 'podchecker'

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:39:01 -04:00
Andrew Elwell
aa9b4d92cd POD Cleanups
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:59 -04:00
Andrew Elwell
546a0244bb More POD cleanups
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:58 -04:00
Andrew Elwell
2856bb8295 POD Cleanups - Few minor ones this time
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:57 -04:00
Andrew Elwell
8480f56370 Another batch of POD cleanups
Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:38:56 -04:00
Andrew Elwell
c6bf50d052 The start of some POD cleanups in C4/*.pm
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>
2010-06-09 08:38:55 -04:00
Colin Campbell
b3489aa045 Bug #4864 Add SIPServer Perl Module Dependencies
SIPServer requires Net::Server and UNIVERSAL::require

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 08:29:51 -04:00
Chris Cormack
aa06ac905a Merge commit 'kc/master' 2010-06-08 22:08:13 +12:00
f00f12f2c3 bug 4445: Upping the daily limit for XISBN
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 07:56:44 -04:00
Chris Cormack
bf14b288bd Merge commit 'kc/master' 2010-06-03 14:11:49 +12:00
Lars Wirzenius
3944230624 Add YAML as a dependency, since C4/Record.pm uses it.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-02 07:14:38 -04:00
Lars Wirzenius
2fcc4fe94e Add tools to update debian/control's build dependencies.
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>
2010-06-02 07:14:36 -04:00
Lars Wirzenius
6241d54c52 merged from upstream master 2010-05-26 16:14:04 +12:00
71a215f4bf bug 4386: fix email hold filled notifications
Call to GetMembers() was using the old parameter style.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 23:30:50 -04:00
ef58c445d3 removed needless imports of the YAML module
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>
2010-05-25 23:30:48 -04:00
64daee5495 fix a common "developement" typo
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 14:38:38 -04:00
b1ed3af633 bug 4311: respect OPACXSLTResultsDisplay
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>
2010-05-25 11:22:47 -04:00
8a25e80f99 bug 4801: fix paging in display of staged bibs and import batches
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>
2010-05-25 06:55:40 +12:00
0e8b468e1b bug 4801: fix paging in display of staged bibs and import batches
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>
2010-05-21 10:29:55 -04:00
Chris Nighswonger
bf2ea9b655 Backing down the required version of Graphics::Magick
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>
2010-05-19 16:55:37 +12:00
Chris Nighswonger
52df155480 Enhancement Bug 4444: Centralize Code Handling Perl Dependencies
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>
2010-05-19 16:55:36 +12:00
451b4cfb04 bug 4509: remove references to PINESISBN system preference
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>
2010-05-19 16:55:36 +12:00
Colin Campbell
17003e56df Bug 4507 Don't return null vendor to claims processing
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>
2010-05-19 16:55:36 +12:00
Chris Nighswonger
a7f56922eb Backing down the required version of Graphics::Magick
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>
2010-05-17 10:29:51 -04:00
Chris Nighswonger
1f32ecbc8e Enhancement Bug 4444: Centralize Code Handling Perl Dependencies
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>
2010-05-17 09:01:37 -04:00
60be9d291f bug 4509: remove references to PINESISBN system preference
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>
2010-05-17 08:59:10 -04:00
Colin Campbell
885d094090 Bug 4507 Don't return null vendor to claims processing
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>
2010-05-17 08:57:16 -04:00
Jane Wagner
fde1abd82e Bug 4394 REVISED Allow opaccolorstylesheet syspref to use an external URL
Previous code would only allow for an auxiliary stylesheet on the same server.  This checks for
http in the opaccolorstylesheet syspref.  If it's found, sets a different variable pointing to the
remote server location.  If not found, retains the previous css directory path.

Also modifies the description of opaccolorstylesheet in the installer files to reflect current
usage as an auxiliary stylesheet.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-05-17 12:32:46 +12:00
76d40d97da Revert "Bug 4450 Use more consistent error returns in C4/Creators/*"
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>
2010-05-17 08:36:26 +12:00
4d87724c78 Revert "Bug 4450 Use more consistent error returns in C4/Creators/*"
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>
2010-05-13 20:20:02 -04:00
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
J. David Bavousett
dd1ad2d3eb 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-12 07:40:33 -04:00
Paul Poulain
b83b603e9f 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-11 08:44:16 -04:00