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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc (-10 / +12 lines)
Lines 134-149 Link Here
134
                            <th>Amount outstanding</th>
134
                            <th>Amount outstanding</th>
135
                        </tr>
135
                        </tr>
136
                    </thead>
136
                    </thead>
137
                    [% FOREACH guarantee IN guarantees %]
137
                    <tbody>
138
                        <tr>
138
                        [% FOREACH guarantee IN guarantees %]
139
                            <td>[% INCLUDE 'patron-title.inc' patron=guarantee hide_patron_infos_if_needed=1 %]</td>
139
                            <tr>
140
                            [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
140
                                <td>[% INCLUDE 'patron-title.inc' patron=guarantee hide_patron_infos_if_needed=1 %]</td>
141
                                <td>[% guarantee.account.balance | $Price %]</td>
141
                                [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
142
                            [% ELSE %]
142
                                    <td>[% guarantee.account.balance | $Price %]</td>
143
                                <td>-</td>
143
                                [% ELSE %]
144
                            [% END %]
144
                                    <td>-</td>
145
                        </tr>
145
                                [% END %]
146
                    [% END %]
146
                            </tr>
147
                        [% END %]
148
                    </tbody>
147
                    <tfoot>
149
                    <tfoot>
148
                        <td>Total due</td>
150
                        <td>Total due</td>
149
                        <td>[% guarantees_fines | $Price %]</td>
151
                        <td>[% guarantees_fines | $Price %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-54 / +54 lines)
Lines 751-810 Link Here
751
                                        <th data-colname="cancel" class="no-sort no-export">Cancel order</th>
751
                                        <th data-colname="cancel" class="no-sort no-export">Cancel order</th>
752
                                    </tr>
752
                                    </tr>
753
                                </thead>
753
                                </thead>
754
                                <tfoot>
755
                                    [% FOREACH foot_loo IN book_foot_loop %]
756
                                        <tr>
757
                                            <th></th>
758
                                            <th>Total (GST [% foot_loo.tax_rate * 100 | html %])</th>
759
                                            <th>&nbsp;</th>
760
                                            <th>&nbsp;</th>
761
                                            <th>&nbsp;</th>
762
                                            <th>&nbsp;</th>
763
                                            <th>&nbsp;</th>
764
                                            <th>&nbsp;</th>
765
                                            <th>&nbsp;</th>
766
                                            <th>[% foot_loo.quantity | html %]</th>
767
                                            <th>[% foot_loo.total_tax_excluded | $Price %]</th>
768
                                            <th>[% foot_loo.total_tax_included | $Price %]</th>
769
                                            <th>&nbsp;</th>
770
                                            <th>[% foot_loo.tax_value | $Price %]</th>
771
                                            <th>&nbsp;</th>
772
                                            <th>&nbsp;</th>
773
                                            <th>&nbsp;</th>
774
                                            <th>&nbsp;</th>
775
                                            <th>&nbsp;</th>
776
                                            <th>&nbsp;</th>
777
                                            <th>&nbsp;</th>
778
                                            <th>&nbsp;</th>
779
                                            <th>&nbsp;</th>
780
                                        </tr>
781
                                    [% END %]
782
                                    <tr>
783
                                        <th></th>
784
                                        <th>Total ([% currency | html %])</th>
785
                                        <th>&nbsp;</th>
786
                                        <th>&nbsp;</th>
787
                                        <th>&nbsp;</th>
788
                                        <th>&nbsp;</th>
789
                                        <th>&nbsp;</th>
790
                                        <th>&nbsp;</th>
791
                                        <th>&nbsp;</th>
792
                                        <th>[% total_quantity | html %]</th>
793
                                        <th>[% total_tax_excluded | $Price %]</th>
794
                                        <th>[% total_tax_included | $Price %]</th>
795
                                        <th>&nbsp;</th>
796
                                        <th>[% total_tax_value | $Price %]</th>
797
                                        <th>&nbsp;</th>
798
                                        <th>&nbsp;</th>
799
                                        <th>&nbsp;</th>
800
                                        <th>&nbsp;</th>
801
                                        <th>&nbsp;</th>
802
                                        <th>&nbsp;</th>
803
                                        <th>&nbsp;</th>
804
                                        <th>&nbsp;</th>
805
                                        <th>&nbsp;</th>
806
                                    </tr>
807
                                </tfoot>
808
                                <tbody>
754
                                <tbody>
809
                                    [% FOREACH books_loo IN books_loop %]
755
                                    [% FOREACH books_loo IN books_loop %]
810
                                        [% IF ( books_loo.order_received ) %]
756
                                        [% IF ( books_loo.order_received ) %]
Lines 1019-1024 Link Here
1019
                                        </tr>
965
                                        </tr>
1020
                                    [% END %]
966
                                    [% END %]
1021
                                </tbody>
967
                                </tbody>
968
                                <tfoot>
969
                                    [% FOREACH foot_loo IN book_foot_loop %]
970
                                        <tr>
971
                                            <th></th>
972
                                            <th>Total (GST [% foot_loo.tax_rate * 100 | html %])</th>
973
                                            <th>&nbsp;</th>
974
                                            <th>&nbsp;</th>
975
                                            <th>&nbsp;</th>
976
                                            <th>&nbsp;</th>
977
                                            <th>&nbsp;</th>
978
                                            <th>&nbsp;</th>
979
                                            <th>&nbsp;</th>
980
                                            <th>[% foot_loo.quantity | html %]</th>
981
                                            <th>[% foot_loo.total_tax_excluded | $Price %]</th>
982
                                            <th>[% foot_loo.total_tax_included | $Price %]</th>
983
                                            <th>&nbsp;</th>
984
                                            <th>[% foot_loo.tax_value | $Price %]</th>
985
                                            <th>&nbsp;</th>
986
                                            <th>&nbsp;</th>
987
                                            <th>&nbsp;</th>
988
                                            <th>&nbsp;</th>
989
                                            <th>&nbsp;</th>
990
                                            <th>&nbsp;</th>
991
                                            <th>&nbsp;</th>
992
                                            <th>&nbsp;</th>
993
                                            <th>&nbsp;</th>
994
                                        </tr>
995
                                    [% END %]
996
                                    <tr>
997
                                        <th></th>
998
                                        <th>Total ([% currency | html %])</th>
999
                                        <th>&nbsp;</th>
1000
                                        <th>&nbsp;</th>
1001
                                        <th>&nbsp;</th>
1002
                                        <th>&nbsp;</th>
1003
                                        <th>&nbsp;</th>
1004
                                        <th>&nbsp;</th>
1005
                                        <th>&nbsp;</th>
1006
                                        <th>[% total_quantity | html %]</th>
1007
                                        <th>[% total_tax_excluded | $Price %]</th>
1008
                                        <th>[% total_tax_included | $Price %]</th>
1009
                                        <th>&nbsp;</th>
1010
                                        <th>[% total_tax_value | $Price %]</th>
1011
                                        <th>&nbsp;</th>
1012
                                        <th>&nbsp;</th>
1013
                                        <th>&nbsp;</th>
1014
                                        <th>&nbsp;</th>
1015
                                        <th>&nbsp;</th>
1016
                                        <th>&nbsp;</th>
1017
                                        <th>&nbsp;</th>
1018
                                        <th>&nbsp;</th>
1019
                                        <th>&nbsp;</th>
1020
                                    </tr>
1021
                                </tfoot>
1022
                            </table>
1022
                            </table>
1023
                            <!-- /#orders -->
1023
                            <!-- /#orders -->
1024
                            [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>[% END %]
1024
                            [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (-5 / +5 lines)
Lines 169-184 Link Here
169
                            <th>Fund</th>
169
                            <th>Fund</th>
170
                        </tr>
170
                        </tr>
171
                    </thead>
171
                    </thead>
172
                    <tfoot>
173
                        [% FOREACH order IN selected_order_loop %]
174
                            [% INCLUDE display_order_line selected => 1 can_check => 1 %]
175
                        [% END %]
176
                    </tfoot>
177
                    <tbody>
172
                    <tbody>
178
                        [% FOREACH order IN result_order_loop %]
173
                        [% FOREACH order IN result_order_loop %]
179
                            [% INCLUDE display_order_line can_check => 1 %]
174
                            [% INCLUDE display_order_line can_check => 1 %]
180
                        [% END %]
175
                        [% END %]
181
                    </tbody>
176
                    </tbody>
177
                    <tfoot>
178
                        [% FOREACH order IN selected_order_loop %]
179
                            [% INCLUDE display_order_line selected => 1 can_check => 1 %]
180
                        [% END %]
181
                    </tfoot>
182
                </table>
182
                </table>
183
            </div>
183
            </div>
184
            <fieldset class="action">
184
            <fieldset class="action">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-34 / +34 lines)
Lines 107-113 Link Here
107
        </div>
107
        </div>
108
        [% UNLESS (invoiceclosedate) %]
108
        [% UNLESS (invoiceclosedate) %]
109
            <div id="acqui_receive_search" class="page-section">
109
            <div id="acqui_receive_search" class="page-section">
110
                <h3>Pending orders</h3>
110
                <h2>Pending orders</h2>
111
                <table id="pending_orders" class="table table-bordered table-striped">
111
                <table id="pending_orders" class="table table-bordered table-striped">
112
                    <thead>
112
                    <thead>
113
                        <tr>
113
                        <tr>
Lines 163-201 Link Here
163
                                <th class="no-sort"></th>
163
                                <th class="no-sort"></th>
164
                            </tr>
164
                            </tr>
165
                        </thead>
165
                        </thead>
166
                        <tfoot>
167
                            [% FOREACH key IN subtotal_for_funds.keys.sort %]
168
                                <tr>
169
                                    [% IF invoiceincgst %]
170
                                        <td colspan="6" class="total">(Tax inc.)</td>
171
                                    [% ELSE %]
172
                                        <td colspan="6" class="total">(Tax exc.)</td>
173
                                    [% END %]
174
                                    <td colspan="3"><em>Subtotal for</em> [% key | html %]</td>
175
                                    <td>[% subtotal_for_funds.$key.ecost | $Price %]</td>
176
                                    <td>[% subtotal_for_funds.$key.unitprice | $Price %]</td>
177
                                    <td>&nbsp;</td>
178
                                    <td>&nbsp;</td>
179
                                </tr>
180
                            [% END %]
181
                            <tr>
182
                                <th colspan="11" class="total">Total tax exc.</th>
183
                                <th>[% total_tax_excluded | $Price %]</th>
184
                                <th></th>
185
                            </tr>
186
                            [% FOREACH book_foot IN book_foot_loop %]
187
                                <tr>
188
                                    <th colspan="11">Total (GST [% book_foot.tax_rate * 100 | html %]%)</th>
189
                                    <th>[% book_foot.tax_value | $Price %]</th>
190
                                    <th></th>
191
                                </tr>
192
                            [% END %]
193
                            <tr>
194
                                <th colspan="11" class="total">Total tax inc.</th>
195
                                <th>[% total_tax_included | $Price %]</th>
196
                                <th></th>
197
                            </tr>
198
                        </tfoot>
199
                        <tbody class="filterclass">
166
                        <tbody class="filterclass">
200
                            [% FOREACH order IN loop_received %]
167
                            [% FOREACH order IN loop_received %]
201
                                <tr>
168
                                <tr>
Lines 301-306 Link Here
301
                                </tr>
268
                                </tr>
302
                            [% END %]
269
                            [% END %]
303
                        </tbody>
270
                        </tbody>
271
                        <tfoot>
272
                            [% FOREACH key IN subtotal_for_funds.keys.sort %]
273
                                <tr>
274
                                    [% IF invoiceincgst %]
275
                                        <td colspan="6" class="total">(Tax inc.)</td>
276
                                    [% ELSE %]
277
                                        <td colspan="6" class="total">(Tax exc.)</td>
278
                                    [% END %]
279
                                    <td colspan="3"><em>Subtotal for</em> [% key | html %]</td>
280
                                    <td>[% subtotal_for_funds.$key.ecost | $Price %]</td>
281
                                    <td>[% subtotal_for_funds.$key.unitprice | $Price %]</td>
282
                                    <td>&nbsp;</td>
283
                                    <td>&nbsp;</td>
284
                                </tr>
285
                            [% END %]
286
                            <tr>
287
                                <th colspan="11" class="total">Total tax exc.</th>
288
                                <th>[% total_tax_excluded | $Price %]</th>
289
                                <th></th>
290
                            </tr>
291
                            [% FOREACH book_foot IN book_foot_loop %]
292
                                <tr>
293
                                    <th colspan="11">Total (GST [% book_foot.tax_rate * 100 | html %]%)</th>
294
                                    <th>[% book_foot.tax_value | $Price %]</th>
295
                                    <th></th>
296
                                </tr>
297
                            [% END %]
298
                            <tr>
299
                                <th colspan="11" class="total">Total tax inc.</th>
300
                                <th>[% total_tax_included | $Price %]</th>
301
                                <th></th>
302
                            </tr>
303
                        </tfoot>
304
                    </table>
304
                    </table>
305
                </form>
305
                </form>
306
                <form id="cancel_receipt" method="post" action="/cgi-bin/koha/acqui/parcel.pl">
306
                <form id="cancel_receipt" method="post" action="/cgi-bin/koha/acqui/parcel.pl">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-33 / +33 lines)
Lines 51-89 Link Here
51
                    <th>Subtotal</th>
51
                    <th>Subtotal</th>
52
                </tr>
52
                </tr>
53
            </thead>
53
            </thead>
54
54
            <tbody>
55
            [% FOREACH order IN spent %]
55
                [% FOREACH order IN spent %]
56
                <tr>
56
                    <tr>
57
                    <td class="cell">
57
                        <td class="cell">
58
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]"> [% order.title | html %] </a>
58
                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]"> [% order.title | html %] </a>
