From 34dcf18bec5b71a9ae00ed594bb37005d121e9d9 Mon Sep 17 00:00:00 2001
From: hdl <hdl>
Date: Thu, 15 Jun 2006 09:54:46 +0000
Subject: [PATCH] Adding bookseller notes management. Merely a template change
 + and adding notes fields to Updatesupplier.

---
 C4/Acquisition.pm                                      |  6 +++---
 acqui/supplier.pl                                      |  2 ++
 acqui/updatesupplier.pl                                |  4 +++-
 koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl | 10 +++++++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 98ac5904a3..61eae68a0a 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -1115,17 +1115,17 @@ sub updatesup {
    contemail=?,contnotes=?,active=?,
    listprice=?, invoiceprice=?,gstreg=?, listincgst=?,
    invoiceincgst=?, specialty=?,discount=?,invoicedisc=?,
-   nocalc=?
+   nocalc=?, notes=?
    where id=?");
    $sth->execute($data->{'name'},$data->{'address1'},$data->{'address2'},
    $data->{'address3'},$data->{'address4'},$data->{'postal'},$data->{'phone'},
    $data->{'fax'},$data->{'url'},$data->{'contact'},$data->{'contpos'},
    $data->{'contphone'},$data->{'contfax'},$data->{'contaltphone'},
    $data->{'contemail'},
-   $data->{'contnote'},$data->{'active'},$data->{'listprice'},
+   $data->{'contnotes'},$data->{'active'},$data->{'listprice'},
    $data->{'invoiceprice'},$data->{'gstreg'},$data->{'listincgst'},
    $data->{'invoiceincgst'},$data->{'specialty'},$data->{'discount'},
-   $data->{'invoicedisc'},$data->{'nocalc'},$data->{'id'});
+   $data->{'invoicedisc'},$data->{'nocalc'},$data->{'notes'},$data->{'id'});
    $sth->finish;
 }
 
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index ad9cde6e74..167a5bfd52 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -65,6 +65,7 @@ if ($op eq "display"){
 					contfax => $booksellers[0]->{'contfax'},
 					contemail => $booksellers[0]->{'contemail'},
 					contnotes => $booksellers[0]->{'contnotes'},
+					notes => $booksellers[0]->{'notes'},
 					active => $booksellers[0]->{'active'},
 					specialty => $booksellers[0]->{'specialty'},
 					gstreg => $booksellers[0]->{'gstreg'},
@@ -109,6 +110,7 @@ if ($op eq "display"){
 						contaltphone => $booksellers[0]->{'contaltphone'},
 						contfax => $booksellers[0]->{'contfax'},
 						contemail => $booksellers[0]->{'contemail'},
+						notes => $booksellers[0]->{'notes'},
 						contnotes => $booksellers[0]->{'contnotes'},
 						active => $booksellers[0]->{'active'},
 						specialty => $booksellers[0]->{'specialty'},
diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index f06ef80e2c..3e700720db 100755
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -52,7 +52,9 @@ $data{'contphone'}=$input->param('contact_phone');
 $data{'contaltphone'}=$input->param('contact_phone_2');
 $data{'contfax'}=$input->param('contact_fax');
 $data{'contemail'}=$input->param('company_email');
-$data{'contnotes'}=$input->param('notes');
+$data{'contnotes'}=$input->param('contact_notes');
+warn "".$data{'contnotes'};
+$data{'notes'}=$input->param('notes');
 $data{'active'}=$input->param('status');
 $data{'specialty'}=$input->param('publishers_imprints');
 $data{'listprice'}=$input->param('list_currency');
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
index df89d36cf7..3c8a0f3cf3 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
@@ -64,7 +64,7 @@
 		</p>
 		<p>
 			<label>Notes</label>
-			<textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+			<textarea name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
 		</p>
 	</div>
 	<div id="bloc25">
@@ -120,6 +120,10 @@
 			<label class="label100">Discount</label>
 			<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
 		</p>
+		<p>
+			<label class="label100">Notes</label>
+			<textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
+		</p>
 	<br/>
 	<br/><input type="image"  name="submit" src="/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0" title="save" alt="save" class="button acquisition">
 	</form>
@@ -231,6 +235,10 @@
 			<label class="label100">Discount</label>
 			<!-- TMPL_VAR NAME="discount" --> %
 		</p>
+		<p>
+			<label class="label100">Notes</label>
+			<!-- TMPL_VAR NAME="notes" -->
+		</p>
 	<br/>
 	<br/>
 	</div>
-- 
2.39.5