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>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

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 65d21b3..a28ac03 100644 (file)
--- 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 f13b4f8..a6d92f7 100755 (executable)
--- 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 ) {