diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 51de25d82b..f2a7f56b1f 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -92,6 +92,7 @@ if ( $supplier_count == 1 ) {
supplier_name => $suppliers[0]->name,
booksellerid => $suppliers[0]->id,
basketcount => $suppliers[0]->baskets->count,
+ subscriptionscount => $suppliers[0]->subscriptions->count,
active => $suppliers[0]->active,
);
}
@@ -149,6 +150,8 @@ for my $vendor (@suppliers) {
booksellerid => $vendor->id,
name => $vendor->name,
active => $vendor->active,
+ basketcount => $vendor->baskets->count,
+ subscriptioncount => $vendor->subscriptions->count,
};
}
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index af8fce7135..0e3570780a 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -89,8 +89,8 @@ if ( $op eq 'display' ) {
);
} elsif ( $op eq 'delete' ) {
# no further message needed for the user
- # the DELETE button only appears in the template if basketcount == 0
- if ( $supplier->baskets->count == 0 ) {
+ # the DELETE button only appears in the template if basketcount == 0 AND subscriptioncount == 0
+ if ( $supplier->baskets->count == 0 && $supplier->subscriptions->count == 0) {
Koha::Acquisition::Booksellers->find($booksellerid)->delete;
}
print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl');
diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index cb7198a532..49a5ce8767 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2714,28 +2714,23 @@ td {
}
#acqui_order_supplierlist {
- > div {
- &.supplier {
- border: 1px solid #EEEEEE;
- margin: .5em;
- padding: 1em;
+ .supplier {
+ &+.supplier {
+ border-top: 1px solid #EEEEEE;
+ margin-top: 1em;
}
+ }
- > div {
- > .baskets {
- margin-top: .5em;
- }
- }
+ .suppliername {
+ display: inline-block;
+ margin: .5em 1em .5em 0;
- > span {
- &.action {
- margin-left: 5em;
- }
+ &.inactive {
+ color: #888;
- &.suppliername {
- display: inline;
- font-size: 1.7em;
- margin-bottom: .5em;
+ a:link,
+ a:visited {
+ color: #888;
}
}
}
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 8191a021ff..294a777629 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc
@@ -1,12 +1,5 @@
[% INCLUDE 'blocking_errors.inc' %]
-