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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-1 / +1 lines)
Lines 46-52 Link Here
46
46
47
  [% FOREACH account IN accounts %]
47
  [% FOREACH account IN accounts %]
48
<tr class="highlight">
48
<tr class="highlight">
49
      <td>[% account.date | $KohaDates %]</td>
49
      <td>[% account.timestamp | $KohaDates with_hours => 1 %]</td>
50
      <td>
50
      <td>
51
        [% SWITCH account.accounttype %]
51
        [% SWITCH account.accounttype %]
52
          [% CASE 'Pay' %]Payment, thanks
52
          [% CASE 'Pay' %]Payment, thanks
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-1 / +1 lines)
Lines 46-52 Link Here
46
46
47
  [% FOREACH account IN accounts %]
47
  [% FOREACH account IN accounts %]
48
<tr class="highlight">
48
<tr class="highlight">
49
      <td>[% account.date | $KohaDates%]</td>
49
      <td>[% account.timestamp | $KohaDates with_hours => 1 %]</td>
50
       <td>
50
       <td>
51
        [% SWITCH account.accounttype %]
51
        [% SWITCH account.accounttype %]
52
          [% CASE 'Pay' %]Payment, thanks
52
          [% CASE 'Pay' %]Payment, thanks
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-1 / +1 lines)
Lines 102-108 Link Here
102
                                                [% END %]
102
                                                [% END %]
103
                                            </td>
103
                                            </td>
104
                                        [% END %]
104
                                        [% END %]
105
                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td>
105
                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %]</td>
106
                                        <td>
106
                                        <td>
107
                                            [% SWITCH ACCOUNT_LINE.accounttype %]
107
                                            [% SWITCH ACCOUNT_LINE.accounttype %]
108
                                            [% CASE 'Pay' %]Payment, thanks
108
                                            [% CASE 'Pay' %]Payment, thanks
(-)a/members/printfeercpt.pl (+1 lines)
Lines 96-101 my %row = ( Link Here
96
    'accountno' => $accountline->{'accountno'},
96
    'accountno' => $accountline->{'accountno'},
97
    accounttype => $accountline->{accounttype},
97
    accounttype => $accountline->{accounttype},
98
    'note'      => $accountline->{'note'},
98
    'note'      => $accountline->{'note'},
99
    'timestamp' => $accountline->{'timestamp'},
99
);
100
);
100
101
101
102
(-)a/members/printinvoice.pl (-2 / +1 lines)
Lines 68-74 if ( $total <= 0 ) { Link Here
68
    $totalcredit = 1;
68
    $totalcredit = 1;
69
}
69
}
70
70
71
72
$accountline->{'amount'} += 0.00;
71
$accountline->{'amount'} += 0.00;
73
if ( $accountline->{'amount'} <= 0 ) {
72
if ( $accountline->{'amount'} <= 0 ) {
74
    $accountline->{'amountcredit'} = 1;
73
    $accountline->{'amountcredit'} = 1;
Lines 80-85 if ( $accountline->{'amountoutstanding'} <= 0 ) { Link Here
80
}
79
}
81
80
82
my %row = (
81
my %row = (
82
    'timestamp'               => $accountline->{'timestamp'},
83
    'date'                    => dt_from_string( $accountline->{'date'} ),
83
    'date'                    => dt_from_string( $accountline->{'date'} ),
84
    'amountcredit'            => $accountline->{'amountcredit'},
84
    'amountcredit'            => $accountline->{'amountcredit'},
85
    'amountoutstandingcredit' => $accountline->{'amountoutstandingcredit'},
85
    'amountoutstandingcredit' => $accountline->{'amountoutstandingcredit'},
86
- 

Return to bug 16486