Commit graph

470 commits

Author SHA1 Message Date
Ian Walls
28309bc61e Bug 5549 Followup: fix suspension in days
ISO dates were being compared with DateTime objects, and DateTime::Durations
with integers.  This patch reimplements the _FixFineDaysOnReturn subroutine
to use the new hourly loans functionality.

Also moves date formatting of patron debar date out of circ/returns.pl and into
KohaDates on the template

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-03-22 09:31:11 +13:00
Gaetan Boisson
d500929cfd Bug 7731 - Library should be used instead of branch and site
standardized the use of the term "library" instead of "Branch" accross the interface and opac

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 15:17:08 +01:00
Adrien Saurat
b38aec8aae Bug 7434: Display of issue number for serials in overdues
items.enumchron is now displayed when not null

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 13:42:55 +01:00
b3cae76694 Bug 5596 [REVISED 2] add author to holds to pull report
Adding output of author.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-19 18:30:11 +01:00
Srdjan Jankovic
a9ded4fa00 bug_7001: Issue and Reserve slips are notices.
Branches can have their own version of notices - added branchcode to
letter table.
Support html notices - added is_html to letter table.
Support for borrower attributes in templates.
GetPreparedletter() is the interface for compiling letters (notices).
Sysprefs for notice and slips stylesheets
Added TRANSFERSLIP to the letters

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-09 10:11:20 +01:00
Paul Poulain
e32e3ba662 Bug 6086 follow-up Uppercase initial coding guideline fix
The patch did not add invalid uppercases, but did not fix them either. I fixed them
2012-03-08 18:20:17 +01:00
Jonathan Druart
45ad4037c2 Bug 6086: Followup: Replace \t characters with 4 spaces
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-08 18:14:10 +01:00
Alex Arnaud
e67fbd1c7c Bug 6086 - adding a dynamic filter to pending holds
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-08 18:14:09 +01:00
Paul Poulain
e07b36dd90 Bug 5877 : Offline circulation improvements : upload all files, apply at once
Offline circ : You now can upload all offline files from the Firefox extension.
Once all circ desks have uploaded the file, the librarian can apply all of them, sorted by date.
This avoid the problem of someone issuing an item on desk A, returning it on desk B.
Before this improvement, if desk B uploaded the file before A, the return was applied before the issue,
resulting in the items reamining issued.

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-02 17:49:35 +01:00
Srdjan Jankovic
b17653355c bug 6039: Cancel All waiting holds button
TransferWhenCancelAllWaitingHolds syspref

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-02-27 15:43:12 +01:00
b420247f2d bug_7467: Printing Transfer Slips for transfers that do not have holds - Addendum: Use for automatic transfers as well.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-27 14:57:13 +01:00
Srdjan Jankovic
f771cc8e26 bug_7467: Printing Transfer Slips for transfers that do not have holds
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-02-27 14:57:10 +01:00
Paul Poulain
647843c3bb Bug 7201 follow-up, fixing some indentation mistakes 2012-02-17 10:58:01 +01:00
Srdjan Jankovic
8b80b315c3 bug_7201: Holds reports: add copynumber and enumchron
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Data is there and correct - very helpful patch, thanks!
passes prove t xt t/db_dependent in line with current master failures.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 10:54:56 +01:00
Ian Walls
1b3e84c672 Bug 7399: Holds Queue should show reserve notes
The notes for a specific hold, if they existed, were being added to the tmp_holdsqueue
table by build_holds_queue.pl, but they were not displayed anywhere, which seems a waste.

This patch adds the Notes column to the far right of view_holdsqueue.pl.

To Test:

Place a hold with a note
Run build_holds_queue.pl to place it in the Holds Queue
View the Holds Queue; you should see the note on the far right of the table

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:48:44 +01:00
Chris Cormack
a9e080a6fb Bug 7278 : Additional Materials
Part 2: This patch shows the message at checkout and checkin

How to test:
* Add a note in cataloguing
* Check it displays at checkout and checkin
* Check items without a note don't display anything

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-01-10 22:41:50 +01:00
bc92dda8c4 Fix for Bug 7077 - Add system pref to control behavior of submitting empty barcode field
Adds a new system preference, CircAutoPrintQuickSlip:

When an empty an empty barcode field is submitted in circulation
[ clear the screen | open a print quick slip window ].

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

Fixed a merge conflict with the updatedatabase.pl

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Another merge conflict resolved. Marked as Passed QA.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 17:34:10 +01:00
Chris Hall
c2837b39a4 Bug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:53:29 +01:00
32e1669731 Bug 7337 - "Debarred Until" display in the opac tells patrons they are debarred until the year 9999
This patch copies the debarred handling method from circulation.pl for
use on opac-user.pl so that debarred dates and comments can be handled
properly.

I have slightly reworded the message in the OPAC and on circulation.pl
to make the display of the debarred comment a little clearer.

Revision adds missing handling of debarred status with regard to
renewal operations. Renew links and buttons were not being hidden
from debarred users.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Renewal buttons are gone, message looks good.

