Commit Graph

377 Commits

Author SHA1 Message Date
Nahuel ANGELINETTI 19c272e39f (bug #3403) fix circulation.pl reservation list
This delete useless code that introduce the leak of reserved items informations.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:29 +02:00
Garry Collum 2d601124cf Bug 2505: Enables warnings in reserveratios.pl
Also fixes resulting warnings.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:27 +02:00
Jane Wagner 862beea7c0 Bug # 2368 Change holds to pull default date range
Delivered range was 10 years ago to yesterday; changed default
to be two days ago to today.  Also removed notes field from report
output; 5xx fields can be quite large and including them in the
display resulted in a very lengthy printout for staff.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:13 +02:00
Galen Charlton 9a09526daf followup: remove unconditional warn
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:07 +02:00
Joe Atzberger 3de17ad306 Standalone branch selection
selectbranchprinter now posts to itself to set the branch.  That also means that
other pages can set the branch by linking to selectbranchprinter like:
    /cgi-bin/koha/circ/selectbranchprinter.pl?branch=MAIN

We use HTTP_REFERER to allow the user to continue back to wherever they linked from,
defaulting to circulation.pl (the former POST target).

Note that all "branchprinter" functions are basically useless as the data is not
properly handled in the session storage.  Chris C. expects this to be addressed
with later patches for HLT.  There appear to be no 3.0 users of this intended
functionality yet.

Includes squashed patch to fix tmpl and to automatically redirect if there are no
POST params to be recycled.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:07 +02:00
Joe Atzberger 1798231d48 Cleanup selectbranchprinter.pl and .tmpl
Use GetBranchesLoop and warnings.  Remove unused code.  Moved the Get's to after auth.
I begin to show how this script will use referer to redirect back to the sending
page upon successful change of branch or printer (see hidden div and recycle_loop).

Indicator for singleBranchMode added.
Also added another helper function for GetBranchesLoop, namely mybranch.  This
encapsulates the logic for finding an intelligent default selection, which is
almost always desirable.

This does not resolve bug 2426, but is work in that direction.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:06 +02:00
Joe Atzberger 290d6a8a16 Branchoverdues circ report reworking.
branchoverdues.pl
~ Removed unused variables.
~ Use elsif where applicable.
~ Added many FIXMEs.
~ Added help description.
~ Changed link to more accurate description.
~ REFACTORED branchoverdues-specific function in C4 for obvious consolidation.

This report is still of questionable value, since it's dataset has such strange
hardcoded limitations.  It is not clear that "FU" type fines and notifys=0 are
reliable or useful indicators to query on, in hardcoded form.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-16 23:19:04 +02:00
Owen Leonard c13abc8f78 Adding additional information and consolidating display of information in holds queue report
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-16 23:19:03 +02:00
Joe Atzberger 1fab8a8a5f Cleanup transferstoreceive.pl and .tmpl
Removed unused variables.  Replaced EXPR.
Inserted hidden span to correct tablesorter behavior on title field.  Without this patch
because of the link href in the cell, the sort would end up being effectively on
biblionumber, not title.

Mostly whitespace edits in template.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:58 +02:00
Joe Atzberger 27acd508dd Cleanup circ/overdue.pl
This also fixes a deficiency with overdue.tmpl not retaining the
user's selection of sort order when displaying results.
Removed 9 unused variables.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:58 +02:00
Joe Atzberger 3f06bd90b4 Cleanup circ/billing.pl
Remove ton of unused variables.
Remove wrong use of BiblioDefaultView on INTRANET side.
Consolidate failover values.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:57 +02:00
Joe Atzberger 7b6795aa3f Cleanup circ/stats.pl
Use elsif and else.  FIXME's added.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:57 +02:00
Joe Atzberger 0607af5c62 More cleanup on returns.pl
Removed unused variable.  Corrected comments.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:55 +02:00
Joe Atzberger 8558a05a8b Cleanup and enhance bookcount.pl and .tmpl
Eliminated bug with date handling outputting an English string.
Row striping added.  Highlight for "my branch" row added.
GetBranchesLoop used instead of recreating data structure, so we get the
benefit of branches being sorted (by display name).

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:53 +02:00
Joe Atzberger 8f18cca98d Cleanup returns, consolidate some repeated logic.
Use one $userenv_branch instead of many calls to C4::Context->userenv->{'branch'}
for comparisons.  Script is not warnings safe yet, but getting closer.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:51 +02:00
Joe Atzberger 3d658f44f7 Bug 3130 and general cleanup
Javascript error in FF and IE when loading page and no data matches criteria.
This was because it was passing more holds than necessary to the template and
letting a template conditional inside the loop control whether to display or not.
That doesn't make sense, and it forces the table to be displayed even when all
rows FAIL the conditional.  jquery.tablesorter was confused trying to be added
on top of an empty table with nothing to sort.

There were several other errors addressed by this patch:
 ~ 13 unused variables deleted.
 ~ regexps run on user-supplied $var before checking $var defined
 ~ decimal ratio prohibited and silently replaced with "3"

I also added the hold ratio to a column display, with a jquery tweak to put it in
the ratio input box on click.  Hidden .sql div now contains the actual query run,
like the other wizard reports.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:18:48 +02:00
John Beppu f0dffa4c17 bug 2874 [3/3] flagsrequired => { circulate => "circulate_remaining_permissions" }
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-04 18:46:17 +12:00
John Beppu 35958a8e03 bug 2874 [2/3]: added awareness of circulate/override_renewals subpermission
A few minor whitespace cleanups were thrown in as well.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-04 18:45:58 +12:00
Ryan Higgins 4091e70eb4 bug 2787 : Fix Global Due date
This patch also lightly refactors the conditional structure wrapping the
call to AddItem, renaming a couple variables to remove double-negatives and
abstruse logic.  If SpecifyDueDate is ON, then the input box is used to pass
GlobalDueDate, allowing modification by circ staff, resulting in a default
'sticky' due date of the global due date in that mode.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-04 15:18:19 +12:00
Joe Atzberger 650dd94f37 Circ cleanup.
Removed unused $dbh variables, converted to loop_context_var instead of togglecolor.
Prevented double comparison in sort.  The rest is whitespace cleanup.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2009-09-04 14:47:31 +12:00
Ryan Higgins df30f5f0c2 Remove ambiguity from SQL statement for holds queue.
holdingbranch table not referenced in view_holdsqueue.pl, causing irresolvable ambiguity in
sql query when limited by library (holdingbranch).  This was causing DBI errors to be thrown
in test database, and library-limited holdsqueue display was thus empty.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-04 13:28:45 +12:00
Danny Bouman c421178817 bug 2569: added the zipcode to display along with the patron address
Added the zipcode to display along with the patron address when you are viewing a Patron from the intranet.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2009-09-04 11:34:16 +12:00
Galen Charlton 799a663ada bug 2522 [2/3]: C4::Reserves support for request targeting
_Findgroupreserve, which identifies which hold request an
item should fill, is modified to check to see if
that item is targeted to fill a specific hold request.

It first checks for a targeted match with an item-level hold request,
then a targeted match with a title-level request.  If no
such targeted match exists, it then checks for the top entries
in the holds queue.

The hold targeting map (i.e., the hold_fill_targets table) is
populated by the build_holds_queue.pl batch job.  If that
job is not used, the behavior of _Findgroupreserve
is not changed.

This patch also

* adjusts ModReserveMinusPriority so that it calls
  _FixPriority().
* adjusts circ/returns.pl so that it
  correctly detects transfers.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-04 09:35:08 +12:00
Henri-Damien LAURENT bfcbf572fe Reordering branches. 2009-05-26 21:15:31 +02:00
Galen Charlton 671efe5428 fix references to $session in circ/circulation.pl
Now that sticky due date processing uses the session,
script will always need it.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:30 +02:00
Michael Hafen c3c75cee80 Make stickyduedate remember for session a little more permanent
Store the stickyduedate in the session.  So "Remember for Session" means
for session rather than "while on this page".

Includes some updates since initial submission of patch.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:30 +02:00
Galen Charlton e1efa13a17 tweak removal of whitespace from barcodes
Per suggestion from Joe Atzberger, match on \s
instead of [ \t] for stripping leading and
trailing whitespace from barcode lookups.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:30 +02:00
Mason James b7f63d0ce2 fix to remove leading/trailing whitespace from entered barcode.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:30 +02:00
Galen Charlton c7e6f5fbe2 fix to previous patch - use 'lt', not '<', to compare date strings
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:15 +02:00
Joe Atzberger dfdbc0b79f Visual alert (red) on overdue return.
This was requested by a Koha user at KohaCon09.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:15 +02:00
Paul Poulain 21cbcd9d25 fix for #946
A member returns a book : it would be better to see the category of this member
in "information member" near his name.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:12 +02:00
Mason James b1939a08a0 fixes error below...
bookcount.pl: Illegal Date 'Item has no branch transfers record' does not match 'iso' format: yyyy-mm-dd at /home/mason/git/kap-k3-2/circ/bookcount.pl line 88

tested on 3.0.x

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:03 +02:00
Owen Leonard 63758df267 Fix for Bug 3015: Check-in screen displays branch name inconsistently
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:02 +02:00
Owen Leonard 72a73e0ddd Enabling listing of category codes when "new patron" button is displayed.
circulation.pl lacked the code to check whether category codes existed, meaning it would only display category types.
2009-03-04 12:47:40 +01:00
Henri-Damien LAURENT 1c51a2e8cf Updated circulation page in order to make things appear the right way 2009-02-17 15:51:55 +01:00
Henri-Damien LAURENT 568fd7b90c Adding System Preference AllowNotForLoanOverride
this system preference was created but not added to system preferences
2009-02-02 16:14:37 +01:00
Nahuel ANGELINETTI ada7677996 (bug #2893) Allow loan forcing if a syspref is set
If the syspref 'AllowNotForLoanForcing'(YESNO) is set to YES, the librarian is able to force a loan on an item set as "not for
loan".
If the item is not for loan and the syspref is set to YES, koha will ask to the librarian if he really want to check-out it,
else do nothing.

Signed-off-by: Henri-Damien LAURENT <henridamien@koha-fr.org>
2009-01-27 12:19:46 +01:00
Joe Atzberger 267fe06f0a Bug 2900: fix GetPendingIssues.
GetPendingIssues did several bad things:
~ select * on a 4 table join,
~ including multiple namespace collisions,
~ including large fields marc and marcxml from biblioitems,
~ return ($count, \@array_being_counted).

Not everything is fixed here (see FIXMEs), but the situation is
improved considerably, with bug 2900 resolved.  The "timestamp"
namespace collision in query should be resolved by separate patch.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-01-27 12:19:45 +01:00
Michael Hafen 9276e1cdd2 javascript redirect when selecting a patron on circulation.pl Patron Selection Screen
This adds a little javascript to the Patron Selection form input after searching for a patron to check out to.
On click it redirects to checking out to the clicked patron.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-01-27 12:19:44 +01:00
Joe Atzberger 16b25aee86 Trivial cleanup
2 FIXME's added.
Vestigial "8-character tabs" comment removed.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2008-12-10 14:26:59 +01:00
Henri-Damien LAURENT 620ead4445 Allow renewal limits to be overridden
Originally by Jesse Weaver <jesse.weaver@liblime.com>

This patch creates a new system preference, AllowRenewalLimitOverride,
that, if YES, allows the renewal limit to be manually overridden. It
updates C4::Circulation and reserve/renewscript.pl to obey this.

Adapted for 3.0 : Henri-Damien LAURENT
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2008-11-24 18:11:42 +01:00
Nahuel Angelinetti 685f284606 Fix overdue list if you do not specify a branchcode.
Before, if you do not provide a "branchcode" you have an empty csv export.
Now, if you have an empty branchcode you have all overdues listed in csv.
(I made a typo error in code)

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-11-12 17:11:22 +01:00
Joe Atzberger 558546fc33 Circ cleanup.
Removed unused $dbh variables, converted to loop_context_var instead of togglecolor.
Prevented double comparison in sort.  The rest is whitespace cleanup.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-11-12 15:15:55 +01:00
Michael Hafen e3528b3e83 Add fine amount to display on circ pages.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-11-12 15:13:57 +01:00
Michael Hafen f9dce6fd89 bug: sticky due date isn't stick if there is a question about an issue
the stickyduedate input isn't sent on from the question dialogs.  This
causes it to un-stick if there is a question.

Also removed month, day, and year as there seems to be no use for them.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-11-12 14:40:14 +01:00
Galen Charlton 7abfefa099 bug 2523: add columns to holds queue report
* added author, ccode, location, and item enumchron
* sorted by collection, locatoin, call number, author, title

As part of this patch, commented out the JavaScript tablesorter,
which could cause the browerer to lock up if the picklist
contains more than a couple hundred items to pull.
Some sort of pagination is clearly required, but since
it is necessary for customers to be able to print out
the picklist, there still needs to be an option to
see the complete list for a branch.

This patch includes the final component of the fix
for bug 2331.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-11-04 17:18:06 +01:00
Galen Charlton 1c69c063dc bug 2521: distinguish types of hold requests
Title-level and item-level requests are now more
clearly distinguished in the patron details page
and the patron checkout page.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-28 22:51:06 +01:00
Ryan Higgins 1c052fc398 Sort libraries by name in holds queue's select input.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-28 22:09:31 +01:00
Danny Bouman 36fbcb8d1e bug2580: category name and home library will now correctly display on all patron tabs
This patch fixes several improperly named variables and includes the home library variable on the pages that were missing it. The category
description was added to the GetMemberDetails function since a couple of the pages using that function required the variable.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-28 22:09:29 +01:00
Henri-Damien LAURENT 3fd62098ce Bug fixing : 2516
There was a problem with names ordering in circ/circulation.pl

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-28 22:09:28 +01:00