Bug 12495 - Include streetnumber in hold alert address

[koha_fer] / circ / transferstoreceive.pl

diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index 88ae91d..365f200 100755 (executable)
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -14,9 +14,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -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,21 +79,27 @@ 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'};
-                       foreach (qw(title biblionumber itemnumber barcode homebranch holdingbranch itemcallnumber)) {
+            $getransf{'datetransfer'} = $num->{'datesent'};
+            $getransf{'itemtype'} = $itemtypeinfo ->{'description'};
+                       foreach (qw(title author biblionumber itemnumber barcode homebranch holdingbranch itemcallnumber)) {
                $getransf{$_} = $gettitle->{$_};
                        }
 
+            my $record = GetMarcBiblio($gettitle->{'biblionumber'});
+            $getransf{'subtitle'} = GetRecordValue('subtitle', $record, GetFrameworkCode($gettitle->{'biblionumber'}));
+
             # we check if we have a reserv for this transfer
-            my @checkreserv = GetReservesFromItemnumber($num->{'itemnumber'} );
+            my @checkreserv = GetReservesFromItemnumber($num->{'itemnumber'});
             if ( $checkreserv[0] ) {
                 my $getborrower = GetMemberDetails( $checkreserv[1] );
                 $getransf{'borrowernum'}       = $getborrower->{'borrowernumber'};
@@ -113,7 +120,8 @@ foreach my $br ( keys %$branches ) {
 $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;