10 years agoMerge remote-tracking branch 'origin/new/bug_7135'
Paul Poulain [Wed, 14 Dec 2011 14:54:34 +0000 (15:54 +0100)]
Merge remote-tracking branch 'origin/new/bug_7135'

10 years agoBug 7135 - in addbiblio, make save button floating to have it on always on screen
Owen Leonard [Tue, 13 Dec 2011 19:37:32 +0000 (14:37 -0500)]
Bug 7135 - in addbiblio, make save button floating to have it on always on screen

Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 7202 - z39.50 search on bib edit not working
Owen Leonard [Fri, 2 Dec 2011 20:14:58 +0000 (15:14 -0500)]
Bug 7202 - z39.50 search on bib edit not working

The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 7197 - add a Spanish readme file to the packages
Robin Sheat [Wed, 23 Nov 2011 05:39:25 +0000 (18:39 +1300)]
Bug 7197 - add a Spanish readme file to the packages

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch

10 years agoMerge branch 'master' into new/bug_7164
Paul Poulain [Wed, 14 Dec 2011 14:35:39 +0000 (15:35 +0100)]
Merge branch 'master' into new/bug_7164

10 years agoBug 7164 follow-up history.txt and perlcritic compliance
Paul Poulain [Wed, 14 Dec 2011 14:10:28 +0000 (15:10 +0100)]
Bug 7164 follow-up history.txt and perlcritic compliance

* in history.txt, added a tab for Stephane Delaune, for display consistency
* fixed a small mistake in about.pl that was resulted in a perlcritic failure

10 years agoBug 7164 minor follow-up
Paul Poulain [Wed, 14 Dec 2011 13:49:22 +0000 (14:49 +0100)]
Bug 7164 minor follow-up

tab for Stephane Delaune, for display consistency

10 years agoBug 7164 - add Koha history timeline tab to 'About' page
Mason James [Sat, 5 Nov 2011 10:28:48 +0000 (23:28 +1300)]
Bug 7164 - add Koha history timeline tab to 'About' page

Includes follow up by Chris Cormack fixing formatting in docs/history.txt

[MINOR EDIT] Added html filter to output for validity's sake

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
10 years agoBug 7160: paying fines throws error
Ian Walls [Sat, 5 Nov 2011 03:28:31 +0000 (23:28 -0400)]
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>
10 years agoBug 7143: Follow up patch for Updating about.tt
Brendan [Wed, 2 Nov 2011 10:04:58 +0000 (03:04 -0700)]
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>
10 years agoBug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain
Brendan [Wed, 2 Nov 2011 09:59:41 +0000 (02:59 -0700)]
Bug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
10 years agoBug 7139 : Log addition and deletion of circulation messages
Chris Cormack [Wed, 2 Nov 2011 01:43:45 +0000 (14:43 +1300)]
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>
10 years agoFix for Bug 7135: Save button options
Owen Leonard [Thu, 3 Nov 2011 18:54:39 +0000 (14:54 -0400)]
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

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

10 years agoFix for Bug 7123 - barcode should be one word
Owen Leonard [Tue, 1 Nov 2011 13:21:51 +0000 (09:21 -0400)]
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>
10 years agoFix for Bug 7121 - remove comma on items info
Owen Leonard [Fri, 11 Nov 2011 16:43:27 +0000 (11:43 -0500)]
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

Revision adds line break for readability

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 7093: placeholds for suggestion table not working in notices
Ian Walls [Wed, 7 Dec 2011 16:43:20 +0000 (11:43 -0500)]
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>
10 years agoBug 6935: Correct XISBNDailyLimit for new installations
Katrin Fischer [Wed, 30 Nov 2011 07:04:27 +0000 (08:04 +0100)]
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>
10 years agoMerge remote-tracking branch 'origin/new/bug_6865'
Paul Poulain [Tue, 13 Dec 2011 15:23:38 +0000 (16:23 +0100)]
Merge remote-tracking branch 'origin/new/bug_6865'

