Commit Graph

177 Commits

Author SHA1 Message Date
Henri-Damien LAURENT 0da6477377 Bug 4326 ; returndate were fixed on the day before
dropbox mode was set even though it was not dropbox.
This patch is an adaptation of Ian Walls
http://www.mail-archive.com/koha-patches@lists.koha.org/msg04736.html
2010-05-14 23:20:41 +02:00
Matthias Meusburger fe3621812e MT2889 : Fix statistics' itemtype when item-level_itypes is ON 2010-03-16 12:37:59 +01:00
Nahuel ANGELINETTI 5af80ab9ab [3.0.x](bug #4084) fix offline circ
this add the function C4::Circulation::GetOpenIssue and delete \r chars when processing koc files.
2010-02-10 14:01:30 +01:00
Nahuel ANGELINETTI 8f0f18d337 [3.0.x] (bug #4055) backport canbook/itembereserved
This backport the functions from 3.2/3.4 to the 3.0 API, because we need to factorize the code.
2010-01-27 14:14:48 +01:00
Nahuel ANGELINETTI 04d92ee17e (bug #4050) update datelastseen even if document isn't on loan
this change the place of moddatelastseen to be used each time a document is checked in, even if the document is not on loan.
2010-01-19 22:08:18 +01:00
Nahuel ANGELINETTI 23dc1bda51 (bug 3536) fix homeorholdingbranch on return
this patch create a new systempreference "homeorholdingbranch"-like used only for returns.
2009-12-24 16:52:20 +01:00
Nahuel ANGELINETTI 6d2739f16b [replaceprevious](bug #3924) fix useDaysMode use
This fix system preference choices, and delete some useless code.
2009-12-17 09:14:56 +01:00
Nahuel ANGELINETTI 9af463f99e (bug #3822) fix returning document in transfert
This fix C4::Circulation::AddReturn, to mark as transfered items in transfert that are returned in homebranch.
2009-12-01 10:05:28 +01:00
Nahuel ANGELINETTI 77392c752c [3.0.x](bug #3753) returning a document always needs transfert
This patch fix a bug in 3.0.4 that do, all returned documents will always need transfers.
2009-11-03 12:14:35 +01:00
Henri-Damien LAURENT a4ca102f77 Bug Fixing : holds management Adding GetBranchItemRule 2009-11-02 10:11:38 +01:00
Henri-Damien LAURENT ba72e844b5 BugFixing : 3306
Using CalcDateDue With borrower information wherever possible
2009-10-07 16:13:53 +02:00
Nahuel ANGELINETTI 0e17926b61 [replaceprevious](bug #3678) Fix circulation
This patch fix major circulation problems with reserves:
A reserved document on "next available", is no more detected when an item of this record is checked-in.
And add a db dependant test to validate this everywhen.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-10-01 10:34:00 +02:00
Henri-Damien LAURENT c5dd5717ec Followup C4::Circulation.pm previous commit
previous commit would generate warnings on compilation
2009-09-21 17:23:38 +02:00
Henri-Damien LAURENT fed8703359 Wrong update in UpdateHoldingBranch 2009-09-21 15:08:20 +02:00
Henri-Damien LAURENT c3aed6b007 Fixing AddReturn Bad Merge 2009-09-21 14:57:36 +02:00
Henri-Damien LAURENT 51adec717f Squashing Merge Fix and followup: renamed _GetCirculationBranch
Merge Fix Followup to 7e2bf9e
2009-09-16 23:19:46 +02:00
Henri-Damien LAURENT ae24ed1109 [replaceprevious](bug #3562) fix returning document in another branch
there is no transfert alert if you make a return in another branch than the homebranch.
2009-09-16 23:19:45 +02:00
Chris Cormack 7bbe9d0ae2 Fixing syntax error in C4/Circulation.pm 2009-09-16 23:19:44 +02:00
Ryan Higgins aae56e21aa Bug 2770 follwup : force AddRenewal obey circControl system preference [revised]
Also prevents infinite-length renewals by returning undef
if passed an invalid date instead of renewing with no due date.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:43 +02:00
Galen Charlton 89c4bc43e5 followup to AddReturn patch - fix test
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-16 23:19:42 +02:00
Ryan Higgins 34bdb12383 Bug 2770 follwup : force AddRenewal obey circControl system preference [revised]
Also prevents infinite-length renewals by returning undef
if passed an invalid date instead of renewing with no due date.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-16 23:19:41 +02:00
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
Galen Charlton 6733015247 bug 2893: extend conditions handled by AllowNotForLoanOverride
Prior to this patch, turning AllowNotForLoanOverride on
allowed the circ operator to permit the loan of an
item who's individual not-for-loan flag was set, but did
not allow the loan of an item whose item type's not-for-loan
flag was set.  This patch extends the definition of the
system preference so that both cases are covered.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-16 23:19:39 +02:00
Nahuel ANGELINETTI 7794cf2eb3 (bug #3432) fix return of lost items
This patch delete some useless code, and fix the problem that if a lost item is returned, the lost flag is not deleted.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:32 +02:00
Nahuel ANGELINETTI 5da38d9ce6 (bug #3409) fix return rules for transfert
This patch add the use of CircControl and HomeOrHoldingBranch for return and transfert rules.
* ItemHomeLibrary goes to item{HomeOrHoldingBranch}
* PatronLibrary goes to the borrower library
* PickupLibrary depends where the items was checked out, and the actual library.

This add a little improvment that does not re-request each time the circcontrol syspref.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:32 +02:00
Joe Atzberger d24f267c73 Correct GetItemIssue to actually return undef if item not checked out.
Updated POD for correctness.
Replaced strftime + regexp w/ C4::Dates->today.
Also removed some sth->finish statements.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-09-16 23:19:21 +02:00
Mason James fb5610d635 fix for bug-2923, corrects renew status in SCO
- removes unneeded  HTML::Template::Pro
 - some indent/newline tidies

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-09-16 23:19:04 +02:00
Joe Atzberger (siptest 0a4bae2cfc Bugs 2541 and 2587 - AddIssue must return date object as intended.
SIP actually relied on the AddIssue return that was not reliable.
AddRenew also updated to return C4::Dates object for datedue.

Please note, any running SIPServer will have to be restarted
*immediately* after applying this patch, because although Koha
C4 behaves as normal, the SIP server runs as a Net::Server with
components cached.  Changes will not be applied until SIPServer
restarts, and so checkout actions may fail until then.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2009-09-04 12:12:48 +12:00
Galen Charlton 7c335eb621 bug 2582 [1/2]: don't set issuedate during renewal
Changed so that issues.issuedate is never modified
during a renewal, since that column records the original
date of the loan.  Changed the name and interpretation
of the $issuedate parameter of AddRenewal() to
$lastreneweddate, allowing (e.g.) offline circulation
to set the date of the renewal without changing the
issue date.

As a result of the original bug, issues.issuedate can be
set to NULL for loans that were renewed via the OPAC,
self checkout, or the staff interface when explicitly
renewing a loan.  Loans that were renewed by checking
the item out to the same patron will have the issue date
changed to the date of the last renewal.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2009-09-04 11:42:11 +12:00
Galen Charlton 82be6509c4 bug 3299: fix setting renewal due date explicitly
When renewing a loan from the patron details page, setting
the renewal due date now works again.  Broken by patch
for bug 2770.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-06-08 18:22:00 +02:00
Galen Charlton a93a847497 excised hard-coded reference to HLT
Note to Chris Cormack: I suspect the current ability
to override most circulation conditions is sufficient,
but if HLT still needs to establish a patron category
that can ignore issuingimpossible limitations, needs
to be done in a more flexible way.

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 28098b5bda fix to CanBookBeIssued()
Bail out if item does not exist - otherwise
subsequent checks can fail for lack of an
item branchcode.

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
Paul Poulain 970e90b309 fix for #988
When a borrower can't issue any book (issuingrules=0), the message should be
"this user can't issue book" and not "too many books already issued"wrong message

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 5d2ad73e98 Tweak ceilingDueDate and CalcDateDue
This patch moves ceilingDueDate and ReturnBeforeExpiry checking into
CalcDateDue(), so the renewal due date is also calculated with those.

Also restores a check in CanBookBeIssued.  If the due date isn't given
call CalcDateDue and make sure it's not in the past.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:29 +02:00
Nahuel ANGELINETTI ebc2ab012e (bug #2750) Cannot return to another branch if the independantbranch option is set as ON
The code was modified to change the holding branch ONLY if the return to the right branch is done. If you set IndependantBranch to on, you must return the document to the HomeBranch.
And verify the return is done before show the message that allow to transfert the document to another branch.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:25 +02:00
Nahuel ANGELINETTI 78804f5dc6 (bug #2750) Cannot return to another branch if the independantbranch option is set as ON
The code was modified to change the holding branch ONLY if the return to the right branch is done. If you set IndependantBranch to on, you must return the document to the HomeBranch.
And verify the return is done before show the message that allow to transfert the document to another branch.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:19 +02:00
Mason James 1cbfa4288a BUG-3160: fixes 'itemlost' check on item return.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:18 +02:00
Galen Charlton 2d048e474e bug 3049: display correct due date of renewed loans
The intranet item display provided by moredetail.pl
would display the original due date of the item, and
would thus be incorrect if the item had been renewed
and got a different due date.

The incorrect date was coming from items.onloan,
which AddIssue() sets to the due date.  This patch
fixes the bug in two ways:

[1] AddRenewal() now updates items.onloan with the
    correct due date.
[2] Two templates were updated to display the
    due date from (indirectly) issues.date_due
    instead of items.onloan, thus making it less
    likely that the wrong value will be displayed.

This patch does *not* update items.onloan to reflect
the correct due date.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-05-26 21:15:09 +02:00
Nahuel Angelinetti 4ebba44a34 fix the previous patch to add a syspref that permit to choose the renewal period(day or date_due).
This patch just check the syspref and use it as base date of renew.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-03-06 11:09:26 +01:00
Nahuel Angelinetti d2d103195c change the date calc, to set the date_due to date_due+loanlength.
At the moment when you renew a document the date_due calculated is now+loanlength, but it's a bad thing, It should be
date_due+loanlength.
This patch do change Circulation.pm to use the date_due as renew base and add the loanlength to get the new date_due after
renewal.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-03-06 10:53:00 +01:00
Nahuel ANGELINETTI 0060634c36 (bug #2929) permit to define "fine days" in issuing rules
This patch add a function un C4::Members that check if a user is allowed to loan a document.
Add a control in issuing.
Add a column in issuingrules table.
And add the needed control in admin to set the fine days rules.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2009-03-06 10:47:32 +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 d7a0dcc55b barcodedecode() did not always return barcode
This patch amends the function to return barcode, in particular when
filter is not defined.  It also adds an optional 2nd argument to
allow the filter to be specified by caller, enabling testing.

Non-DB-dependent test script included.  Note: T-prefix style
barcode filter is not documented, and drops the first nonzero
digit after the T.  This seems mistaken, but is not corrected here
to avoid any surprises.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-01-27 12:19:42 +01:00
Joe Atzberger (siptest 1503a9099e Allow AddIssue to log SIP transactions distinct from others.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-01-27 12:19:42 +01:00
Galen Charlton 33888b26b5 bug 2758: don't confirm checkout if fine balance is 0
Fixes problem where if the IssuingInProcess preference is ON,
the operator is always required to confirm a checkout if
the patron has had any fine transactions at all, even if
the patron's balance is 0.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2008-12-10 14:27:04 +01:00
Henri-Damien LAURENT 887d4637da [bug #2750] Cannot return to another branch if the independantbranch option is set as ON
The code was modified to change the holding branch ONLY if the return to
the right branch is done. If you set IndependantBranch to on, you must
return the document to the HomeBranch.
And verify the return is done before show the message that allow to
transfert the document to another branch.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2008-11-24 18:11:52 +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
Joe Atzberger (siptest 7822223b72 Bugs 2541 and 2587 - AddIssue must return date object as intended.
SIP actually relied on the AddIssue return that was not reliable.
AddRenew also updated to return C4::Dates object for datedue.

Please note, any running SIPServer will have to be restarted
*immediately* after applying this patch, because although Koha
C4 behaves as normal, the SIP server runs as a Net::Server with
components cached.  Changes will not be applied until SIPServer
restarts, and so checkout actions may fail until then.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2008-11-24 18:11:30 +01:00
Joe Atzberger (siptest 0eaf2ff2ab Fully qualify function call.
This is a pre-requisite to continued SIP processing, dealing with some
arcana related to recursive dependencies and UNIVERSAL.  The reason this
is separate from other SIP patches is that it is expected patched in other
submissions already.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-11-12 14:42:30 +01:00