liz@koha-deb:~/kohaclone$ prove xt
xt/permissions.t .. ok
xt/tt_valid.t ..... ok
All tests successful.
Files=2, Tests=27,  9 wallclock secs ( 0.05 usr  0.01 sys +  8.28 cusr  0.08 csys =  8.42 CPU)
Result: PASS

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:08:30 +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
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
Paul Poulain
41b42dbe32 Bug 6328 follow-up for QA comments
* fixed documentation in C4/Auth_with_ldap.pm
* updated ILSDI/Utility.pm to work with debarred being a date
* updated Members.pm/patronflags to work with debarred being a date (copy/paste of BibLibre code that had not been backported)
* fixed opac-reserve to check correctly for debarred status

I also have removed a duplicate line on circulation.pl when the patron was restricted = the information was displayed twice
2011-11-25 14:00:47 +01:00
Paul Poulain
1fe3514c3c Bug 6328 fine in days does not work
Some code coming from BibLibre has been lost in the process of inclusion in
3.4. The result is that fine in days does not work at all (you can setup rules,
but it does nothing)

Step to reproduce:

- Koha > Admin > circ rules > set 1 day fine every day of overdue for default
  rule
- Issue a book return date last week
- check-in the book => no debarment is set

The following patch will fix all of those problems by :

* updating borrowers.debarred to a date field (instead of tinyint). It contains
  the limit of the debarment
* changing API of DebarMember and UpdateBorrowerDebarred to pass a date
* display debarrdate where applicable. Note that a debarrdate of 31/12/9999 is
  considered as unlimited and not displayed
* added a debarrcomment, usefull to explain why a patron is debarred (this is
  independant from debarrdate changes and can be used when placing an unlimited
  debarment too)

[2011-05-12] F. Demians. It works as described. And I can confirm this
functionality is impatiently awaited by French libraries since one year. Thanks
BibLibre for the good work and for contributing this code.

Bug 6328 Followup--update DB structure

Thanks Katrin.

Bug 6328: make comment a textbox / fix debar by notice trigger

Debarring by notice triggers was broken, because the new function
expects a date as second parameter.

The comment field in patron account details was a very long text field.
Patch changes it to be a textbox instead.

Bug 6328: Lift debarment leaves patron account

'Lift debarment' redirects to an empty circulation page.

BZ6328 follow-up 3

Fixes comment 23 from Fernando L. Canizo : when the patron was debarred and debar removed
he still could not check-out.

The changes in the IsMemberBlocked (that were on biblibre/master) were lost somewhere
The sub was still checking for old_issues instead of calling CheckBorrowerDebarred
to get a debardate if applicable

Note : this bug was appearing only is you had issuing rules defined for itemtype/categorycode/branch.
Seemed to work if you had only default rules. That's probably why it hadn't been spotted before

BZ6328 follow-up 4
Comments fron Zeno Tajoli: The patch is OK and I sign-off it. Two little changes done on
installer/data/mysql/kohastructure.sql and installer/data/mysql/updatedatabase.pl

Signed-off-by: koha <koha@kohabase.localdomain>
2011-11-25 14:00:47 +01:00
Srdjan Jankovic
2b2e544f05 Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organisation
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as advertised, doesn't affect display for non-organisational patrons.

Note: Display change in OPAC only affects the summary tab.
It would be a little bit more consistent to make the name show the
same on all tabs in OPAC patron account.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
I repeated Katrin's signoff here (with permission). The patch only changed for some minor rebasing and cosmetic QA requests. Passed QA now.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-11-24 11:30:08 +01:00
Ian Walls
0ea8ff7c4c Bug 6471: add tablesorter to Holds Queue
This patch adds the table sorter to Holds Queue.  Sponsored by Farmington Public Library.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2011-11-06 10:47:48 +01:00
41928b0880 Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on
The display of messages "to the patron" on the checkout screen
lacked the same logic controlling messages "to other librarians,"
affecting conditions under which the [Delete] link would be shown.
This match makes the two categories consistent with each other:
A delete link will be shown if the logged in branch matches the
branch where the message was set OR if AllowAllMessageDeletion
is turned on.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-15 19:56:05 +13:00
Juan Romay Sieira
5187108789 Bug 6925 : The way to show the plural of the word "Item" is not compatible with multilanguage
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-13 16:19:58 +13:00
7f6656aff8 Fix for Bug 5898 - search to hold feature not clearing
Search to hold cookie is now cleared when the user loads a blank
circulation page and when the user logs out.

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

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

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-13 11:11:56 +13:00
Ian Walls
e05d53d50d Enh 6403: Record local use stats when checking in unissued materials
Adds a new system preference, RecordLocalUseOnReturn, which when active will change the statistical
entry type from "return" to "localuse" in AddReturn() if the material was not on loan when returned.
The intended use-case here is for libraries with 'open' book drops, in which patrons can put locally
used (but unissued) materials.

Adds a small message to the user interface to confirm that Local Use was recorded.

This change opens up the possibility to record more types of statistics on return; one would just need
to update the $stat_type variable accordingly.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 19:50:41 +13:00
f7387f27da Bug 6817 Downloading the overdues as a file ignores the filters if the page isn't in english
F. Capovila patch ported to TT.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 19:42:48 +13:00
Robin Sheat
1d89ab22c9 Bug 6937 - change "Fines" to "Fees & Charges" on circ page
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-04 09:20:57 +13:00
Ian Walls
26acaf3dfa Bug 6801: checkoverdues returns unnecessary fields, causing slowness
Explicitly specifies which fields to return in C4::Overdues::checkoverdues
SQL:  all of biblio, items, and issues, and everything in biblioitems
EXCEPT marc, marcxml and timestamp.

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

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

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

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

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

