]> git.koha-community.org Git - koha.git/log
koha.git
13 years agoBug 5995 : MT2892: Fix security issue in CAS intranet login
Matthias Meusburger [Fri, 5 Feb 2010 11:00:15 +0000 (12:00 +0100)]
Bug 5995 : MT2892: Fix security issue in CAS intranet login

Users could log in intranet using their cardnumber, with superlibrarian
rights.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_6770: removed doubled override increment when using AllowHoldPolicyOverride
Srdjan Jankovic [Tue, 6 Sep 2011 04:07:49 +0000 (16:07 +1200)]
bug_6770: removed doubled override increment when using AllowHoldPolicyOverride

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_5533: Improved marking items as lost
Srdjan Jankovic [Thu, 20 Oct 2011 01:21:26 +0000 (14:21 +1300)]
bug_5533: Improved marking items as lost

Call LostItem() whenever an item is lost
Disable lost status on catalogue item edit

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7078: Remove HTML::Template::Pro from Koha perl dependencies list
Ian Walls [Fri, 21 Oct 2011 18:41:03 +0000 (14:41 -0400)]
Bug 7078: Remove HTML::Template::Pro from Koha perl dependencies list

Removes HTML::Template::Pro as a requirement (since we're now on Template::Toolkit).

To test:

On a system without, HTML::Template::Pro installed, run perl koha_perl_deps.pl -m -u

Shouldn't return anything about HTML::Template::Pro

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7063: add available perl packages for Debian in install_misc/debian.packages
Ian Walls [Fri, 21 Oct 2011 18:16:51 +0000 (14:16 -0400)]
Bug 7063: add available perl packages for Debian in install_misc/debian.packages

Takes work done by Eduardo Trápani, alphabetizes, and adds two other packages:

libuniversal-require-perl
libgravatar-url-perl

From my testing, only CGI::Session::Driver::memcached remains missing; it is only
packaged for sid and wheezy at this time

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5995 Follow up: variable scope in koha/sco/sco-main.pl
Ian Walls [Tue, 18 Oct 2011 14:18:14 +0000 (10:18 -0400)]
Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl

The patronid value (cardnumber) set by checkpw in the case of SelfCheckoutByLogin
was improperly scoped with 'my' inside a conditional.  The changes followup to 5995
made this more apparent, causing logins to fail.

Also added "parts copyright" statement to the script, since ByWater Solutions did make some
significant contributions to the operations of the page

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7060 Followup: AddReturn needs GetMemberDetails
Ian Walls [Fri, 21 Oct 2011 14:49:58 +0000 (10:49 -0400)]
Bug 7060 Followup: AddReturn needs GetMemberDetails

In my haste, I overlooked circ/returns.pl's need for borrower flags.  This patch
changes back the call in AddReturn from GetMember to GetMemberDetails

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6854: Correct a double password encryption problem in import_borrowers.pl
Frédérick Capovilla [Wed, 7 Sep 2011 18:15:35 +0000 (14:15 -0400)]
Bug 6854: Correct a double password encryption problem in import_borrowers.pl

When the CSV file has no password column and no default value was set for
the password :
If we try to modify an existing user, the password from the BD is sent
to ModMember, which then encrypts the already-encrypted password a
second time.

http://bugs.koha-community.org/show_bug.cgi?id=6854

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug on current master.
1) Import new patron with password provided
> OPAC login works
2) Overwrite patron record, password provided
> OPAC login works
3) Overwrite patron record, password not provided
Before patch: OPAC login broken, password in database changed
After patch: OPC login works with same password as before

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 906ef4b28c376254743f948808e8ae47bb6f0a01)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting...
Marcel de Rooy [Mon, 17 Oct 2011 09:32:50 +0000 (11:32 +0200)]
7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter

Improving the cleanup_database.pl script in two aspects:
1) In some cases CGI::Session seems to place quotes around the atime and ctime
data in the a_session field. Two regexps now take this into account.
2) If the --sessdays parameter is used, the --sessions parameter is now
implicitly enabled too.

With thanks to Ian Bays and Tom Hanstra.

Signed-off-by: Ian Bays <ian.bays@ptfs-europe.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a7ee2993f02fb45f704c92ffdc49f840e05f5bd0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6094 Follow up for cleanup_database
Marcel de Rooy [Thu, 20 Oct 2011 07:57:12 +0000 (09:57 +0200)]
6094 Follow up for cleanup_database

Adds purging completed entries from need_merge_authorities table.
If you set dontmerge to ON, you need to periodically remove records.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7060: GetMemberDetails unnecessary in C4::Circulation
Ian Walls [Tue, 18 Oct 2011 23:55:22 +0000 (19:55 -0400)]
Bug 7060: GetMemberDetails unnecessary in C4::Circulation

Replaces all instances of GetMemberDetails with the more efficient GetMember.  Since
no hash values other than the borrowers table's fields are used in this module, the
transition is safe.

To test:

1.  Checkout a material; the page should load without error
2.  Renew a material: the page should load without error
3.  Return a material: the page should load without error

The above test plan invokes all the subroutines affected by this patch; any call to an undefined
value in a hashref should give a warning

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 769acee41ae258ea4efb0114eb7995736496a9cf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7057: CheckReserves uses GetMemberDetails unnecessarily
Ian Walls [Tue, 18 Oct 2011 21:56:18 +0000 (17:56 -0400)]
Bug 7057: CheckReserves uses GetMemberDetails unnecessarily

Replaces call to GetMemberDetails with a call to GetMember.  Much more efficient,
and since only branchcode is used, no required data is lost.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a1e3975067bf484f8d5f621e042e41baeb69d7b7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space
Katrin Fischer [Mon, 17 Oct 2011 20:04:53 +0000 (22:04 +0200)]
Bug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space

The item form on the order receive page (AcqCreateItem = on receive) contains a
lot of blank space which makes it hard to read and fill out.

To test:
- set AcqCreateItem = on receive
- create basket, order something, receive shipment
- check item form is nicely formatted and doesn't include lots of blank space

Note: It will be easier to test if you have an ACQ framework created to hide some
unnecessary subfields, because the hidden fields create the blank space.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Created an ACQ framework and hid some of the fields (hidden = 5). Before the
patch there were gaps between the fields as shown in the screenshot from
Katrin. After the patch fields line up nicely, with no extra space between
them.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7027: [SIGNED-OFF] Corrections to German web installer txt files
Katrin Fischer [Thu, 13 Oct 2011 21:47:16 +0000 (23:47 +0200)]
Bug 7027: [SIGNED-OFF] Corrections to German web installer txt files