59
                    </td>
59
                        </td>
60
                    <td class="cell"> [% order.ordernumber | html %] </td>
60
                        <td class="cell"> [% order.ordernumber | html %] </td>
61
                    <td class="cell">
61
                        <td class="cell">
62
                        <a href="/cgi-bin/koha/acquisition/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
62
                            <a href="/cgi-bin/koha/acquisition/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
63
                    </td>
63
                        </td>
64
                    <td class="cell">
64
                        <td class="cell">
65
                        <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
65
                            <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
66
                    </td>
66
                        </td>
67
                    <td class="cell">
67
                        <td class="cell">
68
                        [% FOREACH itemtype IN order.itemtypes %]
68
                            [% FOREACH itemtype IN order.itemtypes %]
69
                            [% ItemTypes.GetDescription( itemtype ) | html %]
69
                                [% ItemTypes.GetDescription( itemtype ) | html %]
70
                            [% IF !loop.last() %]|[% END %]
70
                                [% IF !loop.last() %]|[% END %]
71
                        [% END %]
71
                            [% END %]
72
                    </td>
72
                        </td>
73
                    <td class="cell"> [% order.quantityreceived | html %] </td>
73
                        <td class="cell"> [% order.quantityreceived | html %] </td>
74
                    <td class="cell">
