Merge branch 'bug_10230' into 3.14-master

[koha.git] / tools / letter.pl

diff --git a/tools/letter.pl b/tools/letter.pl
index 44f21ab..68c6701 100755 (executable)
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -115,6 +115,7 @@ $template->param(
     independant_branch => $my_branch,
        script_name => $script_name,
   searchfield => $searchfield,
+    branchcode => $branchcode,
        action => $script_name
 );
 
@@ -194,11 +195,19 @@ sub add_form {
     }
     else {
         push @{$field_selection}, add_fields('biblio','biblioitems'),
-            {value => q{},             text => '---ITEMS---'  },
+            add_fields('items'),
             {value => 'items.content', text => 'items.content'},
-            add_fields('issues','borrowers');
+            {value => 'items.fine',    text => 'items.fine'},
+            add_fields('borrowers');
         if ($module eq 'circulation') {
             push @{$field_selection}, add_fields('opac_news');
+
+        }
+
+        if ( $module eq 'circulation' && $code eq "CHECKIN" ) {
+            push @{$field_selection}, add_fields('old_issues');
+        } else {
+            push @{$field_selection}, add_fields('issues');
         }
     }