Big ups to Ian for tenaciously hunting this one down.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-27 09:43:25 +13:00
Robin Sheat
6e91a453aa Bug 6360 - add some more sounds to some happenings on returns
This adds an alert sound to various events around transfers and holds
when items are being returned, to make it more apparent that attention
is needed.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-22 09:52:28 +12:00
Ian Walls
9ee49d65d4 Enh 6887: Add 'checked out from' column to issued items display tables
Adds "checked out from" column to the right of "checked out on" on both
circ/circulation.pl and members/moremembers.pl.  Columns are sortable with tablesort
(though only on circ/circulation.pl if syspref enabled).

The branch name is sourced from issues.branchcode.

EDIT BY Owen Leonard: Adjusting table columns which are sorted by default
to accommodate the new column.

Things look good! Thanks!

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-21 09:44:00 +12:00
Katrin Fischer
18844d6bf1 Bug 6458: Incorrect translation processing / overdue.tt
Patch removes template directives from within HTML tags from
circulation > overdues.

Problems were related to patron flags pull down and sort by loop for patron attributes.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:25:03 +12:00
Paul Poulain
f6d3cb05dd Bug 6121: follow-up = using overloo instead of reserveloo
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:04:13 +12:00
Christophe Croullebois
b2138a7ec6 Bug 6121: Holds awaiting pickup
On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.

BibLibre MT5647

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-04 20:03:37 +12:00
bd744e6f2a Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

To test:
1) Make sure syspref memberofinstitution is turned on
2) Add a new patron of organisation category (example: library)
3) Check that there is no field set 'organisation' showing up
4) Checkout books to any borrower
5) Renew books until no longer possible
6) Scan barcode from renewed book to force renewal
6) Check that the 'no more renewals' message has no empty pull below text message

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-28 19:33:16 +12:00
Chris Cormack
589403d2e8 Bug 6748 - Add link to fast add framework while circulating, if a barcode is not found
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-08-26 15:03:01 +12:00
714c8b924e Fix for Bug 6640, Locations not showing in circ reports
An invalid template syntax for defining a variable's default
value is found in the circ report template and several
others:

[% DEFAULT LibraryNameTitle="Koha Online" %]

Based on the T:T docs this appears to be the correct way of defining
a default value:

[% LibraryNameTitle or "Koha Online" %]

Reference:

http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 20:57:32 +12:00
Srdjan Jankovic
039872a458 bug_6410: correct borrowernumber template var name
Conflicts:

	koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-12 13:48:12 +12:00
657d074b7c Fix for Bug 6686, Can't delete messages
T:T variable scope error which only affected systems
with the AllowAllMessageDeletion preference ON

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-11 13:36:16 +12:00
Chris Cormack
a869a4d43b Bug 5009 : Turning off autocomplete
Files affected
koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-02 12:24:45 +12:00
Chris Cormack
3195d20440 Merge remote-tracking branch 'kc/new/enh/bug_5922' into kcmaster 2011-08-01 13:03:34 +12:00
53daf8a2de Additional change for bug 5922 - Show waiting items for patron on return
- Adding patron name to dialog
- Styling dialog as a message rather than an alert since it's
  informational rather than a warning
2011-08-01 13:01:41 +12:00
b9cc6b65a5 [SIGNED-OFF} Fix for Bug 6623 - Nicer style for "clear screen" button
This patch replaces the <button> element with an "X" link
styled to appear fixed to the upper right corner of the box
containing the barcode input field. A title attribute
shows "Clear screen" on hover.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-28 11:03:30 +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
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
Ian Walls
fbfb68a444 Bug 6512: time missing from item circulation history
Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but
the value was never actually called into the template.

This patch also moves the time to the right side of the date, and removes the ??:?? default,
because otherwise, it's just silly

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-17 14:36:07 +12:00
f7d2379764 Fix for Bug 6375, Markup and style corrections for overdue report
[2011.05.21] F. Demians - I confirm the bug and solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 15:11:28 +12:00
84a8c9a522 Fix for Bug 6487 - No error explanation if patron expiration date is missing
The script tries to parse the patron expiration date without
checking that it is a valid date. If expiration date is empty
it doesn't get caught along with past expiration dates.

I wonder if this line was supposed to catch this problem:

Line 233: if ( $warning_year*$warning_month*$warning_day==0

This patch adds "!$borrower->{'dateexpiry'} ||" to that line.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 10:49:43 +12:00
Nicole C. Engard
54d4277125 Bug 5268: Change all occurances of 'debar' to 'restrict'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-07 11:28:01 +12:00
ruth@bywatersolutions.com
414880167c Bug 6467: Add shelving location to checkin screen
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-06-07 11:16:17 +12:00
091cd69f44 Fix for Bug 2941 Transfers cannot be canceled once initiated
This patch includes the changes by Catalyst found at
http://git.catalyst.net.nz/gw?p=koha.git;a=shortlog;h=refs/heads/bug_2941
and adds a "cancel transfer" link to the transferstoreceive
script, including a redirect check to send the user back to
that report.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-23 17:22:05 +12:00
8779233948 Fix for Bug 6244, Javascript error on circulation home page
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 07:47:44 +12:00
3e33a071f0 Follow-up fix for Bug 6168, Can't delete holds from circulation page
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 07:38:02 +12:00
93a18939e8 Bug 6234: Fixing missing biblionumber for links using biblio-default-view.inc
Fixes various pages where the biblionumber was missing in links to the detail page of a record.
Should also fix 6241.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I made the changes Owen suggested
- added the class="ratiolimit" back
- fixed additional link in waitingreserve.tt
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-22 07:03:51 +12:00
80cd49f8f7 Fix for Bug 6189 - renewal warning should say 'renew' not checkout
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-19 13:38:19 +12:00
63df8b42fe Bug 4389 - [tt] Trigger quick slip print on empty checkout submit
js listener approach. Added a reasonable id to the mainform.
To+

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-19 13:23:36 +12:00
1efda7ceb4 Fix for Bug 6185, holds slip says 'reserve'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-19 13:21:34 +12:00
ed9b0c551e Incremental fix for Bug 3514, Returning items through patron details tab
Note: Signed off with the understanding that this partial fix still doesn't compensate for items that need to be transited home (i.e. have no holds, but are not being returned at their home branch.)
 This behavior is much better than the old behavior, however.

Hiding the "check in" checkbox for items which are on hold. This
mitigates the problem of checkins not triggering holds prompts
by forcing the librarian to check in these items individually.

This fix should be considered temporary until a more comprehensive
fix can be developed which incorporates handling for holds.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-15 10:40:47 +12:00
Chris Cormack
7cfa1ca509 Merge remote branch 'kc/new/enh/bug_5952' into kcmaster 2011-04-14 14:41:25 +12:00
49af98afd7 Follow-up fix for Bug 5952, Shows member relatives in issues list
- Moving columns around to match display of patron's own checkouts
- Correcting terminology (issues, borrowers)
- Hiding columns added in previous patch which do not display in
  the standard checkout list: materials, stock number, collection.
  If these are to be added they should be added to all displays.

[edit] Adding display of relative's cardnumber alongside their name

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 14:40:19 +12:00
d00d0721b2 Fix for Bug 6183, "Cancel marked requests" button has become "Renew checked items"
Also includes a fixes for Bug 6168 (Can't delete holds from circulation page)
and Bug 6105 (Cancel a reserve from moremember.pl doesn't work)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-14 14:30:59 +12:00
Chris Cormack
548a670eaf Bug 5922 : Template changes 2011-04-13 14:46:08 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
Alex Arnaud
4268fd376f Bug #6049 - Add a filter by date in overdue.pl
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 11:18:44 +12:00
Julian Maurice
d63eda645c Bug 5952: Add another tab for relatives issues
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:03:15 +13:00
Matthias Meusburger
6b2b62eb57 Bug 5952: Shows member relatives in issues lists
Duplicate of '[PATCH] MT3747: Shows member relatives in issueslists' : Subject was wrong

MT3747, Follow-up: Adds siblings issues

MT3747, Follow-up: Shows member relatives in issues lists

 - Now displays patron's and relatives' issues apart

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in circulation.pl
 - Adds links to moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Remove unuseful warn

MT3747, Follow-up: Shows member relatives in issues lists

 - Removes renewal in moremember.pl

MT3747, Follow-up: Shows member relatives in issues lists

 - Adds sorting for circulation.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 21:03:14 +13:00
Chris Cormack
c2cee4b445 Merge remote branch 'kc/new/enh/bug_6003' into kcmaster 2011-04-01 13:31:53 +13:00
Magnus Enger
b023e7f46d Bug 6003 Display call number on return
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-01 13:30:41 +13:00
root
5d707b5e9b Bug 6005: Fixes Transit slips cause FF4 to display "prevent this page from opening additional dialogs"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-31 21:56:09 +13:00
735d986a0c Fix for Bug 5972 - DisplayClearScreenButton preference introduces invalid markup
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 19:56:54 +13:00
84e43e0615 Fix for Bug 5971, Minor markup error in holds queue report
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 19:55:24 +13:00
Chris Cormack
1e98195b10 Merge remote branch 'kc/new/enh/bug_3495' into kcmaster 2011-03-15 22:01:45 +13:00
Katrin Fischer
9dfc9d4d12 Bug 3495: Fast bib record add at circulation
The link to the Fast add framework was never shown.
Now the link is shown if you have the right permissions (fast cataloging or superlibrarian).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 22:00:23 +13:00
Chris Cormack
76d52d89e4 Merge remote branch 'kc/new/enh/bug_3659' into kcmaster 2011-03-15 15:58:26 +13:00
251e2c4d74 Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Revision fixes some markup and corrects an error that would lead
to the hold being initiated for the remembered patron when this
was not intended.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-15 15:48:09 +13:00
Katrin Fischer
38b59b7b53 Bug 1962: Add fine notification during check-in
Original patch submitted by dswhite42@yahoo.com

Reformatted to apply cleanly.
Changed alert message during check-in to message used
on borrower account checkout page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-26 19:52:56 +13:00
50c0ae09a1 Partial fix for Bug 5745, Overdues with fines report not showing titles
- Adding title, subtitle, and author to output
- Reworking display of shelving location selection

Patch does not address the contents of 'overdue status' and 'notified by'

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-15 10:12:36 +13:00
9319ab3254 Fix for Bug 5715, Adding note about ReservesMaxPickUpDelay value
Also correcting display of itemtype based on item-level_itype preference

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:19:29 +13:00
Chris Cormack
7c376879b4 Bug 3495 : Providing a link to the fast add screen in circulation for an item that isn't found
Squashed commit of the following:

commit bf7fb7971d2d6ea6b3ea09bda571bdc3399efb35
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Wed Feb 9 13:53:38 2011 +1300

    Bug 3495 : Wrapping link to the fast cataloguing page with syspref and permissions

commit ae7e2c278e10efea94e19b75446d7fed25272de2
Author: Paul Poulain <paul.poulain@biblibre.com>
Date:   Wed Dec 15 20:50:45 2010 +0100

    Bug 3495 : Add link to Fast cataloguing in case the scanned barcode don't exist in circulation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 13:58:43 +13:00
Christopher Hall
6ed8d1425d Bug 5462: fixed incorrect TMPL_IF
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:56:31 +00:00
Chris Cormack
1c461680c8 Bug 5452 - Overdue date color in borrower's today issues
Patch sent by Fridolyn SOMERS, but not in git format
2011-01-30 07:58:48 +13:00
Chris Cormack
e1b1c43425 Revert "Fix for Bug 3659, Add place hold option from patron checkout tab"
This reverts commit da2040634e.

Wrong patch was applied
2011-01-25 06:24:32 +13:00
da2040634e Fix for Bug 3659, Add place hold option from patron checkout tab
Adds a button on patron-related pages, "Search to hold"
Clicking search to hold sets a cookie with the patron's
borrowernumber and sends the user to the search page.

On subsequent search results pages the user will have
the option to place holds specifically for the remembered
patron. This works on the search results page (single
and multiple hold) and on the detail page.

The saved cookie will time out after 10 minutes or
be erased when a new patron is loaded by circulation.pl

New jQuery plugin added: jquery.cookie.min.js

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-24 20:43:04 +13:00
05c240953a Additional fix for Bug 3550, Use GetRecordValue to get the subtitle
- Adding subtitle to Hold Ratio report output
- Sorting by default on ratio, descending
- Adding author
- Removing description

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-10 05:18:32 +13:00
Nicole Engard
f379638c9d bug 5419: make reason checkouts blocked stand out
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-05 09:11:32 +13:00
Nicole Engard
c71a36fd27 bug 5562 change 'issues' to read 'checkouts'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-03 22:00:08 +13:00
Chris Cormack
9693db7bff Merge remote branch 'kc/new/enh/bug_2965' into kcmaster 2010-12-21 08:51:31 +13:00
Katrin Fischer
cf4d851907 Bug 2965: Follow up - fixing problem with barcode field
The scanned barcode stayed in the checkout field instead of being
deleted after checkout or confirmation.

This patch reverts the template change, so the barcode is deleted.

Please test!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 08:44:46 +13:00
324991fefd Fix for Bug 4946 - hold warning needs rewording
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:

- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out

I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:45:03 +13:00
Chris Cormack
be8f1f3343 Fix for 5143, now with IE debug removed
Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work

adds:
 - the subtitles into the title link (originally Chris Cormack)
 - barcodes for every listed hold
 - denoted which items were only item and which could be filled by any item on that bib.
 - added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)

[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-15 09:31:33 +13:00
Katrin Fischer
872529cb11 Bug 2965: Allow due date in the past - small template fix
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 19:33:58 +13:00
Srdjan Jankovic
4d1762f5ec Bug 2965: Allow due date in the past
Raise warning rather than disallowing
Remove due date js validation when checking out

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 13:49:15 +13:00
Alex Arnaud
122bc589e7 (BUG #4806) circ/circulation.tmpl: Add "reservenumber" in the reserved table.
Add "reservenumber" the "reserved" table which is used for delete or update reserved items.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 14:30:59 +13:00
Koustubha Kale
e4cbc4f421 Bug 5418: Rev-5 patch new itemBarcodeInputFilter for libsuite8 style barcodes
In India a ILS product called Libsuite8 prints barcodes like b0007432. The barcode is not stored anywhere in libsuite8's database. Neither is barcode available in any of the reports generated by the software.

The barcode 'b0007432' when scanned into the libsuite8 software is de-constructed like 'b' which is the itemtype i.e. Book in this instance, and '7432' which is the 'Accession Number'. The software then takes the logged in staff's branchcode and does a join on three tables 'Location', 'Media_Type', and 'Books' to retrieve the particular record from the database.

There is no possibility of recreating the barcodes for insertion in Koha while doing a retrospective conversion, because of arbitrary length of the barcode string AND arbitrary number of zeros in the numeric part of the printed barcode AND the fact that there are no reports available from the software which contain barcodes AND the fact that the barcode is not stored in the database.
But most importantly due to the simple fact that printed barcodes are duplicated among branches.

Therefore this patch emulates the functionality of Libsuite8 software of converting the scanned barcode into one stored in Koha using the itemBarcodeInputFilter system preference.

To use this new itemBarcodeInputFilter systempreference choice called 'libsuite8', the barcodes stored in Koha must match the pattern of <branchcode>-<itemtype_code>-<accession_number>. This is easy to achieve while doing retrospective conversion from Libsuite8 to Koha.

As expected the itemBarcodeInputFilter will return unmodified barcode if presented with a barcode of pattern <branchcode>-<itemtype_code>-<accession_number>

This revision corrects the way updatedatabase.pl is changed in order to correctly update version and insert the libsuite8 option in the database. Also kohaversion.pl is changed in the recommended format of 3.0X.0X.XXX to reflect database has changed.

This revision also changes the erronorous itemBarcodeInputFilter description in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref from 'scanned patron barcodes' to 'scanned item barcodes' there by eliminating need for a separate patch for bug 5417.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

1) applied patch to HEAD
2) set next database number in kohaversion.pl and updatedatabase.pl
3) webinstaller kicked in, update ok
4) typed the barcodes from test cases into check-in

