[Koha-cvs] koha/acqui supplier.pl updatesupplier.pl

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Antoine Farnault <toins>        06/07/27 15:08:32

Modified files:
        acqui          : supplier.pl updatesupplier.pl 

Log message:
        Code cleaned. POD added & somes sub renamed/rewrited.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/supplier.pl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/updatesupplier.pl?cvsroot=koha&r1=1.7&r2=1.8

Patches:
Index: supplier.pl
===================================================================
RCS file: /sources/koha/koha/acqui/supplier.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- supplier.pl 13 Jul 2006 09:30:05 -0000      1.12
+++ supplier.pl 27 Jul 2006 15:08:32 -0000      1.13
@@ -1,11 +1,10 @@
 #!/usr/bin/perl
 
-# $Id: supplier.pl,v 1.12 2006/07/13 09:30:05 toins Exp $
+# $Id: supplier.pl,v 1.13 2006/07/27 15:08:32 toins Exp $
 
 #script to show display basket of orders
 #written by address@hidden 24/2/2000
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -23,6 +22,26 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+=head1 NAME
+
+supplier.pl
+
+=head1 DESCRIPTION
+this script shows the details for a bookseller given on input arg.
+It allows to edit & save information about this bookseller.
+
+=head1 CGI PARAMETERS
+
+=over 4
+
+=item supplierid
+To know the bookseller this script has to display details.
+
+=back
+
+=cut
+
+use strict;
 use C4::Auth;
 use C4::Acquisition;
 use C4::Biblio;
@@ -31,11 +50,14 @@
 use C4::Interface::CGI::Output;
 use C4::Database;
 use HTML::Template;
-use strict;
+use C4::Bookseller;
+use C4::Bookfund;
 
 my $query=new CGI;
 my $id=$query->param('supplierid');
-my ($count,@booksellers)=bookseller($id);
+my @booksellers = GetBookSeller($id);
+my $count = scalar @booksellers;
+
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/supplier.tmpl",
                             query => $query,
@@ -44,20 +66,23 @@
                             flagsrequired => {acquisition => 1},
                             debug => 1,
                             });
+
 #build array for currencies
-my  ($count, $currencies) = &getcurrencies();
+my @currencies = GetCurrencies();
+my $count = scalar @currencies;
+
 my @loop_pricescurrency;
 my @loop_invoicecurrency;
 for (my $i=0;$i<$count;$i++) {
-       if ($booksellers[0]->{'listprice'} eq $currencies->[$i]->{'currency'}) {
-               push @loop_pricescurrency, { currency => "<option 
selected=\"selected\" 
value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"
 };
+       if ($booksellers[0]->{'listprice'} eq $currencies[$i]->{'currency'}) {
+               push @loop_pricescurrency, { currency => "<option 
selected=\"selected\" 
value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>" 
};
        } else {
-               push @loop_pricescurrency, { currency => "<option 
value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"};
+               push @loop_pricescurrency, { currency => "<option 
value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
        }
-       if ($booksellers[0]->{'invoiceprice'} eq 
$currencies->[$i]->{'currency'}) {
-               push @loop_invoicecurrency, { currency => "<option 
selected=\"selected\" 
value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"};
+       if ($booksellers[0]->{'invoiceprice'} eq $currencies[$i]->{'currency'}) 
{
+               push @loop_invoicecurrency, { currency => "<option 
selected=\"selected\" 
value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
        } else {
-               push @loop_invoicecurrency, { currency => "<option 
value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"};
+               push @loop_invoicecurrency, { currency => "<option 
value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
        }
 }
 $template->param(id => $id,

Index: updatesupplier.pl
===================================================================
RCS file: /sources/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- updatesupplier.pl   4 Jul 2006 13:35:29 -0000       1.7
+++ updatesupplier.pl   27 Jul 2006 15:08:32 -0000      1.8
@@ -21,7 +21,30 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-use C4::Acquisition;
+=head1 NAME
+updatesupplier.pl
+
+=head1 DESCRIPTION
+this script allow to update or create (if id == 0)
+a supplier. This script is called from acqui/supplier.pl.
+
+=head1 CGI PARAMETERS
+
+=over 4
+
+All informations regarding this supplier are listed on input parameter.
+Here is the list :
+supplier, id, company, company_postal, physical, company_phone,
+physical, company_phone, company_fax, website, company_contact_name,
+company_contact_position, contact_phone, contact_phone_2, contact_fax,
+company_email, contact_notes, notes, status, publishers_imprints,
+list_currency, gst, list_gst, invoice_gst, discount.
+
+=back
+
+=cut
+
+use C4::Bookseller;
 use C4::Biblio;
 use C4::Output;
 use CGI;
@@ -52,7 +75,7 @@
 $data{'contfax'}=$input->param('contact_fax');
 $data{'contemail'}=$input->param('company_email');
 $data{'contnotes'}=$input->param('contact_notes');
-warn "".$data{'contnotes'};
+# warn "".$data{'contnotes'};
 $data{'notes'}=$input->param('notes');
 $data{'active'}=$input->param('status');
 $data{'specialty'}=$input->param('publishers_imprints');
@@ -64,18 +87,10 @@
 $data{'discount'}=$input->param('discount');
 my $id=$input->param('id');
 if ($data{'id'} != 0){
-  updatesup(\%data);
+  ModBookseller(\%data);
 } else {
-  $id=insertsup(\%data);
+  $id=AddBookseller(\%data);
 }
-#print startmenu('acquisitions');
-#my ($count,@suppliers)=bookseller($supplier);
-
-#print $input->dump;
-
-
-#print endmenu('acquisitions');
-
-#print endpage;
 
+#redirect to order.pl
 print $input->redirect("order.pl?supplier=$id");