[Koha-cvs] koha acqui/acquire.pl acqui/finishreceive.pl ac... [dev_week]
Joshua Ferraro
jmf at kados.org
Thu Jul 27 17:41:17 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/07/27 15:41:17
Modified files:
acqui : acquire.pl finishreceive.pl receive.pl
acqui.simple : additem.pl
C4 : Acquisition.pm
koha-tmpl/intranet-tmpl/default/en/acqui: acquire.tmpl
recieve.tmpl
koha-tmpl/intranet-tmpl/npl/en/acqui.simple: additem.tmpl
Log message:
Syncing with rel_2_2:
bugfixing for acquisitions :
In parcels management, the "primary key" is parcel code + datereceived. the datereceived was sometimes lost during
+navigation, causing problems. this fix solves the problem
+ in Acquisitions.pm, rewritting of a SQL query to LEFT JOIN instead of WHERE
Owen: we need to update NPL templates with these changes in rel_2_2 and dev_week
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/acquire.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.18.2.4&r2=1.18.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/finishreceive.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.17&r2=1.17.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/receive.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.13.2.5&r2=1.13.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/acqui.simple/additem.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.27.2.19.2.1&r2=1.27.2.19.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.9.2.16&r2=1.9.2.16.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.15&r2=1.15.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.12.2.3&r2=1.12.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.10&r2=1.3.2.10.2.1
Patches:
Index: acqui/acquire.pl
===================================================================
RCS file: /sources/koha/koha/acqui/Attic/acquire.pl,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.4.2.1
diff -u -b -r1.18.2.4 -r1.18.2.4.2.1
--- acqui/acquire.pl 7 Mar 2006 16:57:47 -0000 1.18.2.4
+++ acqui/acquire.pl 27 Jul 2006 15:41:16 -0000 1.18.2.4.2.1
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: acquire.pl,v 1.18.2.4 2006/03/07 16:57:47 oleonard Exp $
+# $Id: acquire.pl,v 1.18.2.4.2.1 2006/07/27 15:41:16 kados Exp $
#script to recieve orders
#written by chris at katipo.co.nz 24/2/2000
@@ -41,6 +41,7 @@
my $search=$input->param('recieve');
my $invoice=$input->param('invoice');
+my $datereceived=$input->param('datereceived');
my $freight=$input->param('freight');
my $biblio=$input->param('biblio');
my $catview=$input->param('catview');
@@ -78,6 +79,7 @@
# -default => $results[0]->{'itemtype'},
# -labels => \%itemtypes,
# -size => 1,
+# -tabindex=>'',
# -multiple => 0 );
# $sth->finish;
@@ -94,6 +96,7 @@
-default => $results[0]->{'branchcode'},
-labels => \%select_branches,
-size => 1,
+ -tabindex=>'',
-multiple => 0 );
my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0;
@@ -121,6 +124,7 @@
# -default => $results[0]->{'bookfundid'},
# -labels => \%select_bookfunds,
# -size => 1,
+# -tabindex=>'',
# -multiple => 0 );
if ($results[0]->{'quantityreceived'} == 0){
@@ -137,7 +141,7 @@
supplierid => $results[0]->{'booksellerid'},
freight => $freight,
gst => $gst,
- catview => ($catview ne 'yes'?1:0),
+ catview => ($catview eq 'yes'?1:0),
name => $booksellers[0]->{'name'},
date => format_date($date),
title => $results[0]->{'title'},
@@ -155,6 +159,7 @@
ecost => $results[0]->{'ecost'},
unitprice => $results[0]->{'unitprice'},
invoice => $invoice,
+ datereceived => $datereceived,
notes => $results[0]->{'notes'},
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
@@ -171,6 +176,7 @@
$line{ordernumber} = $results[$i]->{'ordernumber'};
$line{biblionumber} = $results[$i]->{'biblionumber'};
$line{invoice} = $invoice;
+ $line{datereceived} = $datereceived;
$line{freight} = $freight;
$line{gst} = $gst;
$line{title} = $results[$i]->{'title'};
@@ -183,6 +189,7 @@
name => $booksellers[0]->{'name'},
supplierid => $supplierid,
invoice => $invoice,
+ datereceived => $datereceived,
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
Index: acqui/finishreceive.pl
===================================================================
RCS file: /sources/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.17
retrieving revision 1.17.4.1
diff -u -b -r1.17 -r1.17.4.1
--- acqui/finishreceive.pl 14 Sep 2004 12:35:55 -0000 1.17
+++ acqui/finishreceive.pl 27 Jul 2006 15:41:16 -0000 1.17.4.1
@@ -38,6 +38,7 @@
my $quantity=$input->param('quantity');
my $cost=$input->param('cost');
my $invoiceno=$input->param('invoice');
+my $datereceived=$input->param('datereceived');
my $replacement=$input->param('rrp');
my $gst=$input->param('gst');
my $freight=$input->param('freight');
@@ -50,7 +51,7 @@
if ($quantity != 0) {
# save the quantity recieved.
- receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$freight,$replacement);
+ $datereceived = receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$datereceived,$freight,$replacement);
# create items if the user has entered barcodes
my $barcode=$input->param('barcode');
my @barcodes=split(/\,| |\|/,$barcode);
@@ -62,7 +63,7 @@
homebranch => $branch,
loan => 0 },
@barcodes);
- print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst");
+ print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived");
} else {
print $input->header;
delorder($biblionumber,$ordnum);
Index: acqui/receive.pl
===================================================================
RCS file: /sources/koha/koha/acqui/Attic/receive.pl,v
retrieving revision 1.13.2.5
retrieving revision 1.13.2.5.2.1
diff -u -b -r1.13.2.5 -r1.13.2.5.2.1
--- acqui/receive.pl 4 Apr 2006 13:32:53 -0000 1.13.2.5
+++ acqui/receive.pl 27 Jul 2006 15:41:16 -0000 1.13.2.5.2.1
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: receive.pl,v 1.13.2.5 2006/04/04 13:32:53 tipaul Exp $
+# $Id: receive.pl,v 1.13.2.5.2.1 2006/07/27 15:41:16 kados Exp $
#script to recieve orders
#written by chris at katipo.co.nz 24/2/2000
@@ -36,7 +36,7 @@
my $input=new CGI;
my $supplierid=$input->param('supplierid');
my ($count, at booksellers)=bookseller($supplierid);
-my $invoice=$input->param('code') || '';
+my $invoice=$input->param('code') || $input->param('invoice') || '';
my $freight=$input->param('freight');
my $gst=$input->param('gst');
my $date=$input->param('datereceived');
@@ -122,7 +122,7 @@
$tototal=$tototal+$freight;
$template->param(invoice => $invoice,
- date => $date,
+ datereceived => $date,
name => $booksellers[0]->{'name'},
supplierid => $supplierid,
gst => $gst,
Index: acqui.simple/additem.pl
===================================================================
RCS file: /sources/koha/koha/acqui.simple/Attic/additem.pl,v
retrieving revision 1.27.2.19.2.1
retrieving revision 1.27.2.19.2.2
diff -u -b -r1.27.2.19.2.1 -r1.27.2.19.2.2
--- acqui.simple/additem.pl 11 Jul 2006 13:00:46 -0000 1.27.2.19.2.1
+++ acqui.simple/additem.pl 27 Jul 2006 15:41:16 -0000 1.27.2.19.2.2
@@ -1,7 +1,7 @@
#!/usr/bin/perl
-# $Id: additem.pl,v 1.27.2.19.2.1 2006/07/11 13:00:46 kados Exp $
-
+# $Id: additem.pl,v 1.27.2.19.2.2 2006/07/27 15:41:16 kados Exp $
+#
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -75,12 +75,19 @@
# build indicator hash.
my @ind_tag = $input->param('ind_tag');
my @indicator = $input->param('indicator');
+ my @firstsubfields = $input->param('firstsubfields');
#my %indicators;
#for (my $i=0;$i<=$#ind_tag;$i++) {
# $indicators{$ind_tag[$i]} = $indicator[$i];
#}
+ if (C4::Context->preference('TemplateEncoding') eq "iso-8859-1") {
+ $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,\@firstsubfields,\@indicator,\@ind_tag);
+ } else {
my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
- my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
+ $record=MARC::Record->new_from_xml($xml,C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour'));
+ }
+# my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
+# my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
#my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
# if autoBarcode is ON, calculate barcode...
if (C4::Context->preference('autoBarcode')) {
@@ -140,13 +147,18 @@
# build indicator hash.
my @ind_tag = $input->param('ind_tag');
my @indicator = $input->param('indicator');
+ my @firstsubfields = $input->param('firstsubfields');
# my $itemnum = $input->param('itemnum');
#my %indicators;
#for (my $i=0;$i<=$#ind_tag;$i++) {
# $indicators{$ind_tag[$i]} = $indicator[$i];
#}
+ if (C4::Context->preference('TemplateEncoding') eq "iso-8859-1") {
+ $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,\@firstsubfields,\@indicator,\@ind_tag);
+ } else {
my $xml = MARChtml2xml(\@tags,\@subfields,\@values,\@indicator,\@ind_tag);
- my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
+ $record=MARC::Record->new_from_xml($xml,C4::Context->preference('TemplateEncoding'),C4::Context->preference('marcflavour'));
+ }
#my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
# MARC::Record builded => now, record in DB
# warn "R: ".$record->as_formatted;
@@ -188,7 +200,16 @@
for my $i (0..$#subf) {
next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} ne 10 && ($field->tag() ne $itemtagfield && $subf[$i][0] ne $itemtagsubfield));
$witness{$subf[$i][0]} = $tagslib->{$field->tag()}->{$subf[$i][0]}->{lib} if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} eq 10);
- $this_row{$subf[$i][0]} =$subf[$i][1] if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} eq 10);
+# $this_row{$subf[$i][0]} =$subf[$i][1]
+ if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab} eq 10) {
+ if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl}) {
+ $this_row{$subf[$i][0]}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ } elsif ($tagslib->{$field->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ $this_row{$subf[$i][0]}=DisplayISBN($subf[$i][1]);
+ } else {
+ $this_row{$subf[$i][0]}=get_authorised_value_desc($field->tag(), $subf[$i][0], $subf[$i][1], '', $dbh);
+ }
+ }
if (($field->tag eq $branchtagfield) && ($subf[$i][$0] eq $branchtagsubfield) && C4::Context->preference("IndependantBranches")) {
#verifying rights
my $userenv = C4::Context->userenv;
@@ -315,6 +336,7 @@
-default=>"$value",
-labels => \%authorised_lib,
-size=>1,
+ -tabindex=>'',
-multiple=>0,
);
} elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
@@ -356,3 +378,30 @@
$template->param($error => 1);
}
output_html_with_http_headers $input, $cookie, $template->output;
+
+
+sub get_authorised_value_desc ($$$$$) {
+ my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+ #---- branch
+ if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+ return getbranchname($value);
+ }
+
+ #---- itemtypes
+ if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+ return ItemType($value);
+ }
+
+ #---- "true" authorized value
+ my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+ if ($category ne "") {
+ my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+ $sth->execute($category, $value);
+ my $data = $sth->fetchrow_hashref;
+ return $data->{'lib'};
+ } else {
+ return $value; # if nothing is found return the original value
+ }
+}
Index: C4/Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.16
retrieving revision 1.9.2.16.2.1
diff -u -b -r1.9.2.16 -r1.9.2.16.2.1
--- C4/Acquisition.pm 4 Apr 2006 13:14:54 -0000 1.9.2.16
+++ C4/Acquisition.pm 27 Jul 2006 15:41:16 -0000 1.9.2.16.2.1
@@ -24,6 +24,7 @@
use MARC::Record;
use C4::Suggestions;
# use C4::Biblio;
+use Date::Calc qw(:all);
use vars qw($VERSION @ISA @EXPORT);
@@ -317,17 +318,23 @@
=cut
#'
sub receiveorder {
- my ($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$freight,$rrp)=@_;
+ my ($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$datereceived,$freight,$rrp)=@_;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("update aqorders set quantityreceived=?,datereceived=now(),booksellerinvoicenumber=?,
+ unless ($datereceived) {
+ # if datereceived is not set, calculate today date
+ my ($year,$month,$day) = Today();
+ $datereceived = "$year-$month-$day";
+ }
+ my $sth=$dbh->prepare("update aqorders set quantityreceived=?,datereceived=?,booksellerinvoicenumber=?,
unitprice=?,freight=?,rrp=?
where biblionumber=? and ordernumber=?");
my $suggestionid = findsuggestion_from_biblionumber($dbh,$biblio);
if ($suggestionid) {
changestatus($suggestionid,'AVAILABLE','',$biblio);
}
- $sth->execute($quantrec,$invoiceno,$cost,$freight,$rrp,$biblio,$ordnum);
+ $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$biblio,$ordnum);
$sth->finish;
+ return $datereceived;
}
=item updaterecorder
@@ -660,7 +667,6 @@
$strsth .= " AND borrowers.branchcode like \'".C4::Context->userenv->{branch}."\'" if (C4::Context->preference("IndependantBranches") && C4::Context->userenv->{flags}!=1);
$strsth .= " ORDER BY latesince,basketno,borrowers.branchcode, supplier";
}
- warn "C4::Acquisition : getlateorders SQL:".$strsth;
my $sth = $dbh->prepare($strsth);
$sth->execute;
my @results;
@@ -740,11 +746,11 @@
my @searchterms = ($id);
map { push(@searchterms,"$_%","% $_%") } @data;
push(@searchterms,$search,$search,$biblio);
- my $sth=$dbh->prepare("Select biblio.*,biblioitems.*,aqorders.*,aqbasket.*,biblio.title from aqorders,biblioitems,biblio,aqbasket
- where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
- aqorders.basketno = aqbasket.basketno
- and aqbasket.booksellerid = ?
- and biblio.biblionumber=aqorders.biblionumber
+ my $sth=$dbh->prepare("SELECT biblio.*,biblioitems.*,aqorders.*,aqbasket.*,biblio.title from aqorders
+ LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
+ LEFT JOIN biblioitems ON aqorders.biblioitemnumber = biblioitems.biblioitemnumber
+ LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
+ where aqbasket.booksellerid = ?
and ((datecancellationprinted is NULL)
or (datecancellationprinted = '0000-00-00'))
and (("
@@ -799,7 +805,6 @@
}
}
$query .=" order by booksellerid";
- warn "query histearch: ".$query;
my $sth = $dbh->prepare($query);
$sth->execute;
my $cnt=1;
@@ -1075,7 +1080,6 @@
my $strsth ="Select * from branches ";
$strsth.= " WHERE branchcode = ".$dbh->quote(C4::Context->userenv->{branch});
$strsth.= " order by branchname";
- warn "C4::Acquisition->branches : ".$strsth;
$sth=$dbh->prepare($strsth);
} else {
$sth = $dbh->prepare("Select * from branches order by branchname");
@@ -1115,17 +1119,17 @@
contemail=?,contnotes=?,active=?,
listprice=?, invoiceprice=?,gstreg=?, listincgst=?,
invoiceincgst=?, specialty=?,discount=?,invoicedisc=?,
- nocalc=?
+ nocalc=?, notes=?
where id=?");
$sth->execute($data->{'name'},$data->{'address1'},$data->{'address2'},
$data->{'address3'},$data->{'address4'},$data->{'postal'},$data->{'phone'},
$data->{'fax'},$data->{'url'},$data->{'contact'},$data->{'contpos'},
$data->{'contphone'},$data->{'contfax'},$data->{'contaltphone'},
$data->{'contemail'},
- $data->{'contnote'},$data->{'active'},$data->{'listprice'},
+ $data->{'contnotes'},$data->{'active'},$data->{'listprice'},
$data->{'invoiceprice'},$data->{'gstreg'},$data->{'listincgst'},
$data->{'invoiceincgst'},$data->{'specialty'},$data->{'discount'},
- $data->{'invoicedisc'},$data->{'nocalc'},$data->{'id'});
+ $data->{'invoicedisc'},$data->{'nocalc'},$data->{'notes'},$data->{'id'});
$sth->finish;
}
Index: koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -u -b -r1.15 -r1.15.4.1
--- koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl 2 Dec 2004 16:40:12 -0000 1.15
+++ koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl 27 Jul 2006 15:41:16 -0000 1.15.4.1
@@ -75,6 +75,7 @@
<label class="label100">Invoice Number</label>
<!-- TMPL_VAR NAME="invoice" -->
<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
+ <input type="hidden" name="datereceived" value="<!-- TMPL_VAR NAME="datereceived" -->">
</p>
<p>
<label class="label100">Notes</label>
Index: koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.3.2.1
diff -u -b -r1.12.2.3 -r1.12.2.3.2.1
--- koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl 4 Apr 2006 13:56:45 -0000 1.12.2.3
+++ koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl 27 Jul 2006 15:41:16 -0000 1.12.2.3.2.1
@@ -7,8 +7,7 @@
<div id="bloc25">
Invoice: <!-- TMPL_VAR NAME="invoice" --><br>
- Received By: <!-- TMPL_VAR NAME="user" --><br>
- <!-- TMPL_VAR NAME="date" -->
+ <!-- TMPL_VAR name="datereceived"-->
</div>
<div id="bloc25">
@@ -30,7 +29,7 @@
<!-- TMPL_LOOP NAME="loop_received" -->
<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
- <td><a href="acquire.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" -->&catview=yes"><!-- TMPL_VAR NAME="title" --></a></td>
+ <td><a href="acquire.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" -->&catview=yes&datereceived=<!-- TMPL_VAR name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="quantity" --></td>
<td></td>
@@ -88,7 +87,7 @@
<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
<td><!-- TMPL_VAR NAME="title" --></td>
- <td><a href="acquire.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" -->" class="button acquisition">Recieve</td>
+ <td><a href="acquire.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" -->&datereceived=<!-- TMPL_VAR name="datereceived"-->&catview=yes" class="button acquisition">Recieve</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
Index: koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.10.2.1
diff -u -b -r1.3.2.10 -r1.3.2.10.2.1
--- koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl 21 Mar 2006 04:38:53 -0000 1.3.2.10
+++ koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl 27 Jul 2006 15:41:16 -0000 1.3.2.10.2.1
@@ -60,6 +60,9 @@
<!-- TMPL_IF name="barcode_not_unique" -->
<div class="error"><b>ERROR : Barcode already exists !<b></div>
<!-- /TMPL_IF -->
+ <!-- TMPL_IF name="book_on_loan" -->
+ <div class="error"><b>ERROR : Item on loan : can't delete it !<b></div>
+ <!-- /TMPL_IF -->
<!-- TMPL_IF name="opisadd" -->
<input type="button" value="Add item" class="submit" onClick="Check(this.form)" accesskey="w">
<!-- TMPL_ELSE -->
More information about the Koha-cvs
mailing list