Commit graph

15141 commits

Author SHA1 Message Date
Ian Walls
afd2098f3c Bug 7160: paying fines throws error
The call to ReturnLostItem in C4/Accounts was not properly namespaced to
come from C4::Circulation.  That prefix is added to the call.

To test:

Pay a fine, and confirm the error disappears (and the fines is still paid)

Signed-off-by: Brendan <brendan@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-14 14:31:32 +01:00
Brendan
04f8dfec9b Bug 7143: Follow up patch for Updating about.tt
I had a typo where I put Ian Walls as Release Manager - I have fixed to QA.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I put in another missing space for Colin Campbell.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-14 14:28:02 +01:00
Brendan
c3494eaaed Bug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2011-12-14 14:28:00 +01:00
Chris Cormack
288c1a768d Bug 7139 : Log addition and deletion of circulation messages
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Changed the two action names into caps no-spaces.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 18:05:04 +01:00
da916a368c Fix for Bug 7135: Save button options
This patch adds a jQuery plugin which will cause
an element to remain "fixed" at the top of the
screen if it would otherwise scroll up out of
view.

The license of this plugin is "This plugin is as free as fresh
air. Feel free to use it anywhere.".

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I tested this on Chrome OSX
saving works
changing framework works
scrolling works, obviously.
tabbing through the records works
z39 button works as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
updated patch comment about licensing of the plugin
2011-12-13 18:01:33 +01:00
fff32393cf Fix for Bug 7123 - barcode should be one word
Other fixes thrown in for good measure:

- Adding data to the results table to match output of returns
- Better checking of error codes in the script to control
  output of error messages (don't show error box when there
  are no errors).
- Move some errors/messages from the right column onto the
  top of the page to match Koha's established pattern.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 17:48:02 +01:00
e65dc43af7 Fix for Bug 7121 - remove comma on items info
Because I can't just take out one comma, I reworked
the way moredetail.pl fetches and outputs biblio
data based on the way it does in detail.pl. This
allows for simpler output in the template.  In the
process I've added subtitle information to the
template.

Revision adds line break for readability

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 17:16:10 +01:00
Ian Walls
6e497471e3 Bug 7093: placeholds for suggestion table not working in notices
In parseletter_sth, the suggestions table was defined twice.  The first time (which
is the only definition to get called, as it matches first then exists), defined the
primary search keys as borrowernumber and biblionumber.  This is incorrect; the only
usage of the suggestions table tokens is with suggestionid as the key.  This is defined
further down the if/then chain.

This patch removes the erroneous sth query definition.

To test:

1.  Place a suggestion with a patron account with a configured email you can access
2.  Approve or reject it
3.  Verify the message you receive contains suggestion tokens (like title, author and reason)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Suggestion mails for accepted, rejected and ordered look good now.
I couldn't test the suggestion mail AVAILABLE (bug 7096), but
assuming this would work too.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 16:49:54 +01:00
Katrin Fischer
61102d16d1 Bug 6935: Correct XISBNDailyLimit for new installations
This corrects the value of XISBNDailyLimit in the system preferences
installation file to 999 instead of 499.

The file was missed in an earlier update, so new installations
have different values than older installations that were updated.

Another patch with a database update is needed. Sending this patch first,
until it's clear how database updates will work for 3.8.

To test:
1) Recreate your database from scratch
2) Check your system preference XISBNDailyLimit shows 999 instead of 499,
matching the description of the system preference.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 16:47:43 +01:00
Paul Poulain
b0e9423c2f Merge remote-tracking branch 'origin/new/bug_6865' 2011-12-13 16:23:38 +01:00
Alex Arnaud
9855b834b6 bug 6917 Dates filters doesn't work when they are not selected on row or column
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 16:16:25 +01:00
da6c532074 Bug 6865 - Replace image-based gradient backgrounds with CSS3 gradients
Replaces image-based gradients in:

OPAC search bar
OPAC submit buttons
OPAC lists menu background
OPAC alert and message boxes
OPAC user menu tabs
Staff client alert and message boxes
Staff client side menu tabs

Removes obsoleted background image files.

Cross-browser background-gradients created using:
http://www.colorzilla.com/gradient-editor/

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 16:04:16 +01:00
5db3397041 Bug 6803: Replacing remote XSL include
Replacing remote include by local one.
This resolves possible connectivity issues (see Bugzilla comments).
Should theoretically be safer and faster too.

December 7, 2011: Rebased and included nbsp entity definition (bug 7141).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 15:56:09 +01:00
Nicole C. Engard
c30f0e8e89 Bug 6716 Update biblio & deletedbiblio tables
The comments on the biblio and deletedbiblio table
didn't mention the MARC21 subfields. This patch adds
that documentation in.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2011-12-13 15:38:42 +01:00
Nicole C. Engard
3aa00f6313 Bug 6716 : Categories table
This patch documents the patron categories table in Koha.
There are a couple fields marked unused and a couple that aren't
documented because I wasn't sure:

