[Koha-cvs] CVS: koha/acqui acquire.pl,1.16,1.17 addorder.pl,1.20,1.21 basket.pl,1.19,1.20 finishreceive.pl,1.15,1.16 newbasket2.pl,1.13,1.14 newbiblio.pl,1.19,1.20 order.pl,1.12,1.13 receive.pl,1.12,1.13 recieveorder.pl,1.8,1.9 suggestion-select.pl,1.1,1.2 supplier.pl,1.8,1.9

Paul POULAIN tipaul at users.sourceforge.net
Thu Aug 12 16:35:28 CEST 2004


Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26913/acqui

Modified Files:
	acquire.pl addorder.pl basket.pl finishreceive.pl 
	newbasket2.pl newbiblio.pl order.pl receive.pl recieveorder.pl 
	suggestion-select.pl supplier.pl 
Log Message:
* updates to make acquisition compatible with suggestions & serials
* changes to use supplierid instead of id, that's easier to read.

Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** acquire.pl	13 Jul 2004 12:53:00 -0000	1.16
--- acquire.pl	12 Aug 2004 14:35:22 -0000	1.17
***************
*** 37,41 ****
  
  my $input=new CGI;
! my $id=$input->param('id');
  my $dbh = C4::Context->dbh;
  
--- 37,41 ----
  
  my $input=new CGI;
! my $supplierid=$input->param('supplierid');
  my $dbh = C4::Context->dbh;
  
***************
*** 46,50 ****
  my $catview=$input->param('catview');
  my $gst=$input->param('gst');
! my ($count, at results)=ordersearch($search,$id,$biblio,$catview);
  my ($count2, at booksellers)=bookseller($results[0]->{'booksellerid'});
  my $date = $results[0]->{'entrydate'};
--- 46,51 ----
  my $catview=$input->param('catview');
  my $gst=$input->param('gst');
! my ($count, at results)=ordersearch($search,$supplierid,$biblio,$catview);
! warn "C:$count for ordersearch($search,$supplierid,$biblio,$catview);";
  my ($count2, at booksellers)=bookseller($results[0]->{'booksellerid'});
  my $date = $results[0]->{'entrydate'};
***************
*** 61,82 ****
  $template->param($count);
  if ($count == 1){
! 	my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
! 	$sth->execute;
! 	my  @itemtype;
! 	my %itemtypes;
! 	push @itemtype, "";
! 	$itemtypes{''} = "Please choose";
! 	while (my ($value,$lib) = $sth->fetchrow_array) {
! 		push @itemtype, $value;
! 		$itemtypes{$value}=$lib;
! 	}
! 
! 	my $CGIitemtype=CGI::scrolling_list( -name     => 'format',
! 				-values   => \@itemtype,
! 				-default  => $results[0]->{'itemtype'},
! 				-labels   => \%itemtypes,
! 				-size     => 1,
! 				-multiple => 0 );
! 	$sth->finish;
  
  	my @branches;
--- 62,84 ----
  $template->param($count);
  if ($count == 1){
! 	my $sth;
! # 	my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
! # 	$sth->execute;
! # 	my  @itemtype;
! # 	my %itemtypes;
! # 	push @itemtype, "";
! # 	$itemtypes{''} = "Please choose";
! # 	while (my ($value,$lib) = $sth->fetchrow_array) {
! # 		push @itemtype, $value;
! # 		$itemtypes{$value}=$lib;
! # 	}
! # 
! # 	my $CGIitemtype=CGI::scrolling_list( -name     => 'format',
! # 				-values   => \@itemtype,
! # 				-default  => $results[0]->{'itemtype'},
! # 				-labels   => \%itemtypes,
! # 				-size     => 1,
! # 				-multiple => 0 );
! # 	$sth->finish;
  
  	my @branches;
***************
*** 94,98 ****
  				-size     => 1,
  				-multiple => 0 );
- 	$sth->finish;
  
  	my $auto_barcode = C4::Context->boolean_preference("autoBarcode") || 0;
--- 96,99 ----
***************
*** 108,127 ****
  	}
  
