X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fprintinvoice.pl;h=7d591c44d23093e0ba6cf44a648a157dcf15763a;hb=d7c1d52051a3cb5f6ae3be9abb0e9e7aa1f9ece5;hp=4c41461bfac34d549708f89fa7f7d06e9009c7d7;hpb=58ec862da2243d9210a419c210e7b469ac2f6872;p=koha-ffzg.git

diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index 4c41461bfa..7d591c44d2 100755
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -20,8 +20,8 @@
 
 use Modern::Perl;
 
-use C4::Auth;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers );
 use CGI qw ( -utf8 );
 use C4::Letters;
 use Koha::Account::Lines;
@@ -30,10 +30,10 @@ my $input = CGI->new;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "members/printinvoice.tt",
-        query           => $input,
-        type            => "intranet",
-        flagsrequired   => {
+        template_name => "members/printinvoice.tt",
+        query         => $input,
+        type          => "intranet",
+        flagsrequired => {
             borrowers     => 'edit_borrowers',
             updatecharges => 'remaining_permissions'
         }
@@ -41,8 +41,8 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 my $debit_id = $input->param('accountlines_id');
-my $debit = Koha::Account::Lines->find($debit_id);
-my $patron = $debit->patron;
+my $debit    = Koha::Account::Lines->find($debit_id);
+my $patron   = $debit->patron;
 
 my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in";
 output_and_exit_if_error(
@@ -55,13 +55,34 @@ output_and_exit_if_error(
     }
 );
 
-my $letter = C4::Letters::getletter( 'circulation', 'ACCOUNT_DEBIT',
-    C4::Context::mybranch, 'print', $patron->lang );
+my $letter = C4::Letters::GetPreparedLetter(
+    module                 => 'circulation',
+    letter_code            => 'DEBIT_' . $debit->debit_type_code,
+    branchcode             => C4::Context::mybranch,
+    message_transport_type => 'print',
+    lang                   => $patron->lang,
+    tables                 => {
+        debits    => $debit_id,
+        borrowers => $patron->borrowernumber
+    }
+);
 
-$template->param(
-    letter  => $letter,
-    debit   => $debit
+$letter //= C4::Letters::GetPreparedLetter(
+    module                 => 'circulation',
+    letter_code            => 'ACCOUNT_DEBIT',
+    branchcode             => C4::Context::mybranch,
+    message_transport_type => 'print',
+    lang                   => $patron->lang,
+    tables                 => {
+        debits    => $debit_id,
+        borrowers => $patron->borrowernumber
+    }
+);
 
+$template->param(
+    slip   => $letter->{content},
+    plain  => !$letter->{is_html},
+    patron => $patron,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;