[Koha-cvs] CVS: koha/acqui addorder.pl,1.22,1.23

[Paul POULAIN]

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

Modified Files:
	addorder.pl 
Log Message:
* critical fix for acquisition (see RC3 release notes)

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** addorder.pl	14 Sep 2004 12:09:51 -0000	1.22
--- addorder.pl	24 Nov 2004 16:00:20 -0000	1.23
***************
*** 87,90 ****
--- 87,91 ----
  	#check to see if biblio exists
  	if ($existing eq 'no'){
+ 	warn "ADDING";
  		#if it doesnt create it
  		$bibnum = &newbiblio({ title     => $title?$title:"",
***************
*** 106,109 ****
--- 107,111 ----
  		}
  	} else {
+ 	warn "MODIFYING";
  		$bibnum=$input->param('biblio');
  		$bibitemnum=$input->param('bibitemnum');
***************
*** 113,125 ****
  # 						publishercode   => $publishercode,
  # 		});
! # 		&modbiblio({
! # 			biblionumber  => $bibnum,
! # 			title         => $title?$title:"",
! # 			author        => $author?$author:"",
! # 			copyrightdate => $copyrightdate?$copyrightdate:"",
! # 			series        => $series?$series:"" },
! # 			);
  	}
  	if ($ordnum) {
  		modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$invoice,$sort1,$sort2);
  	}else {
--- 115,128 ----
  # 						publishercode   => $publishercode,
  # 		});
!  		&modbiblio({
!  			biblionumber  => $bibnum,
!  			title         => $title?$title:"",
!  			author        => $author?$author:"",
!  			copyrightdate => $copyrightdate?$copyrightdate:"",
!  			series        => $series?$series:"" },
!  			);
  	}
  	if ($ordnum) {
+ 		warn "MODORDER $title / $ordnum / $quantity / $bookfund";
  		modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$invoice,$sort1,$sort2);
  	}else {