Commit Graph

82 Commits

Author SHA1 Message Date
Joe Atzberger 1e244d83e3 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-09-16 23:19:40 +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 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
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
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
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
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
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 eae1168df8 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-10-28 22:09:27 +01: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