Rephrasing, correcting typos, removing blank lines

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Does not break the web-installer and I'm assuming
Katrin is doing the right thing when it comes to
the German text, so signing off!

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.04.05.002
Chris Nighswonger [Tue, 25 Oct 2011 23:38:33 +0000 (19:38 -0400)]
Updating Version Number to 3.04.05.002

13 years ago6094 Fixing ModAuthority problems
Marcel de Rooy [Mon, 25 Jul 2011 09:33:23 +0000 (11:33 +0200)]
6094 Fixing ModAuthority problems

Only contains db revision to insert new table need_merge_authorities.
You can apply the revision by running
cgi-bin/koha/installer/install.pl?step=3&op=updatestructure. (Will not change
your version while testing.)

Oct 19, 2011: Rebased after functionality patch signoff.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6094 Fixing ModAuthority problems
Marcel de Rooy [Thu, 7 Apr 2011 08:14:08 +0000 (10:14 +0200)]
6094 Fixing ModAuthority problems

Pref MergeAuthoritiesOnUpdate does not exist; should be dontmerge
(AuthoritiesMarc.pm).

Instead of folder modified_authorities, now introducing a table for this
purpose: need_merge_authorities. This eliminates several permissions and
security issues. This change applies to AuthoritiesMarc.pm and
merge_authority.pl.

POD lines added for ModAuthority. Deprecated parameter $merge removed.

Test this patch by applying the db revision first from the second patch.

August 4, 2011: Rebased.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Thanks Marcel. It works as advertised. Both modes are functionnal
(back):

- Immediate with dontmerge=0: After modifying an authority record, its
  linked biblios are immediately modified. This isn't the case in 3.4.5.
- Delayed with dontmerge=1: After modifying an authority record, its
  linked biblios are not modified. But an entry is added to
  need_merge_authority new table and 'merge_authorities.pl -b' script
  updates biblios.

Comment: need_merge_authority, like zebraqueue, should be cleared
from time to time.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6553: parentheses in authors break tracings
Ian Walls [Mon, 3 Oct 2011 15:22:30 +0000 (11:22 -0400)]
Bug 6553: parentheses in authors break tracings

If an author's name includes parentheses or other escape-characters, the tracing links
produced in the OPAC and staff client fail in XSLT mode.  This patch wraps the author names
in double-quotes, providing the necessary escapement.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- Create a new framework, delete Thesaurus from 700 and other fields
- Create a new record in this framework
- Add 700$a - use parentheses
- Check the search links in OPAC and staff detail pages
> before patch link was broken, after it works

Note: Links are only broken when no authorities are being used.
When using authorities the link uses the auth number instead of the text
for linking, so the parentheses don't matter for search.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6253 followup: explicitly check ref value for ARRAY before casting
Ian Walls [Wed, 19 Oct 2011 15:46:21 +0000 (11:46 -0400)]
Bug 6253 followup: explicitly check ref value for ARRAY before casting

in C4::SQLHelper::_Process_Operands, $operand has been modified to be cast as an array ref
if the incoming $operand is not a ref.  However, the incoming $operand could be some other
kind of ref (hashref for example), which would case the dereferencing in line 419 to fail and exit.

Adding an explicit test for whether the ref is ARRAY seems to clear up this issue.

To test, run t/db_dependent/Members.t.  Before, it fails after test 3.  After, it completes all tests.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6972 : Followup fixing bad indentation
Chris Cormack [Wed, 19 Oct 2011 12:52:52 +0000 (01:52 +1300)]
Bug 6972 : Followup fixing bad indentation
(cherry picked from commit d50de1f040be4b6498cc054689f524fd7d13321f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6972: Hardcoded template paths to en in showmarc
Maxime Pelletier [Tue, 4 Oct 2011 18:32:08 +0000 (14:32 -0400)]
Bug 6972: Hardcoded template paths to en in showmarc

Couldn't help but reformat the indentation a bit.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Card view works correctly in cataloguing search.
Plain view/labelled show correctly in OPAC.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fixing merge conflict.
(cherry picked from commit 030fe0570f6ae2d0561756ee2168c1d3528af985)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6982 - Don't show MARC tag documentation links for NORMARC
Magnus Enger [Fri, 7 Oct 2011 11:38:15 +0000 (13:38 +0200)]
Bug 6982 - Don't show MARC tag documentation links for NORMARC

Links to UNIMARC documentation were being shown when marcflavour =
NORMARC. This patch hides the doc link functionality for NORMARC
by hiding:
1. The checkbox for turning doc links on/off
2. The hyperlinked questionmarks

This patch does not hide e.g. the JavaScript functions related to
the doc link functionality, in order to make it easy to add
doc links for NORMARC in the future (hopefully).

The doc link functionality was passing a variable called MARC21
(based on the contents of the marcflavour syspref) to the
template and testing the value of this to decide if MARC21 or
UNIMARC doc links were to be shown. I have replaced this variable
with he standard/full marcflavour syspref, in order to make it
possible to test for more then two MARC dialects.

To test:
- Set the marcflavour syspref to MARC21, NORMARC and UNIMARC, one
  after the other.
- Check that correct doc links are shown for MARC21 and UNIMARC
  on the cataloguing screen, and that no checkbox and no doc links
  are displayed for NORMARC.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described - thx for the great test plan!

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6285 strange order in CSV upload
Paul Poulain [Fri, 29 Apr 2011 17:31:40 +0000 (19:31 +0200)]
Bug 6285 strange order in CSV upload

uploading the circ overdues result in a csv with columns in a strange order
and not the order of the screen
This patch reorder the column by putting the usefull ones first

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f6043fbbe49eba279ee0635c43dd5a46a20eeb52)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5616: UTF-8 problem in Card View / Follow up
Marcel de Rooy [Mon, 10 Oct 2011 11:04:34 +0000 (13:04 +0200)]
Bug 5616: UTF-8 problem in Card View / Follow up