10 years agobug 6917 Dates filters doesn't work when they are not selected on row or column
Alex Arnaud [Mon, 26 Sep 2011 10:21:58 +0000 (12:21 +0200)]
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>
10 years agoBug 6865 - Replace image-based gradient backgrounds with CSS3 gradients
Owen Leonard [Tue, 13 Sep 2011 12:16:13 +0000 (08:16 -0400)]
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:

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 6803: Replacing remote XSL include
Marcel de Rooy [Wed, 12 Oct 2011 12:00:54 +0000 (14:00 +0200)]
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>
10 years agoBug 6716 Update biblio & deletedbiblio tables
Nicole C. Engard [Thu, 20 Oct 2011 10:47:54 +0000 (06:47 -0400)]
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>
10 years agoBug 6716 : Categories table
Nicole C. Engard [Mon, 10 Oct 2011 10:50:23 +0000 (06:50 -0400)]
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>
10 years agoBug 6716: Document biblioitems and deletedbiblioitems
Nicole C. Engard [Sun, 2 Oct 2011 14:04:37 +0000 (10:04 -0400)]
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>
10 years agoBug 6716 Document deleteditems table
Nicole C. Engard [Sun, 2 Oct 2011 06:16:44 +0000 (02:16 -0400)]
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>
10 years agoBug 6716 - Document Items Table
Nicole C. Engard [Sun, 2 Oct 2011 06:11:06 +0000 (02:11 -0400)]
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>
10 years agobug6716: documenting reserves and old_reserves tables
Nicole C. Engard [Wed, 28 Sep 2011 10:19:33 +0000 (06:19 -0400)]
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>
10 years agoBug 6663: Features for holidays.pl with datepicker
Christophe Croullebois [Fri, 2 Dec 2011 15:03:19 +0000 (16:03 +0100)]
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>
10 years agowelcome Fabio, you're 165th !
Paul Poulain [Tue, 13 Dec 2011 13:43:41 +0000 (14:43 +0100)]
welcome Fabio, you're 165th !

10 years agoBug 7245 Tables population with mandatory data for italian installation
Frédéric Demians [Sun, 20 Nov 2011 12:13:28 +0000 (13:13 +0100)]
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

Signed-off-by: koha <koha@kohabase.l.i>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoMerge remote-tracking branch 'origin/new/bug_7215'
Paul Poulain [Tue, 13 Dec 2011 13:29:04 +0000 (14:29 +0100)]
Merge remote-tracking branch 'origin/new/bug_7215'

10 years agoBug 7215 : The Module changed, but the tests weren't updated to reflect that
Chris Cormack [Tue, 13 Dec 2011 08:18:37 +0000 (21:18 +1300)]
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>
10 years agoBug 7082: Template improvements for better translatability
Katrin Fischer [Mon, 24 Oct 2011 14:09:35 +0000 (16:09 +0200)]
Bug 7082: Template improvements for better translatability

<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>
10 years agoBug 7336 - memberentry.pl generates an error in the log
Owen Leonard [Thu, 8 Dec 2011 16:10:20 +0000 (11:10 -0500)]
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>
10 years agoBug 7215 - changed callnumber PRESET field to itemcallnumber
Brendan [Fri, 11 Nov 2011 17:25:15 +0000 (09:25 -0800)]
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>
10 years agobug 7198: show patron name in overdue list even if name column is null
Galen Charlton [Wed, 9 Nov 2011 01:44:25 +0000 (20:44 -0500)]
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>
10 years agoBug 7159 - Add branchcode to circulation.pl search (take two, revising with Owen...
Liz Rea [Fri, 4 Nov 2011 19:37:11 +0000 (14:37 -0500)]
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

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoFix for Bug 7124 - back to search wrapping in lower resolutions
Owen Leonard [Fri, 11 Nov 2011 14:00:27 +0000 (09:00 -0500)]
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>
10 years agoBug 7316 - Missing escaping in search results
Frère Sébastien Marie [Sun, 4 Dec 2011 17:14:09 +0000 (18:14 +0100)]
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>
10 years agoMerge remote-tracking branch 'origin/new/bug_6679'
Paul Poulain [Fri, 9 Dec 2011 08:51:40 +0000 (09:51 +0100)]
Merge remote-tracking branch 'origin/new/bug_6679'

10 years agoBug 6679: fix missing use strict
Paul Poulain [Thu, 8 Dec 2011 16:13:38 +0000 (17:13 +0100)]
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>
10 years agoupdatedatabase: Adding missing \n at the end of 2 print
Paul Poulain [Fri, 9 Dec 2011 08:39:38 +0000 (09:39 +0100)]
updatedatabase: Adding missing \n at the end of 2 print

They were missing on bug 6530 and 6328

10 years agoBug 7028 - updated the koha-conf.xml template
Robin Sheat [Mon, 17 Oct 2011 04:51:39 +0000 (17:51 +1300)]
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)

