Commit Graph

287 Commits

Author SHA1 Message Date
Colin Campbell e862d7ce60 Fix some code issues in circulation/returns
Fix obvious warning generators
 use of string comparison on numeric values
 use of capture variables without testing comparison
 reuse of variable names in same lexical scope
Tidy some layout issues
 remove commented out code
 remove unused variables
 remove tabs from mixed space tab layouts
 rewrite a couple of expressions where code flow obscured
2010-01-05 13:54:10 +01:00
Galen Charlton 8219d79f5a cosmetic fix - use $itemnumber as argument to GetItems when available
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-23 13:07:32 -04:00
Colin Campbell e40e11ab0c bug 3481: Allow Item Temporary Locations for Processing and Shelving.
Allows temporary locations corresponding to 'in processing' and 'shelving'
so that newly-created items, and newly-returned items do not show
immediately as a available. Three new system preferences govern the usage
of these features.

NewItemsDefaultLocation. If system pref NewItemsDefaultLocation is set to a location code,
 all newly catalogued items will be set to the location set in this preference.
 Location code must be a valid LOC authorized value type.

InProcessingToShelvingCart. if the system pref InProcessingToShelvingCart is turned on,
any items run through returns.pl with a location code for 'PROC', will be modified to
have a new location code of 'CART'.

ReturnToShelvingCart.  If the syspref ReturnToShelvingCart is turned on,
all items returned other than confirmed holds will have a new location code of 'CART'.
Any item issued is automatically taken of the shelving cart.

Adds a cron script shelf_to_cart.pl which should be run hourly.
Updates all items with a location of CART to the item's permanent location.

The original location code is stored in the new items column 'permanent_location'.

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

This work co-sponsored 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>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-23 11:54:46 -04:00
Darrell Ulm 1b879d7410 Bug#: 3358 File 1 of 3 patch for reserve notes (show)
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-12 23:33:38 -04:00
Joe Atzberger e8908c2f97 Returns reworking to handle empty GetItemIssue
Code cannot rely on issueinformation being populated.

Note there is room for better efficiency to have AddReturn also provide the
itemnumber (where existing) so that GetItemnumberFromBarcode is not called
at both levels.  Unfortunately there is discrepancy between this idea (for
efficiency) and the stated purpose of the $iteminformation object returned,
since $iteminformation is specifically the info from the issues table and
MUST be empty when the item was not in fact issued.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-24 09:44:39 -05:00
Joe Atzberger ce4c8c5b1e More cleanup on returns.pl
Removed unused variable.  Corrected comments.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-21 08:22:34 -05:00
Joe Atzberger 89391ca831 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>
2009-05-20 08:41:18 -05:00
Michael Hafen 454dd9376b New feature Number of Returned Items to Show
This adds a system preference controlled feature.  This controls how
many returned items are shown on the check-in page.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-24 13:23:44 -05:00
Galen Charlton d23a8d3069 fix to previous patch - use 'lt', not '<', to compare date strings
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-20 12:14:28 -05:00
Joe Atzberger 0ad2b08c28 Visual alert (red) on overdue return.
This was requested by a Koha user at KohaCon09.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-20 12:05:01 -05:00
Paul Poulain 6dbe43b54a 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>
2009-04-18 16:04:50 -05:00
Owen Leonard ebc9a26686 Fix for Bug 3015: Check-in screen displays branch name inconsistently
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-11 08:37:23 -05:00
John Beppu c15e1206fd bug 2874 [3/3] flagsrequired => { circulate => "circulate_remaining_permissions" }
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-12-23 17:02:04 -06:00
Michael Hafen 12b216c77d Add fine amount to display on circ pages.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-23 16:29:56 -05:00
Michael Hafen 0e3302e78b Added link to catalogue/moredetail.pl on the returns page for each returned item
Had to add itemnumber to the hash of returned item information.

