From 54987d977b33816799072c8df73508b7d81452e3 Mon Sep 17 00:00:00 2001
From: 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 @@