Barcodes used my local branch code, everything seemed ok to me.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:39:20 +13:00
e29a123a9b Fix for Bug 2808, Hold queue not alphabetizing
White space in the biblio-default-view include and in the page
template caused sorting on title or patron to be incorrect.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:30:06 +13:00
02524213b3 bug 5397: display renew count consistently
Display the renewal count for loans consistently; in particular,
for loans that have never been renewed, display 0.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:56:34 +13:00
083d3b1a92 Fix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab
Display of the renewal date footer in the template was conditional upon
the existence of checkouts from today.

In order to fix this bug it was necessary to repeat the markup for the
table footer twice in the template, so I created an include file for it.
The same include file can now be used in moremember.tmpl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:38:43 +13:00
cc57c2688d Fix for Bug 5281, "Check in" then "Renew" checkboxes checked in the same time
This fix corrects the behavior of the checkboxes whether the user clicks the
checkbox itself or the <td> around it. Tested on a PC in Firefox 3.6, Chrome,
Safari 5, and IE 8.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:15:34 +13:00
8663778b8e Bug 5396: New system preference UseTablesortForCirc
This system preference allows the librarian to toggle on or off whether the JQuery tablesort is used on the
circ/circulation.pl page.  For patrons with many checkouts, this sort may cause very slow page loading (and
therefore slow circulation transaction time), depending on the browser and local machine used.  Staff can
still see a sortable list of current checkouts on the members/moremember.pl page.

