[Koha-cvs] koha/acqui supplier.pl [rel_3_0]

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   06/10/30 09:45:21

Modified files:
        acqui          : supplier.pl 

Log message:
        reintroducing rel_2_2 changes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/supplier.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.13&r2=1.13.2.1

Patches:
Index: supplier.pl
===================================================================
RCS file: /sources/koha/koha/acqui/supplier.pl,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- supplier.pl 27 Jul 2006 15:08:32 -0000      1.13
+++ supplier.pl 30 Oct 2006 09:45:20 -0000      1.13.2.1
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: supplier.pl,v 1.13 2006/07/27 15:08:32 toins Exp $
+# $Id: supplier.pl,v 1.13.2.1 2006/10/30 09:45:20 tipaul Exp $
 
 #script to show display basket of orders
 #written by address@hidden 24/2/2000
@@ -57,6 +57,7 @@
 my $id=$query->param('supplierid');
 my @booksellers = GetBookSeller($id);
 my $count = scalar @booksellers;
+my $op=$query->param('op') || "display";
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/supplier.tmpl",
@@ -68,12 +69,42 @@
                             });
 
 #build array for currencies
-my @currencies = GetCurrencies();
-my $count = scalar @currencies;
-
-my @loop_pricescurrency;
-my @loop_invoicecurrency;
-for (my $i=0;$i<$count;$i++) {
+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'},
+                    specialty => $booksellers[0]->{'specialty'},
+                    gstreg => $booksellers[0]->{'gstreg'},
+                    listincgst => $booksellers[0]->{'listincgst'},
+                    invoiceincgst => $booksellers[0]->{'invoiceincgst'},
+                    discount => $booksellers[0]->{'discount'},
+                    invoiceprice=>$booksellers[0]->{'invoiceprice'},
+                    listprice=>$booksellers[0]->{'listprice'},
+                    GST => C4::Context->preference("gist"),
+                    );
+}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 {
@@ -84,8 +115,8 @@
        } else {
                push @loop_invoicecurrency, { currency => "<option 
value=\"$currencies[$i]->{'currency'}\">$currencies[$i]->{'currency'}</option>"};
        }
-}
-$template->param(id => $id,
+    }
+    $template->param(id => $id,
                                        name => $booksellers[0]->{'name'},
                                        postal =>$booksellers[0]->{'postal'},
                                        address1 => 
$booksellers[0]->{'address1'},
@@ -110,6 +141,9 @@
                                        invoiceincgst => 
$booksellers[0]->{'invoiceincgst'},
                                        discount => 
$booksellers[0]->{'discount'},
                                        loop_pricescurrency => address@hidden,
-                                       loop_invoicecurrency => 
address@hidden,);
-
+                        loop_invoicecurrency => address@hidden,
+                        GST => C4::Context->preference("gist"),
+                        enter=>1,
+                        );
+}
 output_html_with_http_headers $query, $cookie, $template->output;