10 years agoFix for Bug 6818 - acquisitions basket groups could use some design work
Owen Leonard [Wed, 26 Oct 2011 14:50:11 +0000 (10:50 -0400)]
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
- 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

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>
10 years agoBug 7259 - Show a count of items pending approval on staff client home and tools...
Owen Leonard [Wed, 7 Dec 2011 15:02:56 +0000 (10:02 -0500)]
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>
10 years agoBug 7259 - Show a count of items pending approval on staff client home and tools...
Owen Leonard [Wed, 23 Nov 2011 19:25:20 +0000 (14:25 -0500)]
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!

10 years agoBug 7116: White space on item form for bulk ordering from staged file
Katrin Fischer [Sun, 30 Oct 2011 23:21:27 +0000 (00:21 +0100)]
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>
10 years agoWelcome to jon Aker (#164) + missing tabs & "releases"
Paul Poulain [Thu, 8 Dec 2011 10:26:02 +0000 (11:26 +0100)]
Welcome to jon Aker (#164) + missing tabs & "releases"

10 years agoBug 7020 Items with no checkouts report does not output call number, barcode or item...
Jon Aker [Tue, 6 Dec 2011 23:06:41 +0000 (12:06 +1300)]
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>
10 years agoBug 6987 Make return from Overdues::GetFine consistent
Colin Campbell [Fri, 7 Oct 2011 12:19:06 +0000 (13:19 +0100)]
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>
10 years agoMerge remote-tracking branch 'origin/new/bug_7141'
Paul Poulain [Thu, 8 Dec 2011 10:05:35 +0000 (11:05 +0100)]
Merge remote-tracking branch 'origin/new/bug_7141'

10 years agoBug 7141 : Changing test to match new formatting of xsl style sheet
Chris Cormack [Wed, 7 Dec 2011 20:28:12 +0000 (09:28 +1300)]
Bug 7141 : Changing test to match new formatting of xsl style sheet

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
verified tests pass

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 6679 : Allowing eval require
Chris Cormack [Thu, 8 Dec 2011 08:09:48 +0000 (21:09 +1300)]
Bug 6679 : Allowing eval require

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 6679 : Adding license statement and stopping declaring variables in a conditional
Chris Cormack [Wed, 2 Nov 2011 02:55:00 +0000 (15:55 +1300)]
Bug 6679 : Adding license statement and stopping declaring variables in a conditional

10 years agoBug 6679 : cataloguing/ now passing critic tests
Chris Cormack [Mon, 31 Oct 2011 08:16:29 +0000 (21:16 +1300)]
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.

10 years agoMerge remote-tracking branch 'origin/master' into new/bug_6679
Paul Poulain [Thu, 8 Dec 2011 09:08:44 +0000 (10:08 +0100)]
Merge remote-tracking branch 'origin/master' into new/bug_6679


10 years agoBug 6679: catalogue/ now passing perl critic tests
Chris Cormack [Mon, 31 Oct 2011 08:02:13 +0000 (21:02 +1300)]
Bug 6679: catalogue/ now passing perl critic tests

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoMerge remote-tracking branch 'origin/new/bug_5604'
Paul Poulain [Wed, 7 Dec 2011 17:07:40 +0000 (18:07 +0100)]
Merge remote-tracking branch 'origin/new/bug_5604'

10 years agoBug 5604 : Follow up for missing image
Chris Cormack [Tue, 6 Dec 2011 21:17:12 +0000 (10:17 +1300)]
Bug 5604 : Follow up for missing image

When doing icons, there is a test for them please run

perl xt/author/icondirectories.t

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
see jenkins complaining: http://jenkins.koha-community.org/job/Koha_master/lastUnstableBuild/#showFailuresLink

10 years agoJenkins complaining = fixing number of tests
Paul Poulain [Wed, 7 Dec 2011 17:04:10 +0000 (18:04 +0100)]
Jenkins complaining = fixing number of tests

(see jenkins build http://jenkins.koha-community.org/job/Koha_master/557/#showFailuresLink)

10 years agoMerge remote-tracking branch 'origin/new/bug_5327'
Paul Poulain [Wed, 7 Dec 2011 15:38:39 +0000 (16:38 +0100)]
Merge remote-tracking branch 'origin/new/bug_5327'

10 years agot/UploadedFile, updated comment
Paul Poulain [Wed, 7 Dec 2011 15:37:31 +0000 (16:37 +0100)]
t/UploadedFile, updated comment

10 years agoBug 5327: Fixing the Members.t test
Chris Cormack [Tue, 6 Dec 2011 21:09:43 +0000 (10:09 +1300)]
Bug 5327: Fixing the Members.t test

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm Members.t tests complete

10 years agoBug 5327 : Fixing unit test for SQLHelper.pm
Chris Cormack [Tue, 6 Dec 2011 20:17:35 +0000 (09:17 +1300)]
Bug 5327 : Fixing unit test for SQLHelper.pm

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm that all SQLHelper tests pass.

10 years agoBug 5327 : Complete coverage for BackgroundJob.pm
Chris Cormack [Sun, 4 Dec 2011 07:02:45 +0000 (20:02 +1300)]
Bug 5327 : Complete coverage for BackgroundJob.pm

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tests run without problems.

10 years agoBug 5327 : Adding more unit tests
Chris Cormack [Sun, 6 Nov 2011 06:59:34 +0000 (19:59 +1300)]
Bug 5327 : Adding more unit tests

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
New tests run without problems.

10 years agoBug 5327: Unit tests for C4/Exteral/BakerTaylor.pm
Chris Hall [Mon, 21 Nov 2011 23:19:55 +0000 (12:19 +1300)]
Bug 5327: Unit tests for C4/Exteral/BakerTaylor.pm

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
10 years agofix test xml records
Maxime Pelletier [Tue, 20 Sep 2011 22:01:23 +0000 (18:01 -0400)]
fix test xml records


10 years agoMerge remote-tracking branch 'origin/new/bug_6291'
Paul Poulain [Wed, 7 Dec 2011 15:03:16 +0000 (16:03 +0100)]
Merge remote-tracking branch 'origin/new/bug_6291'

10 years agoBug 6291 - Cart printing truncated in Firefox
Owen Leonard [Tue, 6 Dec 2011 17:50:57 +0000 (12:50 -0500)]
Bug 6291 - Cart printing truncated in Firefox

Alternate fix suggested by http://www.sidesofmarch.com/index.php/archive/2007/04/25/firefox-truncates-long-tables-when-printing/

Seems absurd that changing the top heading from an <h1> to an <h2>
would fix the problem, but it does in my tests in Firefox 3.6 and 8
on Windows 7

10 years agoRevert "Fix for Bug 6291, Cart printing truncated in Firefox"
Paul Poulain [Wed, 7 Dec 2011 15:01:27 +0000 (16:01 +0100)]
Revert "Fix for Bug 6291, Cart printing truncated in Firefox"

This reverts commit da0a5b2bd63027102dd61789fc455941e237abc9.

10 years agoMerge remote-tracking branch 'origin/new/bug_6971'
Paul Poulain [Wed, 7 Dec 2011 14:58:38 +0000 (15:58 +0100)]
Merge remote-tracking branch 'origin/new/bug_6971'

10 years agoTest suite: ignoring backups from vi (files ending with a ~)
Paul Poulain [Wed, 7 Dec 2011 14:17:54 +0000 (15:17 +0100)]
Test suite: ignoring backups from vi (files ending with a ~)

On my laptop, this test was failing because some scripts had a conflict marker in a backup ... of a conflict I just fixed!
ignoring any file ending with a ~

10 years agohistory.txt, adding Stéphane Delaune, as 117, moving others and welcome Albert, you...
Paul Poulain [Wed, 7 Dec 2011 14:16:19 +0000 (15:16 +0100)]
history.txt, adding Stéphane Delaune, as 117, moving others and welcome Albert, you're 163th !

10 years agoBug 6971: XSLT Intranet Detail displays 245 subfields out of order
Jared Camins-Esakov [Fri, 2 Dec 2011 00:53:51 +0000 (19:53 -0500)]
Bug 6971: XSLT Intranet Detail displays 245 subfields out of order

245 Subfields in the Intranet Detail Display (MARC21slim2intranetDetail.xsl) are
being reordered on display. Instead of displaying 245$a 245$h 245$b, the
stylesheet was displaying 245$a 245$b 245$h. This patch does not address ISBD

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Follow-up patch to address the issue in the staff client.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 6971: XSLT Opac Detail displays 245 subfields out of order.
Albert Oller [Fri, 18 Nov 2011 18:49:07 +0000 (13:49 -0500)]
Bug 6971: XSLT Opac Detail displays 245 subfields out of order.

245 Subfields in the OPAC Detail Display (MARC21slim2OPACDetail.xsl) are being
reordered on display. Instead of displaying 245$a 245$h 245$b, the stylesheet
was displaying 245$a 245$b 245$h. This patch does not address ISBD punctuation.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Clarified commit message.

10 years agoBug 6908 - increase DEBUG level for *NOISY* Dates.pm init() messages
Mason James [Thu, 22 Sep 2011 09:48:04 +0000 (21:48 +1200)]
Bug 6908 - increase DEBUG level for *NOISY* Dates.pm init() messages

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoAdding Adrien Saurat as 161th committer.
Paul Poulain [Tue, 6 Dec 2011 19:34:55 +0000 (20:34 +0100)]
Adding Adrien Saurat as 161th committer.

10 years agoBug 6893 : Updates suggestions list when adding orders
Adrien Saurat [Fri, 4 Nov 2011 13:20:31 +0000 (14:20 +0100)]
Bug 6893 : Updates suggestions list when adding orders

A suggestion added through addorder.pl now changes
to the ORDERED status as initially intended (but so
far it stayed as ACCEPTED).

This fixes the list of potential suggestions to order,
the ORDERED ones don't appear anymore.

Bug 6893 : Follow-up: Disabled WHERE clause excluding ORDERED status

In SearchSuggestions, a WHERE clause was excluding the ORDERED
suggestions from the results. Now replaced with 1=1.

(before 6893 correction, the WHERE clause was excluding the
STATUS='CLAIMED' suggestions, but this status cannot be found anywhere
else in the code... so I changed to STATUS='ORDERED' which
seemed more accurate, but it had impacts on OPAC and some Admin tabs)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Both patches applied cleanly, sqashed them together after testing.

1) Creating new suggestions
- from OPAC, shows up in patron account as 'requested', pending in staff
- from staff, shows up in list of pending suggestions
Status in database is ASKED

Note: suggestions made from staff for the same patron have suggestedby = 0
in the database, so are not showing up in the patron account. Is this by
intention? (if not, I think this is a separate bug)

2) Accepting suggestions
- from list
- from edit page
Status in database is ACCEPTED
Patron account shows 'Accepted by the library (Bestseller)'

Note: after changing the status from the list, bug 4068 kicks in and
some tabs and even suggestions are hidden. Going back to the acq start
page and going back to the suggestions page from there helps.

3) Rejecting suggestions
- from list
- from edit page
Status in database is REJECTED
Patron account in OPAC shows 'Suggestion declined'

