[Koha-cvs] CVS: koha/circ circulation.pl,1.80,1.81

[Paul POULAIN]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20461/circ

Modified Files:
        circulation.pl 
Log Message:
fix for :
http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=858

* added a button to cancel issue
* adding checkbox to cancel reserve on the book (checked by default)
* the cancelation reserve is done on reserves done for a given item or for any 
item

Nelsonville, pls test & confirm it's OK

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** circulation.pl      13 Dec 2004 17:54:15 -0000      1.80
--- circulation.pl      15 Dec 2004 10:47:09 -0000      1.81
***************
*** 66,69 ****
--- 66,70 ----
  my $stickyduedate=$query->param('stickyduedate');
  my $issueconfirmed = $query->param('issueconfirmed');
+ my $cancelreserve = $query->param('cancelreserve');
  
  
***************
*** 139,143 ****
        my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
        if ($issueconfirmed) {
!                       issuebook(\%env, $borrower, $barcode, $datedue);
        } else {
                my ($error, $question) = canbookbeissued(\%env, $borrower, 
$barcode, $year, $month, $day);
--- 140,144 ----
        my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
        if ($issueconfirmed) {
!                       issuebook(\%env, $borrower, $barcode, 
$datedue,$cancelreserve);
        } else {
                my ($error, $question) = canbookbeissued(\%env, $borrower, 
$barcode, $year, $month, $day);