Adding ability to return biblio results from acquisition search that contain no items

[koha-ffzg.git] / acqui / supplier.pl

diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 0d8b165..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,13 +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 $op=$query->param('op');
+my @booksellers = GetBookSeller($id);
+my $count = scalar @booksellers;
 
-my ($count,@booksellers)=bookseller($id);
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/supplier.tmpl",
                             query => $query,
@@ -46,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,
@@ -86,58 +109,7 @@ $template->param(id => $id,
                                        listincgst => $booksellers[0]->{'listincgst'},
                                        invoiceincgst => $booksellers[0]->{'invoiceincgst'},
                                        discount => $booksellers[0]->{'discount'},
-                                       invoiceprice=>$booksellers[0]->{'invoiceprice'},
-                                       listprice=>$booksellers[0]->{'listprice'},
-                                       intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-                                       intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-                                       IntranetNav => C4::Context->preference("IntranetNav"),
-                                       );
-}else{
-       my  ($count, $currencies) = &getcurrencies();
-       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 value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>" };
-               } else {
-                       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 value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"};
-               } else {
-                       push @loop_invoicecurrency, { currency => "<option value=\"$currencies->[$i]->{'currency'}\">$currencies->[$i]->{'currency'}</option>"};
-               }
-       }
-       $template->param(id => $id,
-                                               name => $booksellers[0]->{'name'},
-                                               postal =>$booksellers[0]->{'postal'},
-                                               address1 => $booksellers[0]->{'address1'},
-                                               address2 => $booksellers[0]->{'address2'},
-                                               address3 => $booksellers[0]->{'address3'},
-                                               address4 => $booksellers[0]->{'address4'},
-                                               phone =>$booksellers[0]->{'phone'},
-                                               fax => $booksellers[0]->{'fax'},
-                                               url => $booksellers[0]->{'url'},
-                                               contact => $booksellers[0]->{'contact'},
-                                               contpos => $booksellers[0]->{'contpos'},
-                                               contphone => $booksellers[0]->{'contphone'},
-                                               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'},
-                                               gstreg => $booksellers[0]->{'gstreg'},
-                                               listincgst => $booksellers[0]->{'listincgst'},
-                                               invoiceincgst => $booksellers[0]->{'invoiceincgst'},
-                                               discount => $booksellers[0]->{'discount'},
-                                               loop_pricescurrency => \@loop_pricescurrency,
-                                               loop_invoicecurrency => \@loop_invoicecurrency,
-                                               intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-                       intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-                       IntranetNav => C4::Context->preference("IntranetNav"),
-                       enter=>1,
-                                               );
-}
+                                       loop_pricescurrency => \@loop_pricescurrency,
+                                       loop_invoicecurrency => \@loop_invoicecurrency,);
+
 output_html_with_http_headers $query, $cookie, $template->output;