Commit graph

14497 commits

Author SHA1 Message Date
Chris Cormack
0dae6dca92 Bug 6611 : With the change to making cardnumber a nullable field, we need to pass it around when we are updating borrowers, to make sure we don't null it
Tested with every small edit link on moremember.pl.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-27 08:51:39 +12:00
9db5fa227f Fix for Bug 6622 - Remove closing style tag from staff-global.css
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-25 15:41:34 +12:00
Chris Cormack
bd73c9f9ce Merge remote-tracking branch 'kc/new/enh/bug_5917' into kcmaster 2011-07-22 08:53:09 +12:00
d8bf9e6a29 Follow-up fixes for Bug 5917, Switch Koha to use Template::Toolkit
While fixing Bug 6395 I found a few other instances of leftover
TMPL usage.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-22 08:50:02 +12:00
Chris Cormack
80ba84159d Fixing missing padding on module version 2011-07-21 20:04:02 +12:00
Ian Walls
c414c11d64 Bug 6613: CSV basket export columns misaligned
Removes 'line' heading, since it does not correspond to any existing field name, and it pushes the fields
over by one ('ordernumber' is used to denote the ordernumber).

This patch also optimizes the GetBasketAsCSV subroutine a bit; it removes an unnecessary call to GetBiblioData,
since the order information retrieved from GetOrders already contains every field in koha.biblio and koha.biblioitems

This patch also removes the explicit sort done by publishercode, since the information returned by GetOrders is
already ORDER BY'ed, first by publishercode, then by title (there was a FIXME note in GetBasketAsCSV to do this, but
it's already done, so... :) )

To Test:
1.  Create a basket with at least three orders:  one from one publishercode, and two from another
2.  Be sure to leave out any "\n" in your Order Notes, lest you fall prey to bug 6614!
3.  Export the basket
4.  You should see the orders sorted first by publishercode, then by title
5.  Columns should line up correct all the way through

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-21 09:56:33 +12:00
0699c8af84 Fix for Bug 6612 - Sort pulldown for messages in alphabetical order
The values in the menu come straight out of GetAuthorisedValues(), which sorts
its results by "category, lib, lib_opac." Rather than trying to re-sort the
data in circulation.pl this patch changes the template to show 'lib,' the
description, instead of the authorised_value. That will make the output
match the column which is being sorted.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-21 09:50:18 +12:00
203de2452e Fix for Bug 6484 - due date sorter on 'my summary' missing
Columns on the summary table are shown or hidden based on a
variety of different settings, leading to convoluted if/else
template constructions if we want to define header sorting
in the <script> block. Using the jQuery Metadata plugin
allows us to specify sorting options as classes on the
table header. This adds a dependency but simplifies the
template markup significantly.

I recommend continuing to specify header sort options in the
<script> block in cases where it is relatively simple to do
so and saving inclusion of the additional jQuery plugin for
pages which really need it.

Other changes: Moved common sorter configuration detalis to
default declaration; Moved the date due column so that it
could be set as the default sort without taking into account
multiple disappearing columns (default sort cannot be set
in the markup for a <th>).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-21 08:20:12 +12:00
6e2e58107f Fix for Bug 6608 - Date-pickers broken on guided reports pages
Template variable scope errors.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-20 09:36:20 +12:00
9d21892cec Fix for Bug 6601 - dictionary items not adding to query
T:T variable scope error.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-20 09:32:18 +12:00
bd6404608a Fix for Bug 6599 - Don't show dictionary definition table if there are no definitions
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-19 19:34:29 +12:00
9a2fd1bb7e Fix for Bug 6596 - Acq framework has white space for hidden fields
Moving the "hidden" style from the <div> inside the <li> to the <li> itself.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-19 19:31:44 +12:00
Katrin Fischer
d80659ce35 Bug 6589: Adding supplements broken
To test:
- add a new subscription, choose 'create items on receive'
- receive some issues and create items > should work ok
- create a supplement, alone or at the same time as receiving a normal issue
- check if item was created and attached to the biblio record

Without patch this should give you an error message. Although supplement will be created,
no item will be added to the bibliogrpahic record.

With patch applied there should be no error message and the item should be created
and attached to the proper record.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-19 19:22:31 +12:00
c8c019e07f Fix for Bug 6578, serial items have misaligned columns in holdings table
It looks like a variable name got changed in the T:T transition.
This correction uses the H:T:P template for reference.
2011-07-17 20:43:51 +12:00
Ricardo Dias Marques
71d22ab827 Bug 6503 - Variable $sth is declared 3 times (with keyword "my") in "makepayment" sub of "Accounts.pm"
In the code available today (14-Jun-2011), in Koha git's "master" branch,
the file "Accounts.pm" (in the "C4" directory) has the variable "$sth"
declared 3 times in the "makepayment" sub. This causes the following
warnings to appear when running "make test" in Koha installation, for
several tests:
t/Heading.t ......................... "my" variable $sth masks earlier declaration
in same scope at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 172.
"my" variable $sth masks earlier declaration in same scope at
kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 188.
[...]
t/ILSDI_Services.t .................. "my" variable $sth masks earlier declaration
in same scope at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 172.
"my" variable $sth masks earlier declaration in same scope
at kohaclone/blib/PERL_MODULE_DIR/C4/Accounts.pm line 188.
[...etc...]