My revision prevents the template from including *any* tablesorter code if the
preference is feature is turned off: both the circulation list and
the holds list will have no jQuery tablesorter.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 19:53:12 +13:00
Chris Cormack
f0fc240e91 Merge remote branch 'kc/new/for-3.4/spelling' into kcmaster 2010-11-02 11:33:49 +13:00
Nicole Engard
9c1eae7453 bug 5163 change title of holds to pull page
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:19:56 +13:00
Bernardo Gonzalez Kriegel
7b2dbbd6b7 Additional fix Bug 5122 - Misspelled word: transfered
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-17 13:51:32 -04:00
Bernardo Gonzalez Kriegel
444fade020 Bug 5122 - Misspelled word: transfered
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-17 13:51:32 -04:00
8a5cf3605b add explicit type to <input> elements missing it
Quells a warning from xt/author/translatable-templates.t

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 17:44:34 -04:00
a9c90b6dfb Fix for Bug 4532, Use include file for bibliodefaultview logic
Note that this new include builds only the first half of the
anchor tag (<a>). Because title and subtitle are output differently
on some pages, rendering of the second half of the tag is left
to individual pages.

Includes fixes for staff client templates.

Change to basket.pl fixes a bug wherein the OPAC's bibliodefaultview
preference was being checked instead of the staff client's.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:54:54 -04:00
Nicole Engard
5bdbd73f63 bug 4845 change language from reserves to holds
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 19:50:07 -04:00
841da504e8 Further corrections for Bug 4244, Use "checkouts" instead of "issues"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-07 13:26:29 -04:00
37e9cbc042 Fix for Bug 4416, renew all and return all buttons too close together
This patch removes the "return all" button altogether. Returning all items
is a step which one wouldn't take lightly or even regularly. Since the
interface has a means of selecting all checkboxes in the "Check in" column,
removing the "Return all" button wouldn't eliminate the means of doing so, it
would just require more deliberation.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:17:21 -04:00
38b16e34fd fix various errors reported by xt/author/translatable-templates.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 08:36:21 -04:00
4bfeac67ed Fix for Bug 4436, reserve should say 'hold'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 10:09:29 -04:00
Michael Hafen
ea0c76af7f on checkout ask for confirmation if borrower from different branch
With IndependantBranches on check that the borrower is from the same branch as
the librarian.  If not then ask for confirmation.  This check is skipped for
SuperLibrarians.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:17:19 -04:00
d575278cba bug 4036, 4405: overdue and fine day block improvements
* Adopted wording suggested by Kyle Hall for the
  USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE circulation blocks
