Bugzilla – Attachment 10891 Details for
Bug 3387
WITHDRAWN items shouldn't check in
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 3387 - WITHDRAWN items shouldn't check in
Bug-3387---WITHDRAWN-items-shouldnt-check-in.patch (text/plain), 5.42 KB, created by
Kyle M Hall
on 2012-07-17 13:47:11 UTC
(
hide
)
Description:
Bug 3387 - WITHDRAWN items shouldn't check in
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2012-07-17 13:47:11 UTC
Size:
5.42 KB
patch
obsolete
>From 252707387def2683e6f1ca3b844f6a9d41554857 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 17 Jul 2012 09:42:59 -0400 >Subject: [PATCH] Bug 3387 - WITHDRAWN items shouldn't check in > >Adds a system preference BlockReturnOfWithdrawnItems to control >whether or not Koha should allow a withdrawn item to be returned >or not. > >Test Plan: >1) Set BlockReturnOfWithdrawnItems to "Block" ( this is the default ) >2) Check an item out to a patron >3) Mark item as withdrawn >4) Attempt to return the item, you should still see the item on the > borrower's record >5) Set BlockReturnOfWithdrawnItems to "Don't Block" >6) Attempt to return the item, you should see the item is no longer > on the borrower's record. >--- > C4/Circulation.pm | 2 +- > circ/returns.pl | 11 +---------- > installer/data/mysql/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 7 +++++++ > .../en/modules/admin/preferences/circulation.pref | 7 +++++++ > 5 files changed, 17 insertions(+), 11 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 9508c78..f1538f2 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1602,7 +1602,7 @@ sub AddReturn { > > if ( $item->{'wthdrawn'} ) { # book has been cancelled > $messages->{'wthdrawn'} = 1; >- $doreturn = 0; >+ $doreturn = 0 if C4::Context->preference("BlockReturnOfWithdrawnItems"); > } > > # case of a return of document (deal with issues and holdingbranch) >diff --git a/circ/returns.pl b/circ/returns.pl >index b9127da..faaa624 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -291,15 +291,6 @@ if ($barcode) { > $input{duedate} = 0; > $returneditems{0} = $barcode; > $riduedate{0} = 0; >- if ( $messages->{'wthdrawn'} ) { >- $input{withdrawn} = 1; >- $input{borrowernumber} = 'Item Cancelled'; # FIXME: should be in display layer ? >- $riborrowernumber{0} = 'Item Cancelled'; >- } >- else { >- $input{borrowernumber} = ' '; # This seems clearly bogus. >- $riborrowernumber{0} = ' '; >- } > push( @inputloop, \%input ); > } > } >@@ -444,7 +435,7 @@ foreach my $code ( keys %$messages ) { > } > elsif ( $code eq 'wthdrawn' ) { > $err{withdrawn} = 1; >- $exit_required_p = 1; >+ $exit_required_p = 1 if C4::Context->preference("BlockReturnOfWithdrawnItems"); > } > elsif ( ( $code eq 'IsPermanent' ) && ( not $messages->{'ResFound'} ) ) { > if ( $messages->{'IsPermanent'} ne $userenv_branch ) { >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 7009155..edf487b 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -375,3 +375,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( > INSERT INTO systempreferences (variable,value,explanation,type) VALUES('EnableBorrowerFiles','0','If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UpdateTotalIssuesOnCirc','0','Whether to update the totalissues field in the biblio on each circ.',NULL,'YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free'); >+INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo'); >\ No newline at end of file >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index bb96644..f5ac87d 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -5536,6 +5536,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > SetVersion($DBversion); > } > >+$DBversion ="3.09.00.XXX"; >+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { >+ $dbh->do("INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo');"); >+ print "Upgrade to $DBversion done (Add system preference IntranetSlipPrinterJS))\n"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index e07fc0d..33beb54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -254,6 +254,13 @@ Circulation: > alert: "display a message" > nothing : "do nothing" > - . >+ Checkin Policy: >+ - >+ - pref: BlockReturnOfWithdrawnItems >+ choices: >+ yes: Block >+ no: "Don't block" >+ - returning of items that have been withdrawn. > Holds Policy: > - > - pref: AllowHoldPolicyOverride >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 3387
:
10891
|
10907
|
10911
|
10941
|
11725
|
12524