Links to moredetail.pl with itemnumber and #item in the url.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-02 16:33:51 -05:00
Galen Charlton 8b48780665 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>
2008-08-18 07:15:52 -05:00
Paul POULAIN 6fc3c7cd9d display itemnote on check-out (added, was not here) & check-in (red-ed, was already here)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-03 06:04:14 -05:00
Paul POULAIN 7979f28cc0 add borrower note to check-in
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-30 12:00:16 -05:00
Ryan Higgins b4017ad01a adjust dropboxdate to allow for holidays calendar.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 09:29:10 -05:00
Ryan Higgins 12a3217bfe Add dropbox mode to return.pl. Small API change to allow setting
returndate other than now().  Overdues will be handled in a forthcoming commit.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 17:54:20 -05:00
Galen Charlton bcbc4ca393 another patch to display correct item type
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-15 08:37:19 -05:00
Ryan Higgins 1cd6263dde Adding barcode_decode syspref
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-02-19 20:22:01 -06:00
Galen Charlton c6c8e80a73 start of BIB change -- introduce C4::Items
Introduced C4::Items module to separate items API
from biblio API.  Details on changes will be
put in later commit messages.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 16:23:12 -06:00
Chris Cormack 052861306b Fix to redirect the user ot the select branch page if they try to use
circulation without a branch set

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 20:03:08 -06:00
Chris Cormack ddd0140ef1 Fix for bug 1626, whitespace stripped from barcodes
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-30 16:24:30 -06:00
Chris Cormack 358ec9c6c3 Fix for 1582, if independent branches is on, you cant return to
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-27 17:24:37 -06:00
Ryan Higgins a9d03af6dc adding 'exempt fine on return' option.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-27 17:22:45 -06:00
Chris Cormack 7d6282e513 Fix for 1704, now if autoitemreturns is off you get a dialogue warning a
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-27 17:22:00 -06:00
Chris Cormack 55a525cb3a Fix for bug 1703
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-23 17:53:43 -06:00
Joshua Ferraro 5227d242fd cleanup of circ/ dir changes to Dates ... missing format_date 2007-12-04 18:47:03 -06:00
Joe Atzberger 82b8c496fd circ subdir - Dates.pm integration and warnings fixes.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-04 18:21:12 -06:00
Owen Leonard c5e80b7b86 Attempting to pretty up confirmations and messages in returns; Adding some variables to the template output; Fixing layout in circulation.tmpl for patrons without messages; Minor correction to OPAC css.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-27 15:58:06 -06:00
Paul POULAIN 8b7085a8ab removing useless code
the 3 parameters :
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),

are filled by Auth.pm automatically, removing them in templates

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-24 17:03:38 -05:00
Chris Cormack 1a4fc157bf Applying the fix for bug 1416 from paul
Had to edit the patch as it was corrupt
2007-09-20 17:39:43 -05:00
tipaul fb143b71ba BIG COMMIT : cleaning of Reserves.pm. See detail on koha-devel 2007-04-24 16:10:36 +00:00
hdl 100e6a9808 functions that were in C4::Interface::CGI::Output are now in C4::Output.
So this implies quite a change for files.
Sorry about conflicts which will be caused.
directory Interface::CGI should now be dropped.
I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
2007-04-24 13:54:28 +00:00
tipaul 9f42b8ad49 renaming currenttransfers to transferstoreceive 2007-04-23 15:21:17 +00:00
tipaul 3ddec89262 moving Reserves2.pm to Reserves.pm 2007-04-23 14:08:47 +00:00
tipaul 7bd99ef365 removing all useless %env / $env 2007-04-18 17:00:14 +00:00
tipaul b71839d85c circulation cleaning continued: bufixing 2007-04-17 08:44:49 +00:00
tipaul c596d55374 HUGE COMMIT : code cleaning circulation.
some stuff to do, i'll write a mail on koha-devel NOW !
2007-04-04 16:46:22 +00:00
tipaul 2ffd5b7228 rel_3_0 moved to HEAD 2007-03-09 14:28:54 +00:00
tgarip1957 4843e0ee78 Resynching Savannah 2006-11-15 01:41:51 +00:00
tgarip1957 7e52a5665c Clean up before final commits 2006-09-06 16:21:03 +00:00
toins 3c6410111b subs renamed according to coding guidelines. 2006-07-21 10:10:29 +00:00
toins cc9524a875 Head & rel_2_2 merged 2006-07-04 14:36:51 +00:00
alaurin 193e22714f Add a new system preference 'AutomaticItemReturn' :
if this prefence is switched on: the document returned in another library than homebranch, the system automaticly transfer the document to his homebranch (with notification for librarian in returns.tmpl) .

