(MT 3267) Add Homebranch and Holdingbranch search criterion on circulation stat.

[koha.git] / C4 / Suggestions.pm

diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index 4250db0..c7955d7 100644 (file)
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -89,9 +89,12 @@ sub SearchSuggestion  {
     my $dbh = C4::Context->dbh;
     my $query = "
     SELECT suggestions.*,
+        U1.branchcode   AS branchcodesuggestedby,
         U1.surname   AS surnamesuggestedby,
         U1.firstname AS firstnamesuggestedby,
         U1.borrowernumber AS borrnumsuggestedby,
+        U1.categorycode AS categorycodesuggestedby,
+        U2.branchcode AS branchcodemanagedby,
         U2.surname   AS surnamemanagedby,
         U2.firstname AS firstnamemanagedby,
         U2.borrowernumber AS borrnummanagedby
@@ -223,7 +226,9 @@ sub GetSuggestionByStatus {
     my $query = qq(SELECT suggestions.*,
                         U1.surname   AS surnamesuggestedby,
                         U1.firstname AS firstnamesuggestedby,
-                                               U1.borrowernumber AS borrnumsuggestedby,
+            U1.branchcode AS branchcodesuggestedby,
+                       U1.borrowernumber AS borrnumsuggestedby,
+                       U1.categorycode AS categorycodesuggestedby,
                         U2.surname   AS surnamemanagedby,
                         U2.firstname AS firstnamemanagedby,
                                                U2.borrowernumber AS borrnummanagedby
@@ -427,7 +432,8 @@ sub ModStatus {
         To => $emailinfo->{byemail},
         From => $emailinfo->{libemail},
         Subject => 'Koha suggestion',
-        Message => "".$template->output
+        Message => "".$template->output,
+        'Content-Type' => 'text/plain; charset="utf8"',
     );
     sendmail(%mail);
 }