Commit Graph

16227 Commits

Author SHA1 Message Date
Chris Cormack fe4d5e5cb8 Bug 4330 : Adding missing license statement
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:50:29 +12:00
Chris Cormack 71928871ca Bug 4330 Fixing FSF statements
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:50:16 +12:00
Chris Cormack dc8a0375ec Bug 4330 : Fixing FSF address and copyright statements
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:50:05 +12:00
Chris Cormack b8b622ac17 Bug 4330 : Fixing FSF address and copyright headers
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:49:53 +12:00
Owen Leonard 50c9b9f787 Bug 7127 - Templates must be valid XHTML
Fixing markup errors on OPAC detail page and OPAC results.
Also conditionally including ratings JS on OPAC detail.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:46:52 +12:00
Paul Poulain 7b0c896d76 Bug 8144 - 775 tag in the MARC record causes display issue
Fixing XSL template in the OPAC and staff client following
recommendations by Jared.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixes the markup and correctly displays 775 notes.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:41:06 +12:00
Mason James 480c367914 Bug 8145 - [SIGNED-OFF] opac-tags.pl fails when DEBUG is set
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:32:26 +12:00
Matthias Meusburger 484f4a9998 Bug 6858: Bug fixing, fix some errors with the staticfines.pl script
This new patch :

  - Fixes calculation bugs
  - Removes -o option for logs (which wasn't working anyway)
  - Adds a --borrower <borrowernumber> option for applying the fine only to one given borrower

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:27:36 +12:00
Colin Campbell df5a7a27c3 Bug 8150 [SIGNED-OFF] Remove obsoleted navigation bar in circ history
The navigation bar is now supplied by the datatables plugin
however we are still calling the old navigation include
resulting in a second navigation bar which does nor work

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, without introducing any bad side effects that
I can see.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:18:27 +12:00
Jonathan Druart f8d315acb1 Bug 8122 - Followup Add a link to new library group creation from empty groups message
Set outside tables the "no group defined" message.

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>
2012-05-29 16:02:10 +12:00
Owen Leonard 1f8f1d01c1 Bug 8122 - Add a link to new library group creation from empty groups message
When there are no groups, add a link to group creation from
the message, "No properties defined."

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 15:58:06 +12:00
Srdjan a5c185fd53 bug_8056: sorted out slip print calls
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
preference works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Tested that CircAutoPrintQuickSlip clear the screen still works well

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 08:57:25 +12:00
Owen Leonard da201ee7e4 Bug 8014 - On the patron entry form hide "restricted until" field if "Restricted: No" is checked
This patch adds JavaScript to automatically hide the "Restricted
unil" form field on the patron entry form if "Restricted: No" is
selected. If "Restricted: Yes" is chosen the "Until:" field
is shown and focus is given to it.

The patch also adds a note, "(optional)" after the "Until:" field
to make it clearer that a date is not required.

To test, open a patron record and try moving the selection
between "Restricted: No" and "Restricted: Yes." Confirm that
the "Until:" field is shown and hidden as expected. Confirm
that the restricted flag is correctly set or unset upon save,
including setting the flag with or without a date.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 08:43:12 +12:00
Paul Poulain 5c2ba44c38 Welcome to the 182th commiter !
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 00:36:10 +12:00
Simon Story 366f3611ae Bug 6684: Fixes to koha-remove
Fixes bugs 6684 6997 4880:
6684 koha-remove should check the number of arguments it gets
6997 koha-remove leaves system in inconsistent state if there is an error
4880 koha-remove sometimes fails because user is logged in

Amended by chrisc@catalyst.net.nz
Trying to resolve conflicts.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on top of bug 7924.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 00:32:50 +12:00
Katrin Fischer 8947b6e8a5 Bug 7926: Acq search results show empty () for orders without basket group
To test:
- search for orders by title or vendor
- make sure some results are attached to a basket group, while others are not
- make sure correct information shows in the basket group column of search results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

- Fixed merge conflict

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 22:22:53 +12:00
Kyle M Hall a47cdad201 Bug 8080 - login and password is pre-filled by the browser when creating a new patron
When creating a new patron, if you have chosen to let your browser remember your
login and password for you, the login and password fields will be pre-filled with
them, leading to a systematic error "the passwords entered do not match" since
the second password field was not filled. These fields should be blank.

Add the directive autocomplete="off" to the memberentry form tags.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
enhances usability of password forms, gets my signoff.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 22:11:47 +12:00
Owen Leonard 9e6c5fb5ca Bug 8107 - Disabled buttons not distinguishable from enabled buttons
Add a "greyed-out" style for disabled buttons.

Having looked through the templates for examples of usage of this
I'm not convinced that we should really be showing disabled buttons.
I think in general it would be better to hide or show a button
based on whether the action is available.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

I agree, I think hiding or showing is better, but this patch is
harmless enough, until we want to go fixing our usage

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 22:09:01 +12:00
Stéphane Delaune beb43aa6ef Bug 8040: bad name in acquisitions-menu
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>
2012-05-28 21:56:02 +12:00
Chris Cormack df2d02a0d3 Bug 5795 : Updating version number 2012-05-28 21:46:24 +12:00
Amit Gupta a8a1623333 Bug 5795 Update the database as follow-up If sys pref
ReservesControlBranch has null then update the table to
insert a PatronLibrary as value

To Test:
1) Go to mysql use koha database
2) select * from systempreferences where variable = 'ReservesControlBranch'; Check if value set to ItemHomeLibrary.
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
| variable              | value           | options                       | explanation                                     | type   |
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
| ReservesControlBranch | PatronLibrary   | ItemHomeLibrary|PatronLibrary | Branch checked for members reservations rights. | Choice |
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+

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

