From 54987d977b33816799072c8df73508b7d81452e3 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 2 Dec 2004 16:36:27 +0000
Subject: [PATCH] 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)

---
 acqui/addorder.pl                             | 21 ++++++-----
 .../default/en/acqui/acquire.tmpl             |  2 +-
 .../default/en/acqui/basket.tmpl              |  6 +++-
 .../default/en/acqui/newbiblio.tmpl           | 36 +++++++++++++++----
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 4c86623628..896e669355 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -86,7 +86,6 @@ my $bibitemnum;
 if ($quantity ne '0'){
 	#check to see if biblio exists
 	if ($existing eq 'no'){
-	warn "ADDING";
 		#if it doesnt create it
 		$bibnum = &newbiblio({ title     => $title?$title:"",
 						author    => $author?$author:"",
@@ -106,26 +105,26 @@ if ($quantity ne '0'){
 			changestatus($suggestionid,'ORDERED');
 		}
 	} else {
-	warn "MODIFYING";
 		$bibnum=$input->param('biblio');
 		$bibitemnum=$input->param('bibitemnum');
-# 		my $oldtype=$input->param('oldtype');
+		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:"" },
- 			);
+#  		&modbiblio({
+#  			biblionumber  => $bibnum,
+#  			title         => $title?$title:"",
+#  			author        => $author?$author:"",
+#  			copyrightdate => $copyrightdate?$copyrightdate:"",
+#  			series        => $series?$series:"" },
+#  			);
 	}
 	if ($ordnum) {
-		warn "MODORDER $title / $ordnum / $quantity / $bookfund";
+# 		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);
 	}
 } else {
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
index ef41152d66..cdd455c4e6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
@@ -69,7 +69,7 @@
 			</p>
 			<p>
 				<label class="label100">Actual Cost *</label>
-				<input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->">
+				<input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->">
 			</p>
 			<p>
 				<label class="label100">Invoice Number</label>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index 1684494e9b..ba41438813 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -38,7 +38,11 @@
 					<td><!-- TMPL_VAR NAME="ordernumber" --></td>
 					<td><!-- TMPL_VAR NAME="publishercode" --></td>
 					<td><!-- TMPL_VAR NAME="isbn" --></td>
-					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+					<!-- TMPL_IF name="closedate" -->
+						<td><!-- TMPL_VAR NAME="title" --></td>
+					<!-- TMPL_ELSE -->
+						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+					<!-- /TMPL_IF -->
 					<td><!-- TMPL_VAR NAME="author" --></td>
 					<td><!-- TMPL_VAR NAME="rrp" --></td>
 					<td><!-- TMPL_VAR NAME="ecost" --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
index 8e56c81a25..a7106cdd54 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
@@ -81,19 +81,35 @@ win.document.write("</font></body></html>");
 		<h2 class="acquisition">catalogue details</h2>
 		<p>
 			<label class="label100"><b>Title *</b></label>
-			<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
+			<!-- /TMPL_IF -->
 		</p>
 		<p>
 			<label class="label100">Author</label>
-			<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" >
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->">
+			<!-- /TMPL_IF -->
 		</p>
 		<p>
 			<label class="label100"> Publisher</label>
-			<input type="text" size="30" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" >
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->"><!-- TMPL_VAR NAME="publishercode" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->">
+			<!-- /TMPL_IF -->
 		</p>
 		<p>
 			<label class="label100">Copyright Date</label>
-			<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->"><!-- TMPL_VAR NAME="copyrightdate" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
+			<!-- /TMPL_IF -->
 		</p>
 		<p>
 			<label class="label100">Format</label>
@@ -101,11 +117,19 @@ win.document.write("</font></body></html>");
 		</p>
 		<p>
 			<label class="label100">ISBN</label>
-			<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
+			<!-- /TMPL_IF -->
 		</p>
 		<p>
 			<label class="label100">Series</label>
-			<input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
+			<!-- /TMPL_IF -->
 		</p>
 		<p>
 			<label class="label100">Branch</label>
-- 
2.39.5