Note: bug 4068 again.

4) Ordering from suggestions
- new basket
- ordered 2 accepted suggestions
SUCCESS! Great improvement:
- Status in database is now ORDERED
- Already ordered suggestions no longer show up on list of
  suggestions to order from.
- Patron account shows 'Ordered by the library (Bestseller)'
- Suggestion management page shows a new tab 'Ordered'
- For the suggestion with a valid 'suggestedby' borrowernumber,
  a mail was generated. (bug 7094)

5) Receive ordered suggestions
- received my ordered suggestions
This is is not in the scope of this bug, but for documentation:
- No message was generated to inform the patron
- Status stays ORDERED
- Patron account still shows item as ordered, no change to 4)

Looking at the suggestion.tt I think there should be another status
216     [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available

Signing off, fixes bug reported. Danke!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 6530 follow-up for fix Item_Due / Item_DUE in message_attributes
Paul Poulain [Tue, 6 Dec 2011 19:05:25 +0000 (20:05 +0100)]
Bug 6530 follow-up for fix Item_Due / Item_DUE in message_attributes

also dealing with existing setups

10 years agoBug 6530: Item Due notice label displaying as 'unknown'
Katrin Fischer [Sun, 20 Nov 2011 21:31:47 +0000 (22:31 +0100)]
Bug 6530: Item Due notice label displaying as 'unknown'

Some of the translated sql files still had 'Item_DUE' instead
of 'Item_Due' causing the staff interface to display 'unknown'
instead of the correct description.

To test:
- Do a new installation, using German, French, Polish, Russian or Ukrainian sample files.
- Actived EnhancedMessagingPreferences
- Create a new patron category and check message descriptions display correctly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 6022: Auth_with_ldap check if categorycode is valid
Dobrica Pavlinusic [Thu, 31 Mar 2011 13:14:46 +0000 (15:14 +0200)]
Bug 6022: Auth_with_ldap check if categorycode is valid

When importing users from LDAP, Auth_with_ldap.pm doesn't check if value for
categorycode is present in categories table in Koha resulting in referential
integrity error instead of using default value from koha-conf.xml

Test scenario:
1. enable LDAP in koha-conf.xml using <useldapserver>1</useldapserver>
   and add <ldapserver> configuration with
   <categorycode is="SomeLDAPField">DefaultCategoryCode</categorycode>
2. select/create LDAP user with category in SomeLDAPField which isn't in
3. try logging in and ensure that assigned category to new user is

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoMerge remote-tracking branch 'origin/new/bug_5604'
Paul Poulain [Tue, 6 Dec 2011 18:46:55 +0000 (19:46 +0100)]
Merge remote-tracking branch 'origin/new/bug_5604'

10 years agoFixing typo in image filename which introduced a space causing problems on win32
Chris Nighswonger [Thu, 6 Oct 2011 17:23:23 +0000 (13:23 -0400)]
Fixing typo in image filename which introduced a space causing problems on win32

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 4051: adds issuedate column to overdues export
Adrien Saurat [Fri, 2 Dec 2011 09:46:29 +0000 (10:46 +0100)]
Bug 4051: adds issuedate column to overdues export

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 3385 - Add checkout date and renewal date to display list of checked out items
Owen Leonard [Thu, 13 Oct 2011 18:44:18 +0000 (14:44 -0400)]
Bug 3385 - Add checkout date and renewal date to display list of checked out items

This patch doesn't fix the origial request to add the renewal date
to the list of checked out items, but follows the other bug commenter's
suggestion that the information be added to the item details page

The other part of this request, to add the checkout date, has already
been fixed by another patch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 2346 follow-up (UpdateBorrowerDebarred subroutine removed)
Paul Poulain [Tue, 6 Dec 2011 18:13:55 +0000 (19:13 +0100)]
Bug 2346 follow-up (UpdateBorrowerDebarred subroutine removed)

notifyMailsOp.pl is deprecated : is was written by and for Ouest Provence (thus the OP) and is not used anymore.

it's probably not working anymore.
Removing the script

10 years agoBug 2346: Remove C4::Overdues::UpdateBorrowerDebarred in favour of C4::Members::Debar...
Ian Walls [Sun, 4 Dec 2011 17:19:29 +0000 (12:19 -0500)]
Bug 2346: Remove C4::Overdues::UpdateBorrowerDebarred in favour of C4::Members::DebarMember

Removes now-unused subroutine from C4::Overdues, as well as the db_dependent unit test

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
10 years agoBug 6740: can add items at ordering/receiving but not remove
Katrin Fischer [Mon, 5 Dec 2011 06:18:21 +0000 (07:18 +0100)]
Bug 6740: can add items at ordering/receiving but not remove

The problem was, that the script was looking for the first
and second <a> tag in the code. When using plugins in the framework
this can't work. The patch changes the script to select the correct
<a> tags by using a class.

Also changes + and - to 'Add' and 'Delete' to make the meaning clearer
and clicking on them a bit easier.

To test:
1) AcqCreateItem = order
- Create a basket
- Create an order line
- Create more than one item
- Delete items
- Check quantity is calculated correctly
- Check items are created correctly

