[Koha-cvs] koha C4/Acquisition.pm acqui/histsearch.pl koha... [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Fri Dec 22 17:49:20 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/22 16:49:20
Modified files:
C4 : Acquisition.pm
acqui : histsearch.pl
koha-tmpl/intranet-tmpl/prog/en/acqui: histsearch.tmpl
Log message:
add a link to the parcel if there is one.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.5&r2=1.43.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/histsearch.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.1&r2=1.8.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3&r2=1.3.2.1
Patches:
Index: C4/Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.43.2.5
retrieving revision 1.43.2.6
diff -u -b -r1.43.2.5 -r1.43.2.6
--- C4/Acquisition.pm 20 Dec 2006 17:15:45 -0000 1.43.2.5
+++ C4/Acquisition.pm 22 Dec 2006 16:49:20 -0000 1.43.2.6
@@ -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.5 2006/12/20 17:15:45 hdl Exp $
+# $Id: Acquisition.pm,v 1.43.2.6 2006/12/22 16:49:20 toins 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.5 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.43.2.6 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
# used in receiveorder subroutine
# to provide library specific handling
@@ -287,7 +287,6 @@
$sth->execute($basketno);
my @results;
- warn $query;
while ( my $data = $sth->fetchrow_hashref ) {
push @results, $data;
}
@@ -1066,7 +1065,9 @@
aqorders.quantity,
aqorders.quantityreceived,
aqorders.ecost,
- aqorders.ordernumber
+ aqorders.ordernumber,
+ aqorders.booksellerinvoicenumber as invoicenumber,
+ aqbooksellers.id as id
FROM aqorders,aqbasket,aqbooksellers,biblio";
$query .= ",borrowers "
Index: acqui/histsearch.pl
===================================================================
RCS file: /sources/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -b -r1.8.2.1 -r1.8.2.2
--- acqui/histsearch.pl 18 Dec 2006 16:35:17 -0000 1.8.2.1
+++ acqui/histsearch.pl 22 Dec 2006 16:49:20 -0000 1.8.2.2
@@ -15,16 +15,15 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: histsearch.pl,v 1.8.2.1 2006/12/18 16:35:17 toins Exp $
-
+# $Id: histsearch.pl,v 1.8.2.2 2006/12/22 16:49:20 toins Exp $
=head1 NAME
histsearch.pl
=head1 DESCRIPTION
-this script offer a interface to search among order.
+this script offer a interface to search among order.
=head1 CGI PARAMETERS
@@ -52,8 +51,6 @@
use strict;
require Exporter;
use CGI;
-
-
use C4::Auth; # get_template_and_user
use C4::Interface::CGI::Output;
use C4::Acquisition;
@@ -66,27 +63,37 @@
my $to_placed_on = $input->param('toplacedon');
my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "acqui/histsearch.tmpl",
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ {
+ template_name => "acqui/histsearch.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {acquisition => 1},
+ flagsrequired => { acquisition => 1 },
debug => 1,
- });
-my ($order_loop,$total_qty,$total_price,$total_qtyreceived)= &GetHistory($title,$author,$name,$from_placed_on,$to_placed_on);
-$template->param(suggestions_loop => $order_loop,
+ }
+);
+
+my ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) =
+ &GetHistory( $title, $author, $name, $from_placed_on, $to_placed_on );
+
+ warn Data::Dumper::Dumper($order_loop);
+
+$template->param(
+ suggestions_loop => $order_loop,
total_qty => $total_qty,
total_qtyreceived => $total_qtyreceived,
- total_price => sprintf ("%.2f",$total_price),
+ total_price => sprintf( "%.2f", $total_price ),
numresults => scalar(@$order_loop),
title => $title,
author => $author,
name => $name,
- from_placed_on =>$from_placed_on,
- to_placed_on =>$to_placed_on,
- intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+ from_placed_on => $from_placed_on,
+ to_placed_on => $to_placed_on,
+ intranetcolorstylesheet =>
+ C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
);
+
output_html_with_http_headers $input, $cookie, $template->output;
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl 20 Jan 2006 16:04:42 -0000 1.3
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl 22 Dec 2006 16:49:20 -0000 1.3.2.1
@@ -88,7 +88,13 @@
</tr>
<!-- TMPL_LOOP NAME="suggestions_loop" -->
<tr>
- <td> </td>
+ <td>
+ <!-- TMPL_IF NAME="invoicenumber" -->
+ <a href="/cgi-bin/koha/acqui/parcel.pl?code=<!-- TMPL_VAR NAME="invoicenumber"-->&supplierid=<!-- TMPL_VAR NAME="id"-->&datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
+ <!-- TMPL_ELSE -->
+
+ <!-- /TMPL_IF -->
+ </td>
<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
<td><!-- TMPL_VAR NAME="author" --></td>
<td><!-- TMPL_VAR NAME="name" --></td>
More information about the Koha-cvs
mailing list