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

(-)a/C4/Accounts.pm (-1 / +1 lines)
Lines 720-726 sub makepartialpayment { Link Here
720
    . ' VALUES (?, ?, now(), ?, ?, ?, 0, ?, ?, ?)';
720
    . ' VALUES (?, ?, now(), ?, ?, ?, 0, ?, ?, ?)';
721
721
722
    $dbh->do(  $insert, undef, $borrowernumber, $nextaccntno, $amount,
722
    $dbh->do(  $insert, undef, $borrowernumber, $nextaccntno, $amount,
723
        "Payment, thanks - $user", 'Pay', $data->{'itemnumber'}, $manager_id, $payment_note);
723
        '', 'Pay', $data->{'itemnumber'}, $manager_id, $payment_note);
724
724
725
    UpdateStats({
725
    UpdateStats({
726
                branch => $user,
726
                branch => $user,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-1 / +16 lines)
Lines 43-49 Link Here
43
  [% FOREACH account IN accounts %]
43
  [% FOREACH account IN accounts %]
44
<tr class="highlight">
44
<tr class="highlight">
45
      <td>[% account.date %]</td>
45
      <td>[% account.date %]</td>
46
      <td>[% account.description %]</td>
46
      <td>
47
        [% SWITCH account.accounttype %]
48
          [% CASE 'Pay' %]Payment, thanks
49
          [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
50
          [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
51
          [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
52
          [% CASE 'N' %]New Card
53
          [% CASE 'F' %]Fine
54
          [% CASE 'A' %]Account management fee
55
          [% CASE 'M' %]Sundry
56
          [% CASE 'L' %]Lost Item
57
          [% CASE 'W' %]Writeoff
58
          [% CASE %][% account.accounttype %]
59
        [%- END -%]
60
        [%- IF account.description %], [% account.description %][% END %]
61
      </td>
47
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
62
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
48
    </tr>
63
    </tr>
49
64
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-1 / +16 lines)
Lines 44-50 Link Here
44
  [% FOREACH account IN accounts %]
44
  [% FOREACH account IN accounts %]
45
<tr class="highlight">
45
<tr class="highlight">
46
      <td>[% account.date %]</td>
46
      <td>[% account.date %]</td>
47
      <td>[% account.description %]</td>
47
       <td>
48
        [% SWITCH account.accounttype %]
49
          [% CASE 'Pay' %]Payment, thanks
50
          [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
51
          [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
52
          [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
53
          [% CASE 'N' %]New Card
54
          [% CASE 'F' %]Fine
55
          [% CASE 'A' %]Account management fee
56
          [% CASE 'M' %]Sundry
57
          [% CASE 'L' %]Lost Item
58
          [% CASE 'W' %]Writeoff
59
          [% CASE %][% account.accounttype %]
60
        [%- END -%]
61
        [%- IF account.description %], [% account.description %][% END %]
62
      </td>
48
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
63
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
49
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>
64
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>
50
    </tr>
65
    </tr>
(-)a/members/printfeercpt.pl (-2 / +1 lines)
Lines 99-106 for (my $i=0;$i<$numaccts;$i++){ Link Here
99
                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
99
                'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
100
                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
100
                'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
101
                'accountno' => $accts->[$i]{'accountno'},
101
                'accountno' => $accts->[$i]{'accountno'},
102
                'payment' => ( $accts->[$i]{'accounttype'} =~ /^Pay/ ),
102
                accounttype => $accts->[$i]{accounttype},
103
104
                );
103
                );
105
104
106
    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
105
    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
(-)a/members/printinvoice.pl (-2 / +1 lines)
Lines 99-105 for ( my $i = 0 ; $i < $numaccts ; $i++ ) { Link Here
99
        'amount'                  => sprintf( "%.2f", $accts->[$i]{'amount'} ),
99
        'amount'                  => sprintf( "%.2f", $accts->[$i]{'amount'} ),
100
        'amountoutstanding'       => sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} ),
100
        'amountoutstanding'       => sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} ),
101
        'accountno'               => $accts->[$i]{'accountno'},
101
        'accountno'               => $accts->[$i]{'accountno'},
102
        'payment'                 => ( $accts->[$i]{'accounttype'} =~ /^Pay/ ),
102
        accounttype               => $accts->[$i]{accounttype},
103
    );
103
    );
104
104
105
    if ( $accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU' ) {
105
    if ( $accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU' ) {
106
- 

Return to bug 12415