[Koha-cvs] CVS: koha/circ circulation.pl,1.70,1.71

[Paul POULAIN]

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

Modified Files:
	circulation.pl 
Log Message:
bugfixes

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** circulation.pl	3 May 2004 09:12:19 -0000	1.70
--- circulation.pl	3 May 2004 16:36:53 -0000	1.71
***************
*** 127,143 ****
  	$barcode = cuecatbarcodedecode($barcode);
  	my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
! #	unless ($invalidduedate) {
  		my ($error, $question) = canbookbeissued(\%env, $borrower, $barcode, $year, $month, $day);
  		my $noerror=1;
  		my $noquestion = 1;
  		foreach my $impossible (keys %$error) {
! 			warn "Impossible : $impossible : ";#.%$error->{$impossible};
! 			$template->param($impossible => 1,
  							IMPOSSIBLE => 1);
  			$noerror = 0;
  		}
  		foreach my $needsconfirmation (keys %$question) {
! 			warn "needsconfirmation : $needsconfirmation : "; #.%$error->{$needsconfirmation};
! 			$template->param($needsconfirmation => 1,
  							NEEDSCONFIRMATION => 1);
  			$noquestion = 0;
--- 127,145 ----
  	$barcode = cuecatbarcodedecode($barcode);
  	my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
! 	if ($issueconfirmed) {
! 			warn "CONFIRMED";
! 			issuebook(\%env, $borrower, $barcode, $datedue);
! 	} else {
! 	#	unless ($invalidduedate) {
  		my ($error, $question) = canbookbeissued(\%env, $borrower, $barcode, $year, $month, $day);
  		my $noerror=1;
  		my $noquestion = 1;
  		foreach my $impossible (keys %$error) {
! 			$template->param($impossible => $$error{$impossible},
  							IMPOSSIBLE => 1);
  			$noerror = 0;
  		}
  		foreach my $needsconfirmation (keys %$question) {
! 			$template->param($needsconfirmation => $$question{$needsconfirmation},
  							NEEDSCONFIRMATION => 1);
  			$noquestion = 0;
***************
*** 145,150 ****
  		if ($noerror && ($noquestion || $issueconfirmed)) {
  			warn "NO ERROR";
! # 			issuebook(\%env, $borrower, $barcode, $datedue);
  		}
  
  #	}
--- 147,153 ----
  		if ($noerror && ($noquestion || $issueconfirmed)) {
  			warn "NO ERROR";
! 			issuebook(\%env, $borrower, $barcode, $datedue);
  		}
+ 	}
  
  #	}