---
C4/Koha.pm | 5 ++---
C4/Members.pm | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/C4/Koha.pm b/C4/Koha.pm
index 7fe07f1..bb35811 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1024,8 +1024,8 @@ sub GetAuthorisedValues {
my @results;
my $dbh = C4::Context->dbh;
my $query = qq{
- SELECT *
- FROM authorised_values
+ SELECT DISTINCT av.*
+ FROM authorised_values av
};
$query .= qq{
LEFT JOIN authorised_values_branches ON ( id = av_id )
@@ -1043,7 +1043,6 @@ sub GetAuthorisedValues {
if(@where_strings > 0) {
$query .= " WHERE " . join(" AND ", @where_strings);
}
- $query .= " GROUP BY lib";
$query .= ' ORDER BY category, ' . (
$opac ? 'COALESCE(lib_opac, lib)'
: 'lib, lib_opac'
diff --git a/C4/Members.pm b/C4/Members.pm
index 383799d..30c3b67 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1423,7 +1423,7 @@ sub GetborCatFromCatType {
my $dbh = C4::Context->dbh;
my $request = qq{
- SELECT categories.categorycode, categories.description
+ SELECT DISTINCT categories.categorycode, categories.description
FROM categories
};
$request .= qq{
@@ -1431,9 +1431,9 @@ sub GetborCatFromCatType {
} if $branch_limit;
if($action) {
$request .= " $action ";
- $request .= " AND (branchcode = ? OR branchcode IS NULL) GROUP BY
description" if $branch_limit;
+ $request .= " AND (branchcode = ? OR branchcode IS NULL)" if
$branch_limit;
} else {
- $request .= " WHERE branchcode = ? OR branchcode IS NULL GROUP BY
description" if $branch_limit;
+ $request .= " WHERE branchcode = ? OR branchcode IS NULL" if
$branch_limit;
}
$request .= " ORDER BY categorycode";
--
2.7.4
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
