Browse Source

Repaired Reserves

master
olwen 22 years ago
parent
commit
47e29f02d1
  1. 9
      C4/Circulation/Returns.pm
  2. 8
      C4/Interface.pm

9
C4/Circulation/Returns.pm

@ -10,6 +10,7 @@ use C4::Database;
use C4::Accounts;
use C4::Interface;
use C4::Circulation;
use C4::Format;
use C4::Scan;
use C4::Stats;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@ -69,8 +70,10 @@ sub Returns {
my $amt_owing;
# until (($reason eq "Circ") || ($reason eq "Quit")) {
until ($reason ne "") {
($reason,$item) = returnwindow($env,"Enter Returns",$item,\@items,$borrower,$amt_owing);
#debug_msg($env,"R1. $reason");
($reason,$item) =
returnwindow($env,"Enter Returns",
$item,\@items,$borrower,$amt_owing); #C4::Circulation
#debug_msg($env,"item = $item");
#if (($reason ne "Circ") && ($reason ne "Quit")) {
if ($reason eq "") {
($reason,$bornum,$borrower,$itemno,$itemrec,$amt_owing) = checkissue($env,$dbh,$item);
@ -83,7 +86,7 @@ sub Returns {
error_msg($env,"$reason");
$reason = "";
} else {
debug_msg($env,"R2. $reason");
#debug_msg($env,"R2. $reason");
}
#}
}

8
C4/Interface.pm

@ -218,7 +218,8 @@ sub returnwindow {
$panel->AddHotKey(NEWT_KEY_F11);
my ($reason,$data)=$panel->Run();
if ($reason eq NEWT_EXIT_HOTKEY) {
if ($data eq NEWT_KEY_F11){
debug_msg($env, "Hotkey");
if ($data eq NEWT_KEY_F11){
$reason="Quit";
} elsif ($data eq NEWT_KEY_F10) {
$reason="Circ";
@ -228,9 +229,12 @@ sub returnwindow {
$reason="Returns";
}
} else {
my $stuff=$entry->Get();
debug_msg($env, "Not Hot");
$stuff=$entry->Get();
$reason="";
}
#debug_msg($env, "reas $reason");
#debug_msg($env, "stuff $stuff");
return($reason,$stuff);
}

Loading…
Cancel
Save