! 	my @bookfund;
! 	my @select_bookfund;
! 	my %select_bookfunds;
! 	($count2, at bookfund)=bookfunds();
! 	for (my $i=0;$i<$count2;$i++){
! 		push @select_bookfund, $bookfund[$i]->{'bookfundid'};
! 		$select_bookfunds{$bookfund[$i]->{'bookfundid'}} = $bookfund[$i]->{'bookfundname'}
! 	}
! 	my $CGIbookfund=CGI::scrolling_list( -name     => 'bookfund',
! 				-values   => \@select_bookfund,
! 				-default  => $results[0]->{'bookfundid'},
! 				-labels   => \%select_bookfunds,
! 				-size     => 1,
! 				-multiple => 0 );
  
- 	my $rrp=$results[0]->{'rrp'};
  	if ($results[0]->{'quantityreceived'} == 0){
  	$results[0]->{'quantityreceived'}='';
--- 109,127 ----
  	}
  
! # 	my @bookfund;
! # 	my @select_bookfund;
! # 	my %select_bookfunds;
! # 	($count2, at bookfund)=bookfunds();
! # 	for (my $i=0;$i<$count2;$i++){
! # 		push @select_bookfund, $bookfund[$i]->{'bookfundid'};
! # 		$select_bookfunds{$bookfund[$i]->{'bookfundid'}} = $bookfund[$i]->{'bookfundname'}
! # 	}
! # 	my $CGIbookfund=CGI::scrolling_list( -name     => 'bookfund',
! # 				-values   => \@select_bookfund,
! # 				-default  => $results[0]->{'bookfundid'},
! # 				-labels   => \%select_bookfunds,
! # 				-size     => 1,
! # 				-multiple => 0 );
  
  	if ($results[0]->{'quantityreceived'} == 0){
  	$results[0]->{'quantityreceived'}='';
***************
*** 135,139 ****
  		ordernumber => $results[0]->{'ordernumber'},
  		biblioitemnumber => $results[0]->{'biblioitemnumber'},
! 		booksellerid => $results[0]->{'booksellerid'},
  		freight => $freight,
  		gst => $gst,
--- 135,139 ----
  		ordernumber => $results[0]->{'ordernumber'},
  		biblioitemnumber => $results[0]->{'biblioitemnumber'},
! 		supplierid => $results[0]->{'booksellerid'},
  		freight => $freight,
  		gst => $gst,
***************
*** 144,156 ****
  		author => $results[0]->{'author'},
  		copyrightdate => format_date($results[0]->{'copyrightdate'}),
! 		CGIitemtype => $CGIitemtype,
  		CGIbranch => $CGIbranch,
  		isbn => $results[0]->{'isbn'},
  		seriestitle => $results[0]->{'seriestitle'},
  		barcode => $barcode,
! 		CGIbookfund => $CGIbookfund,
  		quantity => $results[0]->{'quantity'},
  		quantityreceived => $results[0]->{'quantityreceived'},
! 		rrp => $rrp,
  		ecost => $results[0]->{'ecost'},
  		unitprice => $results[0]->{'unitprice'},
--- 144,156 ----
  		author => $results[0]->{'author'},
  		copyrightdate => format_date($results[0]->{'copyrightdate'}),
! 		itemtype => $results[0]->{'itemtype'},
  		CGIbranch => $CGIbranch,
  		isbn => $results[0]->{'isbn'},
  		seriestitle => $results[0]->{'seriestitle'},
  		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'},
***************
*** 173,177 ****
  		$line{title} = $results[$i]->{'title'};
  		$line{author} = $results[$i]->{'author'};
! 		$line{id} = $id;
  		push @loop,\%line;
  	}
--- 173,177 ----
  		$line{title} = $results[$i]->{'title'};
  		$line{author} = $results[$i]->{'author'};
! 		$line{supplierid} = $supplierid;
  		push @loop,\%line;
  	}
***************
*** 179,183 ****
  						date => format_date($date),
  						name => $booksellers[0]->{'name'},
! 						id => $id,
  						invoice => $invoice,
  );