switch off : the document stay in the holdingbranch ...

correcting bugs :
- comment C4::acquisition (not using in request.pl).
- correcting date in request.pl
-add the new call of function getbranches in request.pl
2006-06-08 15:36:31 +00:00
bob_lyon 3e64f4abd4 merging katipo changes...
adding in new set_transit sub
2006-06-07 04:39:37 +00:00
alaurin 46c9e24e9d new fonctions for returns.pl :
- the system check if we don't have another reserv for the document returned, we return the document to his homebranch, ......
- improvement of returns,  adapt item reservation , loan rules, and transfer rules ....
2006-06-06 12:46:52 +00:00
tipaul b38997925f big commit, still breaking things...
* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued
2005-10-26 09:11:02 +00:00
tipaul 21a379acda CIRCULATION : the big rewrite...
This 1st commit reorders deeply the circulation module.
The goal is to :
* have something 100% templated/translatable.
* have something easy to read & modify, to say to customers/users : you can define your circulation rules as you want if you accept to look in C4/Circ/Circ2.pm

The circulation now works :
1=> ask for the borrower barcode (as previously)
2=> ask for the item barcode.
3=> check "canbookbeissued". This new sub returns 2 arrays :
- IMPOSSIBLE : if something is here, then the issue is not possible and is not done.
- TOBECONFIRMED : if something is here, then the issue can be donc if the user confirms it.
4=> if TOBECONFIRMED is set : ask for confirmation, loop. if neither  are set or confirmation flag is set (2nd pass of the loop), then issue.

The IMPOSSIBLE & TOBECONFIRMED hashs contains :
* the reason of the line. always in capitals, with words separated by _ : BARCODE_UNKNOWN, DEBTS ... as key of the hash
* more information, as value of the hash ( TOBECONFIRMED{ALREADY_ISSUED} = "previous_borrower_name", for example)

