Bugzilla – Attachment 85738 Details for
Bug 19489
Detailed description of charges on Accounting tab
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19489: (QA follow-up) Revert changes in printinvoice
Bug-19489-QA-follow-up-Revert-changes-in-printinvo.patch (text/plain), 3.73 KB, created by
Kyle M Hall (khall)
on 2019-02-26 19:13:06 UTC
(
hide
)
Description:
Bug 19489: (QA follow-up) Revert changes in printinvoice
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2019-02-26 19:13:06 UTC
Size:
3.73 KB
patch
obsolete
>From 07ed8e700750b24deecd01c286b9ada3a304f36c Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >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 <josef.moravec@gmail.com> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../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 @@ > <table> > [% IF ( LibraryName ) %] > <tr> >- <th colspan="8" class="centerednames"> >- <h3>[% LibraryName | html %]</h3> >+ <th colspan="5" class="centerednames"> >+ <h3>[% LibraryName | html %]</h3> > </th> > </tr> > [% END %] > <tr> >- <th colspan="8" class="centerednames"> >- <h2><u>INVOICE</u></h2> >- </th> >+ <th colspan="5" class="centerednames"> >+ <h2><u>INVOICE</u></h2> >+ </th> > </tr> > <tr> >- <th colspan="8" class="centerednames"> >+ <th colspan="5" class="centerednames"> > <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="8" > >+ <th colspan="5" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% patron.cardnumber | html %]<br /> > </th> >@@ -45,9 +45,6 @@ > <tr> > <th>Date</th> > <th>Description of charges</th> >- <th>Barcode</th> >- <th>Due date</th> >- <th>Return date</th> > <th>Note</th> > <th style="text-align:right;">Amount</th> > <th style="text-align:right;">Amount outstanding</th> >@@ -60,9 +57,6 @@ > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] > </td> >- <td>[% account.item.barcode | html %]</td> >- <td>[% account.checkout.date_due | $KohaDates as_due_date => 1 %]</td> >- <td>[% account.checkout.returndate | $KohaDates with_hours => 1 %]</td> > <td>[% account.note | html %]</td> > [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td> > [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | $Price %]</td> >@@ -71,7 +65,7 @@ > [% END %] > <tfoot> > <tr> >- <td colspan="7">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >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.17.2 (Apple Git-113)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19489
:
81956
|
81989
|
81991
|
82519
|
82520
|
82614
|
82615
|
82846
|
83109
|
83110
|
83242
|
83276
|
83277
|
83299
|
83300
|
83301
|
83618
|
83619
|
83620
|
85236
|
85237
|
85275
|
85315
|
85668
|
85669
|
85670
|
85671
|
85672
|
85673
|
85674
|
85675
|
85731
|
85732
|
85733
|
85734
|
85735
|
85736
|
85737
| 85738