Browse Source

Changes to returns

master
olwen 22 years ago
parent
commit
f772932fae
  1. 4
      C4/Circulation/Issues.pm
  2. 7
      C4/Circulation/Returns.pm
  3. 2
      C4/InterfaceCDK.pm

4
C4/Circulation/Issues.pm

@ -177,8 +177,8 @@ sub issueitem{
}
#check if item is on issue already
if ($canissue == 1) {
my $currbor = &C4::Circulation::Main::previousissue($env,$item->{'itemnumber'},$dbh,$bornum);
if ($currbor ne "") {$canissue = 0;};
my ($currbor,$issuestat) = &C4::Circulation::Main::previousissue($env,$item->{'itemnumber'},$dbh,$bornum);
if ($issuestat ) {$canissue = 0;};
}
if ($canissue == 1) {
#check reserve

7
C4/Circulation/Returns.pm

@ -13,6 +13,7 @@ use C4::Circulation::Main;
use C4::Format;
use C4::Scan;
use C4::Stats;
use C4::Search;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
@ -80,8 +81,10 @@ sub Returns {
($resp,$bornum,$borrower,$itemno,$itemrec,$amt_owing) = checkissue($env,$dbh,$item);
if ($resp ne "") {
if ($resp eq "Returned") {
my $fmtitem = fmtstr($env,$itemrec->{'title'},"L50");
unshift @items,$fmtitem;
my $item = itemnodata($env,$dbh,$itemno);
#my $fmtitem = fmtstr($env,$itemrec->{'title'},"L50");
my $fmtitem = C4::Circulation::Issues::formatitem($env,$item,"",$amt_owing);
unshift @items,$fmtitem;
} elsif ($resp ne "") {
error_msg($env,"$resp");
}

2
C4/InterfaceCDK.pm

@ -371,7 +371,7 @@ sub returnwindow {
#debug_msg($env,$borrower);
my $titlepanel = titlepanel($env,"Returns","Scan book");
my $returnlist = new Cdk::Scroll ('Title'=>"Items Returned",
'List'=>\@$items,'Height'=> 12,'Width'=>60,'Ypos'=>10,'Xpos'=>1);
'List'=>\@$items,'Height'=> 12,'Width'=>74,'Ypos'=>10,'Xpos'=>1);
$returnlist->draw();
my $borrbox;
if ($borrower-{'cardnumber'} ne "") {

Loading…
Cancel
Save