Therefore, I'm removing the "my" keyword from the declarations of "$sth"
in lines 172 and 188 of "Accounts.pm".

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-17 20:41:02 +12:00
Janusz Kaczmarek
f16abec68a Bug 6480 - Koha produces a lot of apache logs for UNIMARC
For Koha with UNIMARC a lot of entries in apache log lines are produced.

In the patch, corrections to the GetCOinSBiblio function has been introduces,
in the UNIMARC section: (i.e. || '' at the end of lines that can create this
problem) -- analogous as it is in the MARC21 section.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-16 20:25:31 +12:00
Liz Rea
1a17c0d6bd Bug 6478 -- add purge_suggestions.pl to the crontab.example
To test:
Verify that there is a listed job for purge_suggestions.pl in the crontab.example

Bug 6478 - adding --days support and help verbiage to the cronjob.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-16 20:23:20 +12:00
Chris Cormack
408543294e Merge remote-tracking branch 'kc/new/bug_6476' into kcmaster 2011-07-16 20:21:47 +12:00
Ian Walls
94e3177983 Bug 6476 Followup: more Baker and Taylor bookcover fixes
The T:T variable was also wrong in 6 other instances, and needed to be updated from
'BakerTaylorBookstoreurl' to 'BakerTaylorBookstoreURL'.