74
                        <td class="cell">
75
                        [% IF Koha.Preference('CalculateFundValuesIncludingTax') %]
75
                            [% IF Koha.Preference('CalculateFundValuesIncludingTax') %]
76
                            [% order.unitprice_tax_included | $Price %]
76
                                [% order.unitprice_tax_included | $Price %]
77
                        [% ELSE %]
77
                            [% ELSE %]
78
                            [% order.unitprice_tax_excluded | $Price %]
78
                                [% order.unitprice_tax_excluded | $Price %]
79
                        [% END %]
79
                            [% END %]
80
                    </td>
80
                        </td>
81
                    <td class="cell" data-order="[% order.entrydate | html %]"> [% order.entrydate | $KohaDates %] </td>
81
                        <td class="cell" data-order="[% order.entrydate | html %]"> [% order.entrydate | $KohaDates %] </td>
82
                    <td class="cell" data-order="[% order.datereceived | html %]"> [% order.datereceived | $KohaDates %] </td>
82
                        <td class="cell" data-order="[% order.datereceived | html %]"> [% order.datereceived | $KohaDates %] </td>
83
                    <td class="data cell"> [% order.rowtotal | $Price %] </td>
83
                        <td class="data cell"> [% order.rowtotal | $Price %] </td>
84
                </tr>
84
                    </tr>
85
            [% END %]
85
                [% END %]
86
86
            </tbody>
87
            <tfoot>
87
            <tfoot>
