X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fupdatesupplier.pl;h=7b3bf9d6d8c403bd403ced759a29163ffe9226d5;hb=ef5d4f3c62957100dae0948a44bd27a2159892b4;hp=2a102380450bc0fb8675dea4b862e9db215d919f;hpb=2ffd5b7228f4e638583162d483e1dd2febeafe1b;p=koha_fer

diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index 2a10238045..7b3bf9d6d8 100755
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -5,6 +5,7 @@
 
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2008-2009 BibLibre SARL
 #
 # This file is part of Koha.
 #
@@ -17,45 +18,58 @@
 # 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
+
 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
+list_currency, gst, list_gst, invoice_gst, discount, gstrate.
 
 =cut
 
-use C4::Bookseller;
+use strict;
+#use warnings; FIXME - Bug 2505
+use C4::Context;
+use C4::Auth;
+
+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(
+	{   template_name   => "",
+		query           => $input,
+		type            => "intranet",
+		authnotrequired => 0,
+		flagsrequired   => { acquisition => 'vendors_manage' },
+		debug           => 1,
+	}
+);
+
 #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');
@@ -66,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');
@@ -78,18 +93,25 @@ $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');
-$data{'discount'}=$input->param('discount');
-if ($data{'id'}){
-    ModBookseller(\%data);
+#have to transform this into fraction so it's easier to use
+$data{'gstrate'} = $input->param('gstrate');
+$data{'discount'} = $input->param('discount');
+$data{deliverytime} = $input->param('deliverytime');
+$data{'active'}=$input->param('status');
+if($data{'name'}) {
+	if ($data{'id'}){
+	    ModBookseller(\%data);
+	} else {
+	    $data{id}=AddBookseller(\%data);
+	}
+#redirect to booksellers.pl
+print $input->redirect("booksellers.pl?booksellerid=".$data{id});
 } else {
-    $data{id}=AddBookseller(\%data);
+print $input->redirect("supplier.pl?op=enter"); # fail silently.
 }
-
-#redirect to booksellers.pl
-print $input->redirect("booksellers.pl?supplier=".$data{id});