Attachment #74046 for bug #16486

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

Lines 35-41 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-1 / +3 lines)
35	<table id="table_account_fines">	35	<table id="table_account_fines">
36	<thead>	36	<thead>
37	<tr>	37	<tr>
38	<th class="title-string">Date</th>	38	<th class="title-string">Original date</th>
		39	<th class="title-string">Updated</th>
39	<th>Description of charges</th>	40	<th>Description of charges</th>
40	<th>Note</th>	41	<th>Note</th>
41	<th>Amount</th>	42	<th>Amount</th>
Lines 52-57 Link Here
52	[% FOREACH account IN accounts %]	53	[% FOREACH account IN accounts %]
53		54
54	<tr>	55	<tr>
		56	<td><span title="[% account.date %]">[% account.date \| $KohaDates %]</span></td>
55	<td><span title="[% account.timestamp %]">[% account.timestamp \| $KohaDates with_hours => 1 %]</span></td>	57	<td><span title="[% account.timestamp %]">[% account.timestamp \| $KohaDates with_hours => 1 %]</span></td>
56	<td>	58	<td>
57	[% SWITCH account.accounttype %]	59	[% SWITCH account.accounttype %]

Lines 38-44 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-1 / +3 lines)
38	</th>	38	</th>
39	</tr>	39	</tr>
40	<tr>	40	<tr>
41	<th>Date</th>	41	<th>Original date</th>
		42	<th>Updated</th>
42	<th>Description of charges</th>	43	<th>Description of charges</th>
43	<th>Note</th>	44	<th>Note</th>
44	<th>Amount</th>	45	<th>Amount</th>
Lines 46-51 Link Here
46		47
47	[% FOREACH account IN accounts %]	48	[% FOREACH account IN accounts %]
48	<tr class="highlight">	49	<tr class="highlight">
		50	<td>[% account.date \| $KohaDates %]</td>
49	<td>[% account.timestamp \| $KohaDates with_hours => 1 %]</td>	51	<td>[% account.timestamp \| $KohaDates with_hours => 1 %]</td>
50	<td>	52	<td>
51	[% SWITCH account.accounttype %]	53	[% SWITCH account.accounttype %]

Lines 37-43 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-1 / +3 lines)
37	</th>	37	</th>
38	</tr>	38	</tr>
39	<tr>	39	<tr>
40	<th>Date</th>	40	<th>Original date</th>
		41	<th>Updated</th>
41	<th>Description of charges</th>	42	<th>Description of charges</th>
42	<th>Note</th>	43	<th>Note</th>
43	<th style="text-align:right;">Amount</th>	44	<th style="text-align:right;">Amount</th>
Lines 46-51 Link Here
46		47
47	[% FOREACH account IN accounts %]	48	[% FOREACH account IN accounts %]
48	<tr class="highlight">	49	<tr class="highlight">
		50	<td>[% account.date \| $KohaDates %]</td>
49	<td>[% account.timestamp \| $KohaDates with_hours => 1 %]</td>	51	<td>[% account.timestamp \| $KohaDates with_hours => 1 %]</td>
50	<td>	52	<td>
51	[% SWITCH account.accounttype %]	53	[% SWITCH account.accounttype %]




                            <thead>
                                <tr>
                                    [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
                                    <th class="title-string">Original date</th>
                                    <th class="title-string">Updated</th>
                                    <th>Description</th>
                                    <th>Fine amount</th>
                                    <th>Amount outstanding</th>

                                                [% END %]
                                            </td>
                                        [% END %]
                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.date | $KohaDates %]</td>
                                        <td><span title="[% ACCOUNT_LINE.timestamp %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %]</td>
                                        <td>
                                            [% SWITCH ACCOUNT_LINE.accounttype %]
                                            [% CASE 'Pay' %]Payment, thanks
- 

Return to bug 16486

Lines 71-77 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-3 / +4 lines)
71	<thead>	71	<thead>
72	<tr>	72	<tr>
73	[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]	73	[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]
74	<th class="title-string">Date</th>	74	<th class="title-string">Original date</th>
		75	<th class="title-string">Updated</th>
75	<th>Description</th>	76	<th>Description</th>
76	<th>Fine amount</th>	77	<th>Fine amount</th>
77	<th>Amount outstanding</th>	78	<th>Amount outstanding</th>
Lines 102-108 Link Here
102	[% END %]	103	[% END %]
103	</td>	104	</td>
104	[% END %]	105	[% END %]
105	<td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.timestamp \| $KohaDates with_hours => 1 %]</td>	106	<td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.date \| $KohaDates %]</td>
		107	<td><span title="[% ACCOUNT_LINE.timestamp %]">[% ACCOUNT_LINE.timestamp \| $KohaDates with_hours => 1 %]</td>
106	<td>	108	<td>
107	[% SWITCH ACCOUNT_LINE.accounttype %]	109	[% SWITCH ACCOUNT_LINE.accounttype %]
108	[% CASE 'Pay' %]Payment, thanks	110	[% CASE 'Pay' %]Payment, thanks
109	-