88
                [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
88
                [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
89
                    <tr>
89
                    <tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-15 / +15 lines)
Lines 167-187 Link Here
167
                                        <th class="no-export">Actions</th>
167
                                        <th class="no-export">Actions</th>
168
                                    </tr>
168
                                    </tr>
169
                                </thead>
169
                                </thead>
170
                                <tfoot>
171
                                    <tr>
172
                                        <th></th>
173
                                        <th></th>
174
                                        <th colspan="2" style="text-align: left;" nowrap="nowrap">Period allocated [% IF budget_period_total %][% budget_period_total | $Price %][% END %] </th>
175
                                        <th nowrap="nowrap" class="data"> [% period_alloc_total | $Price %]</th>
176
                                        <th></th>
177
                                        <th class="data">[% ordered_total | $Price %]</th>
178
                                        <th></th>
179
                                        <th class="data">[% spent_total | $Price %]</th>
180
                                        <th></th>
181
                                        <th class="data">[% available_total | $Price %]</th>
182
                                        <th></th>
183
                                    </tr>
184
                                </tfoot>
185
                                <tbody>
170
                                <tbody>
186
                                    [% FOREACH budget IN budgets %]
171
                                    [% FOREACH budget IN budgets %]
187
                                        <tr data-tt-id="[% budget.budget_id | html %]" data-tt-parent-id="[% budget.budget_parent_id | html %]">
172
                                        <tr data-tt-id="[% budget.budget_id | html %]" data-tt-parent-id="[% budget.budget_parent_id | html %]">
Lines 275-280 Link Here
275
                                        </tr>
260
                                        </tr>
276
                                    [% END %]
261
                                    [% END %]
277
                                </tbody>
262
                                </tbody>
263
                                <tfoot>
264
                                    <tr>
265
                                        <th></th>
266
                                        <th></th>
267
                                        <th colspan="2" style="text-align: left;" nowrap="nowrap">Period allocated [% IF budget_period_total %][% budget_period_total | $Price %][% END %] </th>
268
                                        <th nowrap="nowrap" class="data"> [% period_alloc_total | $Price %]</th>
269
                                        <th></th>
270
                                        <th class="data">[% ordered_total | $Price %]</th>
271
                                        <th></th>
272
                                        <th class="data">[% spent_total | $Price %]</th>
273
                                        <th></th>
274
                                        <th class="data">[% available_total | $Price %]</th>
275
                                        <th></th>
276
                                    </tr>
277
                                </tfoot>
278
                            </table>
278
                            </table>
279
                        </div>
279
                        </div>
280
                        <!-- /.page-section -->
280
                        <!-- /.page-section -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt (-56 / +56 lines)
Lines 107-168 Link Here
107
                        <th>&nbsp;</th>
107
                        <th>&nbsp;</th>
108
                    </tr></thead
108
                    </tr></thead
109
                >
109
                >
110
                [% UNLESS edit %]
111
                    <tfoot>
112
                        <tr class="rule-new">
113
                            <th>&nbsp;</th>
114
                            <th>
115
                                <select name="module">
116
                                    <option value="source">Source</option>
117
                                    <option value="categorycode">Patron category</option>
118
                                    <option value="userid">Username</option>
119
                                </select>
120
                            </th>
121
                            <th id="filter-container"></th>
122
                            <th><input type="text" size="5" name="tag" class="required" required="required" /></th>
123
                            <th>
124
                                <select name="preset">
125
                                    <option value="" selected>Custom</option>
126
                                    <option value="protect">Protect</option>
127
                                    <option value="overwrite">Overwrite</option>
128
                                    <option value="add">Add new</option>
129
                                    <option value="addappend">Add and append</option>
130
                                    <option value="protectfromdeletion">Protect from deletion</option>
131
                                </select>
132
                            </th>
133
                            <th class="rule-operation-action-edit">
134
                                <select name="add">
135
                                    <option value="0">Skip</option>
136
                                    <option value="1">Add</option>
137
                                </select>
138
                            </th>
139
                            <th class="rule-operation-action-edit">
140
                                <select name="append">
141
                                    <option value="0">Skip</option>
142
                                    <option value="1">Append</option>
143
                                </select>
144
                            </th>
145
                            <th class="rule-operation-action-edit">
146
                                <select name="remove">
147
                                    <option value="0">Skip</option>
148
                                    <option value="1">Remove</option>
149
                                </select>
150
                            </th>
151
                            <th class="rule-operation-action-edit">
152
                                <select name="delete">
153
                                    <option value="0">Skip</option>
154
                                    <option value="1">Delete</option>
155
                                </select>
156
                            </th>
157
                            <th
158
                                ><button type="submit" class="btn btn-default btn-xs" title="Add" id="add"><i class="fa fa-plus"></i> Add rule</button></th
159
                            >
160
                            <th
161
                                ><button type="button" class="btn btn-default btn-xs" id="btn_batchremove" disabled="disabled" title="Batch remove"><i class="fa fa-trash-can"></i> Delete selected</button></th
162
                            >
163
                        </tr>
164
                    </tfoot>
165
                [% END %]
166
                <tbody>
110
                <tbody>
167
                    [% FOREACH rule IN rules %]
111
                    [% FOREACH rule IN rules %]
168
                        <tr id="[% rule.id | html %]" class="rule[% IF rule.edit %]-edit[% END %]">
112
                        <tr id="[% rule.id | html %]" class="rule[% IF rule.edit %]-edit[% END %]">
Lines 309-314 Link Here
309
                        </tr>
253
                        </tr>
310
                    [% END %]
254
                    [% END %]
311
                </tbody>
255
                </tbody>
256
                [% UNLESS edit %]
257
                    <tfoot>
258
                        <tr class="rule-new">
259
                            <th>&nbsp;</th>
260
                            <th>
261
                                <select name="module">
262
                                    <option value="source">Source</option>
263
                                    <option value="categorycode">Patron category</option>
264
                                    <option value="userid">Username</option>
265
                                </select>
266
                            </th>
267
                            <th id="filter-container"></th>
268
                            <th><input type="text" size="5" name="tag" class="required" required="required" /></th>
269
                            <th>
270
                                <select name="preset">
271
                                    <option value="" selected>Custom</option>
272
                                    <option value="protect">Protect</option>
273
                                    <option value="overwrite">Overwrite</option>
274
                                    <option value="add">Add new</option>
275
                                    <option value="addappend">Add and append</option>
276
                                    <option value="protectfromdeletion">Protect from deletion</option>
277
                                </select>
278
                            </th>
279
                            <th class="rule-operation-action-edit">
280
                                <select name="add">
281
                                    <option value="0">Skip</option>
282
                                    <option value="1">Add</option>
283
                                </select>
284
                            </th>
285
                            <th class="rule-operation-action-edit">
286
                                <select name="append">
287
                                    <option value="0">Skip</option>
288
                                    <option value="1">Append</option>
289
                                </select>
290
                            </th>
291
                            <th class="rule-operation-action-edit">
292
                                <select name="remove">
293
                                    <option value="0">Skip</option>
294
                                    <option value="1">Remove</option>
295
                                </select>
296
                            </th>
297
                            <th class="rule-operation-action-edit">
298
                                <select name="delete">
299
                                    <option value="0">Skip</option>
300
                                    <option value="1">Delete</option>
301
                                </select>
302
                            </th>
303
                            <th
304
                                ><button type="submit" class="btn btn-default btn-xs" title="Add" id="add"><i class="fa fa-plus"></i> Add rule</button></th
305
                            >
306
                            <th
307
                                ><button type="button" class="btn btn-default btn-xs" id="btn_batchremove" disabled="disabled" title="Batch remove"><i class="fa fa-trash-can"></i> Delete selected</button></th
308
                            >
309
                        </tr>
310
                    </tfoot>
311
                [% END %]
312
            </table>
312
            </table>
313
        </form>
313
        </form>
314
    </div>
314
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-155 / +158 lines)
Lines 101-264 Link Here
101
                            <th class="no-sort no-export">Actions</th>
