X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fsupplier.pl;h=0e2ab40302d681415b5764bcc4b9ca2b8aaaaeac;hb=HEAD;hp=e8c872b906ec2755597a55a9ccadfe6286fae6bd;hpb=cfa9223cd1f1fd087f1f05bcad832708c0967631;p=koha_gimpoz

diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index e8c872b906..0e2ab40302 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -1,12 +1,8 @@
 #!/usr/bin/perl
 
-# $Id$
-
-#script to show display basket of orders
-#written by chris@katipo.co.nz 24/2/2000
-
-
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2008-2009 BibLibre SARL
+# Copyright 2010 PTFS Europe Ltd
 #
 # This file is part of Koha.
 #
@@ -19,71 +15,168 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 booksellerid
+
+To know the bookseller this script has to display details.
 
+=back
+
+=cut
+
+use strict;
+use warnings;
 use C4::Auth;
-use C4::Acquisition;
+use C4::Contract qw/GetContract/;
 use C4::Biblio;
 use C4::Output;
 use CGI;
-use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
-use strict;
 
-my $query=new CGI;
-my $id=$query->param('supplierid');
-my ($count,@booksellers)=bookseller($id);
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/supplier.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {acquisition => 1},
-			     debug => 1,
-			     });
+use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
+use C4::Budgets;
+
+my $query    = CGI->new;
+my $booksellerid       = $query->param('booksellerid');
+my $supplier = {};
+if ($booksellerid) {
+    $supplier = GetBookSellerFromId($booksellerid);
+}
+my $op = $query->param('op') || 'display';
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {   template_name   => 'acqui/supplier.tmpl',
+        query           => $query,
+        type            => 'intranet',
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => '*' },
+        debug           => 1,
+    }
+);
+my $seller_gstrate = $supplier->{'gstrate'};
+
+# ensure the scalar isn't flagged as a string
+$seller_gstrate = ( defined $seller_gstrate ) ? $seller_gstrate + 0 : undef;
+my $tax_rate = $seller_gstrate // C4::Context->preference('gist') // 0;
+$tax_rate *= 100;
 #build array for currencies
-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>"};
-	}
+if ( $op eq 'display' ) {
+
+    my $contracts = GetContract( { booksellerid => $booksellerid } );
+
+    $template->param(
+        booksellerid  => $booksellerid,
+        name          => $supplier->{'name'},
+        postal        => $supplier->{'postal'},
+        address1      => $supplier->{'address1'},
+        address2      => $supplier->{'address2'},
+        address3      => $supplier->{'address3'},
+        address4      => $supplier->{'address4'},
+        phone         => $supplier->{'phone'},
+        accountnumber => $supplier->{'accountnumber'},
+        fax           => $supplier->{'fax'},
+        url           => $supplier->{'url'},
+        contact       => $supplier->{'contact'},
+        contpos       => $supplier->{'contpos'},
+        contphone     => $supplier->{'contphone'},
+        contaltphone  => $supplier->{'contaltphone'},
+        contfax       => $supplier->{'contfax'},
+        contemail     => $supplier->{'contemail'},
+        contnotes     => $supplier->{'contnotes'},
+        notes         => $supplier->{'notes'},
+        active        => $supplier->{'active'},
+        gstreg        => $supplier->{'gstreg'},
+        listincgst    => $supplier->{'listincgst'},
+        invoiceincgst => $supplier->{'invoiceincgst'},
+        discount      => $supplier->{'discount'},
+        deliverytime  => $supplier->{deliverytime},
+        invoiceprice  => $supplier->{'invoiceprice'},
+        listprice     => $supplier->{'listprice'},
+        GST           => $tax_rate,
+        default_tax   => defined($seller_gstrate),
+        basketcount   => $supplier->{'basketcount'},
+        subscriptioncount   => $supplier->{'subscriptioncount'},
+        contracts     => $contracts,
+    );
+} elsif ( $op eq 'delete' ) {
+    # no further message needed for the user
+    # the DELETE button only appears in the template if basketcount == 0
+    if ( $supplier->{'basketcount'} == 0 ) {
+        DelBookseller($booksellerid);
+    }
+    print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl');
+    exit;
+} else {
+    my @currencies = GetCurrencies();
+    my $loop_currency;
+    my $active_currency = GetCurrency();
+    my $active_listprice = $supplier->{'listprice'};
+    my $active_invoiceprice = $supplier->{'invoiceprice'};
+    if (!$supplier->{listprice}) {
+        $active_listprice =  $active_currency->{currency};
+    }
+    if (!$supplier->{invoiceprice}) {
+        $active_invoiceprice =  $active_currency->{currency};
+    }
+    for (@currencies) {
+        push @{$loop_currency},
+            { 
+            currency     => $_->{currency},
+            listprice    => ( $_->{currency} eq $active_listprice ),
+            invoiceprice => ( $_->{currency} eq $active_invoiceprice ),
+            };
+    }
+
+    my $default_gst_rate = (C4::Context->preference('gist') * 100) || '0.0';
+
+    my $gstrate = defined $supplier->{gstrate} ? $supplier->{gstrate} * 100 : '';
+    $template->param(
+        booksellerid => $booksellerid,
+        name         => $supplier->{'name'},
+        postal       => $supplier->{'postal'},
+        address1     => $supplier->{'address1'},
+        address2     => $supplier->{'address2'},
+        address3     => $supplier->{'address3'},
+        address4     => $supplier->{'address4'},
+        phone        => $supplier->{'phone'},
+        accountnumber=> $supplier->{'accountnumber'},
+        fax          => $supplier->{'fax'},
+        url          => $supplier->{'url'},
+        contact      => $supplier->{'contact'},
+        contpos      => $supplier->{'contpos'},
+        contphone    => $supplier->{'contphone'},
+        contaltphone => $supplier->{'contaltphone'},
+        contfax      => $supplier->{'contfax'},
+        contemail    => $supplier->{'contemail'},
+        contnotes    => $supplier->{'contnotes'},
+        notes        => $supplier->{'notes'},
+        # set active ON by default for supplier add (id empty for add)
+        active       => $booksellerid ? $supplier->{'active'} : 1,
+        gstreg        => $supplier->{'gstreg'},
+        listincgst    => $supplier->{'listincgst'},
+        invoiceincgst => $supplier->{'invoiceincgst'},
+        gstrate       => $gstrate,
+        discount      => $supplier->{'discount'},
+        deliverytime  => $supplier->{deliverytime},
+        loop_currency => $loop_currency,
+        GST           => $tax_rate,
+        enter         => 1,
+        default_gst_rate => $default_gst_rate,
+    );
 }
-$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'},
-					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,);
 
 output_html_with_http_headers $query, $cookie, $template->output;