--- 179,183 ----
  						date => format_date($date),
  						name => $booksellers[0]->{'name'},
! 						supplierid => $supplierid,
  						invoice => $invoice,
  );

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** addorder.pl	15 Jul 2004 09:41:03 -0000	1.20
--- addorder.pl	12 Aug 2004 14:35:22 -0000	1.21
***************
*** 108,123 ****
  		$bibnum=$input->param('biblio');
  		$bibitemnum=$input->param('bibitemnum');
! 		my $oldtype=$input->param('oldtype');
! 		&modbibitem({biblioitemnumber => $bibitemnum,
! 						isbn            => $isbn,
! 						publishercode   => $publishercode,
! 		});
! 		&modbiblio({
! 			biblionumber  => $bibnum,
! 			title         => $title?$title:"",
! 			author        => $author?$author:"",
! 			copyrightdate => $copyrightdate?$copyrightdate:"",
! 			series        => $series?$series:"" },
! 			);
  	}
  	if ($ordnum) {
--- 108,123 ----
  		$bibnum=$input->param('biblio');
  		$bibitemnum=$input->param('bibitemnum');
! # 		my $oldtype=$input->param('oldtype');
! # 		&modbibitem({biblioitemnumber => $bibitemnum,
! # 						isbn            => $isbn,
! # 						publishercode   => $publishercode,
! # 		});
! # 		&modbiblio({
! # 			biblionumber  => $bibnum,
! # 			title         => $title?$title:"",
! # 			author        => $author?$author:"",
! # 			copyrightdate => $copyrightdate?$copyrightdate:"",
! # 			series        => $series?$series:"" },
! # 			);
  	}
  	if ($ordnum) {

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** basket.pl	15 Jul 2004 09:41:03 -0000	1.19
--- basket.pl	12 Aug 2004 14:35:22 -0000	1.20
***************
*** 27,31 ****
  use C4::Auth;
  use C4::Koha;
- # use C4::Biblio;
  use C4::Output;
  use CGI;
--- 27,30 ----
***************
*** 38,42 ****
  my $query =new CGI;
  my $basketno = $query ->param('basket');
! my $supplierid = $query->param('id');
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui/basket.tmpl",
--- 37,41 ----
  my $query =new CGI;
  my $basketno = $query ->param('basket');
! my $booksellerid = $query->param('supplierid');
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui/basket.tmpl",
***************
*** 49,55 ****
  my ($count, at results);
  
- my ($count2, at booksellers)=bookseller($supplierid);
- 
  my $basket = getbasket($basketno);
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});
--- 48,58 ----
  my ($count, at results);
  
  my $basket = getbasket($basketno);
+ # 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, at booksellers)=bookseller($booksellerid);
+ 
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});

Index: finishreceive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/finishreceive.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** finishreceive.pl	13 Jul 2004 12:53:00 -0000	1.15
--- finishreceive.pl	12 Aug 2004 14:35:22 -0000	1.16
***************
*** 22,25 ****
--- 22,26 ----
  # Suite 330, Boston, MA  02111-1307 USA
  
+ use strict;
  use C4::Output;
  use C4::Acquisition;
***************
*** 32,64 ****
  my $user=$input->remote_user;
  my $biblionumber = $input->param('biblio');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
  my $quantity=$input->param('quantity');
- my $notes=$input->param('notes');
  my $cost=$input->param('cost');
  my $invoiceno=$input->param('invoice');
- my $bibitemno=$input->param('biblioitemnum');
- my $data=bibitemdata($bibitemno);
- my $publisher=$data->{'publishercode'};
- my $pubdate=$data->{'publicationdate'};
- my $class=$data->{'classification'};
- my $dewey=$data->{'dewey'};
- my $subclass=$data->{'subclass'};
- 
- my $size=$data->{'size'};
- my $illus=$data->{'illus'};
- my $pages=$data->{'pages'};
  my $replacement=$input->param('rrp');
  my $branch=$input->param('branch');