101
                            <th class="no-sort no-export">Actions</th>
102
                        </tr>
102
                        </tr>
103
                    </thead>
103
                    </thead>
104
104
                    <tbody>
105
                    <!-- FIXME: Shouldn't hardcode dollar signs, since Euro or Pound might be needed -->
105
                        <!-- FIXME: Shouldn't hardcode dollar signs, since Euro or Pound might be needed -->
106
                    [% FOREACH account IN accounts %]
106
                        [% FOREACH account IN accounts %]
107
                        <tr>
107
                            <tr>
108
                            <td data-order="[% account.date | html %]">[% account.date | $KohaDates %]</td>
108
                                <td data-order="[% account.date | html %]">[% account.date | $KohaDates %]</td>
109
                            <td data-order="[% account.timestamp | html %]">[% account.timestamp | $KohaDates with_hours = 1 %]</td>
109
                                <td data-order="[% account.timestamp | html %]">[% account.timestamp | $KohaDates with_hours = 1 %]</td>
110
                            <td>[% account.credit_number | html %]</td>
110
                                <td>[% account.credit_number | html %]</td>
111
                            <td>[% PROCESS account_type_description account=account %]</td>
111
                                <td>[% PROCESS account_type_description account=account %]</td>
112
                            <td>
112
                                <td>
113
                                [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
113
                                    [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
114
                                [%- IF account.description %][% account.description | html %][% END %]
114
                                    [%- IF account.description %][% account.description | html %][% END %]
115
                                &nbsp;[% IF ( account.itemnumber ) %]
115
                                    &nbsp;[% IF ( account.itemnumber ) %]
116
                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>
116
                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>
117
                                [% END %]</td
117
                                    [% END %]</td
118
                            >
118
                                >
119
                            <td
119
                                <td
120
                                >[% IF ( account.itemnumber ) %]
120
                                    >[% IF ( account.itemnumber ) %]
121
                                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]"
121
                                        <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]"
122
                                        >[% account.item.barcode | html %]</a
122
                                            >[% account.item.barcode | html %]</a
123
                                    >
123
                                        >
124
                                [% END %]</td
124
                                    [% END %]</td
125
                            >
125
                                >
126
                            <td>[% IF ( account.itemnumber ) %][% account.item.itemcallnumber | html %][% END %]</td>
126
                                <td>[% IF ( account.itemnumber ) %][% account.item.itemcallnumber | html %][% END %]</td>
127
                            <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
127
                                <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
128
                            <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td>
128
                                <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td>
129
                            <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.issuedate | $KohaDates %][% END %]</td>
129
                                <td>[% IF ( account.issue_id ) || (account.old_issue_id) %][% account.checkout.issuedate | $KohaDates %][% END %]</td>
130
                            <td class="checked_out_from">
130
                                <td class="checked_out_from">
131
                                [% IF ( account.issue_id ) || (account.old_issue_id) && account.checkout.library %]
131
                                    [% IF ( account.issue_id ) || (account.old_issue_id) && account.checkout.library %]
132
                                    [% account.checkout.library.branchname | html %]
132
                                        [% account.checkout.library.branchname | html %]
133
                                [% END %]
134
                            </td>
135
                            <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
136
                            <td>
137
                                [% account.note | html_line_break %]
138
                                [% IF CAN_user_updatecharges_edit_accountline_notes %]
139
                                    <button
140
                                        type="button"
141
                                        class="btn btn-default btn-xs edit-action"
142
                                        data-bs-toggle="modal"
143
                                        data-bs-target="#editNoteModal"
144
                                        data-accountline="[% account.accountlines_id | html %]"
145
                                        data-note="[% account.note | html %]"
146
                                        data-member="[% account.borrowernumber | html %]"
147
                                        ><i class="fa-solid fa-pen"></i> Edit</button
148
                                    >
149
                                [% END %]
150
                            </td>
151
                            [% IF account.amount <= 0 %]
152
                                [% SET td_class="credit" %]
153
                            [% ELSE %]
154
                                [% SET td_class="debig" %]
155
                            [% END %]
156
                            <td class="[% td_class | html %]" style="text-align: right;">[% account.amount | $Price %]</td>
157
                            <td class="[% td_class | html %]" style="text-align: right;">[% account.amountoutstanding | $Price %]</td>
158
                            <td class="actions">
159
                                [% IF ( account.is_credit ) %]
160
                                    [% IF patron.notice_email_address %]
161
                                        <div class="btn-group dropup">
162
                                            <button class="btn btn-xs btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-receipt"></i> Receipt</button>
163
                                            <ul class="dropdown-menu dropdown-menu-end">
164
                                                <li
165
                                                    ><a target="_blank" href="printfeercpt.pl?accountlines_id=[% account.accountlines_id | uri %]" class="receipt-print-action dropdown-item"><i class="fa fa-print"></i> Print</a></li
166
                                                >
167
                                                <li>
168
                                                    <form method="post" action="/cgi-bin/koha/members/boraccount.pl">
169
                                                        [% INCLUDE 'csrf-token.inc' %]
170
                                                        <input type="hidden" name="op" value="cud-send_receipt" />
171
                                                        <input type="hidden" name="accountlines_id" value="[% account.accountlines_id | html %]" />
172
                                                        <input type="hidden" name="borrowernumber" value="[% account.borrowernumber | html %]" />
173
                                                    </form>
174
                                                    <a href="#" class="receipt-email-action dropdown-item"><i class="fa fa-envelope"></i> Email</a>
175
                                                </li>
176
                                            </ul>
177
                                        </div>
178
                                    [% ELSE %]
179
                                        <a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs receipt-print-action"><i class="fa fa-print"></i> Print</a>
180
                                    [% END %]