Conflicts:

	installer/data/mysql/updatedatabase.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fixed for 3.8.x
2012-05-28 21:44:04 +12:00
Katrin Fischer f4df63b153 Bug 5795 [SIGNED-OFF] - Missing ReservesControlBranch system pref in database installer
sysprefs.sql file was missing ReservesControlBranch.

To test:
1) Create a new installation and check sysprefs.sql loads correctly.
2) Check ReservesControlBranch shows up correctly in the sys pref editor.
3) Check sys pref can be edited and new value saves correctly.

Signed-off-by: Marc Veron <veron@veron.ch>

- Line is added at the end of installer/data/mysql/sysprefs.sql
- Tested Line diretly in MySQL with a systempreferences table where variable 'ReservesControlBranch' was missing. Data inserted correctly.
- Syspref shows up in Staff client

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

- Fixed merge conflict

Conflicts:

	installer/data/mysql/sysprefs.sql

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

- Tidied for 3.8.x
2012-05-28 21:40:44 +12:00
Owen Leonard 98e0ecf355 Bug 8124 - Hide option to download results of items with no checkouts report
We should not show disabled controls for features which don't work.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 21:33:47 +12:00
Kyle M Hall d4f21ef40c Bug 7112 - Having two prices in 020$c causes basket creation to fail from staged marc import
The root problem here is that the price is being pulled from the MARC record
and is then run through Number::Format::unformat_number. This routine is
really being misused, and should only be used to reverse the effects of
Number::Format on a number string. We are apparently using it to strip
out currency characters and the like.

Number::Format::unformat_number will choke if there is more than one period (.)
in the price field. MARC standards do not limit this field to a single period,
so unless there is only one period, we should skip number unformatting.
Examples of that break unformat_number include '18.95 (U.S.)', and
'$5.99 ($7.75 CAN)', both of which are perfectly valid.

This commit adds the function MungeMarcPrice that will better handle
find a real price value in a given price field. It does a very good
job at finding a price in any currency format, and attempts to find
a price in whichever currency is active before falling back to
the first valid price it can find.

The variable $price may fail to have an actual price, in which case
the price then defaults to '0.00', which would be rarely if ever the
correct price. To combat this, I have added highlighting to any
price in the Order Details table that begins with 0 ( i.e. '0.00' ).

Also, fixed the incomplete table footer, adding a new td with a
span of 3 to fill in the nonexistant cells.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-25 09:31:49 +12:00
Chris Cormack 7a11e547e5 Bug 8135 : Fix installer to copy services/ dir
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-25 09:29:22 +12:00
Julian Maurice dd231b0ca7 Bug 7178 follow-up: Do not fill items table with "(undefined)"
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-25 09:15:24 +12:00
Julian Maurice 2c27c86b35 Bug 7178 follow-up: Fix check_additem when UniqueItemFields is empty
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-25 09:14:54 +12:00
Kyle M Hall b546bddd7b Bug 3521 - Items table in catalogue/detail.pl and cataloguing/additem.pl is sorted nonsensically
Based on patch submitted by Ian Walls

Items were sorted by branch, then date accessioned, in GetItemsInfo.  While this can be
helpful in some circumstances, more often it is useful for items to be sorted first by
their enumchron (volume/issue, if applicable) then by their copy number.  This patch changes the
sort on GetItemsInfo to branch, enumcrhon, copynumber then date accessioned.

As sorting on copynumber will be incorrect based on standard sorting ( e.g. 1, 10, 2, 20 ),
the copynumber is now padded with leading zeros to correct the sorting ( e.g. 01, 02, 10 20 ).
This function appears to be a standard SQL function and not a mysql-ism. I have verfified
that is available in MySQL, Postgres, and Oracle.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passed t xt