* dateofbirthrequired
* bulk

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2011-12-13 15:38:36 +01:00
Nicole C. Engard
66b5175aa5 Bug 6716: Document biblioitems and deletedbiblioitems
This patch documents the biblioitems and the deletedbiblioitems
tables.  There are many fields left undocumented because I didn't see
information in them, but this is enough of a start to be helpful to
those writing reports.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2011-12-13 15:38:34 +01:00
Nicole C. Engard
c9441f4895 Bug 6716 Document deleteditems table
This patch documents the deleted items table. Some fields were left
undocumented because I was unsure of what data was stored there:

stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2011-12-13 15:38:31 +01:00
Nicole C. Engard
12031f5b8c Bug 6716 - Document Items Table
This patch documents the items table. Some fields were left
undocumented because I was unsure of what data was stored there:

stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2011-12-13 15:38:28 +01:00
Nicole C. Engard
156f45fe21 bug6716: documenting reserves and old_reserves tables
This patch documents the reserves and the old_reserves table.
Note that a few fields are marked unused: notificationdate and
reminderdate. Also two fields are left undocumented: lowestPriority
which never seems to be anything other than 0 and constrainttype which
is either 'a' or 0, but there doesn't appear to be any explanation
as to what each stands for.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2011-12-13 15:38:09 +01:00
Christophe Croullebois
806fac60f4 Bug 6663: Features for holidays.pl with datepicker
Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I have added also Holidays repeated yearly on a range.
On suggestions I have added a datepicker for "To Date".

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 15:07:05 +01:00
Paul Poulain
53141e7f49 welcome Fabio, you're 165th ! 2011-12-13 14:43:41 +01:00
a5241093b3 Bug 7245 Tables population with mandatory data for italian installation
Formatted patch from Fabio Tiana <fabio.tian@gmail.com>

While installing italian and UNIMARC version of Koha via web installer, two
errors occur: ERROR 1136 (21S01) and ERROR 1064 (42000). Some tables can't be
populated with mandatory data.

Errors are related to files sample_itemtypes.sql and unimarc_framework.sql
(/usr/share/koha/intranet/cgi-bin/installer/data/mysql/it-IT/ and
subdirectories).

Signed-off-by: koha <koha@kohabase.l.i>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 14:32:22 +01:00
Paul Poulain
a0936f1754 Merge remote-tracking branch 'origin/new/bug_7215' 2011-12-13 14:29:04 +01:00
Chris Cormack
9c66c42764 Bug 7215 : The Module changed, but the tests weren't updated to reflect that
Updating the test

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-13 14:25:46 +01:00
Katrin Fischer
57800f2af2 Bug 7082: Template improvements for better translatability
Problem:
/cgi-bin/koha/admin/aqbudgets.pl
<label for="show_mine">Show my<br /> funds only</label>

This gets broken into 2 strings for translation which makes it very hard for
translators to make sense of it.
Patch removes the line break.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This patch removes the linebreak and has no ill effects that I can see, even
on a small screen. I'll attach before and after screenshots in Bugzilla.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 17:45:58 +01:00
1fb0351979 Bug 7336 - memberentry.pl generates an error in the log
Adding check for the existence of a variable in
order to quiet errors in the log.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 17:42:02 +01:00
Brendan
b255d091fd Bug 7215 - changed callnumber PRESET field to itemcallnumber
Fixes problem with creating new labels - before it populated with callnumber and not itemcallnumber

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 17:36:09 +01:00
Galen Charlton
18e06ecf0b bug 7198: show patron name in overdue list even if name column is null
If the surname or firstname of a patron is NULL, the MySQL concat()
function (properly) returns NULL, leading to the patron name not
displaying in the overdue report.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 16:32:13 +01:00
Liz Rea
4fad65cc26 Bug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen's suggestion)
I know there's talk of getting rid of this patron search method, but I had a
request for this and so here it is.

To test:
verify that branchcode is displayed on patron search results from
circulation.pl.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 15:50:25 +01:00
a98219dc34 Fix for Bug 7124 - back to search wrapping in lower resolutions
Maybe not a complete fix, but hopefully an improvement. I couldn't
prevent it from wrapping at smaller browser widths, but I was
able to change the style so that when it does wrap it's a little
more readable.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-12 15:35:01 +01:00
Frère Sébastien Marie
48173560ba Bug 7316 - Missing escaping in search results
Two parameters are now escaped in title (html element):
 - query_desc
 - limit_desc