133
                                    [% END %]
134
                                </td>
135
                                <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
136
                                <td>
137
                                    [% account.note | html_line_break %]
138
                                    [% IF CAN_user_updatecharges_edit_accountline_notes %]
139
                                        <button
140
                                            type="button"
141
                                            class="btn btn-default btn-xs edit-action"
142
                                            data-bs-toggle="modal"
143
                                            data-bs-target="#editNoteModal"
144
                                            data-accountline="[% account.accountlines_id | html %]"
145
                                            data-note="[% account.note | html %]"
146
                                            data-member="[% account.borrowernumber | html %]"
147
                                            ><i class="fa-solid fa-pen"></i> Edit</button
148
                                        >
149
                                    [% END %]
150
                                </td>
151
                                [% IF account.amount <= 0 %]
152
                                    [% SET td_class="credit" %]
181
                                [% ELSE %]
153
                                [% ELSE %]
182
                                    <a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs invoice-print-action"><i class="fa fa-print"></i> Print</a>
154
                                    [% SET td_class="debig" %]
183
                                [% END %]
184
                                <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs details-action"><i class="fa fa-list"></i> Details</a>
185
                                [% IF account.is_debit && account.amountoutstanding > 0 %]
186
                                    <form method="get" action="/cgi-bin/koha/members/paycollect.pl">
187
                                        <input type="hidden" name="borrowernumber" value="[% account.borrowernumber | html %]" />
188
                                        <input type="hidden" name="pay_individual" value="1" />
189
                                        <input type="hidden" name="debit_type_code" value="[% account.debit_type_code | html %]" />
190
                                        <input type="hidden" name="amount" value="[% account.amount | html %]" />
191
                                        <input type="hidden" name="amountoutstanding" value="[% account.amountoutstanding | html %]" />
192
                                        <input type="hidden" name="description" value="[% account.description | html %]" />
193
                                        <input type="hidden" name="itemnumber" value="[% account.itemnumber | html %]" />
194
                                        <input type="hidden" name="accountlines_id" value="[% account.accountlines_id | html %]" />
195
                                        <button type="submit" class="btn btn-default btn-xs pay-action"> <i class="fa-solid fa-money-bill-1"></i> Pay </button>
196
                                    </form>
197
                                [% END %]
198
                                [% IF account.is_credit && account.status != 'VOID' %]
199
                                    <button
200
                                        type="button"
201
                                        data-bs-toggle="modal"
202
                                        data-bs-target="#voidPaymentModal"
203
                                        data-accountline="[% account.accountlines_id | html %]"
204
                                        data-member="[% account.borrowernumber | html %]"
205
                                        class="btn btn-default btn-xs void-action"
206
                                        ><i class="fa fa-ban"></i> Void payment</button
207
                                    >
208
                                [% END %]
209
                                [% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %]
210
                                    <button
211
                                        type="button"
212
                                        data-bs-toggle="modal"
213
                                        data-bs-target="#cancelChargeModal"
214
                                        data-accountlines_id="[% account.accountlines_id | html %]"
215
                                        data-borrowernumber="[% patron.borrowernumber | html %]"
216
                                        class="btn btn-default btn-xs void-action"
217
                                        ><i class="fa fa-ban"></i> Cancel charge</button
218
                                    >
219
                                [% END %]
220
                                [% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %]
221
                                    <button
222
                                        type="button"
223
                                        data-bs-toggle="modal"
224
                                        data-bs-target="#issuePayoutModal"
225
                                        data-account="[%- PROCESS account_type_description account=account -%]"
226
                                        data-accountline="[% account.accountlines_id | html %]"
227
                                        data-amount="[% account.amountoutstanding | $Price on_editing => 1 %]"
228
                                        class="btn btn-default btn-xs payout-action"
229
                                        ><i class="fa-solid fa-money-bill-1"></i> Issue payout</button
230
                                    >
231
                                [% END %]
155
                                [% END %]
