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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-5 / +7 lines)
Lines 15-37 Link Here
15
<table>
15
<table>
16
[% IF ( LibraryName ) %]
16
[% IF ( LibraryName ) %]
17
 <tr>
17
 <tr>
18
	<th colspan=3 class="centerednames">
18
	<th colspan=4 class="centerednames">
19
		<h3>[% LibraryName %]</h3>
19
		<h3>[% LibraryName %]</h3>
20
	</th>
20
	</th>
21
 </tr>
21
 </tr>
22
[% END %]
22
[% END %]
23
 <tr>
23
 <tr>
24
	<th colspan=3 class="centerednames">
24
	<th colspan=4 class="centerednames">
25
        <h2><u>Fee receipt</u></h2>
25
        <h2><u>Fee receipt</u></h2>
26
	</th>
26
	</th>
27
 </tr>
27
 </tr>
28
 <tr>
28
 <tr>
29
	<th colspan=3 class="centerednames">
29
	<th colspan=4 class="centerednames">
30
		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
30
		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
31
	</th>
31
	</th>
32
 </tr>
32
 </tr>
33
 <tr>
33
 <tr>
34
	<th colspan=3 >
34
	<th colspan=4 >
35
		Received with thanks from  [% firstname %] [% surname %] <br />
35
		Received with thanks from  [% firstname %] [% surname %] <br />
36
        Card number : [% cardnumber %]<br />
36
        Card number : [% cardnumber %]<br />
37
	</th>
37
	</th>
Lines 39-44 Link Here
39
  <tr>
39
  <tr>
40
	<th>Date</th>
40
	<th>Date</th>
41
    <th>Description of charges</th>
41
    <th>Description of charges</th>
42
	<th>Note</th>
42
    <th>Amount</th>
43
    <th>Amount</th>
43
 </tr>
44
 </tr>
44
45
Lines 61-73 Link Here
61
        [%- END -%]
62
        [%- END -%]
62
        [%- IF account.description %], [% account.description %][% END %]
63
        [%- IF account.description %], [% account.description %][% END %]
63
      </td>
64
      </td>
65
      <td>[% account.note %]</td>
64
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
66
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
65
    </tr>
67
    </tr>
66
68
67
  [% END %]
69
  [% END %]
68
<tfoot>
70
<tfoot>
69
  <tr>
71
  <tr>
70
    <td colspan="2">Total outstanding dues as on date : </td>
72
    <td colspan="3">Total outstanding dues as on date : </td>
71
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total %]</td>
73
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total %]</td>
72
  </tr>
74
  </tr>
73
  </tfoot>
75
  </tfoot>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-5 / +7 lines)
Lines 13-35 Link Here
13
<table>
13
<table>
14
[% IF ( LibraryName ) %]
14
[% IF ( LibraryName ) %]
15
  <tr>
15
  <tr>
16
    <th colspan="4" class="centerednames">
16
    <th colspan="5" class="centerednames">
17
		<h3>[% LibraryName %]</h3>
17
		<h3>[% LibraryName %]</h3>
18
	</th>
18
	</th>
19
  </tr>
19
  </tr>
20
[% END %]
20
[% END %]
21
  <tr>
21
  <tr>
22
    <th colspan="4" class="centerednames">
22
    <th colspan="5" class="centerednames">
23
		<h2><u>INVOICE</u></h2>
23
		<h2><u>INVOICE</u></h2>
24
	</th>
24
	</th>
25
  </tr>
25
  </tr>
26
  <tr>
26
  <tr>
27
    <th colspan="4" class="centerednames">
27
    <th colspan="5" class="centerednames">
28
		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
28
		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
29
	</th>
29
	</th>
30
  </tr>
30
  </tr>
31
  <tr>
31
  <tr>
32
    <th colspan="4" >
32
    <th colspan="5" >
33
        Bill to: [% firstname %] [% surname %] <br />
33
        Bill to: [% firstname %] [% surname %] <br />
34
        Card number: [% cardnumber %]<br />
34
        Card number: [% cardnumber %]<br />
35
	</th>
35
	</th>
Lines 37-42 Link Here
37
  <tr>
37
  <tr>
38
	<th>Date</th>
38
	<th>Date</th>
39
    <th>Description of charges</th>
39
    <th>Description of charges</th>
40
    <th>Note</th>
40
    <th style="text-align:right;">Amount</th>
41
    <th style="text-align:right;">Amount</th>
41
    <th style="text-align:right;">Amount outstanding</th>
42
    <th style="text-align:right;">Amount outstanding</th>
42
 </tr>
43
 </tr>
Lines 60-65 Link Here
60
        [%- END -%]
61
        [%- END -%]
61
        [%- IF account.description %], [% account.description %][% END %]
62
        [%- IF account.description %], [% account.description %][% END %]
62
      </td>
63
      </td>
64
      <td>[% account.note %]</td>
63
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
65
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
64
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>
66
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>
65
    </tr>
67
    </tr>
Lines 67-73 Link Here
67
  [% END %]
69
  [% END %]
68
<tfoot>
70
<tfoot>
69
  <tr>
71
  <tr>
70
    <td colspan="3">Total outstanding dues as on date: </td>
72
    <td colspan="4">Total outstanding dues as on date: </td>
71
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total %]</td>
73
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total %]</td>
72
  </tr>
74
  </tr>
73
  </tfoot>
75
  </tfoot>
(-)a/members/printfeercpt.pl (+1 lines)
Lines 102-107 for (my $i=0;$i<$numaccts;$i++){ Link Here
102
                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
102
                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
103
                'accountno' => $accts->[$i]{'accountno'},
103
                'accountno' => $accts->[$i]{'accountno'},
104
                accounttype => $accts->[$i]{accounttype},
104
                accounttype => $accts->[$i]{accounttype},
105
                'note' => $accts->[$i]{'note'},
105
                );
106
                );
106
107
107
    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
108
    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
(-)a/members/printinvoice.pl (-1 / +1 lines)
Lines 101-106 for ( my $i = 0 ; $i < $numaccts ; $i++ ) { Link Here
101
        'amountoutstanding'       => sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} ),
101
        'amountoutstanding'       => sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} ),
102
        'accountno'               => $accts->[$i]{'accountno'},
102
        'accountno'               => $accts->[$i]{'accountno'},
103
        accounttype               => $accts->[$i]{accounttype},
103
        accounttype               => $accts->[$i]{accounttype},
104
        'note'                    => $accts->[$i]{'note'},
104
    );
105
    );
105
106
106
    if ( $accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU' ) {
107
    if ( $accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU' ) {
107
- 

Return to bug 17154