2) AcqCreateItem = receive
- Create basket
- Create 2 order lines, order >1 items
- Do a partial item by removing items from the receive form
- Receive all missing items
- Receive more items than ordered

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agobug/7285 Use C4::Auth::checkpw instead of checkpw only
Alex Arnaud [Fri, 2 Dec 2011 08:19:33 +0000 (09:19 +0100)]
bug/7285 Use C4::Auth::checkpw instead of checkpw only

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 7280 - can't place hold without selecting on list
Owen Leonard [Wed, 30 Nov 2011 17:50:35 +0000 (12:50 -0500)]
Bug 7280 - can't place hold without selecting on list

JavaScript was looking for clicks on links with class "hold,"
and incorrectly triggering the check for checked checkboxes.
Making the selection stricter lets the JS function as it should
while allowing people to place individual holds directly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 7251 : Corrects a problem in overdue_notices.pl when delimiter is set to tabulation
Frédérick Capovilla [Mon, 21 Nov 2011 17:28:25 +0000 (12:28 -0500)]
Bug 7251 : Corrects a problem in overdue_notices.pl when delimiter is set to tabulation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that others values for the separator are OK = it is (space, semicolon,... see syspref "delimiter")

10 years agoBug 7225 - "Delete all items" should be greyed out when a title has no items
Owen Leonard [Tue, 15 Nov 2011 17:01:19 +0000 (12:01 -0500)]
Bug 7225 - "Delete all items" should be greyed out when a title has no items

