From bc1610cccbf51f9c61b8899e156c2af369e536be Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Tue, 31 Jan 2012 11:28:56 +0100 Subject: [PATCH] Bug 4969: allows deletion of vendor with no basket --- acqui/supplier.pl | 6 +++++- .../prog/en/includes/acquisitions-toolbar.inc | 4 ++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/acqui/supplier.pl b/acqui/supplier.pl index 3faa560..a24db4a 100755 --- a/acqui/supplier.pl +++ b/acqui/supplier.pl @@ -117,7 +117,11 @@ if ( $op eq 'display' ) { contracts => $contracts, ); } elsif ( $op eq 'delete' ) { - DelBookseller($id); + # no further message needed for the user + # the DELETE button only appears in the template if basketcount == 0 + if ( $supplier->{'basketcount'} == 0 ) { + DelBookseller($id); + } print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl'); exit; } else { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index f81b303..0385d94 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/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 ( id ) %] [% IF ( CAN_user_acquisition_vendors_manage ) %]
  • Edit
  • + [% UNLESS basketcount %] +
  • Delete
  • + [% END %]
  • New Contract
  • Contracts
  • [% UNLESS ( basketcount ) %] -- 1.7.4.1