Item sorts appear to be correct to me based on the rubric of branch, enumchron, copynumber, then date accessioned.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-24 10:20:57 +12:00
Kyle M Hall dbfd3517f4 Bug 7948 - Printing transfer slip loses barcode field focus
* Refocus on barcode field after running Dopop()
  * Cleaned up javascript, removed tabs

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
works as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-24 09:59:45 +12:00
Kyle M Hall 54d475bdcf Bug 8057 - Error when adding a patron with email address
Caused by code assuming a the variable $err is a hashref
when it is only a hashref if there is an error.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-24 09:36:24 +12:00
Chris Cormack 2397702f62 Bumping debian changelog 2012-05-23 20:01:54 +12:00
Marcel de Rooy f9c8822766 Bug 7788: [SIGNED-OFF] Followup: GetShelf call in addbybiblio script corrected
Patch resolves incorrect call to GetShelf in opac and staff. It was and is harmless, because the singlecategory variable was not really used (the category$x param was ignored in the template). Just a cleanup operation.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-23 16:20:42 +12:00
Marcel de Rooy 644c812c66 Bug 7788: [SIGNED-OFF] Remove two unused calls to GetShelf
Removed two unused calls. Initialized $output in downloadshelf. Corrected some confusing indentation in downloadhself too.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-23 16:19:34 +12:00
Chris Cormack efb163439a Merge remote-tracking branch 'tamil/3.8.1-translate' into 3.8.x 2012-05-22 08:36:33 +12:00
Frédéric Demians 81a000e007 Koha 3.8.1 Translation Update 2012-05-21 21:06:18 +02:00
Chris Cormack 63d942bb5c Updating release notes for 3.8.1 2012-05-22 06:18:44 +12:00
Katrin Fischer 088f5353dc Bug 7604 - Link on basket group name for closed basket groups is broken
Fixes the intended behaviour of the link on the basket group name
for closed basket groups by adding a missing '='.

Clicking the link will reopen the basket group.

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>
2012-05-22 06:17:39 +12:00
Kyle M Hall ba136a9351 Bug 8077 - overdues with fines won't run
When I try to run the overdues with fines report I get the following:
Software error:
Undefined subroutine &main::dt_from_string called at
kohaclone/circ/branchoverdues.pl line 116.

Fixed by add a use line for Koha::DateUtils to branchoverdues.pl

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>
2012-05-22 06:16:00 +12:00
Chris Cormack 1e9e2e76a0 Fixing the release notes template, the wiki files are out of date 2012-05-19 20:19:08 +12:00
Chris Cormack ced8b3afea 3.8.1 release notes 2012-05-19 20:02:41 +12:00
Chris Cormack 01a3be8b20 Updating databasebase version number for 3.8.1 release 2012-05-19 20:01:02 +12:00
Chris Cormack 90de5d990a Updating release notes templates 2012-05-19 19:49:05 +12:00
Chris Cormack ccc4ef3e9c Working on template for 3.8.x release notes 2012-05-19 19:37:36 +12:00
Chris Nighswonger 9cf701bdaa Adding template for autogeneration of 3.6.x release notes 2012-05-19 19:36:46 +12:00
Stéphane Delaune d5808ffd41 Bug 8041: lost items are no longer available in search
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>
2012-05-16 14:47:18 +12:00
Robin Sheat 0dba911f26 Bug 8001: [SIGNED-OFF] improve styling potential of the tag list
This adds the class name "tagterm" to the terms in the list of a user's
tags in the OPAC, allowing them to be seperately styled.

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-16 14:44:27 +12:00
Kyle M Hall 44d85b4598 Bug 7722 - Insidious problem with searching
I cannot find the root cause of this issue, but multiple libraries that I am aware of have problems searching on particular search terms ( and never the same terms at the same library ). The error they get when they trigger this problem is:

Tag "" is not a valid tag. at /home/koha/kohaclone/C4/Biblio.pm line 1849

Something somewhere is adding empty keys to C4::Context->marcfromkohafield, I think it may have something to do with the analytics feature that was added.

In the while loop for TransformKohaToMarc, there is a line

next unless my $dtm = $db_to_marc->{''}->{$name};

I don't think it's working.
If I dump $dtm, for each search, I see the dump twice.
It looks like this:
$VAR1 = [
           '952',
           'w'
         ];
 $VAR1 = [];
I think the second time, when it is empty is what's breaking this.
The next never fails because even though it is empty, it is still a valid arrayref.

The solution I have some up with is to skip over the elements where the arrayref is empty.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-16 14:42:12 +12:00
Kyle M Hall 5fea1d6f11 Bug 8084: Follow fix for 7641 - Suspend Until not set on by suspend button.
For request.pl, there are two ways to suspend a reserve, either
by using the 'suspend' button for an individual reserve, or by
using the 'Update hold(s)' button with suspend until dates set.

If the 'suspend' button is used, any date in the 'suspend until'
field is ignored. This commit fixes this issue.

  * Add suspend_until date to suspend button link via jquery
  * Add optional date to ToggleSuspend()
  * Add KohaDates plugin where necessary

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, tested:
* suspend all holds from circ.pl
* suspend one hold from circ.pl
* suspend all holds from moremember.pl
* suspend one hold from moremember.pl
   --- NOTE: clicking suspend all holds without setting a date will mean the holds must be manually unsuspended. I'm not sure this is intentional?
* suspend a specific hold using the in-table button on reserves
* suspend a specific hold using the "update hold" button

500 error is gone.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-16 14:39:28 +12:00
Marcel de Rooy 1d4a3b5308 Bug 7368 typo: MARC -> Card
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-16 14:28:27 +12:00
Chris Cormack 3e8382e979 Bug 7213 : Follow up fixing license information 2012-05-15 09:15:43 +12:00