@@ -, +, @@ without basket group - search for orders by title or vendor - make sure some results are attached to a basket group, while others are not - make sure correct information shows in the basket group column of search results - Fixed merge conflict --- .../prog/en/modules/acqui/histsearch.tt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -79,7 +79,13 @@ [% FOREACH suggestions_loo IN suggestions_loop %] [% suggestions_loo.basketname %] ([% suggestions_loo.basketno %]) - [% suggestions_loo.groupname %] ([% suggestions_loo.basketgroupid %]) + + [% IF ( suggestions_loo.basketgroupid ) %] + [% suggestions_loo.groupname %] ([% suggestions_loo.basketgroupid %]) + [% ELSE %] +   + [% END %] + [% IF ( suggestions_loo.invoicenumber ) %] [% suggestions_loo.invoicenumber %] [% ELSE %] --