Decode data only if needed.
Add instruction to use UTF8 in html header.
Force utf8 on output handle.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Umlauts and other diacritics in card view of z39.50 search are now
correctly displayed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
  removed 2 commented lines

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6996: Encoding problem in opac-showmarc
Marcel de Rooy [Wed, 12 Oct 2011 12:43:53 +0000 (14:43 +0200)]
Bug 6996: Encoding problem in opac-showmarc

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No more encoding problems spotted.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6929 - ensure that koha-stop-zebra will try to stop everything
Robin Sheat [Wed, 28 Sep 2011 06:09:01 +0000 (19:09 +1300)]
Bug 6929 - ensure that koha-stop-zebra will try to stop everything

Currently, if it attempts to stop a zebra process that doesn't exist,
the script will abort, which leaves things running. This patch prevents
it from aborting.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aca414977ac3f16cec353c23c59a298ee828d24c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_6253: Unified member Search()
Srdjan Jankovic [Thu, 22 Sep 2011 14:43:12 +0000 (09:43 -0500)]
bug_6253: Unified member Search()

Removed SearchMembers() and replaced with more generic Search()
Amended Search() to try cardnumber first
Replaced SearchMembers() calls with Search()
Replaced SELECT with Search() where appropriate
C4::SQLHelper:
- added support for '' key for search filter.
- when passing an array to filter, join with OR (rather than AND)
- added support for key => [val1, val2] in filter
- did not document - there was no input documentation to start with,
  and SQLHelper should be replaced with something better anyway

Signed-off-by: Liz Rea <lrea@nekls.org>
(again - testing merge issue)
The functionality of the patch seems to be maintained with Biblibre's changes.

I tested the following:
Extended attribute searching: works
3 part name searching: works
2 part name searching: works
1 part name searching: works

From:
mainpage.pl
members-home.pl
Patron search limited by branch: Works
Patron search limited by patron category: works
Ordering by cardnumber instead of surname: works
The "Check Out" field in the masthead.

Circ Autocomplete is not reliably functional at this time, but the problem appears to predate this patch.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 18b8991cf1832a0ee79a526e6438b51fdb4f3208)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6526 - make the reserves code use the borrowernumber
Robin Sheat [Thu, 23 Jun 2011 09:09:30 +0000 (21:09 +1200)]
Bug 6526 - make the reserves code use the borrowernumber

Previously it used the cardnumber, which caused numerous issues if your
users don't have card numbers.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 218a35776e0e212567c15db4a486969debd67859)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7007: 490 series statements should appear when not traced
Jared Camins-Esakov [Tue, 11 Oct 2011 19:21:04 +0000 (15:21 -0400)]
Bug 7007: 490 series statements should appear when not traced

Although the MARC21 standard requires libraries to set the first indicator to
'0' when a 490 field is untraced, many libraries leave it blank. Previously,
this resulted in a blank line with the label "Series:" but no actual series
information. This patch fixes that by showing untraced series headings for
490s whenever the first indicator is not set to '1'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked that series shows correctly when first indicator is 0, 1 or not set.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7026 Web installer does not switch language
Frédéric Demians [Mon, 17 Oct 2011 06:03:29 +0000 (08:03 +0200)]
Bug 7026 Web installer does not switch language

Language installer should switch to template files of language selected in
first step. It used to do that, but the feature seems to be broken now. Web
installer remains English after selecting a different language.

To reproduce:

- make sure your database is empty
- run 'perl translate install <some language>
- access web installer
- select language other then en on the first page

=> templates should change to translated templates

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan provided works, correct language and sample files are selected.

In a second test I deleted the staff templates for de-DE and repeated
the steps. de-DE is not offered in the language selection of the web installer
now, but does appear in the opaclanguages list after running the web installer.
(Bug 5660)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1bf7550a82e7fc8b1c608fde3ff236af65b83dfc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7051 de-nesting C4::Reserve, 1st step
Paul Poulain [Fri, 16 Sep 2011 22:32:54 +0000 (00:32 +0200)]
Bug 7051 de-nesting C4::Reserve, 1st step

C4::Search is not used, so removing it from C4::Reserves
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7631bae2b2e5f6f2f71ddc4fe841816cd4688047)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7037 de-nesting C4/Print.pm
Paul Poulain [Fri, 16 Sep 2011 22:31:10 +0000 (00:31 +0200)]
Bug 7037 de-nesting C4/Print.pm

removing use C4::Circulation, that is useless

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 86e9c29f54e16a276889b10c1245ad1588147e35)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7036 de-nesting C4::Circulation
Paul Poulain [Fri, 16 Sep 2011 22:30:44 +0000 (00:30 +0200)]
Bug 7036 de-nesting C4::Circulation

Just removing use C4::Koha, as other packages are widely used.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 56b9412562599d1decabb27e7d4f562ec63c005a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7035 de-nesting C4::ClassSource & ClassSortRoutine
Paul Poulain [Fri, 16 Sep 2011 17:29:47 +0000 (19:29 +0200)]
Bug 7035 de-nesting C4::ClassSource & ClassSortRoutine

just removing use C4::Koha, that are useless

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 94b067b53c566c320478eb074e4250ed9c86b51d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7034: de-nesting C4/Branch.pm
Paul Poulain [Fri, 16 Sep 2011 16:09:57 +0000 (18:09 +0200)]
Bug 7034: de-nesting C4/Branch.pm

use C4::Koha was loaded only to call C4::Koha::get_infos_of in get_branchinfos_of

the sub get_branchinfos_of was used nowhere
(checked with "grep -R get_branchinfos_of *")
only one reference was made to get_branchinfos_of, in reserve/request.pl, but the sub was not used in fact (maybe removed previously & silently)

This patch removes sub get_branchinfos_of and use C4::Koha in C4::Branch, as well as the reference in request.pl and the t test

The patch doesn't remove use C4::Branch in reserve/request.pl, as it's still used for other subroutines.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 69732f5c62337a97269d8b0b09343805a970c6fa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6949: cannot remove owner from fund
Ian Walls [Thu, 13 Oct 2011 14:11:46 +0000 (10:11 -0400)]
Bug 6949: cannot remove owner from fund

The Javascript to remove an owner from a budget cleared the name from the screen, but did not remove
the actual value in the form, so when saving, the original owner was retained.

