@@ -, +, @@ 
 suggestions
---
 C4/Suggestions.pm                                  |  5 +++
 .../prog/en/modules/suggestion/suggestion.tt       | 44 +++++++++++++++++++---
 suggestion/suggestion.pl                           | 18 +++++++--
 3 files changed, 58 insertions(+), 9 deletions(-)
--- a/C4/Suggestions.pm	
+++ a/C4/Suggestions.pm	
@@ -207,6 +207,11 @@ sub SearchSuggestion {
         }
     }
 
+    # By default do not search for archived suggestions
+    unless ( exists $suggestion->{archived} && $suggestion->{archived} ) {
+        push @query, q{ AND suggestions.archived = 0 };
+    }
+
     $debug && warn "@query";
     my $sth = $dbh->prepare("@query");
     $sth->execute(@sql_params);
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt	
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt	
@@ -560,6 +560,7 @@ 
                     [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate | html %] [% END %]
                         [% IF ( suggestions_loo.volumedesc ) %]; Volume:<i>[% suggestions_loo.volumedesc | html %]</i> [% END %]
                         [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn | html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear | html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place | html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<div class="note"><i class="fa fa-comment"></i> [% suggestions_loo.note | html %]</div>[% END %]
+                        [% IF suggestions_loo.archived %]<br /><i class="fa fa-archive"> Archived[% END %]
                 </td>
                 <td>
                     <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a>
@@ -603,8 +604,19 @@ 
                     [% END %]
                 </td>
                 <td class="actions">
-                    <a class="btn btn-xs btn-default" href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&amp;op=edit"><i class="fa fa-pencil"></i> Edit</a>
-                    <a class="btn btn-default btn-xs deletesuggestion" href="suggestion.pl?op=delete&amp;suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a>
+                    <div class="dropup">
+                    <div class="btn-group">
+                        <a class="btn btn-default btn-xs" role="button" href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&amp;op=edit"><i class="fa fa-pencil"></i> Edit</a><a class="btn btn-default btn-xs dropdown-toggle" id="more_actions_[% suggestions_loo.suggestionid | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a>
+                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="more_actions_[% suggestions_loo.suggestionid | html %]">
+                            <li><a class="deletesuggestion" href="suggestion.pl?op=delete&amp;suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-trash"></i> Delete</a></li>
+                            [% UNLESS suggestions_loo.archived %]
+                                <li><a class="archivesuggestion" href="suggestion.pl?op=archive&amp;suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-archive"></i> Archive</a></li>
+                            [% ELSE %]
+                                <li><a class="unarchivesuggestion" href="suggestion.pl?op=unarchive&amp;suggestionid=[% suggestions_loo.suggestionid | html %]"><i class="fa fa-archive"></i> Unarchive</a></li>
+                            [% END %]
+                        </ul>
+                    </div>
+                    </div>
                 </td>
         </tr>
         [% END %]</tbody>
@@ -664,6 +676,7 @@ 
                     </div>
 
                     <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
+                    <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" />
                     <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="update_status"/>Submit</button></fieldset>
                 </fieldset>
             </div>
@@ -672,6 +685,7 @@ 
                     <label for="itemtype">Update item types with: </label>
                     [% PROCESS 'av-build-dropbox.inc' name="suggestion_itemtype", category="SUGGEST_FORMAT", size = 20  %]
                     <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
+                    <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" />
                     <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="update_itemtype"/>Submit</button></fieldset>
                 </fieldset>
             </div>
@@ -683,6 +697,7 @@ 
                     <span id="managedby_name[% loop.count %]"></span>
                     <input type="hidden" name="suggestion_managedby" id="managedby[% loop.count %]" value="[% logged_in_user.borrowernumber | html %]" />
                     <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
+                    <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" />
                     <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="update_manager"/>Submit</button></fieldset>
                 </fieldset>
             </div>
@@ -691,6 +706,7 @@ 
                 <fieldset>
                     <label for="delete_[% loop.count %]">Delete selected</label>
                     <input type="hidden" name="branchcode" value="[% branchfilter | html %]" />
+                    <input type="hidden" name="filter_archived" value="[% filter_archived | html %]" />
                     <fieldset class="action"><button type="submit" class="btn btn-default btn-xs" value="delete"/>Delete</button></fieldset>
                 </fieldset>
             </div>
@@ -742,7 +758,12 @@ 
                     [% ELSE %]
                         <option value="acceptedby">Accepted by</option>
                     [% END %]
-                </select> <input type="submit" value="Go" /></li></ol></fieldset>
+                </select>
+                <input type="submit" value="Go" />
+                </li>
+                </ol>
+                </fieldset>
+
 <h4>Filter by: <a style="font-size:80%;font-weight:normal;" href="/cgi-bin/koha/suggestion/suggestion.pl">[clear]</a></h4>
                 <div style="display:block;" id="limits">
 
@@ -758,7 +779,11 @@ 
                     <ol>
                         <li>
                             <label for="archived" style="display: inline;">Include archived:</label>
-                            <input type="checkbox" id="archived" name="filter_archived" value="archived" title="Include archived suggestions in the search" />
+                            [% IF filter_archived %]
+                                <input type="checkbox" id="archived" name="filter_archived" checked="checked" title="Include archived suggestions in the search" />
+                            [% ELSE %]
+                                <input type="checkbox" id="archived" name="filter_archived" title="Include archived suggestions in the search" />
+                            [% END %]
                       </li>
                       <li>
                           <label for="STATUS"> Status:</label>
@@ -833,7 +858,10 @@ 
                         <label for="accepteddate_to">To:</label>
                         <input type="text" id="accepteddate_to" size="10" name="accepteddate_to" value="[% accepteddate_to | html %]" />
                     </li>
-                    <li><input type="submit" value="Go" /></li></ol>
+                    <li>
+                        <input type="submit" value="Go" />
+                    </li>
+                </ol>
                 </fieldset>
 
 				<fieldset class="brief"><h4 class="local_collapse"><a href="#">Acquisition information</a></h4>
@@ -857,7 +885,11 @@ 
                         [% ELSE %]
                             [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
                         [% END %]
-                    </select></li><li><input type="submit" value="Go" /></li></ol>
+                    </select></li>
+                    <li>
+                        <input type="submit" value="Go" />
+                    </li>
+                </ol>
                 </fieldset>
             </form>
         [% INCLUDE 'acquisitions-menu.inc' %]
--- a/suggestion/suggestion.pl	
+++ a/suggestion/suggestion.pl	
@@ -93,6 +93,7 @@ my $displayby       = $input->param('displayby') || '';
 my $tabcode         = $input->param('tabcode');
 my $save_confirmed  = $input->param('save_confirmed') || 0;
 my $notify          = $input->param('notify');
+my $filter_archived = $input->param('filter_archived');
 
 my $reasonsloop     = GetAuthorisedValues("SUGGEST");
 
@@ -105,7 +106,7 @@ my $columns = ' '.join(' ', $schema->source('Suggestion')->columns).' ';
 my $suggestion_only = { map { $columns =~ / $_ / ? ($_ => $suggestion_ref->{$_}) : () } keys %$suggestion_ref };
 $suggestion_only->{STATUS} = $suggestion_ref->{STATUS};
 
-delete $$suggestion_ref{$_} foreach qw( suggestedbyme op displayby tabcode edit_field notify );
+delete $$suggestion_ref{$_} foreach qw( suggestedbyme op displayby tabcode notify filter_archived );
 foreach (keys %$suggestion_ref){
     delete $$suggestion_ref{$_} if (!$$suggestion_ref{$_} && ($op eq 'else' ));
 }
@@ -290,6 +291,16 @@ elsif ($op eq "update_status" ) {
     }
     redirect_with_params($input);
 }
+elsif ($op eq "archive" ) {
+    Koha::Suggestions->find($_)->update({ archived => 1 }) for @editsuggestions;
+
+    redirect_with_params($input);
+}
+elsif ($op eq "unarchive" ) {
+    Koha::Suggestions->find($_)->update({ archived => 0 }) for @editsuggestions;
+
+    redirect_with_params($input);
+}
 elsif ( $op eq 'update_itemtype' ) {
     my $new_itemtype = $input->param('suggestion_itemtype');
     foreach my $suggestionid (@editsuggestions) {
@@ -348,7 +359,7 @@ if ($op=~/else/) {
         next if ( $definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue ) and ($displayby ne 'branchcode' or $branchfilter ne '__ANY__' );
         $$suggestion_ref{$displayby} = $criteriumvalue;
 
-        my $suggestions = &SearchSuggestion($suggestion_ref);
+        my $suggestions = &SearchSuggestion({ %$suggestion_ref, archived => $filter_archived });
         foreach my $suggestion (@$suggestions) {
             if ($suggestion->{budgetid}){
                 my $bud = GetBudget( $suggestion->{budgetid} );
@@ -379,6 +390,7 @@ $template->param(
 
 $template->param(
     %$suggestion_ref,
+    filter_archived => $filter_archived,
     "op"             =>$op,
 );
 
@@ -464,7 +476,7 @@ sub redirect_with_params {
         displayby branchcode title author isbn publishercode copyrightdate
         collectiontitle suggestedby suggesteddate_from suggesteddate_to
         manageddate_from manageddate_to accepteddate_from
-        accepteddate_to budgetid
+        accepteddate_to budgetid filter_archived
         )
       )
     {
--