232
                                [% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') && !(account.debit_type_code == 'VOID') %]
156
                                <td class="[% td_class | html %]" style="text-align: right;">[% account.amount | $Price %]</td>
233
                                    <button
157
                                <td class="[% td_class | html %]" style="text-align: right;">[% account.amountoutstanding | $Price %]</td>
234
                                        type="button"
158
                                <td class="actions">
235
                                        class="btn btn-default btn-xs refund-action"
159
                                    [% IF ( account.is_credit ) %]
236
                                        data-bs-toggle="modal"
160
                                        [% IF patron.notice_email_address %]
237
                                        data-bs-target="#issueRefundModal"
161
                                            <div class="btn-group dropup">
238
                                        data-item="[%- PROCESS account_type_description account=account -%]"
162
                                                <button class="btn btn-xs btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"><i class="fa fa-receipt"></i> Receipt</button>
239
                                        data-accountline="[% account.accountlines_id | html %]"
163
                                                <ul class="dropdown-menu dropdown-menu-end">
240
                                        data-amount="[% account.amount | $Price on_editing => 1 %]"
164
                                                    <li
241
                                        data-amountoutstanding="[% account.amountoutstanding | $Price on_editing => 1 %]"
165
                                                        ><a target="_blank" href="printfeercpt.pl?accountlines_id=[% account.accountlines_id | uri %]" class="receipt-print-action dropdown-item"><i class="fa fa-print"></i> Print</a></li
242
                                        data-member="[% account.borrowernumber | html %]"
166
                                                    >
243
                                        ><i class="fa-solid fa-money-bill-1"></i> Issue refund</button
167
                                                    <li>
244
                                    >
168
                                                        <form method="post" action="/cgi-bin/koha/members/boraccount.pl">
245
                                [% END %]
169
                                                            [% INCLUDE 'csrf-token.inc' %]
246
                                [% IF CAN_user_updatecharges_discount && account.is_debit && ( account.amountoutstanding == account.amount ) && !(account.debit_type_code == 'PAYOUT') && !(account.debit_type_code == 'VOID') %]
170
                                                            <input type="hidden" name="op" value="cud-send_receipt" />
247
                                    <button
171
                                                            <input type="hidden" name="accountlines_id" value="[% account.accountlines_id | html %]" />
248
                                        type="button"
172
                                                            <input type="hidden" name="borrowernumber" value="[% account.borrowernumber | html %]" />
249
                                        data-bs-toggle="modal"
173
                                                        </form>
250
                                        data-bs-target="#applyDiscountModal"
174
                                                        <a href="#" class="receipt-email-action dropdown-item"><i class="fa fa-envelope"></i> Email</a>
251
                                        data-item="[%- PROCESS account_type_description account=account -%]"
175
                                                    </li>
252
                                        data-accountline="[% account.accountlines_id | html %]"
176
                                                </ul>
253
                                        data-amount="[% account.amount | $Price on_editing => 1 %]"
177
                                            </div>
254
                                        data-amountoutstanding="[% account.amountoutstanding | $Price on_editing => 1 %]"
178
                                        [% ELSE %]
255
                                        class="btn btn-default btn-xs discount-action"
179
                                            <a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs receipt-print-action"
256
                                        >Apply discount</button
180
                                                ><i class="fa fa-print"></i> Print</a
257
                                    >
181
                                            >
258
                                [% END %]
182
                                        [% END %]
259
                            </td>
183
                                    [% ELSE %]
260
                        </tr>
184
                                        <a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs invoice-print-action"><i class="fa fa-print"></i> Print</a>
261
                    [% END %]
185
                                    [% END %]
186
                                    <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs details-action"><i class="fa fa-list"></i> Details</a>
187
                                    [% IF account.is_debit && account.amountoutstanding > 0 %]
188
                                        <form method="get" action="/cgi-bin/koha/members/paycollect.pl">
189
                                            <input type="hidden" name="borrowernumber" value="[% account.borrowernumber | html %]" />
190
                                            <input type="hidden" name="pay_individual" value="1" />
191
                                            <input type="hidden" name="debit_type_code" value="[% account.debit_type_code | html %]" />
192
                                            <input type="hidden" name="amount" value="[% account.amount | html %]" />
193
                                            <input type="hidden" name="amountoutstanding" value="[% account.amountoutstanding | html %]" />
194
                                            <input type="hidden" name="description" value="[% account.description | html %]" />
195
                                            <input type="hidden" name="itemnumber" value="[% account.itemnumber | html %]" />
196
                                            <input type="hidden" name="accountlines_id" value="[% account.accountlines_id | html %]" />
197
                                            <button type="submit" class="btn btn-default btn-xs pay-action"> <i class="fa-solid fa-money-bill-1"></i> Pay </button>
198
                                        </form>
199
                                    [% END %]
200
                                    [% IF account.is_credit && account.status != 'VOID' %]
201
                                        <button
202
                                            type="button"
203
                                            data-bs-toggle="modal"
204
                                            data-bs-target="#voidPaymentModal"
205
                                            data-accountline="[% account.accountlines_id | html %]"
206
                                            data-member="[% account.borrowernumber | html %]"
207
                                            class="btn btn-default btn-xs void-action"
208
                                            ><i class="fa fa-ban"></i> Void payment</button
209
                                        >
210
                                    [% END %]
211
                                    [% IF account.is_debit && account.amount == account.amountoutstanding && account.status != 'CANCELLED' && !(account.debit_type_code == 'PAYOUT') %]
212
                                        <button
213
                                            type="button"
214
                                            data-bs-toggle="modal"
215
                                            data-bs-target="#cancelChargeModal"
216
                                            data-accountlines_id="[% account.accountlines_id | html %]"
217
                                            data-borrowernumber="[% patron.borrowernumber | html %]"
218
                                            class="btn btn-default btn-xs void-action"
219
                                            ><i class="fa fa-ban"></i> Cancel charge</button
220
                                        >
221
                                    [% END %]
222
                                    [% IF CAN_user_updatecharges_payout && account.is_credit && ( account.amountoutstanding < 0 ) %]
223
                                        <button
224
                                            type="button"
225
                                            data-bs-toggle="modal"
226
                                            data-bs-target="#issuePayoutModal"
227
                                            data-account="[%- PROCESS account_type_description account=account -%]"
228
                                            data-accountline="[% account.accountlines_id | html %]"
229
                                            data-amount="[% account.amountoutstanding | $Price on_editing => 1 %]"
230
                                            class="btn btn-default btn-xs payout-action"
231
                                            ><i class="fa-solid fa-money-bill-1"></i> Issue payout</button
232
                                        >
233
                                    [% END %]
234
                                    [% IF CAN_user_updatecharges_refund && account.is_debit && ( account.amountoutstanding != account.amount ) && !(account.status == 'REFUNDED') && !(account.debit_type_code == 'PAYOUT') && !(account.debit_type_code == 'VOID') %]
235
                                        <button
236
                                            type="button"
237
                                            class="btn btn-default btn-xs refund-action"
238
                                            data-bs-toggle="modal"
239
                                            data-bs-target="#issueRefundModal"
240
                                            data-item="[%- PROCESS account_type_description account=account -%]"
241
                                            data-accountline="[% account.accountlines_id | html %]"
242
                                            data-amount="[% account.amount | $Price on_editing => 1 %]"
243
                                            data-amountoutstanding="[% account.amountoutstanding | $Price on_editing => 1 %]"
244
                                            data-member="[% account.borrowernumber | html %]"
245
                                            ><i class="fa-solid fa-money-bill-1"></i> Issue refund</button
246
                                        >
247
                                    [% END %]
248
                                    [% IF CAN_user_updatecharges_discount && account.is_debit && ( account.amountoutstanding == account.amount ) && !(account.debit_type_code == 'PAYOUT') && !(account.debit_type_code == 'VOID') %]
249
                                        <button
250
                                            type="button"
251
                                            data-bs-toggle="modal"
252
                                            data-bs-target="#applyDiscountModal"
253
                                            data-item="[%- PROCESS account_type_description account=account -%]"
254
                                            data-accountline="[% account.accountlines_id | html %]"
255
                                            data-amount="[% account.amount | $Price on_editing => 1 %]"
256
                                            data-amountoutstanding="[% account.amountoutstanding | $Price on_editing => 1 %]"
257
                                            class="btn btn-default btn-xs discount-action"
258
                                            >Apply discount</button
259
                                        >
260
                                    [% END %]
261
                                </td>
262
                            </tr>
263
                        [% END %]
264
                    </tbody>
262
                    <tfoot>
265
                    <tfoot>
263
                        <tr>
266
                        <tr>
264
                            <td colspan="14">Total due</td>
267
                            <td colspan="14">Total due</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-11 / +11 lines)
