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

(-)a/admin/columns_settings.yml (+4 lines)
Lines 531-536 modules: Link Here
531
        -
531
        -
532
          columnname: returndate
532
          columnname: returndate
533
        -
533
        -
534
          columnname: issuedate
535
        -
534
          columnname: note
536
          columnname: note
535
        -
537
        -
536
          columnname: amount
538
          columnname: amount
Lines 568-573 modules: Link Here
568
        -
570
        -
569
          columnname: returndate
571
          columnname: returndate
570
        -
572
        -
573
          columnname: issuedate
574
        -
571
          columnname: note
575
          columnname: note
572
        -
576
        -
573
          columnname: amount
577
          columnname: amount
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-2 / +4 lines)
Lines 50-55 Link Here
50
          <th>Barcode</th>
50
          <th>Barcode</th>
51
          <th>Due date</th>
51
          <th>Due date</th>
52
          <th>Return date</th>
52
          <th>Return date</th>
53
          <th>Issue date</th>
53
          <th>Home library</th>
54
          <th>Home library</th>
54
          <th>Note</th>
55
          <th>Note</th>
55
          <th>Amount</th>
56
          <th>Amount</th>
Lines 71-76 Link Here
71
      <td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td>
72
      <td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td>
72
      <td>[% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
73
      <td>[% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
73
      <td>[% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td>
74
      <td>[% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td>
75
      <td>[% IF ( account.issue_id ) %][% account.checkout.issuedate | $KohaDates %][% END %]</td>
74
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
76
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
75
      <td>[% account.note | html_line_break %]</td>
77
      <td>[% account.note | html_line_break %]</td>
76
      [% IF account.amount <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
78
      [% IF account.amount <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
Lines 100-106 Link Here
100
  [% END %]
102
  [% END %]
101
<tfoot>
103
<tfoot>
102
  <tr>
104
  <tr>
103
    <td colspan="9">Total due</td>
105
    <td colspan="10">Total due</td>
104
    [% IF ( totalcredit ) %]
106
    [% IF ( totalcredit ) %]
105
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
107
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
106
    [% ELSE %]
108
    [% ELSE %]
Lines 328-334 Link Here
328
                    var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408
330
                    var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408
329
                    $(this).html('<i class="fa fa-filter"></i> '+txtInactivefilter);
331
                    $(this).html('<i class="fa fa-filter"></i> '+txtInactivefilter);
330
                }
332
                }
331
                table_account_fines.fnFilter(filteredValue, 9, true, false);
333
                table_account_fines.fnFilter(filteredValue, 10, true, false);
332
                $(this).toggleClass('filtered');
334
                $(this).toggleClass('filtered');
333
            });
335
            });
334
336
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-4 / +9 lines)
Lines 52-57 Link Here
52
    <th>Barcode</th>
52
    <th>Barcode</th>
53
    <th>Due date</th>
53
    <th>Due date</th>
54
    <th>Return date</th>
54
    <th>Return date</th>
55
    <th>Issue date</th>
55
    <th class="NoSort">Payment note</th>
56
    <th class="NoSort">Payment note</th>
56
    <th>Amount</th>
57
    <th>Amount</th>
57
    <th>Amount outstanding</th>
58
    <th>Amount outstanding</th>
Lines 106-111 Link Here
106
            [% line.checkout.returndate | $KohaDates with_hours => 1 %]
107
            [% line.checkout.returndate | $KohaDates with_hours => 1 %]
107
        [% END %]
108
        [% END %]
108
    </td>
109
    </td>
110
    <td>
111
        [% IF line.issue_id %]
112
            [% line.checkout.issuedate | $KohaDates %]
113
        [% END %]
114
    </td>
109
    <td class="actions">
115
    <td class="actions">
110
        <a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id | html %]"><i class="fa fa-plus"></i> Add note</a>
116
        <a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id | html %]"><i class="fa fa-plus"></i> Add note</a>
111
        <span class="payment_note" id="payment_note_[% line.accountlines_id | html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id | html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span>
117
        <span class="payment_note" id="payment_note_[% line.accountlines_id | html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id | html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span>
Lines 118-133 Link Here
118
124
119
<tfoot>
125
<tfoot>
120
    <tr>
126
    <tr>
121
        <td class="total" colspan="10">Total due:</td>
127
        <td class="total" colspan="11">Total due:</td>
122
        <td style="text-align: right;">[% total | $Price %]</td>
128
        <td style="text-align: right;">[% total | $Price %]</td>
123
    </tr>
129
    </tr>
124
    [% IF outstanding_credits.total_outstanding < 0 %]
130
    [% IF outstanding_credits.total_outstanding < 0 %]
125
        <tr>
131
        <tr>
126
            <td class="total" colspan="10">Outstanding credits could be applied: </td>
132
            <td class="total" colspan="11">Outstanding credits could be applied: </td>
127
            <td class="credit" style="text-align: right;"><button type="submit" id="apply_credits" name="apply_credits" value="apply_credits" class="btn btn-default btn-sm">Apply <strong class="credit">[% outstanding_credits.total_outstanding | $Price %]</strong></button></td>
133
            <td class="credit" style="text-align: right;"><button type="submit" id="apply_credits" name="apply_credits" value="apply_credits" class="btn btn-default btn-sm">Apply <strong class="credit">[% outstanding_credits.total_outstanding | $Price %]</strong></button></td>
128
        </tr>
134
        </tr>
129
        <tr>
135
        <tr>
130
            <td class="total" colspan="10">Total due if credit applied:</td>
136
            <td class="total" colspan="11">Total due if credit applied:</td>
131
            <td style="text-align: right;">[% total + outstanding_credits.total_outstanding | $Price %]</td>
137
            <td style="text-align: right;">[% total + outstanding_credits.total_outstanding | $Price %]</td>
132
        </tr>
138
        </tr>
133
    [% END %]
139
    [% END %]
134
- 

Return to bug 24995