Code cleaned. POD added & somes sub renamed/rewrited.

diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 3d4d317..db21d20 100755 (executable)
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -5,7 +5,6 @@
 #script to show display basket of orders
 #written by chris@katipo.co.nz 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 CGI;
 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 @@ my ($template, $loggedinuser, $cookie)
                             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,

diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index 26869f5..1db9a27 100755 (executable)
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -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{'contaltphone'}=$input->param('contact_phone_2');
 $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{'invoiceincgst'}=$input->param('invoice_gst');
 $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");