This patch changes the catalog toolbar so that when there are no
items attached to a record the "Delete all items" menu item appears
to be disabled. Clicking it will trigger an alert, "This record
has no items."

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 7216 - koha-restore does not correctly set home
Jared Camins-Esakov [Sat, 12 Nov 2011 00:53:14 +0000 (19:53 -0500)]
Bug 7216 - koha-restore does not correctly set home

Prior to this patch, the koha-restore Debian script did not set the home
directory properly for the system users it created, causing problems down the
line for koha-rebuild-zebra. This patch fixes that by specifying the home

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
10 years agoFix a problem when translations contain &nbsp; various XSL files
Frédérick Capovilla [Wed, 2 Nov 2011 14:56:33 +0000 (10:56 -0400)]
Fix a problem when translations contain &nbsp; various XSL files

With new 3.6.1 translation files, the lake of 'nbsp' entity definition make
fail t/00-valid-xml.t test.

This patch applies to HEAD and 3.6.x.

How to test:

  - checkout 3.6.x branch
  - generate French templates:
    cd misc/translator
    ./translate install fr-FR
    cd ../..
  - run test:
    prove -v t/00-valid-xml.t
    you get failing error message
  - apply this patch
  - run test again: it passes

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

10 years agoFix for Bug 7137 - fixed width table where it should be variable
Owen Leonard [Wed, 2 Nov 2011 14:08:25 +0000 (10:08 -0400)]
Fix for Bug 7137 - fixed width table where it should be variable

Removing inline style setting the table width.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across...
Liz Rea [Mon, 31 Oct 2011 21:16:34 +0000 (16:16 -0500)]
Bug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across OPAC user pages.

To test:
verify that the div <div class="yui-g" id="usermessaging"> appears and can be styled via opacusercss.

Signed-off-by: Arslan Farooq <arslanone@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years ago160th developer + 2 events added (NZ tm and 3.6.1 released)
Paul Poulain [Tue, 6 Dec 2011 11:07:48 +0000 (12:07 +0100)]
160th developer + 2 events added (NZ tm and 3.6.1 released)

10 years agoFix for Bug 7120 - After deleting order from order receive page redirect fails
Owen Leonard [Mon, 31 Oct 2011 15:01:35 +0000 (11:01 -0400)]
Fix for Bug 7120 - After deleting order from order receive page redirect fails

The order modification script doesn't retrieve an order's basket
when doing a delete, so the template must explicitly pass
the basket number if we want the redirect to work.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
10 years agoBug7108: Intranet Language Menu Display Patch
Martin Renvoize [Fri, 28 Oct 2011 14:30:39 +0000 (15:30 +0100)]
Bug7108: Intranet Language Menu Display Patch

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>