From 7c38f63d85f3cd8024bc7038ec7f3e6db6e14f57 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Mon, 25 Feb 2019 21:43:17 +0000 Subject: [PATCH] Bug 19489: (QA follow-up) Revert changes in printinvoice It would be change behaviour, libraries are often using POS printers and wider table could make a problem for them and break theirs workflow. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens --- .../prog/en/modules/members/printinvoice.tt | 22 +++++++------------ members/printinvoice.pl | 5 +---- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt index 65d21b3aae..a28ac03e34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt @@ -21,23 +21,23 @@ [% IF ( LibraryName ) %] - [% END %] - + - - @@ -45,9 +45,6 @@ - - - @@ -60,9 +57,6 @@ [% PROCESS account_type_description account=account %] [%- IF account.description %], [% account.description | html %][% END %] - - - [% IF ( account.amountcredit ) %] [% IF ( account.amountoutstandingcredit ) %] @@ -71,7 +65,7 @@ [% END %] - + [% IF ( totalcredit ) %] diff --git a/members/printinvoice.pl b/members/printinvoice.pl index f13b4f843f..a6d92f7e3a 100755 --- a/members/printinvoice.pl +++ b/members/printinvoice.pl @@ -55,10 +55,7 @@ output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log #get account details my $total = $patron->account->balance; -my $accountline_object = Koha::Account::Lines->find($accountlines_id); -my $accountline = $accountline_object->unblessed; -$accountline->{item} = $accountline_object->item || "" ; -$accountline->{checkout} = $accountline_object->checkout || ""; +my $accountline = Koha::Account::Lines->find($accountlines_id)->unblessed; my $totalcredit; if ( $total <= 0 ) { -- 2.39.5
-

[% LibraryName | html %]

+
+

[% LibraryName | html %]

-

INVOICE

-
+

INVOICE

+
+

[% Branches.GetName( patron.branchcode ) | html %]

+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
Date Description of chargesBarcodeDue dateReturn date Note Amount Amount outstanding[% account.item.barcode | html %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% account.checkout.returndate | $KohaDates with_hours => 1 %] [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %][% ELSE %][% END %][% account.amountoutstanding | $Price %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]