Browse Source

work on returns screen

master
olwen 22 years ago
parent
commit
6052f34cae
  1. 3
      C4/Circulation.pm
  2. 7
      C4/Circulation/Returns.pm
  3. 8
      C4/Interface.pm

3
C4/Circulation.pm

@ -62,9 +62,12 @@ sub Start_circ{
my $donext;
if ($data eq 'Issues'){
$donext=Issue($env);
} elsif ($data eq 'Returns') {
$donext=Returns($env);
} else {
&endint($env);
}
debug_msg($env,"donext - $donext");
if ($donext eq 'Circ'){
Start_circ($env);
} else {

7
C4/Circulation/Returns.pm

@ -18,7 +18,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
$VERSION = 0.01;
@ISA = qw(Exporter);
@EXPORT = qw(&returnrecord &calc_odues);
@EXPORT = qw(&returnrecord &calc_odues &Returns);
%EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ],
# your exported package globals go here,
@ -54,7 +54,10 @@ my $priv_func = sub {
# make all your functions, whether exported or not;
sub Returns {
my ($env)=@_;
returnwindow($env);
}
sub returnrecord {
# mark items as returned
my ($env,$dbh,$bornum,$itemno)=@_;

8
C4/Interface.pm

@ -79,6 +79,7 @@ sub menu {
my ($reason,$data)=menu2($title,@items);
return($reason,$data);
# end of menu
}
}
@ -106,6 +107,7 @@ sub menu2 {
$stuff = $data->Tag();
}
return($reason,$stuff);
# end of menu2
}
sub clearscreen{
@ -153,6 +155,7 @@ sub list {
my @stuff=$li->Get();
$data=$stuff[0];
return($reason,$data);
# end of list
}
@ -184,6 +187,7 @@ sub selborrower {
}
}
return($data,$bdata);
# end of selborrower
}
sub returnwindow {
@ -206,7 +210,7 @@ sub returnwindow {
my ($reason,$data)=$panel->Run();
if ($reason eq NEWT_EXIT_HOTKEY) {
if ($data eq NEWT_KEY_F11) {
$reason="Finished user";
$reason="Circ";
}
if ($data eq NEWT_KEY_F10) {
$reason="Finished issues";
@ -326,7 +330,7 @@ sub borrower_dialog {
my ($reason,$data)=$panel1->Run();
if ($reason eq NEWT_EXIT_HOTKEY) {
if ($data eq NEWT_KEY_F11) {
$reason="Finished user";
$reason="Circ";
}
if ($data eq NEWT_KEY_F10) {
$reason="Finished issues";

Loading…
Cancel
Save