[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha acquisupplier.pl acquiupdatesupplier.pl C4... [rel_2_2]
|
From: |
Henri-Damien LAURENT |
|
Subject: |
[Koha-cvs] koha acquisupplier.pl acquiupdatesupplier.pl C4... [rel_2_2] |
|
Date: |
Thu, 15 Jun 2006 09:54:47 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Henri-Damien LAURENT <hdl> 06/06/15 09:54:46
Modified files:
acqui : supplier.pl updatesupplier.pl
C4 : Acquisition.pm
koha-tmpl/intranet-tmpl/default/en/acqui: supplier.tmpl
Log message:
Adding bookseller notes management.
Merely a template change + and adding notes fields to Updatesupplier.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/supplier.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.4&r2=1.9.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/updatesupplier.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.9.2.16&r2=1.9.2.17
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.12.2.3&r2=1.12.2.4
Patches:
Index: acqui/supplier.pl
===================================================================
RCS file: /sources/koha/koha/acqui/supplier.pl,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -b -r1.9.2.4 -r1.9.2.5
--- acqui/supplier.pl 20 Feb 2006 14:58:13 -0000 1.9.2.4
+++ acqui/supplier.pl 15 Jun 2006 09:54:46 -0000 1.9.2.5
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: supplier.pl,v 1.9.2.4 2006/02/20 14:58:13 hdl Exp $
+# $Id: supplier.pl,v 1.9.2.5 2006/06/15 09:54:46 hdl Exp $
#script to show display basket of orders
#written by address@hidden 24/2/2000
@@ -65,6 +65,7 @@
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 @@
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'},
Index: acqui/updatesupplier.pl
===================================================================
RCS file: /sources/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- acqui/updatesupplier.pl 13 Jul 2004 12:53:00 -0000 1.5
+++ acqui/updatesupplier.pl 15 Jun 2006 09:54:46 -0000 1.5.2.1
@@ -52,7 +52,9 @@
$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');
Index: C4/Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.16
retrieving revision 1.9.2.17
diff -u -b -r1.9.2.16 -r1.9.2.17
--- C4/Acquisition.pm 4 Apr 2006 13:14:54 -0000 1.9.2.16
+++ C4/Acquisition.pm 15 Jun 2006 09:54:46 -0000 1.9.2.17
@@ -1115,17 +1115,17 @@
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;
}
Index: koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -b -r1.12.2.3 -r1.12.2.4
--- koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl 4 Apr 2006
13:56:45 -0000 1.12.2.3
+++ koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl 15 Jun 2006
09:54:46 -0000 1.12.2.4
@@ -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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha acquisupplier.pl acquiupdatesupplier.pl C4... [rel_2_2],
Henri-Damien LAURENT <=