X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fsupplier.pl;h=0e2ab40302d681415b5764bcc4b9ca2b8aaaaeac;hb=e7971380e8ff699b57d0c02b2406eca254dfd04a;hp=8896b3b44206702856058c13d9a4dcde3fd128d6;hpb=803095a7989bd1cd4357ebe9736a19284d97b2db;p=koha_fer

diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 8896b3b442..0e2ab40302 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -46,7 +46,6 @@ use C4::Auth;
 use C4::Contract qw/GetContract/;
 use C4::Biblio;
 use C4::Output;
-use C4::Dates qw/format_date /;
 use CGI;
 
 use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
@@ -79,11 +78,6 @@ if ( $op eq 'display' ) {
 
     my $contracts = GetContract( { booksellerid => $booksellerid } );
 
-    for ( @{$contracts} ) {
-        $_->{contractstartdate} = format_date( $_->{contractstartdate} );
-        $_->{contractenddate}   = format_date( $_->{contractenddate} );
-    }
-
     $template->param(
         booksellerid  => $booksellerid,
         name          => $supplier->{'name'},
@@ -109,15 +103,21 @@ if ( $op eq 'display' ) {
         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' ) {
-    DelBookseller($booksellerid);
+    # 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 {
@@ -171,6 +171,7 @@ if ( $op eq 'display' ) {
         invoiceincgst => $supplier->{'invoiceincgst'},
         gstrate       => $gstrate,
         discount      => $supplier->{'discount'},
+        deliverytime  => $supplier->{deliverytime},
         loop_currency => $loop_currency,
         GST           => $tax_rate,
         enter         => 1,