This commit :
* compiles
* works on certain situations, not on other
* does NOT issue (the line is # )
* does not check issuing rules depending of # of books allowed / already issued

The next step is :
- check issuing rule.
- extend issuing rule to have a 3D array : for each branch / itemtype / borrowertype = issuing number and issuing length.
2004-05-03 09:02:12 +00:00
rangi 9ab6c09048 Passing thru the borrowernumber with the charges data, so can create a link
to the payment window
2004-03-15 23:41:20 +00:00
rangi 1d2a764626 fix for bug 606,
seems to be an error in the tmpl still but the functionality seems to be working again
2004-02-25 21:44:40 +00:00
oleonard 7a2a0fe018 Adding item information variable declarations to 'Waiting' section already present in 'Reserved' section 2004-02-18 16:51:20 +00:00
oleonard 84b3a7b984 Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info 2004-02-17 22:15:33 +00:00
rangi 5a808e96ef Fix for bug 621,
Returns not marking reserves waiting
2003-10-28 19:34:05 +00:00
rangi 80ab9dee1d Fix for returns error message always displaying 2003-08-04 21:47:23 +00:00
wolfpac444 be884f5b62 *** empty log message *** 2003-05-08 11:19:49 +00:00
tipaul 9b2028ab72 some fixes, and links to themelang/images 2003-03-11 15:13:18 +00:00
acli bf5fb01d32 Make sure flagsrequired is *circulate* not parameters 2003-02-06 05:10:54 +00:00
acli c965f345cd Fixed bug 200; a "last" was placed in the wrong place
The file does not use 4-character tabs, nor 8-character tabs, it uses both
(!); updated comments.

Catch more $code's; is this (and the change to Circ2.pm) what was intended?
2003-02-05 07:57:56 +00:00
acli f475af255f Implemented fixes for bug 170
1. Circ2::returnbook will throw an exception if $branch is undef
2. branch/printer-getting code is modularized into getbranch and getprinter
   with correct logic from circulation.pl (temporarily put into Circ2.pm)
3. circulation.pl and returns.pl modified to use above functions

Noted correct tab sizes for the files; returns.pl partially reformatted to
conform to the dominant correct tab size

Handle non-latin1 charsets for returns.pl
2003-02-05 06:28:56 +00:00
hdl a0f2bc96a3 Templating : returns.pl 2003-01-29 22:45:07 +00:00
rangi 12c6a26124 Fixing typo, thanks ambrose for spotting this 2003-01-15 03:47:46 +00:00
arensb 5aa0fca7fa Removed trailing whitespace. 2002-10-13 10:43:54 +00:00
finlayt 4867288671 changed the way Waiting items are transfered from returns.pl to Circ2.pm 2002-09-05 00:16:39 +00:00
finlayt 01d6f11543 Changed so that when a Waiting item is returned the holding branch is updated. 2002-09-05 00:06:30 +00:00
finlayt 0883b382b9 Fixed bug in flags display 2002-08-29 00:00:45 +00:00
finlayt d8e359ce2f added another link on the "Reserve Found" flag. 2002-08-22 04:20:33 +00:00
finlayt bb97d5133a fixed bug caused by last commit 2002-08-21 04:35:13 +00:00
finlayt 26957b08de turned of the branchtransfer when an item is set to "waiting". 2002-08-21 04:29:03 +00:00
finlayt 4b1f369036 Fixed up some of the messaging stuff. 2002-08-21 03:54:39 +00:00
tonnesen bac842beda Removed '_' between issues, returns, and transfers graphics 2002-08-16 20:46:40 +00:00
finlayt 0f4b30b89c Changed the wording of the reserves print slip slightly. 2002-08-15 22:26:34 +00:00
tonnesen 1e67687742 Added copyright statement to all .pl and .pm files 2002-08-14 18:12:50 +00:00
finlayt 0f93387146 all items are listed in the returned items list, regardless of whether they were issued or not.
Changed some messageing stuff as well, but will be back to fix that up some more.
2002-08-14 05:35:53 +00:00
finlayt ba793f7604 added the itemtype code to the printed slip that goes in a reserved book. 2002-07-26 02:27:16 +00:00
finlayt 3e5a9b644e added the book title and author to the reserve messages. 2002-07-26 01:09:55 +00:00
finlayt ee16dd23ff fixed up the reserves. Can view the printed slip before it is printed! 2002-07-24 03:14:04 +00:00
finlayt c78de2bcb8 changed the behaviour when a reserved book is returned according to the wishes of HLT. 2002-07-23 03:28:36 +00:00
finlayt a1afd5ab09 changed the wording of two messages. see http://bugzilla.katipo.co.nz/show_bug.cgi?id=1390 2002-07-19 03:33:52 +00:00
rangi 49e2b90a8b Fix to get list of overdue items showing correctly 2002-06-13 03:16:55 +00:00
finlayt 2bb0991120 fixed minor bugs 2002-06-06 02:51:38 +00:00
finlayt e6099545cc Most everything is fixed now in returns, including the way it displays (a little). 2002-05-30 01:32:29 +00:00
finlayt e9bfecc3a4 Fixed up the reserves code to use the new Reserves2.pm methods. 2002-05-29 05:50:52 +00:00
finlayt 73706c24f7 improoved layout and branch and printer settings are displayed 2002-05-18 05:07:26 +00:00
finlayt 277f3490be Changes to circulations:
added returns.pl  ->  deals with the returns only
moved old circulation.pl to circulationold.pl which still deals with issues.
fixed up branchtransfers.pl
moved circulation2.pl to circulation.pl

Note more changes coming next week
2002-05-02 00:06:28 +00:00