[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/acqui acquire.pl,1.17,1.18 basket.pl,1.20,1.21 newb
From: |
Paul POULAIN |
Subject: |
[Koha-cvs] CVS: koha/acqui acquire.pl,1.17,1.18 basket.pl,1.20,1.21 newbasket2.pl,1.14,1.15 order.pl,1.13,1.14 suggestion-select.pl,1.2,1.3 |
Date: |
Mon, 13 Sep 2004 08:17:51 -0700 |
Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7943/acqui
Modified Files:
acquire.pl basket.pl newbasket2.pl order.pl
suggestion-select.pl
Log Message:
some fixes for acquisition
Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** acquire.pl 12 Aug 2004 14:35:22 -0000 1.17
--- acquire.pl 13 Sep 2004 15:17:48 -0000 1.18
***************
*** 47,51 ****
my $gst=$input->param('gst');
my ($count,@results)=ordersearch($search,$supplierid,$biblio,$catview);
! warn "C:$count for ordersearch($search,$supplierid,$biblio,$catview);";
my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'});
my $date = $results[0]->{'entrydate'};
--- 47,51 ----
my $gst=$input->param('gst');
my ($count,@results)=ordersearch($search,$supplierid,$biblio,$catview);
! # warn "C:$count for ordersearch($search,$supplierid,$biblio,$catview);";
my ($count2,@booksellers)=bookseller($results[0]->{'booksellerid'});
my $date = $results[0]->{'entrydate'};
Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** basket.pl 12 Aug 2004 14:35:22 -0000 1.20
--- basket.pl 13 Sep 2004 15:17:48 -0000 1.21
***************
*** 51,55 ****
# FIXME : the query->param('supplierid') below is probably useless. The
bookseller is always known from the basket
# if no booksellerid in parameter, get it from basket
! warn "=>".$basket->{booksellerid};
$booksellerid = $basket->{booksellerid} unless $booksellerid;
my ($count2,@booksellers)=bookseller($booksellerid);
--- 51,55 ----
# FIXME : the query->param('supplierid') below is probably useless. The
bookseller is always known from the basket
# if no booksellerid in parameter, get it from basket
! # warn "=>".$basket->{booksellerid};
$booksellerid = $basket->{booksellerid} unless $booksellerid;
my ($count2,@booksellers)=bookseller($booksellerid);
Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** newbasket2.pl 12 Aug 2004 14:35:22 -0000 1.14
--- newbasket2.pl 13 Sep 2004 15:17:48 -0000 1.15
***************
*** 63,67 ****
}
my $booksellerid=$input->param('booksellerid');
! my $basket=$input->param('basket');
my $sub=$input->param('sub');
#print $sub;
--- 63,67 ----
}
my $booksellerid=$input->param('booksellerid');
! my $basketno=$input->param('basketno');
my $sub=$input->param('sub');
#print $sub;
***************
*** 218,222 ****
$lineres{copyright}=$result->{'copyrightdate'};
$lineres{booksellerid}=$booksellerid;
! $lineres{basket}=$basket;
$lineres{sub}=$sub;
$lineres{biblionumber}=$result->{biblionumber};
--- 218,222 ----
$lineres{copyright}=$result->{'copyrightdate'};
$lineres{booksellerid}=$booksellerid;
! $lineres{basketno}=$basketno;
$lineres{sub}=$sub;
$lineres{biblionumber}=$result->{biblionumber};
***************
*** 234,238 ****
$template->param( bookselname => $booksellers[0]->{'name'},
booksellerid =>
$booksellerid,
! basket =>
$basket,
parsub => $sub,
count => $count,
--- 234,238 ----
$template->param( bookselname => $booksellers[0]->{'name'},
booksellerid =>
$booksellerid,
! basketno =>
$basketno,
parsub => $sub,
count => $count,
***************
*** 243,247 ****
offset =>
$offset,
type => $type,
- basket =>
$basket,
title => $title,
author =>
$author,
--- 243,246 ----
Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** order.pl 12 Aug 2004 14:35:22 -0000 1.13
--- order.pl 13 Sep 2004 15:17:48 -0000 1.14
***************
*** 77,80 ****
--- 77,82 ----
$inner_line{total} =$orders->[$i2]->{'count(*)'};
$inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
+ $inner_line{surname} = $orders->[$i2]->{'firstname'};
+ $inner_line{firstname} = $orders->[$i2]->{'surname'};
$inner_line{creationdate} =
format_date($orders->[$i2]->{'creationdate'});
$inner_line{closedate} =
format_date($orders->[$i2]->{'closedate'});
Index: suggestion-select.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/suggestion-select.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** suggestion-select.pl 12 Aug 2004 14:35:22 -0000 1.2
--- suggestion-select.pl 13 Sep 2004 15:17:48 -0000 1.3
***************
*** 11,15 ****
my $input = new CGI;
! my $basketid = $input->param('basket');
my $supplierid = $input->param('booksellerid');
--- 11,15 ----
my $input = new CGI;
! my $basketno = $input->param('basketno');
my $supplierid = $input->param('booksellerid');
***************
*** 23,28 ****
my $place = $input->param('place');
my $isbn = $input->param('isbn');
! my $status = $input->param('status');
! my $suggestedbyme = $input->param('suggestedbyme');
my $op = $input->param('op');
$op = 'else' unless $op;
--- 23,28 ----
my $place = $input->param('place');
my $isbn = $input->param('isbn');
! my $status = 'ACCEPTED';
! my $suggestedbyme = 1;
my $op = $input->param('op');
$op = 'else' unless $op;
***************
*** 44,48 ****
status => $status,
suggestedbyme => $suggestedbyme,
! basket => $basketid,
supplierid => $supplierid,
"op_$op" => 1,
--- 44,48 ----
status => $status,
suggestedbyme => $suggestedbyme,
! basketno => $basketno,
supplierid => $supplierid,
"op_$op" => 1,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/acqui acquire.pl,1.17,1.18 basket.pl,1.20,1.21 newbasket2.pl,1.14,1.15 order.pl,1.13,1.14 suggestion-select.pl,1.2,1.3,
Paul POULAIN <=