X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fupdatesupplier.pl;h=844e504712fe90b792b1fb1656226235cb601384;hb=4612eeddf7889521f3ba73587beee45ac058ef82;hp=8348a0029244c28316d0fd7ea8efafe79edbd460;hpb=5f69c342de9c3914633c6f10dd04028b0f7e2e67;p=koha_fer

diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index 8348a00292..844e504712 100755
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -23,34 +23,36 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =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, gstrate.
 
-=back
-
 =cut
+
+use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Context;
 use C4::Auth;
-use C4::Bookseller;
+
+use C4::Bookseller qw( ModBookseller AddBookseller );
 use C4::Biblio;
 use C4::Output;
 use CGI;
-use strict;
 
 my $input=new CGI;
 my ($template, $loggedinuser, $cookie) = get_template_and_user(
@@ -64,10 +66,10 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
 );
 
 #print $input->header();
-my $supplier=$input->param('supplier');
+my $booksellerid=$input->param('booksellerid');
 #print startpage;
 my %data;
-$data{'id'}=$input->param('id');
+$data{'id'}=$booksellerid;
 
 $data{'name'}=$input->param('company');
 $data{'postal'}=$input->param('company_postal');
@@ -78,6 +80,7 @@ $data{'address2'}=$addresses[1];
 $data{'address3'}=$addresses[2];
 $data{'address4'}=$addresses[3];
 $data{'phone'}=$input->param('company_phone');
+$data{'accountnumber'}=$input->param('accountnumber');
 $data{'fax'}=$input->param('company_fax');
 $data{'url'}=$input->param('website');
 $data{'contact'}=$input->param('company_contact_name');
@@ -90,14 +93,19 @@ $data{'contnotes'}=$input->param('contact_notes');
 # warn "".$data{'contnotes'};
 $data{'notes'}=$input->param('notes');
 $data{'active'}=$input->param('status');
-$data{'specialty'}=$input->param('publishers_imprints');
+
 $data{'listprice'}=$input->param('list_currency');
 $data{'invoiceprice'}=$input->param('invoice_currency');
 $data{'gstreg'}=$input->param('gst');
 $data{'listincgst'}=$input->param('list_gst');
 $data{'invoiceincgst'}=$input->param('invoice_gst');
 #have to transform this into fraction so it's easier to use
-$data{'gstrate'}=$input->param('gstrate')/100;
+my $gstrate = $input->param('gstrate');
+if ($gstrate eq '') {
+    $data{'gstrate'} = undef;
+} else {
+    $data{'gstrate'} = $input->param('gstrate')/100;
+}
 $data{'discount'}=$input->param('discount');
 $data{'active'}=$input->param('status');
 if($data{'name'}) {
@@ -107,7 +115,7 @@ if($data{'name'}) {
 	    $data{id}=AddBookseller(\%data);
 	}
 #redirect to booksellers.pl
-print $input->redirect("booksellers.pl?id=".$data{id});
+print $input->redirect("booksellers.pl?booksellerid=".$data{id});
 } else {
 print $input->redirect("supplier.pl?op=enter"); # fail silently.
 }