This is a security correction against XSS.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-09 16:01:23 +01:00
Paul Poulain
3dc9930001 Merge remote-tracking branch 'origin/new/bug_6679' 2011-12-09 09:51:40 +01:00
Paul Poulain
fe50ffb37f Bug 6679: fix missing use strict
The 3 files had use strict missing. The patch add the use strict and modify what's needed to work with it
4XX.pl also has some perlcritic fixes:
Variable declared in conditional statement at line XXX, column 9.  Declare variables outside of the condition.  (Severity: 5)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-12-09 09:49:22 +01:00
Paul Poulain
7e4e0d4300 updatedatabase: Adding missing \n at the end of 2 print
They were missing on bug 6530 and 6328
2011-12-09 09:39:38 +01:00
Robin Sheat
038a2cf5d6 Bug 7028 - updated the koha-conf.xml template
Now it more closely matches the one that's distributed in /etc

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(not tested. I confirm the code is clean, and tests are not broken)
2011-12-08 17:49:53 +01:00
c1dbd7bbbf Fix for Bug 6818 - acquisitions basket groups could use some design work
I've made changes to the basket grouping interface to bring it
in line with other interfaces in Koha. I think it's better to
keep things following a consistent pattern.

On the page which lists basket groups:

- Basket groups listed in a table instead of as custom-styled lists
- Buttons use standard style
- Tabs are generated by jQuery

On the page for managing baskets in a group:

- Markup has been revised to be more consistent with established
  patterns.
- Corrections have been made for validity

On the basket view page:

- Display of data has been streamlined a little bit
- An option has been added to the "Basket group" dropdown
  for adding a new group
- Markup has been corrected for validity and consistency

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Basket group page
The blue is gone and the new buttons  are much better
readable than before.

2) Basket grouping page
Works.

3) Basket view page
I like the new option to create a new group from here.
Nice improvement to the workflow!
I removed a spare 'td' from line 264.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 17:36:37 +01:00
8f0c10ef1b Bug 7259 - Show a count of items pending approval on staff client home and tools pages
- Correcting permissions checks on the home page
- Adding default parameter (1)  to numberofreviews subroutine

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 12:06:41 +01:00
d3c02c6bb6 Bug 7259 - Show a count of items pending approval on staff client home and tools pages
This patch adds count indicators on the staff client home page and
the tools page for the number of items pending approval. On the
home page this includes suggestions, comments, and tags. On the tools
page a count of pending comments and tags is shown.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Counts appear for all types of actionable items listed, all are clickable through to the proper place.

Nice work!
2011-12-08 12:04:28 +01:00
Katrin Fischer
5d6f770c18 Bug 7116: White space on item form for bulk ordering from staged file
Same fix that was done for normal order page and receive page.
Moving the style element for hiding the subfield into the li tag.

AcqCreateItem = on order

To recreate:
1) stage a marc file with 1 - many records
2) make sure you have an acq framework with hidden fields in 952
3) create new basket
4) order from your marc file
5) check item form below the record list for white space

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Followed the steps outlined by Katrin above. Before the patch there are gaping
holes left by the hidden fields. After the patch the holes are gone.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 11:52:59 +01:00
Paul Poulain
614cc4ca8d Welcome to jon Aker (#164) + missing tabs & "releases" 2011-12-08 11:26:02 +01:00
Jon Aker
90ddf1b254 Bug 7020 Items with no checkouts report does not output call number, barcode or item details
When running the Items with no checkouts report and outputting to
screen, the results do not include any identifying information for
the items. The only information listed is the item count and the
branch location.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 11:24:14 +01:00
Colin Campbell
d39262e61d Bug 6987 Make return from Overdues::GetFine consistent
If there is not a fine amount return zero not
undefined or other undefined behaviour

Use more meaningful var names for readability

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 11:19:10 +01:00
Paul Poulain
484c1f6dea Merge remote-tracking branch 'origin/new/bug_7141' 2011-12-08 11:05:35 +01:00
Chris Cormack
ce59911932 Bug 7141 : Changing test to match new formatting of xsl style sheet
http://bugs.koha-community.org/show_bug.cgi?id=7141
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
verified tests pass

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 10:51:25 +01:00
Chris Cormack
7dbb966b49 Bug 6679 : Allowing eval require
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 10:25:14 +01:00
Chris Cormack
dc6e1031f8 Bug 6679 : Adding license statement and stopping declaring variables in a conditional 2011-12-08 10:11:27 +01:00
Chris Cormack
a047dea5e4 Bug 6679 : cataloguing/ now passing critic tests
Declare variables outside of conditionals
Don't use prototypes http://www.modernperlbooks.com/mt/2009/08/the-problem-with-prototypes.html
Use ":encoding(UTF-8)" to get strict validation.
2011-12-08 10:11:23 +01:00
Paul Poulain
b9d743a928 Merge remote-tracking branch 'origin/master' into new/bug_6679
Conflicts:
	catalogue/showmarc.pl
2011-12-08 10:08:44 +01:00
Chris Cormack
4a14e7dbe6 Bug 6679: catalogue/ now passing perl critic tests
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-12-08 10:05:48 +01:00
Paul Poulain
c0234dd9b9 Merge remote-tracking branch 'origin/new/bug_5604' 2011-12-07 18:07:40 +01:00