From 6f998dcbb89effe4966638c70839fb02f80a4a07 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 11 Dec 2014 11:50:20 +0100 Subject: [PATCH] Bug 13371: List suppliers even if they don't have basket. Signed-off-by: Paola Rossi --- .../prog/en/modules/acqui/booksellers.tt | 37 +++++++++++++++++----- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 699356b..eb01497 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -122,6 +122,17 @@ $(document).ready(function() { [% ELSE %]

Vendor search: [% count %] results found for '[% supplier %]'

[% END %] + + [% BLOCK action %] + + [% IF CAN_user_acquisition_order_manage %] + [% IF supplier.active %] + New basket + [% END %] + [% END %] + Receive shipment + + [% END %] [% END %] [% IF ( loop_suppliers.size ) %] [% IF allbaskets %] @@ -149,6 +160,23 @@ $(document).ready(function() { [% FOREACH supplier IN loop_suppliers %] + [% IF supplier.loop_basket.size == 0 %] + + + [% supplier.name %] + ([% supplier.booksellerid %]) + [% PROCESS action supplier = supplier %] + + + [% IF allbaskets %] + No basket. + [% ELSE %] + No active basket. + [% END %] + + + + [% END %] [% FOREACH basket IN supplier.loop_basket %] [% IF ( basket.uncertainprices ) %] @@ -158,14 +186,7 @@ $(document).ready(function() { [% supplier.name %] ([% supplier.booksellerid %]) - - [% IF ( CAN_user_acquisition_order_manage ) %] - [% IF ( supplier.active ) %] - New basket - [% END %] - [% END %] - Receive shipment - + [% PROCESS action supplier = supplier %] [% basket.basketno %] [% basket.basketname %] -- 2.1.4