This patch adds the command to set the value to ''.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I could reproduce the bug on current master. Patch fixes the problem, fund
owners can now be added and removed without any problems.
Thx for providing a test plan!

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating perl version required to match reality
Chris Cormack [Tue, 18 Oct 2011 13:57:18 +0000 (02:57 +1300)]
Updating perl version required to match reality
(cherry picked from commit 5faaa7f13a17d29197b1bced3bd86731d61ee0d7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 7043 - masthead_search id used twice in template
Owen Leonard [Mon, 17 Oct 2011 15:51:16 +0000 (11:51 -0400)]
Fix for Bug 7043 - masthead_search id used twice in template

Changing ID of library selector, and moving inline styles to
the CSS as requested by kf in the bug comments.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 72f826963c20dfdc6c5934693089e3d3e83ec1ec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6983 - Item type filter on overdues report does not respect item-level_itypes
Owen Leonard [Thu, 6 Oct 2011 19:13:30 +0000 (15:13 -0400)]
Fix for Bug 6983 - Item type filter on overdues report does not respect item-level_itypes

This patch adds a check for the item-level_itypes preference
when building the SQL for the overdues report.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 15e846d74aa30d3bfa5222d009171313594590d7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 7044 OPAC Branch Selector Fix
Nicole C. Engard [Sat, 15 Oct 2011 02:39:56 +0000 (22:39 -0400)]
Bug 7044 OPAC Branch Selector Fix

There was a typo in the OPAC branch selector added by
the OpacAddMastheadLibraryPulldown preference where the
current branch wasn't selected. This patch fixes that typo.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5938eb306acc2668b00178d88f319ad18c93e775)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on
Owen Leonard [Thu, 13 Oct 2011 14:02:38 +0000 (10:02 -0400)]
Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on

The display of messages "to the patron" on the checkout screen
lacked the same logic controlling messages "to other librarians,"
affecting conditions under which the [Delete] link would be shown.
This match makes the two categories consistent with each other:
A delete link will be shown if the logged in branch matches the
branch where the message was set OR if AllowAllMessageDeletion
is turned on.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 7019 - Circulation History Sort Order Wrong
Owen Leonard [Thu, 13 Oct 2011 15:59:48 +0000 (11:59 -0400)]
Fix for Bug 7019 - Circulation History Sort Order Wrong

The return column sort was not using the right sort algorithm
because it was confused by the combination of date data and
text data ("Checked out"). I've added an explicit instruction
to sort by date. The downside to this change is that checked
out items are sorted with the oldest checkouts rather than
the newest:

Checked Out
Checked Out
10/14/1988
07/14/2005

Not perfect, but an improvement over completely incorrect
sorting. This patch also adds the necessary check for system
dateformat preference to properly sort metric dates.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bfaf07b2780ed033677683ef40ce04e55d7c2b3d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6942 - Add link to manual to help/authorities/authorities-home.tt
Liz Rea [Thu, 29 Sep 2011 17:31:09 +0000 (12:31 -0500)]
Bug 6942 - Add link to manual to help/authorities/authorities-home.tt

To test:
Verify link to manual shows on authorities home page in-app help.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
(cherry picked from commit 5affbfc9fd5b6e5974aa9e64d074235046359950)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6942 - Add link to manual to help/admin/admin-home.tt
Liz Rea [Thu, 29 Sep 2011 17:26:07 +0000 (12:26 -0500)]
Bug 6942 - Add link to manual to help/admin/admin-home.tt

To test:
Verify link to manual shows on administration home page in-app help.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
(cherry picked from commit a43974029205fb830eef8989b8a5899d0561840d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding another developer to the history
Chris Cormack [Sat, 15 Oct 2011 01:10:04 +0000 (14:10 +1300)]
Adding another developer to the history
(cherry picked from commit 1576e3f410b3c4914d1b803953f64e32c20d3e74)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6915 - [SIGNED-OFF] reduce module name truncation problem in koha_perl_deps.pl
Greg Barniskis [Mon, 26 Sep 2011 17:07:20 +0000 (12:07 -0500)]
Bug 6915 - [SIGNED-OFF] reduce module name truncation problem in koha_perl_deps.pl

Widen module name allowance in the format statement, adjust other
columns to be generous but not-so-much as before, modify report
header and footer print statements to align and clarify. Very very
long module names or version numbers are still subject to possible
truncation.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Sign off comment: With this patch module names are not truncated, which is an
improvement. Lines are still too long to fit an 80 column display, and so they
wrap around, but tht is a minor annoyance compared to the truncated names.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e5e5e3155e4c4b3f51415d08a324f84142e91f3d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6806 Fix encoding of title in subscription-add
Colin Campbell [Tue, 30 Aug 2011 13:58:36 +0000 (14:58 +0100)]
Bug 6806 Fix encoding of title in subscription-add

Port of Maxime Pelletier <maxime.pelletier@libeo.com>'s patch for
3.2 to TT
Stops the mangling of titles containing accented characters

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d010412c66a9291d13676ed7a3fbdaaf1b269b59)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6789: biblios with many items can result in broken search results link
Ian Walls [Thu, 25 Aug 2011 22:32:51 +0000 (18:32 -0400)]
Bug 6789: biblios with many items can result in broken search results link

This patch fixes an issue whereby biblios with many items (often > 500) would index,
but not the biblionumber itself, resulting in search results with a) inaccurate item counts
and b) no biblionumber to use in the link to the details page.  This is due to Net::Z3950::ZOOM  not providing
a mechanism for specifying different connection attributes; the maximumRecordSize ZOOM connection attribute,
if not specified, defaults to 1MB, which is less than the size of a MARC record with many, many 952 fields.  Since
it is unlikely we can fix Net::Z3950::ZOOM in a timely fashion, this patch aims to build a workaround on the Koha end.

This patch changes EmbedItemsInMarcBiblio to use append_fields instead of insert_ordered_fields,
so the 999$c will come before the item records.  It's VERY unlikely we will encounter more than 1MB of biblio-level MARC
content, as this would break the ISO-2709 standard by a large factor.

To this end, it also moves the fix_biblio_ids portion of get_corrected_marc_record out of rebuild_zebra.pl,
and makes it a part of GetMarcBiblio (right before EmbedItemsInMarcBiblio, so the 952s still come last).  fix_biblio_ids
is kept as a subroutine for the deletion portion of rebuild_zebra.pl, which still uses it.

It also uses the subroutine parameter in GetMarcBiblio to do the EmbedItemsInMarcBiblio action, rather than having
rebuild_zebra.pl perform it on the itemless record returned from GetMarcBiblio.  Simpler and cleaner that way.