Scoping issues also present on most all instances
2011-07-16 20:20:54 +12:00
efc0851a49 6083: Adding some version numbers and newlines to improve output in web installer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-16 20:17:47 +12:00
0132b52f0d Alternate fix for Bug 5876, New permission for overdues report
Original fix included a change for offline circ that depended
on a fix for another bug. This patch adds only the permission
for the overdues report and is formatted for TT.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-16 20:13:10 +12:00
Colin Campbell
306dc79217 Bug 5453 : Move declarations out of conditionals
Patched for C4 Modules

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:24 +12:00
Colin Campbell
b5b71339f3 Bug 5453 Move declarations out of conditionals
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:23 +12:00
Colin Campbell
af3c7d4ce7 Bug 5453 Move declarations out of conditionals in opac
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:22 +12:00
Colin Campbell
4a3ce35f2f Bug 5453 Move declarations out of conditionals
Fix im members scripts

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:22 +12:00
Colin Campbell
129d97df97 Bug 5453: Move declarations from within conditionals in catalogue/search.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:21 +12:00
Colin Campbell
df6ba9bc5f Bug 5453: Move declarations out of conditionals
Patch admin/*.pl scripts

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:20 +12:00
Colin Campbell
827b8c4c46 Bug 5453 Do not declare variables in conditionals
Removed occurences in acqui/*.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 15:50:19 +12:00
Frédérick Capovilla
a8fe55124e Bug 5867 : Improved the email checking when sending "Hold filled" notices.
The subroutine for sending HOLD and HOLD_PRINT notices only checked the
"email" field of the borrowers table and didn't check the value of the
AutoEmailPrimaryAddress preference. With this patch, "Hold filled"
notices can now be sent using the other email addresses of the member.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5867
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-15 11:10:00 +12:00
Zeno Tajoli
fa203e9761 Bug 5462: Update of the italian sql files The bug is about strings that are used as variables by Template::Toolkit The strings need to be like valid perl variable names. To fix the bug we need to fix also .sql files. Others .sql files are OK. Italian .sql file needs this fix
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-15 10:59:19 +12:00
05e90ad0f4 Fix for Bug 6587 - Tag moderation lost colors
T:T variable scope error. Also correcting T:T
variable error with row numbering.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 09:51:01 +12:00
1b0a8e997b Fix for Bug 6586 - calendar showing the wrong event type when editing
This bug must have been present for a while. There wasn't proper
handling of repeating yearly holidays when it came to the label.

To be clear, I believe this bug only affected holidays which repeat
yearly on the same date.

Instead of correcting the label to match the existing scheme I
added a new color code and label so that there are now two styles
for yearly and weekly repeating holdiays. This makes it more
clear what kind of repeating holiday you're looking at (rather
than having one color code for both).

After applying this patch, new and existing holidays which
repeat yearly on the same day should be color-coded orange and have
a 'Holiday repeating yearly' label. Weekly holidays are now
labeled 'Holiday repeating weekly.'

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 09:45:16 +12:00
0d8f8ce99d Fix for Bug 6570 - unlabeled box on funds form
The cause was a missing </select>, an error which wasn't
picked up by the HTML validator. Firefox 3.6 didn't have
a problem with it, but newer browsers must be changing
the way they accommodate markup errors.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 09:43:46 +12:00
4c58011f48 Fix for 6426 - messaging not showing on patron categories
T:T variable name problems were causing the problem.

I used this opportunity to change the way the data is
output: Now the messaging preferences are only output
if there is a current setting.

Also corrected the js table sorter configuration for
the right columns and moved the template-based table
row striping to the tablesorter plugin config.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-15 09:40:01 +12:00
f4892799e5 Fix for Bug 6577 - columns misaligned on serials search results
Minor T:T variable scope problem

[2011.07.12] I confirm the bug and the solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-14 10:38:48 +12:00
Dobrica Pavlinusic
b79c4c88a9 Bug 4994 - Net::LDAP returns lowercase names
This requires us to specify all LDAP mappings in koha-conf.xml in lowercase,
instead of original case used withing LDAP.

Compare readability of

<userid      is="hrEduPersonUniqueID"  ></userid>

(which doesn't work) with required (and non-intuitive)

<userid      is="hredupersonuniqueid"  ></userid>

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-14 10:36:33 +12:00
7b1ca473cc Fix for Bug 6573 - Library name entry field enforces unnecessary maxlength
Removing maxlength from branches.tt and other admin templates
which enforce it unnecessarily. Correcting other maxlengths
which do not match the database structure.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-12 20:01:51 +12:00
7f095be74a Revised fix for Bug 6133 - Authorised values administration, warn for modifs
- Reformatted for T:T
- Changed wording slighly
- Styled message with new "note" style for non-dialog messages
- Added correct alert style to existing error message

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-12 19:59:04 +12:00
Ian Walls
358a3b364a Bug 5197: add <<today>> token to notices
implements for Overdue notices
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-12 19:52:59 +12:00
Chris Cormack
1d0bdecd4b Merge remote-tracking branch 'kc/new/bug_2505' into kcmaster 2011-07-11 21:09:25 +12:00
Colin Campbell
ffa86e29b5 Bug 2505: Suppress some warnings emitted by members-home.pl
an undefined value in branch and the undef selected
can generate a large amount of warning noise

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-11 21:05:37 +12:00
Nicole C. Engard
afe52ddc90 bug 6558 correct description for IntranetNav
IntranetNav says the HTML will appear in the More
menu, but it appears to the left of the More
menu. This patch fixes the preference description.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-10 21:20:58 +12:00
f789331148 Fix for Bug 6531 - clicking print button in opac causes 404 error
opac-detail and opac-ISBDdetail both use window.print(), so I've
added that to opac-MARCdetail as well. I've also eliminated the
"javascript:" pseudo-protocol because it's pointless. I'd
prefer to have a real link for non-js users but that will have
to wait for another bug.

After applying this patch users with JS enabled should get a
print prompt after clicking the "Print" link on opac-MARCdetail.pl

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-10 21:18:29 +12:00
Ian Walls
90dc391e1a Bug 6476: Baker & Taylor content not working
Template Toolkit scope issue.

To Test:
1.  Disable Amazon and Google bookcovers
2.  Enable Baker and Taylor images
3.  put SOMETHING in the BakerTaylorBookstoreURL system preference
4.  check the source of opac-results.pl and opac-detail.pl, and see that SOMETHING in place between "https://" and the normalized ISBN

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-10 21:15:01 +12:00
Paul Poulain
b6a28b1bee BZ6066 let's the librarian choose the itemtype when ordering
For libraries with item-level_itype, the itemtype is in the item.
For others, it's in the biblio and should be added with the title/author when it's ordered

This patch adds the list when applicable,and build the biblio record accordingly
(BibLibre MT5189)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-10 20:28:37 +12:00
Liz Rea
fcdf50af6e Bug 4951 - Print page doesn't close after print This patch adds the print/close functionality present on all other slips to the full page account summary.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-10 20:25:39 +12:00
conan (aka Fernando L. Canizo)
c5b1c39b80 Bug 3674: reimplementation
05eb43f5fc reverted a previous
implementation of 3674.

3674 was encoding the password field when it was meant to be disabled
(password='!'), and then, in Auth.pm we were trying to compare an
encoded '!' with '!', which will never succeed.

This gets sure we encode only provided passwords and also includes an
auto generated login.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-10 20:21:26 +12:00
9047bd2ddf Fix for Bug 3397 - Deleting item record leaves a hole in patron's reading history
Excluding entries in old_issues which have a NULL itemnumber

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>
2011-07-10 20:17:56 +12:00
Ian Walls
f2fa6c893c Bug 6305: receiving serials does not create items
Template::Toolkit variable scope issue.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-06 08:32:07 +12:00
Katrin Fischer
ad26a21056 Bug 6305: Copy enumchron into created serial item
Should work for normal and supplemental issues.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-06 08:32:05 +12:00