- my $bookfund=$input->param('bookfund');
- my $itemtype=$input->param('format');
- my $isbn=$input->param('ISBN');
- my $biblio = {
- 	biblionumber  => $biblionumber,
- 	title         => $input->param('title')?$input->param('title'):"",
- 	author        => $input->param('author')?$input->param('author'):"",
- 	copyrightdate => $input->param('copyright')?$input->param('copyright'):"",
- 	series        => $input->param('Series')?$input->param('Series'):""
- }; # my $biblio
  
  if ($quantrec != 0){
--- 33,47 ----
  my $user=$input->remote_user;
  my $biblionumber = $input->param('biblio');
+ my $bibitemno=$input->param('biblioitemnum');
  my $ordnum=$input->param('ordnum');
  my $quantrec=$input->param('quantityrec');
  my $quantity=$input->param('quantity');
  my $cost=$input->param('cost');
  my $invoiceno=$input->param('invoice');
  my $replacement=$input->param('rrp');
+ my $gst=$input->param('gst');
+ my $freight=$input->param('freight');
+ my $supplierid = $input->param('supplierid');
  my $branch=$input->param('branch');
  
  if ($quantrec != 0){
***************
*** 66,133 ****
  }
  
! my $gst=$input->param('gst');
! my $freight=$input->param('freight');
! my $volinf=$input->param('volinf');
! my $id = $input->param('id');
! my $loan=0;
! if ($itemtype =~ /REF/){
! 	$loan=1;
! }
! 
! if ($itemtype =~ /PER/){
! 	$class="Periodical";
! 	$bibitemno = &newbiblioitem({
! 		biblionumber   => $biblionumber,
! 		itemtype       => $itemtype?$itemtype:"",
! 		isbn           => $isbn?$isbn:"",
! 		volumeddesc    => $volinf?$volinf:"",
! 		classification => $class?$class:"" });
! }
! if ($quantity != 0){
! # 	warn "receive : $biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund";
! 	receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
! 	modbiblio($biblio);
! 	&modbibitem({
! 		biblioitemnumber => $bibitemno,
! 		biblionumber     => $biblionumber,
! 		itemtype         => $itemtype?$itemtype:"",
! 		isbn             => $isbn?$isbn:"",
! 		publisher        => $publisher?$publisher:"",
! 		publicationyear  => $pubdate?$pubdate:"",
! 		class            => $class?$class:"",
! 		dewey            => $dewey?$dewey:"",
! 		subclass         => $subclass?$subclass:"",
! 		illus            => $illus?$illus:"",
! 		pages            => $pages?$pages:"",
! 		volumeddesc      => $volinf?$volinf:"",
! 		notes            => $notes?$notes:"",
! 		size             => $size?$size:"" });
  	my $barcode=$input->param('barcode');
! 	my @barcodes;
! #	if ($barcode =~ /\,/){
! 		@barcodes=split(/\,| |\|/,$barcode);
! #	}elsif ($barcode =~ /\|/){
! #		@barcodes=split(/\|/,$barcode);
! #	} else {
! #		$barcodes[0]=$barcode;
! #	}
  	my ($error) = newitems({ biblioitemnumber => $bibitemno,
  					biblionumber     => $biblionumber,
  					replacementprice => $replacement,
  					price            => $cost,
! 					booksellerid     => $id,
  					homebranch       => $branch,
! 					loan             => $loan },
  				@barcodes);
! 	if ($error eq ''){
! 		if ($itemtype ne 'PER'){
! 			print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&id=$id&freight=$freight&gst=$gst");
! 		} else {
! 			print $input->redirect("/acquisitions/");
! 		}
! 	} else {
! 		print $input->header;
! 		print $error;
! 	}
  } else {
  	print $input->header;
--- 49,67 ----
  }
  
! if ($quantity != 0) {
! 	# save the quantity recieved.
! 	receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$freight,$replacement);
! 	# create items if the user has entered barcodes
  	my $barcode=$input->param('barcode');
! 	my @barcodes=split(/\,| |\|/,$barcode);
  	my ($error) = newitems({ biblioitemnumber => $bibitemno,
  					biblionumber     => $biblionumber,
  					replacementprice => $replacement,
  					price            => $cost,
! 					booksellerid     => $supplierid,
  					homebranch       => $branch,
! 					loan             => 0 },
  				@barcodes);
! 	print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst");
  } else {
  	print $input->header;

Index: newbasket2.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbasket2.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** newbasket2.pl	13 Jul 2004 12:53:00 -0000	1.13
--- newbasket2.pl	12 Aug 2004 14:35:22 -0000	1.14
***************
*** 62,74 ****
    $num=10;
  }