To verify bug issue:
1. Find a biblio with over 700 items (or enough that the resulting MARCXML is greater than 1MB)
2. search for this biblio (in a search that would return multiple results, not just this title).  You should get the title in
the results list
3. attempt to click the link to this biblio's details page; the biblionumber should be blank, leading to a 404

To test solution:
1. Apply patch
2. modify the biblio slightly (click the 005 for example) and save
   OR manually add the biblio to zebraqueue for reindexing
3. after rebuild_zebra.pl -z -b -x runs, use the same search as above. The title should still appear.
4. click the link, and find yourself on the biblio detail page as desired

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4e95e94727b09b33d2f6c597bdd218a59dcc3681)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5995 Followup: checkpw was returning inconsistent values
Ian Walls [Fri, 14 Oct 2011 20:37:54 +0000 (16:37 -0400)]
Bug 5995 Followup: checkpw was returning inconsistent values

In the case of LDAP, checkpw was returning the cardnumber of there user, but it was being treated as the
userid.  This patch updates checkpw_ldap to return the cardnumber AND the userid, and updates checkpw to
uniformly return cardnumber and userid in all instances, so that whoever is authenticating can use the
desired value in the right way.
(cherry picked from commit dcb4ac77fbfd813cc0eb39e060b49a7b8d491016)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6970 - logout not redirecting to login page
Owen Leonard [Wed, 5 Oct 2011 13:53:02 +0000 (09:53 -0400)]
Fix for Bug 6970 - logout not redirecting to login page

For some reason the latest version of Firefox doesn't like
the javascript which empties the cart on logout. As Ian points
out, there is code which tries to redirect to "about:blank"
and close the window (since the main context of the function
is the Cart's popup window.

This patch adds a parameter to the delBasket function so
that we can pass a "popup" context to the function and
choose whether or not we want to ask JS to close the window.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d139d400b11e76f19ed208d4898d57f678acf9f4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating Version Number to 3.04.05.001
Chris Nighswonger [Wed, 19 Oct 2011 20:01:49 +0000 (16:01 -0400)]
Updating Version Number to 3.04.05.001

13 years agoBug 6862: Duplicate VOKAL Book icons
Ian Walls [Fri, 9 Sep 2011 15:17:19 +0000 (11:17 -0400)]
Bug 6862: Duplicate VOKAL Book icons

Removes duplicate VOKAL icons for Book.png and Book-32px.png.  Database updated in both
itemtypes and authorised_values tables to reflect change, so no icon loss should be seen

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug 5780 followup: RIS export now includes all URLs
Galen Charlton [Tue, 30 Aug 2011 19:27:27 +0000 (15:27 -0400)]
bug 5780 followup: RIS export now includes all URLs

Also cleanup whitespace and adjust the line ending per
bug 6769.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 72eeac56fdb967d3fcfb08fc3f8dfb56bf74e755)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5780 - Export the URI as part of a RIS export
Chris Cormack [Sun, 20 Feb 2011 21:29:48 +0000 (10:29 +1300)]
Bug 5780 - Export the URI as part of a RIS export

Squashed commit of the following:

commit 8486cd30caf879ddff93aaa5fab722838db946a1
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Feb 21 10:23:07 2011 +1300

    WR76962 - Fixing typos

commit f3ac9d9233db2b410fded112e16e54b27280af0a
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Feb 21 09:56:43 2011 +1300

    WR76962 - Extending RIS support to handle URI

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 412666e52b4e8f7bc5ae70f2b2978b1bd088a885)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6938 - replace two subscription fields that were incorrectly removed
Robin Sheat [Thu, 29 Sep 2011 05:05:49 +0000 (18:05 +1300)]
Bug 6938 - replace two subscription fields that were incorrectly removed

The "Note for OPAC" and "Note for staff" fields in subscriptions were
removed, but they are their own fields in the database and display in
other places too. This patch puts them back so that they can once again
be edited.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2f11d527a0749e86350d62055f289aaee9435848)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6925 : The way to show the plural of the word "Item" is not compatible with multi...
Juan Romay Sieira [Tue, 27 Sep 2011 16:53:52 +0000 (18:53 +0200)]
Bug 6925 : The way to show the plural of the word "Item" is not compatible with multilanguage

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 518710878972a72b8d7b306af571b7c543267ddd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6840 warning in logs
Paul Poulain [Fri, 2 Sep 2011 16:39:53 +0000 (18:39 +0200)]
Bug 6840 warning in logs

In staff interface, in search (catalogue/search.pl), there is a warning saying:
[Fri Sep  2 18:20:24 2011] search.pl: Use of uninitialized value $key in hash
element at /home/paul/koha.dev/koha-community/C4/Templates.pm line 227.

The problem happens when searching from the quick search toolbar, not when you
search from advanced search.
Investigating, it seems it's because the sort_by is not defined in this case.

This patch
* fixes the problem in Search.pl by setting the parameter only if there is a sort_by field
* modify te Template->param sub to get a better error message. Instead of having just "use of uninitia..." get the value you try to set to an empty key. Much easier to understand which line causes the problem

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6912 Test 008 presence in get CoinS function
Frédéric Demians [Sun, 25 Sep 2011 09:25:25 +0000 (11:25 +0200)]
Bug 6912 Test 008 presence in get CoinS function

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7621591ae697328798a44a95757352a147e33d72)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6885 Follow up to fix superlibarian permission check
Chris Cormack [Thu, 13 Oct 2011 02:54:48 +0000 (15:54 +1300)]
Bug 6885 Follow up to fix superlibarian permission check
(cherry picked from commit cdd798ec3216c6019adccc40935e93736ce4dc3b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6885 Allow superlib to delete items from any library
Frédéric Demians [Mon, 19 Sep 2011 17:53:38 +0000 (19:53 +0200)]
Bug 6885 Allow superlib to delete items from any library

When IndependantBranches syspref is enabled, a 'regular' user can only
delete items belonging to his/her library. But a superlibrarian should
have the permission to delete items from all libraries. He can't for the
time being. This is fix by this patch.

How to test?

- On a multi-libraries Koha, activate IndependantBranches
- Log in with a superlibrarian user
- Find a biblio with one item from another library than the user home
  library
- Click on Edit > Edit Items
- On the list of items, all lines have Delete link
- If you try to delete an item from another library than the user home
  library, deletion will fail.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b64dbb246c8f29ac1c5e40b88a1f26f8d207b18d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6278 Funny translation bug with XSLT subfieldSelect parameters
Marcel de Rooy [Thu, 1 Sep 2011 09:53:16 +0000 (11:53 +0200)]
6278 Funny translation bug with XSLT subfieldSelect parameters

This patch resolves the situation of translating the parameters at (meaning subfield a and t) of subfieldSelect by replacing at with a_t. This string will not be translated and the xslt function subfieldSelect just ignores the underscore.
It is a pragmatic and easy solution. Theoretically, we should look for a solution in the translation parser. This is much harder and would probably not result in better code in those modules.

Test this patch with the following remarks in mind:
1) This patch deals with XSLT. So you should enable XSLT at OPAC detail.
2) In English or any language not translating the word at: Just check if the links for a MARC 490, 773, 780 or 785 still work at the opac detail page.
3) For a language translating the word at (like Dutch where at becomes bij), you should first rerun your translation process (at least for the OPAC).
4) In that language: Check the results on the vernacular opac detail page for MARC 490, 773, 780 or 785. Without the patch, you would not see a link following e.g. the Series label (with 490 first indicator set to 1). With the patch, you should see a link now.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Pragmatic solution for an annoying problem.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 5898 - search to hold feature not clearing
Owen Leonard [Fri, 23 Sep 2011 15:49:37 +0000 (11:49 -0400)]
Fix for Bug 5898 - search to hold feature not clearing

