[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha C4/Biblio.pm C4/Circulation.pm C4/Context....
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha C4/Biblio.pm C4/Circulation.pm C4/Context.... |
|
Date: |
Mon, 23 Apr 2007 15:21:18 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/04/23 15:21:18
Modified files:
C4 : Biblio.pm Circulation.pm Context.pm Members.pm
Reserves.pm
circ : circulation.pl returns.pl
koha-tmpl/intranet-tmpl/prog/en/includes: menu-circ.inc
members : moremember.pl
reserve : modrequest.pl
Added files:
circ : transferstoreceive.pl
koha-tmpl/intranet-tmpl/prog/en/circ: transferstoreceive.tmpl
Log message:
renaming currenttransfers to transferstoreceive
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Biblio.pm?cvsroot=koha&r1=1.197&r2=1.198
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation.pm?cvsroot=koha&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Context.pm?cvsroot=koha&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves.pm?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/koha/circ/transferstoreceive.pl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/modrequest.pl?cvsroot=koha&r1=1.5&r2=1.6
Patches:
Index: C4/Biblio.pm
===================================================================
RCS file: /sources/koha/koha/C4/Biblio.pm,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -b -r1.197 -r1.198
--- C4/Biblio.pm 18 Apr 2007 17:00:14 -0000 1.197
+++ C4/Biblio.pm 23 Apr 2007 15:21:17 -0000 1.198
@@ -33,7 +33,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.197 $' =~ /\d+/g; shift(@v).".".join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.198 $' =~ /\d+/g; shift(@v).".".join(
"_", map { sprintf "%03d", $_ } @v ); };
@ISA = qw( Exporter );
@@ -760,7 +760,7 @@
if ( $datedue eq '' ) {
#$datedue="Available";
my ( $restype, $reserves ) =
- C4::Reserves2::CheckReserves( $data->{'itemnumber'} );
+ CheckReserves( $data->{'itemnumber'} );
if ($restype) {
#$datedue=$restype;
@@ -3647,8 +3647,11 @@
=cut
-# $Id: Biblio.pm,v 1.197 2007/04/18 17:00:14 tipaul Exp $
+# $Id: Biblio.pm,v 1.198 2007/04/23 15:21:17 tipaul Exp $
# $Log: Biblio.pm,v $
+# Revision 1.198 2007/04/23 15:21:17 tipaul
+# renaming currenttransfers to transferstoreceive
+#
# Revision 1.197 2007/04/18 17:00:14 tipaul
# removing all useless %env / $env
#
Index: C4/Circulation.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- C4/Circulation.pm 23 Apr 2007 14:08:47 -0000 1.17
+++ C4/Circulation.pm 23 Apr 2007 15:21:17 -0000 1.18
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Circulation.pm,v 1.17 2007/04/23 14:08:47 tipaul Exp $
+# $Id: Circulation.pm,v 1.18 2007/04/23 15:21:17 tipaul Exp $
use strict;
require Exporter;
@@ -43,7 +43,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.17 $' =~ /\d+/g; shift(@v).".".join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.18 $' =~ /\d+/g; shift(@v).".".join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -68,6 +68,7 @@
# FIXME subs that should probably be elsewhere
push @EXPORT, qw(
&FixOverduesOnReturn
+ &cuecatbarcodedecode
);
# subs to deal with issuing a book
@@ -99,10 +100,12 @@
# subs to remove
push @EXPORT, qw(
- &decode
&dotransfer
);
+# FIXME - At least, I'm pretty sure this is for decoding CueCat stuff.
+# FIXME From Paul : i don't understand what this sub does & why it has to be
called on every circ. Speak of this with chris maybe ?
+
=head2 decode
=head3 $str = &decode($chunk);
@@ -116,9 +119,32 @@
=cut
-# FIXME - At least, I'm pretty sure this is for decoding CueCat stuff.
+sub cuecatbarcodedecode {
+ my ($barcode) = @_;
+ chomp($barcode);
+ my @fields = split( /\./, $barcode );
+ my @results = map( decode($_), @fields[ 1 .. $#fields ] );
+ if ( $#results == 2 ) {
+ return $results[2];
+ }
+ else {
+ return $barcode;
+ }
+}
+
+=head2 decode
+
+=head3 $str = &decode($chunk);
+
+=over 4
+
+=item Decodes a segment of a string emitted by a CueCat barcode scanner and
+returns it.
+
+=back
+
+=cut
-# FIXME From Paul : i don't understand what this sub does & why it has to be
called on every circ. Speak of this with chris maybe ?
sub decode {
my ($encoded) = @_;
my $seq =
@@ -256,9 +282,6 @@
return ( $dotransfer, $messages, $biblio );
}
-# Not exported
-# FIXME - This is only used in &transferbook. Why bother making it a
-# separate function?
sub dotransfer {
my ( $itm, $fbr, $tbr ) = @_;
@@ -1668,11 +1691,11 @@
$renewokay = 1;
}
$sth2->finish;
- my ( $resfound, $resrec ) = C4::Reserves2::CheckReserves($itemnumber);
+ my ( $resfound, $resrec ) = CheckReserves($itemnumber);
if ($resfound) {
$renewokay = 0;
}
- ( $resfound, $resrec ) = C4::Reserves2::CheckReserves($itemnumber);
+ ( $resfound, $resrec ) = CheckReserves($itemnumber);
if ($resfound) {
$renewokay = 0;
}
Index: C4/Context.pm
===================================================================
RCS file: /sources/koha/koha/C4/Context.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- C4/Context.pm 17 Apr 2007 08:48:00 -0000 1.55
+++ C4/Context.pm 23 Apr 2007 15:21:17 -0000 1.56
@@ -16,7 +16,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Context.pm,v 1.55 2007/04/17 08:48:00 tipaul Exp $
+# $Id: Context.pm,v 1.56 2007/04/23 15:21:17 tipaul Exp $
use strict;
use DBI;
use ZOOM;
@@ -28,7 +28,7 @@
qw($context),
qw(@context_stack);
-$VERSION = do { my @v = '$Revision: 1.55 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.56 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -875,6 +875,9 @@
=cut
# $Log: Context.pm,v $
+# Revision 1.56 2007/04/23 15:21:17 tipaul
+# renaming currenttransfers to transferstoreceive
+#
# Revision 1.55 2007/04/17 08:48:00 tipaul
# circulation cleaning continued: bufixing
#
@@ -944,7 +947,7 @@
# In this commit, I created a "fake" user when insecure=ON. It has a fake
branch. You may find better to have the 1st branch in branch table instead of a
fake one.
#
# Revision 1.43.2.8 2006/12/19 16:48:16 alaurin
-# reident programs, and adding branchcode value in reserves2
+# reident programs, and adding branchcode value in reserves
#
# Revision 1.43.2.7 2006/12/06 21:55:38 hdl
# Adding ModZebrations for servers to get serverinfos in Context.pm
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- C4/Members.pm 23 Apr 2007 14:08:47 -0000 1.44
+++ C4/Members.pm 23 Apr 2007 15:21:17 -0000 1.45
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.44 2007/04/23 14:08:47 tipaul Exp $
+# $Id: Members.pm,v 1.45 2007/04/23 15:21:17 tipaul Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.44 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.45 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -442,7 +442,7 @@
$flags{'ODUES'} = \%flaginfo;
}
my $itemswaiting =
- C4::Reserves2::GetWaitingReserves(
$patroninformation->{'borrowernumber'} );
+ GetWaitingReserves( $patroninformation->{'borrowernumber'} );
my $nowaiting = scalar @$itemswaiting;
if ( $nowaiting > 0 ) {
my %flaginfo;
Index: C4/Reserves.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- C4/Reserves.pm 23 Apr 2007 14:08:47 -0000 1.8
+++ C4/Reserves.pm 23 Apr 2007 15:21:17 -0000 1.9
@@ -20,7 +20,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Reserves.pm,v 1.8 2007/04/23 14:08:47 tipaul Exp $
+# $Id: Reserves.pm,v 1.9 2007/04/23 15:21:17 tipaul Exp $
use strict;
require Exporter;
@@ -33,11 +33,11 @@
my $library_name = C4::Context->preference("LibraryName");
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.8 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.9 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
-C4::Reserves2 - Koha functions for dealing with reservation.
+C4::Reserves - Koha functions for dealing with reservation.
=head1 SYNOPSIS
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- circ/circulation.pl 23 Apr 2007 14:08:47 -0000 1.107
+++ circ/circulation.pl 23 Apr 2007 15:21:17 -0000 1.108
@@ -728,19 +728,3 @@
SpecifyDueDate => C4::Context->preference("SpecifyDueDate")
);
output_html_with_http_headers $query, $cookie, $template->output;
-
-####################################################################
-# Extra subroutines,,,
-
-sub cuecatbarcodedecode {
- my ($barcode) = @_;
- chomp($barcode);
- my @fields = split( /\./, $barcode );
- my @results = map( decode($_), @fields[ 1 .. $#fields ] );
- if ( $#results == 2 ) {
- return $results[2];
- }
- else {
- return $barcode;
- }
-}
Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- circ/returns.pl 23 Apr 2007 14:08:47 -0000 1.50
+++ circ/returns.pl 23 Apr 2007 15:21:17 -0000 1.51
@@ -531,16 +531,3 @@
# actually print the page!
output_html_with_http_headers $query, $cookie, $template->output;
-
-sub cuecatbarcodedecode {
- my ($barcode) = @_;
- chomp($barcode);
- my @fields = split( /\./, $barcode );
- my @results = map( decode($_), @fields[ 1 .. $#fields ] );
- if ( $#results == 2 ) {
- return $results[2];
- }
- else {
- return $barcode;
- }
-}
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc 16 Mar 2007
01:25:09 -0000 1.7
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc 23 Apr 2007
15:21:17 -0000 1.8
@@ -5,9 +5,8 @@
<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>
<a href="/cgi-bin/koha/circ/reserve.pl">Pending</a>
<a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting</a>
- <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers
(waiting)</a>
- <a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfers(current)</a>
- <a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a>
+ <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers to
do</a>
+ <a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfersto receive</a>
<a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues by
branch/department</a>
<a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily
reconciliation</a>
</div>
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- members/moremember.pl 23 Apr 2007 14:08:47 -0000 1.34
+++ members/moremember.pl 23 Apr 2007 15:21:18 -0000 1.35
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: moremember.pl,v 1.34 2007/04/23 14:08:47 tipaul Exp $
+# $Id: moremember.pl,v 1.35 2007/04/23 15:21:18 tipaul Exp $
=head1 moremember.pl
@@ -246,7 +246,7 @@
#
# find reserves
#
-# my ($rescount,$reserves)=FindReserves('',$borrowernumber); #From
C4::Reserves2
+# my ($rescount,$reserves)=FindReserves('',$borrowernumber); #From C4::Reserves
# my @reservedata;
# $toggle = 0;
# foreach my $reserveline (@$reserves) {
Index: reserve/modrequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/modrequest.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- reserve/modrequest.pl 23 Apr 2007 14:08:47 -0000 1.5
+++ reserve/modrequest.pl 23 Apr 2007 15:21:18 -0000 1.6
@@ -43,7 +43,7 @@
# 2 possibilitys : cancel an item reservation, or modify or cancel the queded
list
-# 1) cancel an item reservation by fonction GlobalCancel (in reserves2.pm)
+# 1) cancel an item reservation by fonction GlobalCancel (in reserves.pm)
if ($CancelBorrowerNumber) {
GlobalCancel($CancelItemnumber, $CancelBorrowerNumber);
$biblionumber[0] = $CancelBiblioNumber,
@@ -52,7 +52,7 @@
# 2) Cancel or modify the queue list of reserves (without item linked)
else {
for (my $i=0;$i<$count;$i++){
-
UpdateReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i]);
#from C4::Reserves2
+
UpdateReserve($rank[$i],$biblionumber[$i],$borrower[$i],$branch[$i],$itemnumber[$i]);
#from C4::Reserves
}
}
my $from=$input->param('from');
Index: circ/transferstoreceive.pl
===================================================================
RCS file: circ/transferstoreceive.pl
diff -N circ/transferstoreceive.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ circ/transferstoreceive.pl 23 Apr 2007 15:21:17 -0000 1.1
@@ -0,0 +1,143 @@
+#!/usr/bin/perl
+
+# $Id: transferstoreceive.pl,v 1.1 2007/04/23 15:21:17 tipaul Exp $
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+
+use strict;
+use CGI;
+use C4::Context;
+use C4::Output;
+use C4::Branch;
+use C4::Auth;
+use C4::Date;
+use C4::Biblio;
+use C4::Circulation;
+use C4::Members;
+use C4::Interface::CGI::Output;
+use Date::Calc qw(
+ Today
+ Add_Delta_Days
+ Date_to_Days
+);
+
+use C4::Koha;
+use C4::Reserves;
+
+my $input = new CGI;
+
+my $theme = $input->param('theme'); # only used if allowthemeoverride is set
+my $itemnumber = $input->param('itemnumber');
+my $todaysdate = join "-", &Today;
+
+# if we have a resturn of the form to delete the transfer, we launch the
subrroutine
+if ($itemnumber) {
+ C4::Circulation::Circ2::DeleteTransfer($itemnumber);
+}
+
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "circ/transferstoreceive.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { circulate => 1 },
+ debug => 1,
+ }
+);
+
+# set the userenv branch
+my $default = C4::Context->userenv->{'branch'};
+
+# get the all the branches for reference
+my $branches = GetBranches();
+my @branchesloop;
+foreach my $br ( keys %$branches ) {
+ my @transferloop;
+ my %branchloop;
+ $branchloop{'branchname'} = $branches->{$br}->{'branchname'};
+ $branchloop{'branchcode'} = $branches->{$br}->{'branchcode'};
+ my @gettransfers =
+ GetTransfersFromTo( $branches->{$br}->{'branchcode'}, $default );
+
+ if (@gettransfers) {
+ foreach my $num (@gettransfers) {
+ my %getransf;
+
+ my ( $sent_year, $sent_month, $sent_day ) = split "-",
+ $num->{'datesent'};
+ $sent_day = ( split " ", $sent_day )[0];
+ ( $sent_year, $sent_month, $sent_day ) =
+ Add_Delta_Days( $sent_year, $sent_month, $sent_day,
+ C4::Context->preference('TransfersMaxDaysWarning'));
+ my $calcDate = Date_to_Days( $sent_year, $sent_month, $sent_day );
+ my $today = Date_to_Days(&Today);
+ my $warning = ( $today > $calcDate );
+
+ if ( $warning > 0 ) {
+ $getransf{'messcompa'} = 1;
+ }
+ my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} );
+ my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
+
+ $getransf{'title'} = $gettitle->{'title'};
+ $getransf{'datetransfer'} = format_date( $num->{'datesent'} );
+ $getransf{'biblionumber'} = $gettitle->{'biblionumber'};
+ $getransf{'itemnumber'} = $gettitle->{'itemnumber'};
+ $getransf{'barcode'} = $gettitle->{'barcode'};
+ $getransf{'itemtype'} = $itemtypeinfo->{'description'};
+ $getransf{'homebranch'} = $gettitle->{'homebranch'};
+ $getransf{'holdingbranch'} = $gettitle->{'holdingbranch'};
+ $getransf{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
+
+ # we check if we have a reserv for this
transfer
+ my @checkreserv = GetReservations( $num->{'itemnumber'} );
+ if ( $checkreserv[0] ) {
+ my $getborrower =
+ GetMemberDetails( $checkreserv[1] );
+ $getransf{'borrowernum'} = $getborrower->{'borrowernumber'};
+ $getransf{'borrowername'} = $getborrower->{'surname'};
+ $getransf{'borrowerfirstname'} = $getborrower->{'firstname'};
+ if ( $getborrower->{'emailaddress'} ) {
+ $getransf{'borrowermail'} = $getborrower->{'emailaddress'};
+ }
+ $getransf{'borrowerphone'} = $getborrower->{'phone'};
+
+ }
+ push( @transferloop, \%getransf );
+ }
+
+ # If we have a return of reservloop we put it in the
branchloop sequence
+ $branchloop{'reserv'} = address@hidden;
+ }
+ else {
+
+# if we don't have a retrun from reservestobranch we unset branchname and
branchcode
+ $branchloop{'branchname'} = 0;
+ $branchloop{'branchcode'} = 0;
+ }
+ push( @branchesloop, \%branchloop );
+}
+
+$template->param(
+ branchesloop => address@hidden,
+ show_date => format_date($todaysdate),
+);
+
+output_html_with_http_headers $input, $cookie, $template->output;
+
Index: koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl
===================================================================
RCS file: koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl
diff -N koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ koha-tmpl/intranet-tmpl/prog/en/circ/transferstoreceive.tmpl 23 Apr
2007 15:21:17 -0000 1.1
@@ -0,0 +1,61 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha › Circulation</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+
+<div id="mainbloc">
+ <h1 class="circulation">Transfers made TO your library the : <!--
TMPL_VAR NAME="show_date" --></h1>
+ <p>You are the destination of this transfer</p>
+ <div id="resultlist">
+ <!-- TMPL_LOOP NAME="branchesloop" -->
+ <!-- TMPL_IF NAME="branchcode" -->
+ <table>
+ <tr>
+ <th class="circulation" colspan="5">Coming from <!--
TMPL_VAR NAME="branchname" --> </th>
+ </tr>
+ <tr>
+ <th class="circulation">Date of transfer</th>
+ <th class="circulation">Title</th>
+ <th class="circulation">Reserved by </th>
+ <th class="circulation">Localisation</th>
+ <th class="circulation">Action</th>
+ </tr>
+ <!-- TMPL_LOOP NAME="reserv" -->
+ <tr <!-- TMPL_IF NAME="messcompa" --> class="problem"
<!-- /TMPL_IF -->>
+ <td><p><!-- TMPL_VAR NAME="datetransfer"
--></p> <!-- TMPL_IF NAME="messcompa" --> check this transfer<!-- /TMPL_IF
--></td>
+ <td>
+ <p>
+ <a
href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+ (<b><!-- TMPL_VAR
NAME="itemtype" --> </b>)
+ <br />Barcode : <!-- TMPL_VAR
NAME="barcode" -->
+ </p>
+ </td>
+ <td>
+ <!-- TMPL_IF NAME="borrowername" -->
+ <p><a
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR
Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> <!--
TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR
NAME="borrowerphone" --><br />
+ <!-- TMPL_IF NAME="borrowermail" --><a
href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR
NAME="title" -->">
+ <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
+ </p>
+ <!-- TMPL_ELSE -->
+ <p>
+ None
+ </p>
+ <!-- /TMPL_IF -->
+ </td>
+ <td><p><!-- TMPL_VAR NAME="homebranch" --> <!--
TMPL_VAR NAME="itemcallnumber" --></p></td>
+ <td>
+ <!--<form name="dotransfer"
action="currenttransfers.pl" method="post">
+ <input type="hidden"
name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+ <input type="submit" value="Cancel this
transfer">
+ </form>-->
+ </td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ <br><br>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ </div>
+</div>
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha C4/Biblio.pm C4/Circulation.pm C4/Context....,
paul poulain <=