@@ -, +, @@ --- C4/Bookseller.pm | 3 +++ acqui/supplier.pl | 7 ++++++- .../prog/en/includes/acquisitions-toolbar.inc | 4 ++++ 3 files changed, 13 insertions(+), 1 deletions(-) --- a/C4/Bookseller.pm +++ a/C4/Bookseller.pm @@ -84,6 +84,9 @@ sub GetBookSellerFromId { ( $vendor->{basketcount} ) = $dbh->selectrow_array( 'SELECT count(*) FROM aqbasket where booksellerid = ?', {}, $id ); + ( $vendor->{subscriptioncount} ) = $dbh->selectrow_array( + 'SELECT count(*) FROM subscription WHERE aqbooksellerid = ?', + {}, $id ); } return $vendor; } --- a/acqui/supplier.pl +++ a/acqui/supplier.pl @@ -114,10 +114,15 @@ if ( $op eq 'display' ) { 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 { --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -16,6 +16,7 @@ new YAHOO.widget.Button("newsupplier"); new YAHOO.widget.Button("newbasket"); new YAHOO.widget.Button("editsupplier"); + new YAHOO.widget.Button("deletesupplier"); new YAHOO.widget.Button("receive"); new YAHOO.widget.Button("newcontract"); new YAHOO.widget.Button("editcontracts"); @@ -46,6 +47,9 @@ [% IF ( booksellerid ) %] [% IF ( CAN_user_acquisition_vendors_manage ) %]
  • Edit
  • + [% UNLESS ( basketcount OR subscriptioncount ) %] +
  • Delete
  • + [% END %]
  • New Contract
  • Contracts
  • [% UNLESS ( basketcount ) %] --