Search to hold cookie is now cleared when the user loads a blank
circulation page and when the user logs out.

The user also now has the option to "forget" the current
search to hold patron by choosing an option from the
search to hold menu on the search results page.

Signed-off-by: Liz Rea <lrea@nekls.org>
Tested:
Forget <patron> from search to hold results clears cookie
Logging out clears the cookie - testing note: i had to clear my cookies and test fresh before this would work
Loading a blank circulation page (Check Out from the circulation-home) clears the cookie.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7f6656aff84b2e9e47dd3317e8c72d69aaa8e433)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6977 : Adds support for repeatable subfields when importing authorities.
Frédérick Capovilla [Wed, 5 Oct 2011 17:16:37 +0000 (13:16 -0400)]
Bug 6977 : Adds support for repeatable subfields when importing authorities.

Before this patch, if we tried to import an authority with multiple $x
subfields into a bibliographic record, only the last value get added
to the form.

All repeated values should now be sent to the form.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f97726406697f7973d2f8118049acaac2f95a3ed)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5630, follow-up
Paul Poulain [Fri, 2 Sep 2011 16:12:10 +0000 (18:12 +0200)]
Bug 5630, follow-up

Fixes chris comment 28, that was a consequence of Marcel comment 27
Recent error
[Thu Sep 01 14:22:45 2011] [error] [client 192.87.126.61] [Thu Sep  1 14:22:45
2011] opac-MARCdetail.pl: DBD::mysql::st execute failed: Unknown column
'limit_desc' in 'field list' at /usr/share/koha/testclone/C4/Auth.pm line 276.
Seems to come from this commit 9a3950f673c28688a2ead6514c3320e34ec0cc4c (5630
CAS Improvements)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5630 Followup: checkpw_ldap not imported
Ian Walls [Tue, 30 Aug 2011 14:41:10 +0000 (10:41 -0400)]
Bug 5630 Followup: checkpw_ldap not imported

If LDAP authentication is used, Koha barks that C4::Auth::checkpw_ldap is
undefined, which is true.  checkpw_ldap needs to be imported from C4::Auth_with_ldap,
like it was before the bug fix for 5630

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5630 CAS improvements
Chris Cormack [Wed, 30 Mar 2011 21:06:46 +0000 (10:06 +1300)]
Bug 5630 CAS improvements

Squashed commit of the following:

commit 0e13a5278e11b288e48190dc26f31e96d06598dd
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Wed Jan 19 21:24:39 2011 +0100

    Bug 5630 : fixing C4/Auth.pm

commit b55abc7a0dc1ca43b2610a27246293e9a9346e18
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Wed Jan 19 21:24:38 2011 +0100

    Bug 5630 : Adds CAS documentation

commit df0098a6a65465e6e734f99f65fb453dd3fa11d1
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Wed Jan 19 21:24:37 2011 +0100

    Bug 5630 : ilsdi service AuthenticatePatron doesn't with CAS syspref on

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
commit 31c8f0c0facfafae011ad24c9d458c50f2fad296
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Wed Jan 19 21:24:36 2011 +0100

    Bug 5630 : Adds the ability to authenticate against multiple CAS servers

commit 9d0def826135d5756533dc0dcf8e0a107d1ac8fc
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Wed Jan 19 21:24:34 2011 +0100

    Auth_with_cas : removing a warning

    $sth was defined twice in a function
    Removing the second definition

commit 5ee550e9a2bb7ab6bc09f14fced6ce0df8011eb0
Author: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date:   Wed Jan 19 21:24:33 2011 +0100

    Bug 6012 : MT 2270: CAS proxy

    CAS Proxy
    Examples included are now really usable

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 046c996c2fa8150b8c6a037976c9c22826e04b8b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 5459 - Holds not being shifted when merging biblios
Chris Cormack [Sun, 4 Sep 2011 23:02:19 +0000 (11:02 +1200)]
Bug 5459 - Holds not being shifted when merging biblios

