Fix for Bug 3984, Confusing note on transfers to receive

- Changing 'check this transfer' message to more informative
   'Transfer is XX days late'
 - Adding note in the case of late transfers: 'Transfers are
   considered late after XX [TransfersMaxDaysWarning] days.'

diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index 88ae91d..ddb7f4a 100755 (executable)
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -58,6 +58,7 @@ my $default = C4::Context->userenv->{'branch'};
 # get the all the branches for reference
 my $branches = GetBranches();
 my @branchesloop;
+my $latetransfers;
 foreach my $br ( keys %$branches ) {
     my @transferloop;
     my %branchloop;
@@ -78,15 +79,18 @@ foreach my $br ( keys %$branches ) {
                 C4::Context->preference('TransfersMaxDaysWarning'));
             my $calcDate = Date_to_Days( $sent_year, $sent_month, $sent_day );
             my $today    = Date_to_Days(&Today);
+                       my $diff = $today - $calcDate;
 
             if ($today > $calcDate) {
+                               $latetransfers = 1;
                 $getransf{'messcompa'} = 1;
+                               $getransf{'diff'} = $diff;
             }
             my $gettitle     = GetBiblioFromItemNumber( $num->{'itemnumber'} );
-            my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
+            my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $gettitle->{'itype'} : $gettitle->{'itemtype'} );
 
             $getransf{'datetransfer'} = format_date( $num->{'datesent'} );
-            $getransf{'itemtype'} = $itemtypeinfo->{'description'};
+            $getransf{'itemtype'} = $itemtypeinfo ->{'description'};
                        foreach (qw(title biblionumber itemnumber barcode homebranch holdingbranch itemcallnumber)) {
                $getransf{$_} = $gettitle->{$_};
                        }
@@ -114,6 +118,8 @@ $template->param(
     branchesloop => \@branchesloop,
     show_date    => format_date(C4::Dates->today('iso')),
        'dateformat_' . (C4::Context->preference("dateformat") || '') => 1,
+       TransfersMaxDaysWarning => C4::Context->preference('TransfersMaxDaysWarning'),
+       latetransfers => $latetransfers ? 1 : 0,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index 6a7e902..6b036af 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -35,9 +35,10 @@ $(document).ready(function() {
        <div id="yui-main">
        <div class="yui-g">
 
-       <h1>Transfers made to your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
+       <h1>Transfers made to your library as of <!-- TMPL_VAR NAME="show_date" --></h1>
        <!-- TMPL_IF name="branchesloop" -->
         <p>Your library is the destination for the following transfer(s)</p>
+               <!-- TMPL_IF NAME="latetransfers" --><p>Transfers are <span class="error">considered late</span> after <!-- TMPL_VAR NAME="TransfersMaxDaysWarning" --> days.</p><!-- /TMPL_IF -->
         <div id="resultlist">
         <!-- TMPL_LOOP NAME="branchesloop" -->
             <!-- TMPL_IF NAME="branchcode" -->
@@ -55,7 +56,7 @@ $(document).ready(function() {
                 <!-- TMPL_ELSE -->
                 <tr>
                 <!-- /TMPL_IF -->
-                    <td><p><!-- TMPL_VAR NAME="datetransfer" --></p> <!-- TMPL_IF NAME="messcompa" -->check this transfer<!-- /TMPL_IF --></td>
+                    <td><p><!-- TMPL_VAR NAME="datetransfer" --></p> <!-- TMPL_IF NAME="messcompa" --><span class="error">Transfer is <!-- TMPL_VAR NAME="diff" --> days late</span><!-- /TMPL_IF --></td>
                     <td><span style="display:none;"><!-- TMPL_VAR NAME="title" escape="html" --></span><!-- invisible title for tablesorter -->
                         <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
 <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a>