From ca2717c968359d191f64a685f302e54d2866e0e9 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 14 Sep 2004 12:09:51 +0000
Subject: [PATCH] bugfix in order modification

---
 acqui/addorder.pl                                       | 2 +-
 acqui/newbiblio.pl                                      | 1 +
 koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 58c69630d9..2332ab7cef 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -121,7 +121,7 @@ if ($quantity ne '0'){
 # 			);
 	}
 	if ($ordnum) {
-		modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$booksellerid,$loggedinuser,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice,$sort1,$sort2);
+		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);
 	}
diff --git a/acqui/newbiblio.pl b/acqui/newbiblio.pl
index c836b9e790..00283a1b61 100755
--- a/acqui/newbiblio.pl
+++ b/acqui/newbiblio.pl
@@ -169,6 +169,7 @@ $template->param( existing => $biblio,
 						quantity => $data->{'quantity'},
 						listprice => $data->{'listprice'},
 						rrp => $data->{'rrp'},
+						invoice => $data->{'booksellerinvoicenumber'},
 						ecost => $data->{'ecost'},
 						notes => $data->{'notes'},
 						sort1 => $data->{'sort1'},
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
index 3f1c02ae73..8e56c81a25 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
@@ -144,11 +144,11 @@ win.document.write("</font></body></html>");
 		</p>
 		<p>
 			<label class="label100">Actual Cost</label>
-			<input type="text" size="20" name="cost">
+			<input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->">
 		</p>
 		<p>
 			<label class="label100">Invoice Number *</label>
-			<input type="text" size="20" name="invoice" >
+			<input type="text" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->">
 		<p>
 			<label class="label100">Notes</label>
 			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
-- 
2.39.5