Holds are now shifted and reordered by date placed.
Holds already marked waiting, or in transit are not reordered.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 71defcbc6c851f54da223c040aa5d95e0bd43b73)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixing line endings
Chris Cormack [Mon, 10 Oct 2011 09:10:41 +0000 (22:10 +1300)]
Fixing line endings
(cherry picked from commit fd052de5e179a26f9fec32141cc6d0f07b31ad9d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6992 - add missing tab chars to history.txt
Mason James [Sun, 9 Oct 2011 16:12:07 +0000 (05:12 +1300)]
Bug 6992 - add missing tab chars to history.txt

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6991 - correcting committer info and adding company to koha-team page
Mason James [Sun, 9 Oct 2011 14:15:44 +0000 (03:15 +1300)]
Bug 6991 - correcting committer info and adding company to koha-team page

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6667 Correct documentation of function
Colin Campbell [Thu, 4 Aug 2011 11:57:52 +0000 (12:57 +0100)]
Bug 6667 Correct documentation of function

Return list was documented as being in the reverse order
to how it is returned. Correct the perldoc description

also removed comments which did not help anyone trying
to make sense of this subroutine

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Just improving text comments. No code changes involved.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6817 Downloading the overdues as a file ignores the filters if the page isn't...
Frédéric Demians [Mon, 5 Sep 2011 05:50:29 +0000 (07:50 +0200)]
Bug 6817 Downloading the overdues as a file ignores the filters if the page isn't in english

F. Capovila patch ported to TT.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f7387f27daa110c9165a5d69024bd5b4fad0757e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6371 Item Types description not properly displayed if not pure ASCII
Frédéric Demians [Thu, 19 May 2011 04:54:38 +0000 (06:54 +0200)]
Bug 6371 Item Types description not properly displayed if not pure ASCII

In several places, C4::ItemType module is used to retrieve item types
and their description. If the description text contains non-ASCII
characters, those characters are not properly displayed.

This bug can be seen in:

  - 4xx plugin of a UNIMARC DB
  - Home > Admin > Item circulation alerts
  - others?...

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
  - Fixes display probems in circulation alerts and 4xx UNIMARC plugin
  - display in other places looks ok with and without patch

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7d599afe6d044db30f4ba7c233fce774dd8020d2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6959: can't import record via Z39.50 from MARC edit page
Ian Walls [Tue, 4 Oct 2011 17:24:05 +0000 (13:24 -0400)]
Bug 6959: can't import record via Z39.50 from MARC edit page

JS to call Z39.50 popup wasn't updated to reflect the change ID values, so the frameworkcode passed was
"undefined" instead of "Default"

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 4223 - Too much serials info - design work needed
Owen Leonard [Wed, 28 Sep 2011 13:58:04 +0000 (09:58 -0400)]
Fix for Bug 4223 - Too much serials info - design work needed

This patch reimplements the changes suggested in the original
patch. It puts each main section of the display into its own
tab.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 77d69d1bebbe1b20fd35b39e4be1afda2a899b8a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6048: printoverdues.sh bash odities
Jonathan Druart [Thu, 7 Apr 2011 15:08:48 +0000 (17:08 +0200)]
Bug 6048: printoverdues.sh bash odities

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Note: this script really needs a rewrite, but this patch does fix up the
things it's supposed to fix up.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cfe8b6bd9a4f1921cb728d784083300344bcf2b1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6786: False detection of index names in Search; make index names case insensitive
Marcel de Rooy [Thu, 25 Aug 2011 11:12:38 +0000 (13:12 +0200)]
6786: False detection of index names in Search; make index names case insensitive

Fixing the regex to detect index names in ccl queries.  Changing loop
structure: looping through the index candidates in the query is faster than
testing every index name with a regex.  Making the index comparison case
insensitive will benefit users misspelling the case of an index; Zebra does not
care about it.  Test the change by searching on a word followed by a : or =
character.  Previously, when that word contained an index name like an or nb,
the search would crash.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Perltidied the new block to fix indentation

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6769 Getting rid of some RIS errors/warnings
Marcel de Rooy [Wed, 24 Aug 2011 14:12:52 +0000 (16:12 +0200)]
6769 Getting rid of some RIS errors/warnings

Removing unnecessary warnings. Some were based on errors in the script. Others are removed by adding debug flag and disabling debugging mode by default.
Adding carriage returns for Windows users, assuming that it does not hurt the Linux users. (Perhaps a future option?)
Test it with: http://yourserver.com/cgi-bin/koha/opac-export.pl?bib=yourbibnumber&format=ris&op=export [replace server and biblionumber]

Revision of Aug 24: Fixed two missing newlines too.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
  (removed comment "240811 marcelr during QA"

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years ago6584: Enable searching on Zebra's Bib-level index
Marcel de Rooy [Wed, 13 Jul 2011 13:05:16 +0000 (15:05 +0200)]
6584: Enable searching on Zebra's Bib-level index

Bib-level is already indexed in MARC21 record.abs.
But you cannot search this index, because it is commented in ccl.properties and
not listed in getIndexes of Search.pm.
This very simple patch does only do those two things.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f02796d989a377266a844e5b498945372a2a254f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6953 - Value builder for NORMARC 007 does not show further options
Magnus Enger [Sat, 1 Oct 2011 15:43:55 +0000 (17:43 +0200)]
Bug 6953 - Value builder for NORMARC 007 does not show further options

A previous commit introduced a missing TT control structure, but
forgot to include the trailing "\" for multiline JavaScript.
This patch simply adds the missing "\".

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6600, Library name linking wrong if current location is different
Owen Leonard [Tue, 19 Jul 2011 13:12:30 +0000 (09:12 -0400)]
Fix for Bug 6600, Library name linking wrong if current location is different

GetItemsInfo in Items.pm includes this join:

LEFT JOIN branches ON items.homebranch = branches.branchcode

This means that the branch URL (from the branches table) comes out
as the URL for items.homebranch, thus the URL in the holdings
output is the item's home branch even though the display might
be showing a different current location.

This patch changes the join to use items.holdingbranch. The join
was originally added to fix Bug 3702, and based on the description
of that feature I'm assuming this change is not harmful to other
usages. However, it does make the assumption that the item's
current (holding) branch is the branch we want to see information
about.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBZ6268 follow-up for the form
Paul Poulain [Wed, 29 Jun 2011 19:10:34 +0000 (21:10 +0200)]
BZ6268 follow-up for the form

This follow up fixes cait request to calculate the form like the budget

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6268: (MT #6408) Bad Total in basket.pl
Paul Poulain [Mon, 23 May 2011 09:27:07 +0000 (11:27 +0200)]
Bug 6268: (MT #6408) Bad Total in basket.pl

The total_est_gste or gsti is computed on the total_rrp_gste or gsti.
But in the budget this amount is the summ of discounts computed for each line.
Due to the rounding to 2 decimal places this produces a difference in Funds view with Total sublevels spent.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d0b3ef9c2840633ae9860b66babeba3cb453b1b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6076: acqui pdf error when marcxml wrong
Jonathan Druart [Fri, 8 Jul 2011 09:13:41 +0000 (11:13 +0200)]
Bug 6076: acqui pdf error when marcxml wrong

when marcxml is wrong the PDF is not generated. There is a Perl error
because
the biblio can't be retrieved.
This can be workarounded with a eval when decoding the marc

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBZ6074: setting import flag when staged file imported in aqbasket
Paul Poulain [Tue, 5 Apr 2011 20:11:15 +0000 (22:11 +0200)]
BZ6074: setting import flag when staged file imported in aqbasket

Lines issued from a staged file have a flag that can be set when the order has
been added in a basket. It's set when a staged file is imported into the
catalogue, it should be set also when a record is inserted through aquisition.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Add order from staged file to a new basket
- Add single order from one item
- Import rest using the bulk feature
- Staged file will no longer be shown after all titles
  have been ordered and import_status in import_batches
  is correctly  set to 'imported'

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agobug_6974: bugfix: do not create empty record before building input for new biblio
Srdjan Jankovic [Thu, 6 Oct 2011 00:55:47 +0000 (13:55 +1300)]
bug_6974: bugfix: do not create empty record before building input for new biblio

It messes up javascript default values

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4c1ea37e6366fc7a17ece602f73de4d7ebfbd279)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6958 : Fix for leading spaces being stripped on translation
Chris Cormack [Mon, 3 Oct 2011 21:43:45 +0000 (10:43 +1300)]
Bug 6958 : Fix for leading spaces being stripped on translation

This will re-add any leading spaces, so formatting is not messed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
- all examples from the bug report are fixed now
- verified system preferences are still translated
- verified xslt displays are still translated
- verified javascript alerts are still translated
- verified switching languages works

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 873091dcc84de8856a1da936ab0045351273cc53)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6867: Date last seen ignored on import
D Ruth Bavousett [Tue, 4 Oct 2011 14:37:33 +0000 (07:37 -0700)]
Bug 6867: Date last seen ignored on import

The date last seen field (952 $r) and replacement price date (952 $w) were being
ignored on import, being replaced with NOW() as a hardcoded value.  This patch will
allow a value to be imported, but if none is, it will use the ISO date of import
as a default.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6633: SCO return button doesn't work
Ian Walls [Tue, 27 Sep 2011 18:09:45 +0000 (14:09 -0400)]
Bug 6633: SCO return button doesn't work

A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
the fines column even if no fines column header was displaying.

This patch adjusts the scope of several T:T variables on the sco-main template to fix this

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>
(cherry picked from commit a291cc52ca79ed11e0032e73b380b17f3bf308cb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
Ian Walls [Wed, 21 Sep 2011 15:08:33 +0000 (11:08 -0400)]
Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname

In the 5 places in the label editor, the user's current branch is determined by taking
the LoginBranchname and doing a reverse look up for the branchcode.  This is an unnecessary
query, since C4::Context->userenv has the immediate access to the branchcode; this is how
it's summoned in all other points in the Koha code.

This addresses bug 6673 because, since the move to T:T, the call in tools/manage-marc-import.pl
has used in correct syntax:  $template->param('LoginBranchname') instead of $template->{VARS}->param('LoginBranchname')

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 973371a68b1c2a8af7d90afab8db15bda567f606)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoUpdating history and about file
Chris Cormack [Tue, 27 Sep 2011 20:53:34 +0000 (09:53 +1300)]
Updating history and about file
(cherry picked from commit 405ee6844d835322621bad4cfcfa8c359e8878f7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6927-- Typo in C4::Overdues.pm
Liz Rea [Tue, 27 Sep 2011 14:08:33 +0000 (09:08 -0500)]
Bug 6927-- Typo in C4::Overdues.pm

Corrected a small typo in overdues.pm to fix a "Undefined subroutine &C4::Members::checkoverdues called at /home/koha/kohaclone/C4/Members.pm line 511." when making calls to GetMemberDetails

This fix suggested by Elliot Davis of UT Tyler, and he did the testing -- I'm just submitting the fix to master for him.  :)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFix for Bug 6872 - Can't set default SMS messaging options for patron category
Owen Leonard [Thu, 15 Sep 2011 13:42:38 +0000 (09:42 -0400)]
Fix for Bug 6872 - Can't set default SMS messaging options for patron category

Passing SMS driver preference value to the template so that SMS
options can be displayed when appropriate.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5d5c4a67ec5c91770583edb38ce0213dfa6119c7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6801: checkoverdues returns unnecessary fields, causing slowness
Ian Walls [Wed, 31 Aug 2011 18:43:09 +0000 (14:43 -0400)]
Bug 6801: checkoverdues returns unnecessary fields, causing slowness

Explicitly specifies which fields to return in C4::Overdues::checkoverdues
SQL:  all of biblio, items, and issues, and everything in biblioitems
EXCEPT marc, marcxml and timestamp.

Bug 6801: member details page taking long time to load when many checkouts present

This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
subroutine was being run for every single item a patron (or their relatives) have checked out.
Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.

Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).

Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].

Signed-off-by: Liz Rea <lrea@nekls.org>
On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
With this patch, the time is reduced to 5 or so seconds.

Big ups to Ian for tenaciously hunting this one down.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 4841: biblio-level itemtypes not searchable in advance search by itype
Larry Baerveldt [Thu, 22 Sep 2011 20:36:05 +0000 (16:36 -0400)]
Bug 4841: biblio-level itemtypes not searchable in advance search by itype

Mapping 942$c into itype index along with 952$y; this allows for biblios without any items, but with a biblio-level itemtype to be retrieved in search. This is particularly useful for E-books or Serials without barcoded items.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoAdding new developer to history
Chris Cormack [Mon, 26 Sep 2011 01:40:13 +0000 (14:40 +1300)]
Adding new developer to history

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T...
Janusz Kaczmarek [Sun, 5 Jun 2011 21:41:03 +0000 (00:41 +0300)]
Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)

A corrected version of the patch of 6 June 2011.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoFixing a broken test
Chris Cormack [Sun, 25 Sep 2011 22:55:58 +0000 (11:55 +1300)]
Fixing a broken test
(cherry picked from commit 7244d5060be46f0b7154b897d28997970774957d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug:6781--Log membership renewal
Meenakshi.R [Mon, 29 Aug 2011 11:06:25 +0000 (16:36 +0530)]
Bug:6781--Log membership renewal

If patron related logging is tuned on, log membership renewal

Signed-off-by: Amit Gupta <amit.gupta@osslabs.biz>
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8b75f5b38c00609299d7b6ed14bb5a08540f2675)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
13 years agoBug 6649 Allow help screens editing
Frédéric Demians [Sat, 17 Sep 2011 07:09:23 +0000 (09:09 +0200)]
Bug 6649 Allow help screens editing

edithelp.pl hadn't been updated to allow help screen editing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Only a note: Apparently you need to be 'superlibrarian' permission
to edit help pages.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>