X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fsupplier.pl;h=b8afe0d48dcb8c0058c90e294394d37c5a4fc7f4;hb=b5312a17cb87851c01601825f03dc2dba75b9f84;hp=4df003f17744a6be0ec75c5361bfa95d9f65434a;hpb=6376aa43263cd868098bad1551b00567fe09491e;p=koha_fer

diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 4df003f177..b8afe0d48d 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -1,12 +1,10 @@
 #!/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
 #
 # This file is part of Koha.
 #
@@ -23,67 +21,140 @@
 # 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;
 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('id');
-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,
-			     });
-#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>"};
+use C4::Bookseller;
+use C4::Budgets;
+
+my $query       = new CGI;
+my $id          = $query->param('supplierid');
+my @booksellers = GetBookSellerFromId($id) if $id;
+my $count       = scalar @booksellers;
+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 => 'vendors_manage' },
+		debug           => 1,
 	}
+);
+my $GST = $booksellers[0]->{'gstrate'} || C4::Context->preference("gist");
+$GST *= 100;
+#build array for currencies
+if ($op eq "display") {
+	$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'},
+		notes         => $booksellers[0]->{'notes'},
+		active        => $booksellers[0]->{'active'},
+		gstreg        => $booksellers[0]->{'gstreg'},
+		listincgst    => $booksellers[0]->{'listincgst'},
+		invoiceincgst => $booksellers[0]->{'invoiceincgst'},
+		gstrate       => $booksellers[0]->{'gstrate'}*100,
+		discount      => $booksellers[0]->{'discount'},
+		invoiceprice  => $booksellers[0]->{'invoiceprice'},
+		listprice     => $booksellers[0]->{'listprice'},
+		GST           => $GST,
+		basketcount   => $booksellers[0]->{'basketcount'},
+	);
+}
+elsif ($op eq 'delete') {
+  &DelBookseller($id);
+  print $query->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
+  exit;
+} else {
+    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>" };
+        } 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=\"selected\" value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
+        } else {
+            push @loop_invoicecurrency, { currency => "<option value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
+        }
+    }
+    my $GST = $booksellers[0]->{'gstrate'} || C4::Context->preference("gist");
+    $GST *= 100;
+	$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'},
+		notes                => $booksellers[0]->{'notes'},
+		active               => $id?$booksellers[0]->{'active'}:1, # set active ON by default for supplier add (id empty for add)
+		gstreg               => $booksellers[0]->{'gstreg'},
+		listincgst           => $booksellers[0]->{'listincgst'},
+		invoiceincgst        => $booksellers[0]->{'invoiceincgst'},
+		gstrate              => $booksellers[0]->{'gstrate'}*100,
+		discount             => $booksellers[0]->{'discount'},
+		loop_pricescurrency  => \@loop_pricescurrency,
+		loop_invoicecurrency => \@loop_invoicecurrency,
+		GST                  => $GST,
+		enter                => 1,
+	);
 }
-$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;