installer: added (in some cases back) module deps
[koha_fer] / circ / returns.pl
index e06a8ce..bf79dea 100755 (executable)
@@ -31,7 +31,7 @@ use C4::Context;
 use C4::Auth;
 use C4::Output;
 use C4::Circulation;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Print;
 use C4::Reserves;
 use C4::Biblio;
@@ -135,6 +135,7 @@ if ( $query->param('resbarcode') ) {
     if ( $messages->{'transfert'} ) {
         $template->param(
             itemtitle      => $iteminfo->{'title'},
+                       itembiblionumber => $iteminfo->{'biblionumber'},
             iteminfo       => $iteminfo->{'author'},
             tobranchname   => $branchname,
             name           => $name,
@@ -249,8 +250,9 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
             wborsurname     => $borr->{'surname'},
             wbortitle       => $borr->{'title'},
             wborphone       => $borr->{'phone'},
-            wboremail       => $borr->{'emailaddress'},
-            wborstraddress  => $borr->{'streetaddress'},
+            wboremail       => $borr->{'email'},
+            wboraddress  => $borr->{'address'},
+            wboraddress2 => $borr->{'address2'},
             wborcity        => $borr->{'city'},
             wborzip         => $borr->{'zipcode'},
             wborrowernumber => $reserve->{'borrowernumber'},
@@ -282,8 +284,9 @@ if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
             borsurname     => $borr->{'surname'},
             bortitle       => $borr->{'title'},
             borphone       => $borr->{'phone'},
-            boremail       => $borr->{'emailaddress'},
-            borstraddress  => $borr->{'streetaddress'},
+            boremail       => $borr->{'email'},
+            boraddress  => $borr->{'address'},
+            boraddress2  => $borr->{'address2'},
             borcity        => $borr->{'city'},
             borzip         => $borr->{'zipcode'},
             borrowernumber => $reserve->{'borrowernumber'},
@@ -327,11 +330,12 @@ if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
             borrowernumber   => $reserve->{'borrowernumber'},
             borcnum          => $borr->{'cardnumber'},
             borphone         => $borr->{'phone'},
-            borstraddress    => $borr->{'streetaddress'},
+            boraddress    => $borr->{'address'},
+            boraddress2    => $borr->{'address2'},
             borsub           => $borr->{'suburb'},
             borcity          => $borr->{'city'},
             borzip           => $borr->{'zipcode'},
-            boremail         => $borr->{'emailaddress'},
+            boremail         => $borr->{'email'},
             debarred         => $borr->{'debarred'},
             gonenoaddress    => $borr->{'gonenoaddress'},
             barcode          => $barcode