[Koha-cvs] koha acqui/finishreceive.pl acqui/orderreceive.... [rel_3_0]
Henri-Damien LAURENT
laurenthdl at alinto.com
Fri Dec 22 18:17:40 CET 2006
CVSROOT: /cvsroot/koha
Module name: koha
Branch: rel_3_0
Changes by: Henri-Damien LAURENT <hdl> 06/12/22 17:17:40
Modified files:
acqui : finishreceive.pl orderreceive.pl parcel.pl
C4 : Acquisition.pm
koha-tmpl/intranet-tmpl/prog/en/acqui: orderreceive.tmpl
parcel.tmpl supplier.tmpl
Log message:
Somme BugFixing.
But still need much much work.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/finishreceive.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.20.2.8&r2=1.20.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/orderreceive.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/parcel.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.6&r2=1.43.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.5&r2=1.2.2.6
Patches:
Index: acqui/finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
diff -u -b -r1.20.2.8 -r1.20.2.9
--- acqui/finishreceive.pl 20 Dec 2006 17:15:45 -0000 1.20.2.8
+++ acqui/finishreceive.pl 22 Dec 2006 17:17:39 -0000 1.20.2.9
@@ -94,6 +94,7 @@
my $booksellers = $input->param('booksellers');
my $foo = $input->param('foo');
my $volinf = $input->param('volinf');
+my $daterecieved = $input->param('daterecieved');
my $catview = $input->param('catview'); # for editing from moredetail.tmpl
my $barcodeexists = $input->param('barcodeexists'); # if barcode exists
my $newitemfailed = $input->param('newitemfailed'); # if create new item failed
@@ -193,7 +194,7 @@
if ( $quantity != 0 ) {
# save the quantity recieved.
ModReceiveOrder( $biblionumber, $ordnum, $quantrec, $user, $cost,
- $invoiceno, $freightperitem, $bookfund, $replacement );
+ $invoiceno, $freightperitem, $bookfund, $replacement,$daterecieved );
# create items if the user has entered barcodes
my @barcodes = split( /\,| |\|/, $barcode ); #WTF?
@@ -249,7 +250,7 @@
$invoiceno =~
s/\&/\%26/g; # swapping pesky & with url friendly hex codes.
print $input->redirect(
- "/cgi-bin/koha/acqui/parcels.pl?code=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&quantity=$quantity"
+ "/cgi-bin/koha/acqui/parcel.pl?daterecieved=$daterecieved&code=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst"
);
}
}
Index: acqui/orderreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/Attic/orderreceive.pl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- acqui/orderreceive.pl 14 Dec 2006 15:41:54 -0000 1.2.2.1
+++ acqui/orderreceive.pl 22 Dec 2006 17:17:39 -0000 1.2.2.2
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: orderreceive.pl,v 1.2.2.1 2006/12/14 15:41:54 toins Exp $
+# $Id: orderreceive.pl,v 1.2.2.2 2006/12/22 17:17:39 hdl Exp $
#script to recieve orders
#written by chris at katipo.co.nz 24/2/2000
@@ -66,7 +66,6 @@
use C4::Bookseller;
use C4::Members;
use C4::Branch; # GetBranches
-
my $input = new CGI;
my $supplierid = $input->param('supplierid');
my $dbh = C4::Context->dbh;
@@ -75,6 +74,9 @@
my $invoice = $input->param('invoice');
my $freight = $input->param('freight');
my $biblio = $input->param('biblio');
+my $daterecieved = $input->param('date');
+# ### $daterecieved
+# ### $input
my $catview = $input->param('catview');
my $gst = $input->param('gst');
my @results = SearchOrder( $search, $supplierid, $biblio, $catview );
@@ -130,56 +132,60 @@
if ( $results[0]->{'unitprice'} == 0 ) {
$results[0]->{'unitprice'} = '';
}
+ $results[0]->{'copyrightdate'}=format_date( $results[0]->{'copyrightdate'} );
$template->param(
branchloop => \@branchloop,
count => 1,
- biblionumber => $results[0]->{'biblionumber'},
- ordernumber => $results[0]->{'ordernumber'},
- biblioitemnumber => $results[0]->{'biblioitemnumber'},
- supplierid => $results[0]->{'booksellerid'},
freight => $freight,
gst => $gst,
catview => ( $catview ne 'yes' ? 1 : 0 ),
name => $booksellers[0]->{'name'},
date => format_date($date),
- title => $results[0]->{'title'},
- author => $results[0]->{'author'},
- copyrightdate => format_date( $results[0]->{'copyrightdate'} ),
- itemtype => $results[0]->{'itemtype'},
- isbn => $results[0]->{'isbn'},
- seriestitle => $results[0]->{'seriestitle'},
+ daterecieved => $daterecieved,
barcode => $barcode,
- bookfund => $results[0]->{'bookfundid'},
- quantity => $results[0]->{'quantity'},
- quantityreceived => $results[0]->{'quantityreceived'},
- rrp => $results[0]->{'rrp'},
- ecost => $results[0]->{'ecost'},
- unitprice => $results[0]->{'unitprice'},
invoice => $invoice,
- notes => $results[0]->{'notes'},
+ %{$results[0]}
+ # contains biblionumber, ordernumber, biblioitmenumber, supplierid, title, author, itemtype, isbn, seriestitle, bookfund, quantity, quantityreceived, rrp, ecost, unitprice, notes
+# biblionumber => $results[0]->{'biblionumber'},
+# ordernumber => $results[0]->{'ordernumber'},
+# biblioitemnumber => $results[0]->{'biblioitemnumber'},
+# supplierid => $results[0]->{'booksellerid'},
+# title => $results[0]->{'title'},
+# author => $results[0]->{'author'},
+# itemtype => $results[0]->{'itemtype'},
+# isbn => $results[0]->{'isbn'},
+# seriestitle => $results[0]->{'seriestitle'},
+# bookfund => $results[0]->{'bookfundid'},
+# quantity => $results[0]->{'quantity'},
+# quantityreceived => $results[0]->{'quantityreceived'},
+# rrp => $results[0]->{'rrp'},
+# ecost => $results[0]->{'ecost'},
+# unitprice => $results[0]->{'unitprice'},
+# notes => $results[0]->{'notes'},
);
}
else {
my @loop;
for ( my $i = 0 ; $i < $count ; $i++ ) {
- my %line;
- $line{isbn} = $results[$i]->{'isbn'};
- $line{basketno} = $results[$i]->{'basketno'};
- $line{quantity} = $results[$i]->{'quantity'};
- $line{quantityrecieved} = $results[$i]->{'quantityreceived'};
- $line{ordernumber} = $results[$i]->{'ordernumber'};
- $line{biblionumber} = $results[$i]->{'biblionumber'};
+ my %line=%{$results[$i]};
+# $line{title} = $results[$i]->{'title'};
+# $line{author} = $results[$i]->{'author'};
+# $line{isbn} = $results[$i]->{'isbn'};
+# $line{basketno} = $results[$i]->{'basketno'};
+# $line{quantity} = $results[$i]->{'quantity'};
+# $line{quantityrecieved} = $results[$i]->{'quantityreceived'};
+# $line{ordernumber} = $results[$i]->{'ordernumber'};
+# $line{biblionumber} = $results[$i]->{'biblionumber'};
$line{invoice} = $invoice;
$line{freight} = $freight;
$line{gst} = $gst;
- $line{title} = $results[$i]->{'title'};
- $line{author} = $results[$i]->{'author'};
$line{supplierid} = $supplierid;
push @loop, \%line;
-}
+ }
$template->param(
loop => \@loop,
date => format_date($date),
+ daterecieved => $daterecieved,
name => $booksellers[0]->{'name'},
supplierid => $supplierid,
invoice => $invoice,
Index: acqui/parcel.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/parcel.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- acqui/parcel.pl 22 Dec 2006 15:02:56 -0000 1.3.2.2
+++ acqui/parcel.pl 22 Dec 2006 17:17:39 -0000 1.3.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: parcel.pl,v 1.3.2.2 2006/12/22 15:02:56 toins Exp $
+# $Id: parcel.pl,v 1.3.2.3 2006/12/22 17:17:39 hdl Exp $
#script to recieve orders
#written by chris at katipo.co.nz 24/2/2000
@@ -85,8 +85,9 @@
flagsrequired => {acquisition => 1},
debug => 1,
});
-
+# warn "$code : $invoice : $date";
my @parcelitems=GetParcel($supplierid,$invoice,$date);
+# use Data::Dumper; warn Dumper(@parcelitems);
my $countlines = scalar @parcelitems;
my $totalprice=0;
@@ -103,22 +104,13 @@
if ($toggle==0){
$line{color}='#EEEEEE';
$toggle=1;
-} else {
+ } else {
$line{color}='white';
$toggle=0;
-}
- $line{basketno} = $parcelitems[$i]->{'basketno'};
- $line{isbn} = $parcelitems[$i]->{'isbn'};
- $line{ordernumber} = $parcelitems[$i]->{'ordernumber'};
- $line{biblionumber} = $parcelitems[$i]->{'biblionumber'};
+ }
+ %line = %{$parcelitems[$i]};
$line{invoice} = $invoice;
$line{gst} = $gst;
- $line{title} = $parcelitems[$i]->{'title'};
- $line{author} = $parcelitems[$i]->{'author'};
- $line{unitprice} = $parcelitems[$i]->{'unitprice'};
- $line{ecost} = $parcelitems[$i]->{'ecost'};
- $line{quantityrecieved} = $parcelitems[$i]->{'quantityreceived'};
- $line{quantity} = $parcelitems[$i]->{'quantity'};
$line{total} = $total;
$line{supplierid} = $supplierid;
push @loop_received, \%line;
@@ -136,22 +128,15 @@
if ($toggle==0){
$line{color}='#EEEEEE';
$toggle=1;
-} else {
+ } else {
$line{color}='white';
$toggle=0;
-}
- $line{basketno} = $pendingorders->[$i]->{'basketno'};
- $line{isbn} = $pendingorders->[$i]->{'isbn'};
- $line{ordernumber} = $pendingorders->[$i]->{'ordernumber'};
- $line{biblionumber} = $pendingorders->[$i]->{'biblionumber'};
+ }
+ %line = %{$pendingorders->[$i]};
+ $line{ecost} = sprintf("%.2f",$line{ecost});
+ $line{unitprice} = sprintf("%.2f",$line{unitprice});
$line{invoice} = $invoice;
$line{gst} = $gst;
- $line{title} = $pendingorders->[$i]->{'title'};
- $line{author} = $pendingorders->[$i]->{'author'};
- $line{unitprice} = $pendingorders->[$i]->{'unitprice'};
- $line{ecost} = $pendingorders->[$i]->{'ecost'};
- $line{quantityrecieved} = $pendingorders->[$i]->{'quantityreceived'};
- $line{quantity} = $pendingorders->[$i]->{'quantity'};
$line{total} = $total;
$line{supplierid} = $supplierid;
push @loop_orders, \%line;
Index: C4/Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.43.2.6
retrieving revision 1.43.2.7
diff -u -b -r1.43.2.6 -r1.43.2.7
--- C4/Acquisition.pm 22 Dec 2006 16:49:20 -0000 1.43.2.6
+++ C4/Acquisition.pm 22 Dec 2006 17:17:39 -0000 1.43.2.7
@@ -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: Acquisition.pm,v 1.43.2.6 2006/12/22 16:49:20 toins Exp $
+# $Id: Acquisition.pm,v 1.43.2.7 2006/12/22 17:17:39 hdl Exp $
use strict;
require Exporter;
@@ -30,7 +30,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.43.2.6 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.43.2.7 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
# used in receiveorder subroutine
# to provide library specific handling
@@ -211,8 +211,8 @@
my ($supplierid) = @_;
my $dbh = C4::Context->dbh;
my $strsth = "
- SELECT count(*),authorisedby,creationdate,aqbasket.basketno,
- closedate,surname,firstname,aqorders.title
+ SELECT count(*),aqbasket.basketno,
+ surname,firstname,aqorders.*
FROM aqorders
LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
@@ -231,15 +231,13 @@
. "' or borrowers.branchcode ='')";
}
}
- $strsth .= " group by basketno order by aqbasket.basketno";
+ $strsth .= " group by aqbasket.basketno order by aqbasket.basketno";
+ warn "$strsth";
my $sth = $dbh->prepare($strsth);
$sth->execute($supplierid);
- my @results = ();
- while ( my $data = $sth->fetchrow_hashref ) {
- push( @results, $data );
- }
+ my $results = $sth->fetchall_arrayref({});
$sth->finish;
- return \@results;
+ return $results;
}
#------------------------------------------------------------#
@@ -580,13 +578,14 @@
sub ModReceiveOrder {
my (
$biblionumber, $ordnum, $quantrec, $user, $cost,
- $invoiceno, $freight, $rrp, $bookfund
+ $invoiceno, $freight, $rrp, $bookfund, $daterecieved
)
= @_;
my $dbh = C4::Context->dbh;
+ $daterecieved=POSIX::strftime("%Y-%m-%d",CORE::localtime) unless $daterecieved;
my $query = "
UPDATE aqorders
- SET quantityreceived=?,datereceived=now(),booksellerinvoicenumber=?,
+ SET quantityreceived=?,datereceived=?,booksellerinvoicenumber=?,
unitprice=?,freight=?,rrp=?
WHERE biblionumber=? AND ordernumber=?
";
@@ -595,8 +594,8 @@
if ($suggestionid) {
ModStatus( $suggestionid, 'AVAILABLE', '', $biblionumber );
}
- $sth->execute( $quantrec, $invoiceno, $cost, $freight, $rrp, $biblionumber,
- $ordnum );
+ $sth->execute( $quantrec,$daterecieved, $invoiceno, $cost, $freight, $rrp, $biblionumber,
+ $ordnum);
$sth->finish;
# Allows libraries to change their bookfund during receiving orders
@@ -695,6 +694,7 @@
. ") or biblioitems.isbn=? OR (aqorders.ordernumber=? AND aqorders.biblionumber=?)) ";
}
$query .= " GROUP BY aqorders.ordernumber";
+ ### $query
my $sth = $dbh->prepare($query);
$sth->execute(@searchterms);
my @results = ();
@@ -722,6 +722,7 @@
$data->{'bookfundid'} = $data3->{'bookfundid'};
push( @results, $data );
}
+ ### @results
$sth->finish;
$sth2->finish;
$sth3->finish;
@@ -789,7 +790,7 @@
=cut
sub GetParcel {
-
+use Smart::Comments;
#gets all orders from a certain supplier, orders them alphabetically
my ( $supplierid, $code, $datereceived ) = @_;
my $dbh = C4::Context->dbh;
@@ -834,7 +835,7 @@
while ( my $data = $sth->fetchrow_hashref ) {
push( @results, $data );
}
- ### countparcelbiblio: $count
+ ### countparcelbiblio: scalar(@results)
$sth->finish;
return @results;
@@ -900,17 +901,13 @@
$strsth .= "group by aqorders.booksellerinvoicenumber,datereceived ";
$strsth .= "order by $order " if ($order);
+### $strsth
my $sth = $dbh->prepare($strsth);
$sth->execute;
- my @results;
-
- while ( my $data2 = $sth->fetchrow_hashref ) {
- push @results, $data2;
- }
-
+ my $results = $sth->fetchall_arrayref({});
$sth->finish;
- return @results;
+ return @$results;
}
#------------------------------------------------------------#
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/Attic/orderreceive.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl 2 Aug 2006 08:10:06 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/orderreceive.tmpl 22 Dec 2006 17:17:39 -0000 1.2.2.1
@@ -9,7 +9,7 @@
<div id="acqui_acquire_summary">
Invoice: <!-- TMPL_VAR NAME="invoice" --></p>
<p>Received By: <!-- TMPL_VAR NAME="user" --></p>
- <p>Date: <!-- TMPL_VAR NAME="date" --></p>
+ <p>Date: <!-- TMPL_VAR NAME="daterecieved" --></p>
</div>
<!-- TMPL_IF name="count" -->
@@ -30,7 +30,7 @@
<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
<h1><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
<ul><li>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></li>
- <li>Order placed on: <!-- TMPL_VAR NAME="date" --></li>
+ <li>Order placed on: <!-- TMPL_VAR NAME="closedate" --></li>
</ul>
<h2>Catalogue Details</h2>
@@ -53,13 +53,9 @@
<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
<input type="hidden" name="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
+ <input type="hidden" name="daterecieved" value="<!-- TMPL_VAR NAME="daterecieved" -->" />
<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
- <!-- TMPL_IF name="catview" -->
- <input type="submit" name="submit" value="Save" />
- <!-- TMPL_ELSE -->
- <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
- <!-- /TMPL_IF -->
<h2>Accounting Details</h2>
<p><label>Bookfund *</label><!-- TMPL_VAR NAME="CGIbookfund" --></p>
<p><label>Quantity Ordered</label><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /></p>
@@ -69,6 +65,11 @@
<p><label>Actual Cost *</label><input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></p>
<p><label>Invoice Number</label><!-- TMPL_VAR NAME="invoice" --><input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" /></p>
<p><label>Notes</label><input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></p>
+ <!-- TMPL_IF name="catview" -->
+ <input type="submit" name="submit" value="Save" />
+ <!-- TMPL_ELSE -->
+ <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
+ <!-- /TMPL_IF -->
</form>
</div>
<!-- TMPL_ELSE -->
@@ -86,7 +87,7 @@
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="isbn" --></td>
- <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&freight=<!-- TMPL_VAR NAME="freight" -->&gst=<!-- TMPL_VAR NAME="gst" -->&id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+ <td><a href="orderreceive.pl?daterecieved=<!-- TMPL_VAR NAME="daterecieved" -->&recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&freight=<!-- TMPL_VAR NAME="freight" -->&gst=<!-- TMPL_VAR NAME="gst" -->&id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="quantity" --></td>
<td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl 13 Jul 2006 15:20:42 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl 22 Dec 2006 17:17:39 -0000 1.1.2.1
@@ -4,8 +4,8 @@
<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
<h1>
- <!-- TMPL_IF name="invoice" -->
- Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
+ <!-- TMPL_IF name="date" -->
+ Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"-->Invoice <i><!-- TMPL_VAR NAME="invoice" --></i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="date" --></i>
<!-- TMPL_ELSE -->
orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
<!-- /TMPL_IF -->
@@ -21,30 +21,32 @@
<table>
<tr>
<th class="acquisition">BASKET</th>
- <th class="acquisition">ISBN</th>
- <th class="acquisition">TITLE</th>
- <th class="acquisition">AUTHOR</th>
+ <th class="acquisition">Summary</th>
+ <th class="acquisition">QTY ordered</th>
+ <th class="acquisition">Est Cost</th>
<th class="acquisition">ACTUAL</th>
<th class="acquisition">P&P</th>
- <th class="acquisition">QTY</th>
+ <th class="acquisition">QTY received</th>
<th class="acquisition">TOTAL</th>
</tr>
- <!-- TMPL_LOOP NAME="loop_orders" -->
+ <!-- TMPL_LOOP NAME="loop_received" -->
<tr>
<td><!-- TMPL_VAR NAME="basketno" --></td>
- <td><!-- TMPL_VAR NAME="isbn" --></td>
- <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
- <td><!-- TMPL_VAR NAME="author" --></td>
+ <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&date=<!-- TMPL_VAR NAME="date" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
+ <!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
+ <!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
+ <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
+ </td>
+ <td><!-- TMPL_VAR NAME="quantity" --></td>
+ <td><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="unitprice" --></td>
<td></td>
- <td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+ <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
<td><!-- TMPL_VAR NAME="total" --></td>
</tr>
<!-- /TMPL_LOOP -->
<tr>
- <th class="acquisition"></th>
- <th class="acquisition"></th>
- <th class="acquisition"></th>
+ <th class="acquisition" colspan="3"></th>
<th class="acquisition">SUBTOTALS</th>
<th class="acquisition"><!-- TMPL_VAR NAME="totalprice" --></th>
<th class="acquisition"><!-- TMPL_VAR NAME="totalfreight" --></th>
@@ -52,7 +54,7 @@
<th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
</tr>
<tr>
- <td>
+ <td colspan="5">
<b>HELP</b>
<p>The total at the bottom of the page should be within a few cents of the total for the invoice.</p>
</td>
@@ -60,6 +62,7 @@
<td><!-- TMPL_VAR NAME="gst" --></td>
</tr>
<tr>
+ <td colspan="5"> </td>
<td colspan="2"><b>TOTAL</b></td>
<td><!-- TMPL_VAR NAME="grandtot" --></td>
</tr>
@@ -75,6 +78,33 @@
<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
<p><b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve" /></p>
</form>
+ <table> <caption>Pending Orders</caption>
+ <tr>
+ <th class="acquisition">BASKET</th>
+ <th class="acquisition">Summary</th>
+ <th class="acquisition">Est. Cost</th>
+ <th class="acquisition">P&P</th>
+ <th class="acquisition">QTY Ordered</th>
+ <th class="acquisition">QTY</th>
+ <th class="acquisition">TOTAL</th>
+ </tr>
+ <!-- TMPL_LOOP NAME="loop_orders" -->
+ <tr>
+ <td><!-- TMPL_VAR NAME="basketno" --></td>
+ <td>
+ <a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&date=<!-- TMPL_VAR NAME="date" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
+ <!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
+ <!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
+ <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
+ </td>
+ <td><!-- TMPL_VAR NAME="unitprice" --></td>
+ <td></td>
+ <td><!-- TMPL_VAR NAME="quantity" --></td>
+ <td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+ <td><!-- TMPL_VAR NAME="ecost" --></td>
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
</div>
<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -b -r1.2.2.5 -r1.2.2.6
--- koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl 20 Dec 2006 17:15:45 -0000 1.2.2.5
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl 22 Dec 2006 17:17:39 -0000 1.2.2.6
@@ -134,10 +134,10 @@
<a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">
Edit Supplier
</a>
- <a href="parcel.pl?supplierid=<!--TMPL_VAR Name="id"-->">
+ <a href="booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">
Manage Orders
</a>
- <a href="/cgi-bin/koha/acqui/orderreceive.pl?supplierid=<!--TMPL_VAR Name="id"-->">
+ <a href="parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->">
Receive Parcel
</a>
</div>
More information about the Koha-cvs
mailing list