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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-5 / +18 lines)
Lines 48-62 Link Here
48
        [% SWITCH account.accounttype %]
48
        [% SWITCH account.accounttype %]
49
          [% CASE 'Pay' %]Payment,thanks
49
          [% CASE 'Pay' %]Payment,thanks
50
          [% CASE 'N' %]New Card
50
          [% CASE 'N' %]New Card
51
          [% CASE 'F' %]Fine, [% account.title %] 
51
          [% CASE 'F' %]Fine
52
          [% CASE 'A' %]Account management fee
52
          [% CASE 'FU' %]Fine Adjusted
53
          [% CASE 'FN' %]Fine
54
          [% CASE 'FFOR' %]Fine Forgiven On Return
55
          [% CASE 'A' %]Account Management Fee
53
          [% CASE 'M' %]Sundry
56
          [% CASE 'M' %]Sundry
54
          [% CASE 'L' %]Lost
57
          [% CASE 'L' %]Lost Item
58
          [% CASE 'LR' %]Lost & Refunded
55
          [% CASE 'W' %]Writeoff
59
          [% CASE 'W' %]Writeoff
60
          [% CASE 'Rent' %]Rental
61
          [% CASE 'REF' %]Refund Cash
62
          [% CASE 'Rep' %]Replaced
63
          [% CASE 'Res' %]Reserve
64
          [% CASE 'O' %]Overdue
56
          [% CASE %][% account.accounttype %]
65
          [% CASE %][% account.accounttype %]
57
        [%- END -%]
66
        [%- END -%]
58
        [%- IF account.description %], [% account.description %][% END %]
67
        [%- IF account.accounttype == 'Rent' AND account.description.match('enewal') %] Renewal[% END %]
59
        &nbsp;[% IF ( account.itemnumber ) %]<a title="[% account.title %]" href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">View item</a>&nbsp;[% END %]</td>
68
        [%- IF account.title %] (&nbsp;[% account.title |html_entity %]
69
          [% IF account.item AND account.item.barcode %]&nbsp;[% account.item.barcode |html_entity %][% END %]&nbsp;)
70
        [% END %]
71
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">View item</a>&nbsp;[% END %]
72
      </td>
60
      <td>[% account.note | html_line_break %]</td>
73
      <td>[% account.note | html_line_break %]</td>
61
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
74
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>
62
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>
75
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-3 / +14 lines)
Lines 119-132 function enableCheckboxActions(){ Link Here
119
          [% CASE 'Pay' %]Payment,thanks
119
          [% CASE 'Pay' %]Payment,thanks
120
          [% CASE 'N' %]New Card
120
          [% CASE 'N' %]New Card
121
          [% CASE 'F' %]Fine
121
          [% CASE 'F' %]Fine
122
          [% CASE 'A' %]Account management fee
122
          [% CASE 'FU' %]Fine Adjusted
123
          [% CASE 'FN' %]Fine
124
          [% CASE 'FFOR' %]Fine Forgiven On Return
125
          [% CASE 'A' %]Account Management Fee
123
          [% CASE 'M' %]Sundry
126
          [% CASE 'M' %]Sundry
124
          [% CASE 'L' %]Lost Item
127
          [% CASE 'L' %]Lost Item
128
          [% CASE 'LR' %]Lost & Refunded
125
          [% CASE 'W' %]Writeoff
129
          [% CASE 'W' %]Writeoff
130
          [% CASE 'Rent' %]Rental
131
          [% CASE 'REF' %]Refund Cash
132
          [% CASE 'Rep' %]Replaced
133
          [% CASE 'Res' %]Reserve
134
          [% CASE 'O' %]Overdue
126
          [% CASE %][% line.accounttype %]
135
          [% CASE %][% line.accounttype %]
127
        [%- END -%]
136
        [%- END -%]
128
        [%- IF line.description %], [% line.description %][% END %]
137
        [%- IF line.accounttype == 'Rent' AND line.description.match('enewal') %] Renewal[% END %]
129
        [% IF line.title %]([% line.title |html_entity %])[% END %]
138
        [%- IF line.title %] (&nbsp;[% line.title |html_entity %]
139
          [% IF line.item AND line.item.barcode %]&nbsp;[% line.item.barcode |html_entity %]&nbsp;[% END %])
140
        [% END %]
130
    </td>
141
    </td>
131
    <td><input type="text" name="payment_note_[% line.accountno %]" /></td>
142
    <td><input type="text" name="payment_note_[% line.accountno %]" /></td>
132
    <td>[% line.accounttype %]</td>
143
    <td>[% line.accounttype %]</td>
(-)a/members/boraccount.pl (+2 lines)
Lines 32-37 use CGI; Link Here
32
use C4::Members;
32
use C4::Members;
33
use C4::Branch;
33
use C4::Branch;
34
use C4::Accounts;
34
use C4::Accounts;
35
use C4::Biblio;
35
use C4::Members::Attributes qw(GetBorrowerAttributes);
36
use C4::Members::Attributes qw(GetBorrowerAttributes);
36
37
37
my $input=new CGI;
38
my $input=new CGI;
Lines 88-93 foreach my $accountline ( @{$accts}) { Link Here
88
        $accountline->{payment} = 1;
89
        $accountline->{payment} = 1;
89
        $reverse_col = 1;
90
        $reverse_col = 1;
90
    }
91
    }
92
    $accountline->{item} = GetBiblioFromItemNumber($accountline->{itemnumber});
91
}
93
}
92
94
93
$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
95
$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
(-)a/members/pay.pl (-1 / +5 lines)
Lines 40-45 use C4::Stats; Link Here
40
use C4::Koha;
40
use C4::Koha;
41
use C4::Overdues;
41
use C4::Overdues;
42
use C4::Branch;
42
use C4::Branch;
43
use C4::Biblio;
43
use C4::Members::Attributes qw(GetBorrowerAttributes);
44
use C4::Members::Attributes qw(GetBorrowerAttributes);
44
45
45
our $input = CGI->new;
46
our $input = CGI->new;
Lines 123-128 sub add_accounts_to_template { Link Here
123
          GetBorNotifyAcctRecord( $borrowernumber, $notify_id );
124
          GetBorNotifyAcctRecord( $borrowernumber, $notify_id );
124
        if ( @{$accountlines} ) {
125
        if ( @{$accountlines} ) {
125
            my $totalnotify = AmountNotify( $notify_id, $borrowernumber );
126
            my $totalnotify = AmountNotify( $notify_id, $borrowernumber );
127
            foreach my $accountline (@{$accountlines}) {
128
               my $item = GetBiblioFromItemNumber($accountline->{itemnumber});
129
               $accountline->{item} = $item; 
130
            }
126
            push @{$accounts},
131
            push @{$accounts},
127
              { accountlines => $accountlines,
132
              { accountlines => $accountlines,
128
                notify       => $notify_id,
133
                notify       => $notify_id,
129
- 

Return to bug 11573