@@ -, +, @@
and fix it
commit 0cffb0f7589aa52d65bda9a8a4934790a141f3a0
Bug 21621: Remove incorrect GROUP BY from tools/letter.pl
---
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +-
tools/letter.pl | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -93,7 +93,7 @@
[% FOREACH lette IN letter %]
[% can_edit = lette.branchcode || !independant_branch %]
- [% IF lette.branchname %][% lette.branchname | html %][% ELSE %](All libraries)[% END %] |
+ X[%lette.branchcode%]X[% IF lette.branchname%][% lette.branchname | html %][% ELSE %](All libraries)[% END %] |
[% SWITCH lette.module %]
[% CASE 'acquisition' %]Acquisition
--- a/tools/letter.pl
+++ a/tools/letter.pl
@@ -377,6 +377,8 @@ sub retrieve_letters {
}
$sql .= " WHERE ".join(" AND ", @where) if @where;
+ $sql .= " GROUP BY branchcode,module,code,name,branchname";
+
$sql .= " ORDER BY module, code, branchcode";
return $dbh->selectall_arrayref($sql, { Slice => {} }, @args);
--
|