! my $id=$input->param('id');
  my $basket=$input->param('basket');
  my $sub=$input->param('sub');
- my $donation;
- if ($id == 72){
-   $donation='yes';
- }
  #print $sub;
! my ($count, at booksellers)=bookseller($id);
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui/newbasket2.tmpl",
--- 62,70 ----
    $num=10;
  }
! my $booksellerid=$input->param('booksellerid');
  my $basket=$input->param('basket');
  my $sub=$input->param('sub');
  #print $sub;
! my ($count, at booksellers)=bookseller($booksellerid);
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui/newbasket2.tmpl",
***************
*** 84,88 ****
  #print startmenu('acquisitions');
  
- my $testdonation = ($donation ne 'yes'); #tests if donation = true
  if ($keyword ne ''){
  	($count, at results)=KeywordSearch(undef,'intra',\%search,$num,$offset);
--- 80,83 ----
***************
*** 222,226 ****
  	$lineres{title2}=$title2;
  	$lineres{copyright}=$result->{'copyrightdate'};
! 	$lineres{id}=$id;
  	$lineres{basket}=$basket;
  	$lineres{sub}=$sub;
--- 217,221 ----
  	$lineres{title2}=$title2;
  	$lineres{copyright}=$result->{'copyrightdate'};
! 	$lineres{booksellerid}=$booksellerid;
  	$lineres{basket}=$basket;
  	$lineres{sub}=$sub;
***************
*** 238,245 ****
  $offset=$num+$offset;
  $template->param(	bookselname => $booksellers[0]->{'name'},
! 								id => $id,
  								basket => $basket,
  								parsub => $sub,
- 								testdonation => $testdonation,
  								count => $count,
  								offset2 =>$offset2,
--- 233,239 ----
  $offset=$num+$offset;
  $template->param(	bookselname => $booksellers[0]->{'name'},
! 								booksellerid => $booksellerid,
  								basket => $basket,
  								parsub => $sub,
  								count => $count,
  								offset2 =>$offset2,
***************
*** 249,253 ****
  								offset => $offset,
  								type =>  $type,
- 								id => $id,
  								basket => $basket,
  								title => $title,
--- 243,246 ----

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** newbiblio.pl	15 Jul 2004 09:41:03 -0000	1.19
--- newbiblio.pl	12 Aug 2004 14:35:22 -0000	1.20
***************
*** 50,58 ****
  	$new='yes';
  # 	$ordnum=newordernum;
! 	if ($biblio) {
  			$data=bibdata($biblio);
  	}
! 	if ($suggestionid) { # get suggestion fields if applicable.
! 		$data = getsuggestion($suggestionid);
  	}
  	if ($data->{'title'} eq ''){
--- 50,64 ----
  	$new='yes';
  # 	$ordnum=newordernum;
! 	if ($biblio && !$suggestionid) {
  			$data=bibdata($biblio);
  	}
! 	# get suggestion fields if applicable. If it's a subscription renewal, then the biblio already exists
! 	# otherwise, retrieve suggestion information.
! 	if ($suggestionid) {
! 		if ($biblio) {
! 			$data=bibdata($biblio);
! 		} else {
! 			$data = getsuggestion($suggestionid);
! 		}
  	}
  	if ($data->{'title'} eq ''){

Index: order.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/order.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** order.pl	15 Jul 2004 09:41:03 -0000	1.12
--- order.pl	12 Aug 2004 14:35:22 -0000	1.13
***************
*** 55,59 ****
  }
  
! #build reult page
  my $toggle=0;
  my @loop_suppliers;
--- 55,59 ----
  }
  
! #build result page
  my $toggle=0;
  my @loop_suppliers;

Index: receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/receive.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** receive.pl	13 Jul 2004 12:53:00 -0000	1.12
--- receive.pl	12 Aug 2004 14:35:22 -0000	1.13
***************
*** 35,40 ****
  
  my $input=new CGI;
! my $id=$input->param('id');
! my ($count, at booksellers)=bookseller($id);
  my $invoice=$input->param('invoice');
  my $freight=$input->param('freight');
--- 35,40 ----
  
  my $input=new CGI;
! my $supplierid=$input->param('supplierid');
! my ($count, at booksellers)=bookseller($supplierid);
  my $invoice=$input->param('invoice');
  my $freight=$input->param('freight');
***************
*** 54,58 ****
  ($count, at results)=invoice($invoice);
  if ($invoice eq ''){
! 	($count, at results)=getallorders($id);
  }
  my $totalprice=0;
--- 54,58 ----
  ($count, at results)=invoice($invoice);
  if ($invoice eq ''){
! 	($count, at results)=getallorders($supplierid);
  }
  my $totalprice=0;
***************
*** 85,89 ****
  	$line{quantityrecieved} = $results[$i]->{'quantityreceived'};
  	$line{total} = $total;
! 	$line{id} = $id;
  	push @loop_orders, \%line;
  	$totalprice+=$results[$i]->{'unitprice'};
--- 85,89 ----
  	$line{quantityrecieved} = $results[$i]->{'quantityreceived'};
  	$line{total} = $total;
! 	$line{supplierid} = $supplierid;
  	push @loop_orders, \%line;
  	$totalprice+=$results[$i]->{'unitprice'};
***************
*** 99,103 ****
  						date => $date,
  						name => $booksellers[0]->{'name'},
! 						id => $id,
  						gst => $gst,
  						freight => $freight,
--- 99,103 ----
  						date => $date,
  						name => $booksellers[0]->{'name'},
! 						supplierid => $supplierid,
  						gst => $gst,
  						freight => $freight,

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** recieveorder.pl	13 Jul 2004 12:53:00 -0000	1.8
--- recieveorder.pl	12 Aug 2004 14:35:22 -0000	1.9
***************
*** 33,38 ****
  
  my $input=new CGI;
! my $id=$input->param('id');
! my ($count, at booksellers)=bookseller($id);
  
  my ($template, $loggedinuser, $cookie)
--- 33,38 ----
  
  my $input=new CGI;
! my $supplierid=$input->param('supplierid');
! my ($count, at booksellers)=bookseller($supplierid);
  
  my ($template, $loggedinuser, $cookie)
***************
*** 47,51 ****
  $template->param(
  		name => $booksellers[0]->{'name'},
! 		id => $id,
  		);
  
--- 47,51 ----
  $template->param(
  		name => $booksellers[0]->{'name'},
! 		supplierid => $supplierid,
  		);
  

Index: suggestion-select.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/suggestion-select.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** suggestion-select.pl	15 Jul 2004 09:41:03 -0000	1.1
--- suggestion-select.pl	12 Aug 2004 14:35:22 -0000	1.2
***************
*** 12,16 ****
  
  my $basketid = $input->param('basket');
! my $supplierid = $input->param('id');
  
  my $title = $input->param('title');
--- 12,16 ----
  
  my $basketid = $input->param('basket');
! my $supplierid = $input->param('booksellerid');
  
  my $title = $input->param('title');

Index: supplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/supplier.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** supplier.pl	13 Jul 2004 12:53:00 -0000	1.8
--- supplier.pl	12 Aug 2004 14:35:22 -0000	1.9
***************
*** 35,39 ****
  
  my $query=new CGI;
! my $id=$query->param('id');
  my ($count, at booksellers)=bookseller($id);
  my ($template, $loggedinuser, $cookie)
--- 35,39 ----
  
  my $query=new CGI;
! my $id=$query->param('supplierid');
  my ($count, at booksellers)=bookseller($id);
  my ($template, $loggedinuser, $cookie)





More information about the Koha-cvs mailing list