* Updated IsMemberBlocked so that if a patron has accrued
  fine days, that will be tested for first before testing
  to see if the patron has current overdue items; this solves
  a problem introduced in the patch series for bug 4505 where
  accrued fine days would be ignored if (a) the patron has
  current overdue items but (b) the library has chosen to
  set the OverduesBlockCirc syspref to noblock.
* Now correctly assigns the USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE
  blocks; prior to this patch, they had been swapped.

FIXME: IsMemberBlock ought to be split into two functions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:46:26 -04:00
b7a5bbefe8 bug 4505 followup - template changes
* fix syntax error
* adjust wording - "patron" instead of "borrower"
* handle case where overdue items should require
  confirmation of loan by operator
* fix typo in system preference template

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:59:05 -04:00
Chris Cormack
86fbe2ec21 Bug 4405 - Overdues block check out
[Documentation note by RM:

This patch adds a new system preference, OverduesBlockCirc,
that can take one of three values:

  - noblock:      checkouts permitted even if patrons
                  have overdue items (default)
  - confirmation: circ operator asked to confirm checkout
  - block:        checkouts to patrons who have overdue
                  items are forbidden

]

Squashed commit of the following:

commit 6a1f66e0686a14d8a89abfc3fe5978dabd0b7af7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:27:39 2010 +1200

    Tidy up ready to send patch

commit 4d1398df18dcce4fd888cf17a0e2955fdf6ee1e4
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:26:15 2010 +1200

    Bug 4405 - tidy up

commit 3daeb71bc6b690e18dda96aa3c767c2bb0521038
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:02:04 2010 +1200

    Bug 4405 - Overdues block checkout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:39:11 -04:00
Kyle M Hall
9a989c9e58 Circulation - Disable Barcode Field If Item Needs Confirmation
When issuing items, if a confirmation screen comes up,
another item can still be scanned into the barcode field.

If a librarian does not notice the confirmation dialog,
he or she may continue scanning items without confirming
the issue and thus give a patron an item without it actually
being issued to the patron.