Lines 155-180 Link Here
155
                            <fieldset class="rows">
155
                            <fieldset class="rows">
156
                                <legend>Pay an individual charge</legend>
156
                                <legend>Pay an individual charge</legend>
157
                                <table>
157
                                <table>
158
                                    <thead
158
                                    <thead>
159
                                        ><tr>
159
                                        <tr>
160
                                            <th>Description</th>
160
                                            <th>Description</th>
161
                                            <th>Account type</th>
161
                                            <th>Account type</th>
162
                                            <th>Amount</th>
162
                                            <th>Amount</th>
163
                                            <th>Amount outstanding</th>
163
                                            <th>Amount outstanding</th>
164
                                        </tr></thead
164
                                        </tr>
165
                                    >
165
                                    </thead>
166
                                    <tfoot>
166
                                    <tbody>
167
                                        <tr><td colspan="3">Total amount payable:</td><td>[% amountoutstanding | $Price %]</td></tr>
167
                                        <tr>
168
                                    </tfoot>
169
                                    <tbody
170
                                        ><tr>
171
                                            <td> [% individual_description | html %] </td>
168
                                            <td> [% individual_description | html %] </td>
172
                                            [% line.debit_type_code = debit_type_code %]
169
                                            [% line.debit_type_code = debit_type_code %]
173
                                            <td>[% PROCESS account_type_description account=line %]</td>
170
                                            <td>[% PROCESS account_type_description account=line %]</td>
174
                                            <td class="debit">[% amount | $Price %]</td>
171
                                            <td class="debit">[% amount | $Price %]</td>
175
                                            <td class="debit">[% amountoutstanding | $Price %]</td>
172
                                            <td class="debit">[% amountoutstanding | $Price %]</td>
176
                                        </tr></tbody
173
                                        </tr>
177
                                    >
174
                                    </tbody>
175
                                    <tfoot>
176
                                        <tr><td colspan="3">Total amount payable:</td><td>[% amountoutstanding | $Price %]</td></tr>
177
                                    </tfoot>
178
                                </table>
178
                                </table>
179
179
180
                                <ol>
180
                                <ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-16 / +18 lines)
Lines 168-189 Link Here
168
                    <th>Item type</th>
168
                    <th>Item type</th>
169
                </tr>
169
                </tr>
170
            </thead>
170
            </thead>
171
            [% FOREACH loopresul IN loopresult %]
171
            <tbody>
172
                <tr>
172
                [% FOREACH loopresul IN loopresult %]
173
                    <td>[% loopresul.mfirstname | html %] [% loopresul.msurname | html %]</td>
173
                    <tr>
174
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopresul.borrowernumber | uri %]">[% loopresul.cardnumber | html %]</a></td>
174
                        <td>[% loopresul.mfirstname | html %] [% loopresul.msurname | html %]</td>
175
                    <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
175
                        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopresul.borrowernumber | uri %]">[% loopresul.cardnumber | html %]</a></td>
176
                    <td>[% loopresul.branchname | html %]</td>
176
                        <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
177
                    <td data-order="[% loopresul.date | html %]">[% loopresul.date | $KohaDates %]</td>
177
                        <td>[% loopresul.branchname | html %]</td>
178
                    <td data-order="[% loopresul.timestamp | html %]">[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td>
178
                        <td data-order="[% loopresul.date | html %]">[% loopresul.date | $KohaDates %]</td>
179
                    <td>[% loopresul.type_description | html %]</td>
179
                        <td data-order="[% loopresul.timestamp | html %]">[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td>
180
                    <td>[% loopresul.note | html %]</td>
180
                        <td>[% loopresul.type_description | html %]</td>
181
                    <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
181
                        <td>[% loopresul.note | html %]</td>
182
                    <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td>
182
                        <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
183
                    <td>[% loopresul.barcode | html %]</td>
183
                        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td>
184
                    <td>[% ItemTypes.GetDescription(loopresul.itype) | html %]</td>
184
                        <td>[% loopresul.barcode | html %]</td>
185
                </tr>
185
                        <td>[% ItemTypes.GetDescription(loopresul.itype) | html %]</td>
186
            [% END %]
186
                    </tr>
187
                [% END %]
188
            </tbody>
187
            <tfoot>
189
            <tfoot>
188
                <tr>
190
                <tr>
189
                    [% IF transaction_type == "ACT" %]
191
                    [% IF transaction_type == "ACT" %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt (-7 / +6 lines)
Lines 55-66 Link Here
55
                            <th>Count</th>
55
                            <th>Count</th>
56
                        </tr>
56
                        </tr>
57
                    </thead>
57
                    </thead>
58
                    <tfoot>
59
                        <tr>
60
                            <th>TOTAL</th>
61
                            <th>[% mainloo.total | html %]</th>
62
                        </tr>
63
                    </tfoot>
64
                    <tbody>
58
                    <tbody>
65
                        [% FOREACH loopitemtyp IN mainloo.loopitemtype %]
59
                        [% FOREACH loopitemtyp IN mainloo.loopitemtype %]
66
                            <tr>
60
                            <tr>
Lines 69-74 Link Here
69
                            </tr>
63
                            </tr>
70
                        [% END %]
64
                        [% END %]
71
                    </tbody>
65
                    </tbody>
66
                    <tfoot>
67
                        <tr>
68
                            <th>TOTAL</th>
69
                            <th>[% mainloo.total | html %]</th>
70
                        </tr>
71
                    </tfoot>
72
                </table>
72
                </table>
73
            </div>
73
            </div>
74
            <!-- /.page-section -->
74
            <!-- /.page-section -->
75
- 

Return to bug 41760