View | Details | Raw Unified | Return to bug 19489
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-14 / +8 lines)
Lines 21-43 Link Here
21
<table>
21
<table>
22
[% IF ( LibraryName ) %]
22
[% IF ( LibraryName ) %]
23
  <tr>
23
  <tr>
24
    <th colspan="8" class="centerednames">
24
    <th colspan="5" class="centerednames">
25
        <h3>[% LibraryName | html %]</h3>
25
		<h3>[% LibraryName | html %]</h3>
26
	</th>
26
	</th>
27
  </tr>
27
  </tr>
28
[% END %]
28
[% END %]
29
  <tr>
29
  <tr>
30
    <th colspan="8" class="centerednames">
30
    <th colspan="5" class="centerednames">
31
        <h2><u>INVOICE</u></h2>
31
		<h2><u>INVOICE</u></h2>
32
    </th>
32
	</th>
33
  </tr>
33
  </tr>
34
  <tr>
34
  <tr>
35
    <th colspan="8" class="centerednames">
35
    <th colspan="5" class="centerednames">
36
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
36
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
37
	</th>
37
	</th>
38
  </tr>
38
  </tr>
39
  <tr>
39
  <tr>
40
    <th colspan="8" >
40
    <th colspan="5" >
41
        Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
41
        Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
42
        Card number: [% patron.cardnumber | html %]<br />
42
        Card number: [% patron.cardnumber | html %]<br />
43
	</th>
43
	</th>
Lines 45-53 Link Here
45
  <tr>
45
  <tr>
46
	<th>Date</th>
46
	<th>Date</th>
47
    <th>Description of charges</th>
47
    <th>Description of charges</th>
48
    <th>Barcode</th>
49
    <th>Due date</th>
50
    <th>Return date</th>
51
    <th>Note</th>
48
    <th>Note</th>
52
    <th style="text-align:right;">Amount</th>
49
    <th style="text-align:right;">Amount</th>
53
    <th style="text-align:right;">Amount outstanding</th>
50
    <th style="text-align:right;">Amount outstanding</th>
Lines 60-68 Link Here
60
        [% PROCESS account_type_description account=account %]
57
        [% PROCESS account_type_description account=account %]
61
        [%- IF account.description %], [% account.description | html %][% END %]
58
        [%- IF account.description %], [% account.description | html %][% END %]
62
      </td>
59
      </td>
63
      <td>[% account.item.barcode | html %]</td>
64
      <td>[% account.checkout.date_due | $KohaDates as_due_date => 1 %]</td>
65
      <td>[% account.checkout.returndate | $KohaDates with_hours => 1 %]</td>
66
      <td>[% account.note | html %]</td>
60
      <td>[% account.note | html %]</td>
67
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td>
61
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td>
68
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | $Price %]</td>
62
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | $Price %]</td>
Lines 71-77 Link Here
71
  [% END %]
65
  [% END %]
72
<tfoot>
66
<tfoot>
73
  <tr>
67
  <tr>
74
    <td colspan="7">Total outstanding dues as on date: </td>
68
    <td colspan="4">Total outstanding dues as on date: </td>
75
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
69
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
76
  </tr>
70
  </tr>
77
  </tfoot>
71
  </tfoot>
(-)a/members/printinvoice.pl (-5 / +1 lines)
Lines 55-64 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log Link Here
55
55
56
#get account details
56
#get account details
57
my $total = $patron->account->balance;
57
my $total = $patron->account->balance;
58
my $accountline_object = Koha::Account::Lines->find($accountlines_id);
58
my $accountline = Koha::Account::Lines->find($accountlines_id)->unblessed;
59
my $accountline = $accountline_object->unblessed;
60
$accountline->{item} = $accountline_object->item || "" ;
61
$accountline->{checkout} = $accountline_object->checkout || "";
62
59
63
my $totalcredit;
60
my $totalcredit;
64
if ( $total <= 0 ) {
61
if ( $total <= 0 ) {
65
- 

Return to bug 19489