This patch disables the barcode field until the confirmation
question is answered.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 22:44:49 -04:00
Nahuel ANGELINETTI
67f9ea0264 (MT #3007) update hold transfer slip datas
This patch add information to hold transfer slip:
 * itemcallnumber
 * location
 * waiting date

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:42:43 -04:00
Srdjan Jankovic
7c6d572b4c catalyst-wr68479: Limit holds to the user branch, provide a link to
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:10:49 -04:00
Kyle M Hall
74f6e35c60 Replace branch codes in on returns screen with branch names.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-16 07:47:08 -04:00
a136920f30 Improve display of information on Transfers to your library report
- Use GetRecordValue() to show subtitle
- Show author
- Separate branch and call number display for better sorting
- Correct teriminology (reserve -> hold)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:12:20 -04:00
d38a716fc1 Removing bogus style declaration
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:01 -05:00
5e83c889a7 bug 3825 followup: fix errors in template
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 16:35:32 -05:00
Nahuel ANGELINETTI
631a875de1 (bug #3825) improve waiting holds
[cherry-pick from 3.0.x]

This patch :
 * fix indentation
 * Separate waiting holds from holds over with tabs
 * Select only holds for librarian library

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 16:14:21 -05:00
Will Stokes
f27c5ae5a1 Display amount of credit patron has, not just that they have credit.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:18:03 -05:00
0bdba46f91 bug 1080: XHTML-ify audio tags
This doesn't actually do much, since the <audio> tag is still
not defined in XHTML1, but it makes it consistent with the rest of the
markup.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 09:25:16 -05:00
root
b4c887f2c4 Bugzilla 1080 to add enhancement for sound. Only changed circulation.tmpl/pl and returns.tmpl/pl and added a single syspref (set to off) along with very compressed OGG files for sound which are on the open source "artistic" licence.
Works for HTML5 because it loads smoothly and no plugins required but *at
  this time* this update will only work with staff clients which are Firefox
  version >=3.5 (std for Koha) but other browsers will soon be adding support.

  Additional sounds are included for people to modify and play with, but this
  is such a simple upgrade I doubt at this time Koha needs another complex
  selector so users can add their own sounds. It could be a nice enhancement
  later, of course.

  Suggest we stick with HTML5 <audio tag because it is a standard and no
  plug-ins.

  This simple update has been running live for SMFPL.org for almost 2 weeks

  -Darrell Ulm

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 08:12:25 -05:00
Will Stokes
7fc8025978 Bug #2162: Step 2, add pagination. Splits results into blocks of 250 results and adds Previous and Next buttons. Achieved using forms, hidden search variables and submit buttons.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 19:26:31 -05:00
Will Stokes
7de9a2128a Bug #2162: Step 1, prevent running of report upon entry to page. Add name run_report to submit button and checks in template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 19:26:15 -05:00
Nicole Engard
96e4e27b42 bug 4129 fix display of html on the overdue report
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 07:39:57 -05:00
e1b19d70d0 Fix for Bug 4113, Failed renewal from circulation screen results in malformed table
Renewal failure message should appear in renewal checkbox column just
like it does in moremember.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 19:00:27 -05:00
bad504cbe1 Style correction
- Use <div class="dialog alert"> for warnings, not "dialog error"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-04 12:31:03 -05:00
2ce51846a0 More fixes for Bug 2600, HTML tags in titles not escaped in many places
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 16:52:31 -05:00
cd921163c0 Fixes for Bug 3089, Date entry fields should indicate required date format
- Added include, date-format.inc, which shows format, e.g. "(DD/MM/YYYY)"
- Hint shows expected date format based on system preference
- Removing calendar.inc include from templates which don't use it

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:12:18 -05:00
Kyle M Hall
844f63f1f8 Rotating Collections Fixes
This patch does the following:
  * Fixes the typos in updatedatabase.pl ( updates colBranchcode to varchar(10)
  * Adds the rotating_collections template files that somehow were not committed
  * Adds a missing sub from RotatingCollections.pm that must been deleted by accident
  * Adds the neccessary hooks in returns.pl to warn that and item needs to be returned
    to the branch that currently holds the collection.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-02 19:22:05 -05:00
Michael Hafen
616a5ff349 Change style of return errors to be more noticable.
Changed the class of the div from message to error.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-02 18:45:57 -05:00
f8c1ee66a3 Fix for Bug 3984, Confusing note on transfers to receive
- Changing 'check this transfer' message to more informative
   'Transfer is XX days late'
 - Adding note in the case of late transfers: 'Transfers are
   considered late after XX [TransfersMaxDaysWarning] days.'
2010-01-25 18:37:11 +01:00
7e94056989 Fix for Bug 4035: Today's checkouts grouped with previous checkouts
Creating separate variable to be output to the template so that
the original issuedate can be used in date comparison.
2010-01-15 10:22:04 +01:00
Liz Rea
7b8666e855 Adds auto print/auto close functionality to hold transit slip. 2009-12-20 14:27:12 +01:00
Matthias Meusburger
9f41fe64be MT 2050, Follow-up, Fast Cataloging
Adds granular permissions for cataloging
Also adds a link from the circulation home to fast cataloging when fast cataloging is active
2009-11-24 10:05:10 +01:00
75423b3010 Corrections to ensure message list appears in the proper box (Bug 3668).
The patch sets a "flagged" variable for displaying the messages correctly, bringing it in line with the way other messages are displayed. The patch also includes some markup tweaks and a change to make display of the "add message" link javascript-dependent.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:20:56 -04:00
Colin Campbell
6fb8ef0d79 New Messaging System.
This system is indended to replace the old opacnotes
  and borrowernotes fields in the borrowers table.
  This system allows an unlimited number of Libraran and OPAC notes to be
  attached to a borrower. Each note has a message, a message type,
  the data it was created, and which library created it.
  Each message can only be deleted by the library that created it unless the syspref
  AllowAllMessageDeletion has been set.

  This system may be used simultaneously with the old notes system and does not affect it in any way.

  A new database table (messages) was added for this feature.

  The System also allows for pre-defined notes for Borrower records

  To use these, just create authorised values with the category BOR_NOTES
  where the Authorized Value is the short description shown in the pulldown,
  and the description is the text that should be in the note.

  Original Author: PTFS Contractor <dbavousett@ptfs.com>

  This work co-sponsered by Middletown Township Public Library, Middletown, NJ, USA
     and East Brunswick Public Library, East Brunswick, NJ, USA

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2009-09-15 22:11:38 -04:00
e50bc421c4 Changes to make checkouts/holds display the same on circulation and patron detail screens (Bug 3106)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-06 14:37:10 -04:00
PTFS Contractor
36ec435cd9 bug 3485: Clear Borrower record after checkout.
Button added to clear the last Borrower record after transaction is complete
To enable, turn on the syspref DisplayClearScreenButton.

This work was sponsored by Middletown Township Public Library, Middletown, NJ USA

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-23 13:21:21 -04:00
45f799a7de Minor change to fix Bug 3086, Can't close circulation date-picker popup in Internet Explorer
I don't know why this edit fixes the problem, but it does. Tested in IE6, IE7, and IE8 on Windows XP.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-01 08:27:23 -04:00
5a93f0b806 More changes to implement jQuery upgrade.
- Upgrading jquery checkboxes plugin
- Correcting references to checkboxes plugin
- Upgrading jquery hotkeys plugin
- Upgrading syntax for calls to hotkeys plugin
- Removing jquery dimensions plugin (functionality rolled into jQuery)

Signed-off-by: John Beppu <john.beppu@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-14 07:08:18 -04:00
Darrell Ulm
62cf086ef1 Bug#: 3358 File 3 of 3 patch for reserve notes (show)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-12 23:33:46 -04:00
Darrell Ulm
c943c9f39c Bug#: 3358 File 2 of 3 patch for reserve notes (show)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-12 23:33:44 -04:00
471fe3927a Removing hard-coded $ symbols from the template, addressing Bug 2547
Pending a system for displaying the correct currency symbol based on the system's default currency all dollar-specific symbols should be removed in favor of no symbol.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-29 13:47:25 -05:00