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

[Paul POULAIN]

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

Modified Files:
	addorder.pl 
Log Message:
CRITICAL bug in acquisition (another one...) : when MARC=ON, and an order line is created from an existing biblio (to buy another item), the MARC biblio is lost and replaced by the non marc one (that has a lot less informations...). To solve the problem, the biblio can no more be modified after the order has been placed. Less feature, but more reliable ! (not simple solution to solve this problem. Would imply to rewrite the MARC biblio from the non marc datas, and no API is provided for this yet)

Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** addorder.pl	24 Nov 2004 16:00:20 -0000	1.23
--- addorder.pl	2 Dec 2004 16:36:27 -0000	1.24
***************
*** 87,91 ****
  	#check to see if biblio exists
  	if ($existing eq 'no'){
- 	warn "ADDING";
  		#if it doesnt create it
  		$bibnum = &newbiblio({ title     => $title?$title:"",
--- 87,90 ----
***************
*** 107,130 ****
  		}
  	} else {
- 	warn "MODIFYING";
  		$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) {
! 		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 {
  		$basketno=neworder($basketno,$bibnum,$title,$quantity,$listprice,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2);
  	}
--- 106,129 ----
  		}
  	} else {
  		$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) {
! # 		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 {
+ # 	warn "new order : ";
  		$basketno=neworder($basketno,$bibnum,$title,$quantity,$listprice,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2);
  	}