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

(-)a/installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_CREDIT_notice.perl (+60 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{DELETE FROM letter WHERE code = 'ACCOUNT_CREDIT'});
4
    $dbh->do(q{
5
INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES
6
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
7
[% IF ( LibraryName ) %]
8
 <tr>
9
    <th colspan="5" class="centerednames">
10
        <h3>[% LibraryName | html %]</h3>
11
    </th>
12
 </tr>
13
[% END %]
14
 <tr>
15
    <th colspan="5" class="centerednames">
16
        <h2><u>Fee receipt</u></h2>
17
    </th>
18
 </tr>
19
 <tr>
20
    <th colspan="5" class="centerednames">
21
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
22
    </th>
23
 </tr>
24
 <tr>
25
    <th colspan="5">
26
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
27
        Card number: [% patron.cardnumber | html %]<br />
28
    </th>
29
 </tr>
30
  <tr>
31
    <th>Created</th>
32
    <th>Updated</th>
33
    <th>Description of charges</th>
34
    <th>Note</th>
35
    <th>Amount</th>
36
 </tr>
37
38
  [% FOREACH account IN accounts %]
39
    <tr class="highlight">
40
      <td>[% account.date | $KohaDates %]</td>
41
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
42
      <td>
43
        [% PROCESS account_type_description account=account %]
44
        [%- IF account.description %], [% account.description | html %][% END %]
45
      </td>
46
      <td>[% account.note | html %]</td>
47
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td>
48
    </tr>
49
50
  [% END %]
51
<tfoot>
52
  <tr>
53
    <td colspan="4">Total outstanding dues as on date: </td>
54
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
55
  </tr>
56
</tfoot>
57
</table>', 'print', 'default') });
58
59
    NewVersion( $DBversion, 16486, "Adding timestamp to ACCOUNT_CREDIT notice" );
60
}
(-)a/installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_DEBIT_notice.perl (+63 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{DELETE FROM letter WHERE code = 'ACCOUNT_DEBIT'});
4
    $dbh->do(q{
5
INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES
6
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
7
  [% IF ( LibraryName ) %]
8
    <tr>
9
      <th colspan="6" class="centerednames">
10
        <h3>[% LibraryName | html %]</h3>
11
      </th>
12
    </tr>
13
  [% END %]
14
15
  <tr>
16
    <th colspan="6" class="centerednames">
17
      <h2><u>INVOICE</u></h2>
18
    </th>
19
  </tr>
20
  <tr>
21
    <th colspan="6" class="centerednames">
22
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
23
    </th>
24
  </tr>
25
  <tr>
26
    <th colspan="6" >
27
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
28
      Card number: [% patron.cardnumber | html %]<br />
29
    </th>
30
  </tr>
31
  <tr>
32
    <th>Created</th>
33
    <th>Updated</th>
34
    <th>Description of charges</th>
35
    <th>Note</th>
36
    <th style="text-align:right;">Amount</th>
37
    <th style="text-align:right;">Amount outstanding</th>
38
  </tr>
39
40
  [% FOREACH account IN accounts %]
41
    <tr class="highlight">
42
      <td>[% account.date | $KohaDates%]</td>
43
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
44
      <td>
45
        [% PROCESS account_type_description account=account %]
46
        [%- IF account.description %], [% account.description | html %][% END %]
47
      </td>
48
      <td>[% account.note | html %]</td>
49
      [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td>
50
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | $Price %]</td>
51
    </tr>
52
  [% END %]
53
54
  <tfoot>
55
    <tr>
56
      <td colspan="5">Total outstanding dues as on date: </td>
57
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
58
    </tr>
59
  </tfoot>
60
</table>', 'print', 'default') });
61
62
    NewVersion( $DBversion, 16486, "Adding timestamp to ACCOUNT_DEBIT notice" );
63
}
(-)a/installer/data/mysql/de-DE/mandatory/sample_notices.sql (-12 / +16 lines)
Lines 215-243 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
215
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
215
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
216
[% IF ( LibraryName ) %]
216
[% IF ( LibraryName ) %]
217
 <tr>
217
 <tr>
218
    <th colspan="4" class="centerednames">
218
    <th colspan="5" class="centerednames">
219
        <h3>[% LibraryName | html %]</h3>
219
        <h3>[% LibraryName | html %]</h3>
220
    </th>
220
    </th>
221
 </tr>
221
 </tr>
222
[% END %]
222
[% END %]
223
 <tr>
223
 <tr>
224
    <th colspan="4" class="centerednames">
224
    <th colspan="5" class="centerednames">
225
        <h2><u>Fee receipt</u></h2>
225
        <h2><u>Fee receipt</u></h2>
226
    </th>
226
    </th>
227
 </tr>
227
 </tr>
228
 <tr>
228
 <tr>
229
    <th colspan="4" class="centerednames">
229
    <th colspan="5" class="centerednames">
230
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
230
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
231
    </th>
231
    </th>
232
 </tr>
232
 </tr>
233
 <tr>
233
 <tr>
234
    <th colspan="4">
234
    <th colspan="5">
235
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
235
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
236
        Card number: [% patron.cardnumber | html %]<br />
236
        Card number: [% patron.cardnumber | html %]<br />
237
    </th>
237
    </th>
238
 </tr>
238
 </tr>
239
  <tr>
239
  <tr>
240
    <th>Date</th>
240
    <th>Created</th>
241
    <th>Updated</th>
241
    <th>Description of charges</th>
242
    <th>Description of charges</th>
242
    <th>Note</th>
243
    <th>Note</th>
243
    <th>Amount</th>
244
    <th>Amount</th>
Lines 246-251 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
246
  [% FOREACH account IN accounts %]
247
  [% FOREACH account IN accounts %]
247
    <tr class="highlight">
248
    <tr class="highlight">
248
      <td>[% account.date | $KohaDates %]</td>
249
      <td>[% account.date | $KohaDates %]</td>
250
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
249
      <td>
251
      <td>
250
        [% PROCESS account_type_description account=account %]
252
        [% PROCESS account_type_description account=account %]
251
        [%- IF account.description %], [% account.description | html %][% END %]
253
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 257-263 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
257
  [% END %]
259
  [% END %]
258
<tfoot>
260
<tfoot>
259
  <tr>
261
  <tr>
260
    <td colspan="3">Total outstanding dues as on date: </td>
262
    <td colspan="4">Total outstanding dues as on date: </td>
261
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
263
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
262
  </tr>
264
  </tr>
263
</tfoot>
265
</tfoot>
Lines 267-296 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
267
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
269
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
268
  [% IF ( LibraryName ) %]
270
  [% IF ( LibraryName ) %]
269
    <tr>
271
    <tr>
270
      <th colspan="5" class="centerednames">
272
      <th colspan="6" class="centerednames">
271
        <h3>[% LibraryName | html %]</h3>
273
        <h3>[% LibraryName | html %]</h3>
272
      </th>
274
      </th>
273
    </tr>
275
    </tr>
274
  [% END %]
276
  [% END %]
275
277
276
  <tr>
278
  <tr>
277
    <th colspan="5" class="centerednames">
279
    <th colspan="6" class="centerednames">
278
      <h2><u>INVOICE</u></h2>
280
      <h2><u>INVOICE</u></h2>
279
    </th>
281
    </th>
280
  </tr>
282
  </tr>
281
  <tr>
283
  <tr>
282
    <th colspan="5" class="centerednames">
284
    <th colspan="6" class="centerednames">
283
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
285
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
284
    </th>
286
    </th>
285
  </tr>
287
  </tr>
286
  <tr>
288
  <tr>
287
    <th colspan="5" >
289
    <th colspan="6" >
288
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
290
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
289
      Card number: [% patron.cardnumber | html %]<br />
291
      Card number: [% patron.cardnumber | html %]<br />
290
    </th>
292
    </th>
291
  </tr>
293
  </tr>
292
  <tr>
294
  <tr>
293
    <th>Date</th>
295
    <th>Created</th>
296
    <th>Updated</th>
294
    <th>Description of charges</th>
297
    <th>Description of charges</th>
295
    <th>Note</th>
298
    <th>Note</th>
296
    <th style="text-align:right;">Amount</th>
299
    <th style="text-align:right;">Amount</th>
Lines 300-305 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
300
  [% FOREACH account IN accounts %]
303
  [% FOREACH account IN accounts %]
301
    <tr class="highlight">
304
    <tr class="highlight">
302
      <td>[% account.date | $KohaDates%]</td>
305
      <td>[% account.date | $KohaDates%]</td>
306
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
303
      <td>
307
      <td>
304
        [% PROCESS account_type_description account=account %]
308
        [% PROCESS account_type_description account=account %]
305
        [%- IF account.description %], [% account.description | html %][% END %]
309
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 312-318 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
312
316
313
  <tfoot>
317
  <tfoot>
314
    <tr>
318
    <tr>
315
      <td colspan="4">Total outstanding dues as on date: </td>
319
      <td colspan="5">Total outstanding dues as on date: </td>
316
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
320
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
317
    </tr>
321
    </tr>
318
  </tfoot>
322
  </tfoot>
(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-12 / +16 lines)
Lines 55-83 tables: Link Here
55
            - "<table>"
55
            - "<table>"
56
            - "[% IF ( LibraryName ) %]"
56
            - "[% IF ( LibraryName ) %]"
57
            - " <tr>"
57
            - " <tr>"
58
            - "    <th colspan=\"4\" class=\"centerednames\">"
58
            - "    <th colspan=\"5\" class=\"centerednames\">"
59
            - "        <h3>[% LibraryName | html %]</h3>"
59
            - "        <h3>[% LibraryName | html %]</h3>"
60
            - "    </th>"
60
            - "    </th>"
61
            - " </tr>"
61
            - " </tr>"
62
            - "[% END %]"
62
            - "[% END %]"
63
            - " <tr>"
63
            - " <tr>"
64
            - "    <th colspan=\"4\" class=\"centerednames\">"
64
            - "    <th colspan=\"5\" class=\"centerednames\">"
65
            - "        <h2><u>Fee receipt</u></h2>"
65
            - "        <h2><u>Fee receipt</u></h2>"
66
            - "    </th>"
66
            - "    </th>"
67
            - " </tr>"
67
            - " </tr>"
68
            - " <tr>"
68
            - " <tr>"
69
            - "    <th colspan=\"4\" class=\"centerednames\">"
69
            - "    <th colspan=\"5\" class=\"centerednames\">"
70
            - "        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>"
70
            - "        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>"
71
            - "    </th>"
71
            - "    </th>"
72
            - " </tr>"
72
            - " </tr>"
73
            - " <tr>"
73
            - " <tr>"
74
            - "    <th colspan=\"4\">"
74
            - "    <th colspan=\"5\">"
75
            - "        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />"
75
            - "        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />"
76
            - "        Card number: [% patron.cardnumber | html %]<br />"
76
            - "        Card number: [% patron.cardnumber | html %]<br />"
77
            - "    </th>"
77
            - "    </th>"
78
            - " </tr>"
78
            - " </tr>"
79
            - "  <tr>"
79
            - "  <tr>"
80
            - "    <th>Date</th>"
80
            - "    <th>Created</th>"
81
            - "    <th>Updated</th>"
81
            - "    <th>Description of charges</th>"
82
            - "    <th>Description of charges</th>"
82
            - "    <th>Note</th>"
83
            - "    <th>Note</th>"
83
            - "    <th>Amount</th>"
84
            - "    <th>Amount</th>"
Lines 86-91 tables: Link Here
86
            - "  [% FOREACH account IN accounts %]"
87
            - "  [% FOREACH account IN accounts %]"
87
            - "    <tr class=\"highlight\">"
88
            - "    <tr class=\"highlight\">"
88
            - "      <td>[% account.date | $KohaDates %]</td>"
89
            - "      <td>[% account.date | $KohaDates %]</td>"
90
            - "      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>"
89
            - "      <td>"
91
            - "      <td>"
90
            - "        [% PROCESS account_type_description account=account %]"
92
            - "        [% PROCESS account_type_description account=account %]"
91
            - "        [%- IF account.description %], [% account.description | html %][% END %]"
93
            - "        [%- IF account.description %], [% account.description | html %][% END %]"
Lines 97-103 tables: Link Here
97
            - "  [% END %]"
99
            - "  [% END %]"
98
            - "<tfoot>"
100
            - "<tfoot>"
99
            - "  <tr>"
101
            - "  <tr>"
100
            - "    <td colspan=\"3\">Total outstanding dues as on date: </td>"
102
            - "    <td colspan=\"4\">Total outstanding dues as on date: </td>"
101
            - "    [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
103
            - "    [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
102
            - "  </tr>"
104
            - "  </tr>"
103
            - "</tfoot>"
105
            - "</tfoot>"
Lines 115-144 tables: Link Here
115
            - "<table>"
117
            - "<table>"
116
            - "  [% IF ( LibraryName ) %]"
118
            - "  [% IF ( LibraryName ) %]"
117
            - "    <tr>"
119
            - "    <tr>"
118
            - "      <th colspan=\"5\" class=\"centerednames\">"
120
            - "      <th colspan=\"6\" class=\"centerednames\">"
119
            - "        <h3>[% LibraryName | html %]</h3>"
121
            - "        <h3>[% LibraryName | html %]</h3>"
120
            - "      </th>"
122
            - "      </th>"
121
            - "    </tr>"
123
            - "    </tr>"
122
            - "  [% END %]"
124
            - "  [% END %]"
123
            - ""
125
            - ""
124
            - "  <tr>"
126
            - "  <tr>"
125
            - "    <th colspan=\"5\" class=\"centerednames\">"
127
            - "    <th colspan=\"6\" class=\"centerednames\">"
126
            - "      <h2><u>INVOICE</u></h2>"
128
            - "      <h2><u>INVOICE</u></h2>"
127
            - "    </th>"
129
            - "    </th>"
128
            - "  </tr>"
130
            - "  </tr>"
129
            - "  <tr>"
131
            - "  <tr>"
130
            - "    <th colspan=\"5\" class=\"centerednames\">"
132
            - "    <th colspan=\"6\" class=\"centerednames\">"
131
            - "      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>"
133
            - "      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>"
132
            - "    </th>"
134
            - "    </th>"
133
            - "  </tr>"
135
            - "  </tr>"
134
            - "  <tr>"
136
            - "  <tr>"
135
            - "    <th colspan=\"5\" >"
137
            - "    <th colspan=\"6\" >"
136
            - "      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />"
138
            - "      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />"
137
            - "      Card number: [% patron.cardnumber | html %]<br />"
139
            - "      Card number: [% patron.cardnumber | html %]<br />"
138
            - "    </th>"
140
            - "    </th>"
139
            - "  </tr>"
141
            - "  </tr>"
140
            - "  <tr>"
142
            - "  <tr>"
141
            - "    <th>Date</th>"
143
            - "    <th>Created</th>"
144
            - "    <th>Updated</th>"
142
            - "    <th>Description of charges</th>"
145
            - "    <th>Description of charges</th>"
143
            - "    <th>Note</th>"
146
            - "    <th>Note</th>"
144
            - "    <th style=\"text-align:right;\">Amount</th>"
147
            - "    <th style=\"text-align:right;\">Amount</th>"
Lines 148-153 tables: Link Here
148
            - "  [% FOREACH account IN accounts %]"
151
            - "  [% FOREACH account IN accounts %]"
149
            - "    <tr class=\"highlight\">"
152
            - "    <tr class=\"highlight\">"
150
            - "      <td>[% account.date | $KohaDates%]</td>"
153
            - "      <td>[% account.date | $KohaDates%]</td>"
154
            - "      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>"
151
            - "      <td>"
155
            - "      <td>"
152
            - "        [% PROCESS account_type_description account=account %]"
156
            - "        [% PROCESS account_type_description account=account %]"
153
            - "        [%- IF account.description %], [% account.description | html %][% END %]"
157
            - "        [%- IF account.description %], [% account.description | html %][% END %]"
Lines 160-166 tables: Link Here
160
            - ""
164
            - ""
161
            - "  <tfoot>"
165
            - "  <tfoot>"
162
            - "    <tr>"
166
            - "    <tr>"
163
            - "      <td colspan=\"4\">Total outstanding dues as on date: </td>"
167
            - "      <td colspan=\"5\">Total outstanding dues as on date: </td>"
164
            - "      [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
168
            - "      [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
165
            - "    </tr>"
169
            - "    </tr>"
166
            - "  </tfoot>"
170
            - "  </tfoot>"
(-)a/installer/data/mysql/es-ES/mandatory/sample_notices.sql (-12 / +16 lines)
Lines 208-236 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
208
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
208
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
209
[% IF ( LibraryName ) %]
209
[% IF ( LibraryName ) %]
210
 <tr>
210
 <tr>
211
    <th colspan="4" class="centerednames">
211
    <th colspan="5" class="centerednames">
212
        <h3>[% LibraryName | html %]</h3>
212
        <h3>[% LibraryName | html %]</h3>
213
    </th>
213
    </th>
214
 </tr>
214
 </tr>
215
[% END %]
215
[% END %]
216
 <tr>
216
 <tr>
217
    <th colspan="4" class="centerednames">
217
    <th colspan="5" class="centerednames">
218
        <h2><u>Fee receipt</u></h2>
218
        <h2><u>Fee receipt</u></h2>
219
    </th>
219
    </th>
220
 </tr>
220
 </tr>
221
 <tr>
221
 <tr>
222
    <th colspan="4" class="centerednames">
222
    <th colspan="5" class="centerednames">
223
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
223
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
224
    </th>
224
    </th>
225
 </tr>
225
 </tr>
226
 <tr>
226
 <tr>
227
    <th colspan="4">
227
    <th colspan="5">
228
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
228
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
229
        Card number: [% patron.cardnumber | html %]<br />
229
        Card number: [% patron.cardnumber | html %]<br />
230
    </th>
230
    </th>
231
 </tr>
231
 </tr>
232
  <tr>
232
  <tr>
233
    <th>Date</th>
233
    <th>Created</th>
234
    <th>Updated</th>
234
    <th>Description of charges</th>
235
    <th>Description of charges</th>
235
    <th>Note</th>
236
    <th>Note</th>
236
    <th>Amount</th>
237
    <th>Amount</th>
Lines 239-244 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
239
  [% FOREACH account IN accounts %]
240
  [% FOREACH account IN accounts %]
240
    <tr class="highlight">
241
    <tr class="highlight">
241
      <td>[% account.date | $KohaDates %]</td>
242
      <td>[% account.date | $KohaDates %]</td>
243
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
242
      <td>
244
      <td>
243
        [% PROCESS account_type_description account=account %]
245
        [% PROCESS account_type_description account=account %]
244
        [%- IF account.description %], [% account.description | html %][% END %]
246
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 250-256 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
250
  [% END %]
252
  [% END %]
251
<tfoot>
253
<tfoot>
252
  <tr>
254
  <tr>
253
    <td colspan="3">Total outstanding dues as on date: </td>
255
    <td colspan="4">Total outstanding dues as on date: </td>
254
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
256
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
255
  </tr>
257
  </tr>
256
</tfoot>
258
</tfoot>
Lines 260-289 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
260
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
262
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
261
  [% IF ( LibraryName ) %]
263
  [% IF ( LibraryName ) %]
262
    <tr>
264
    <tr>
263
      <th colspan="5" class="centerednames">
265
      <th colspan="6" class="centerednames">
264
        <h3>[% LibraryName | html %]</h3>
266
        <h3>[% LibraryName | html %]</h3>
265
      </th>
267
      </th>
266
    </tr>
268
    </tr>
267
  [% END %]
269
  [% END %]
268
270
269
  <tr>
271
  <tr>
270
    <th colspan="5" class="centerednames">
272
    <th colspan="6" class="centerednames">
271
      <h2><u>INVOICE</u></h2>
273
      <h2><u>INVOICE</u></h2>
272
    </th>
274
    </th>
273
  </tr>
275
  </tr>
274
  <tr>
276
  <tr>
275
    <th colspan="5" class="centerednames">
277
    <th colspan="6" class="centerednames">
276
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
278
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
277
    </th>
279
    </th>
278
  </tr>
280
  </tr>
279
  <tr>
281
  <tr>
280
    <th colspan="5" >
282
    <th colspan="6" >
281
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
283
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
282
      Card number: [% patron.cardnumber | html %]<br />
284
      Card number: [% patron.cardnumber | html %]<br />
283
    </th>
285
    </th>
284
  </tr>
286
  </tr>
285
  <tr>
287
  <tr>
286
    <th>Date</th>
288
    <th>Created</th>
289
    <th>Updated</th>
287
    <th>Description of charges</th>
290
    <th>Description of charges</th>
288
    <th>Note</th>
291
    <th>Note</th>
289
    <th style="text-align:right;">Amount</th>
292
    <th style="text-align:right;">Amount</th>
Lines 293-298 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
293
  [% FOREACH account IN accounts %]
296
  [% FOREACH account IN accounts %]
294
    <tr class="highlight">
297
    <tr class="highlight">
295
      <td>[% account.date | $KohaDates%]</td>
298
      <td>[% account.date | $KohaDates%]</td>
299
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
296
      <td>
300
      <td>
297
        [% PROCESS account_type_description account=account %]
301
        [% PROCESS account_type_description account=account %]
298
        [%- IF account.description %], [% account.description | html %][% END %]
302
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 305-311 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
305
309
306
  <tfoot>
310
  <tfoot>
307
    <tr>
311
    <tr>
308
      <td colspan="4">Total outstanding dues as on date: </td>
312
      <td colspan="5">Total outstanding dues as on date: </td>
309
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
313
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
310
    </tr>
314
    </tr>
311
  </tfoot>
315
  </tfoot>
(-)a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql (-12 / +16 lines)
Lines 98-126 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
98
('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '<table>
98
('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '<table>
99
[% IF ( LibraryName ) %]
99
[% IF ( LibraryName ) %]
100
 <tr>
100
 <tr>
101
    <th colspan="4" class="centerednames">
101
    <th colspan="5" class="centerednames">
102
        <h3>[% LibraryName | html %]</h3>
102
        <h3>[% LibraryName | html %]</h3>
103
    </th>
103
    </th>
104
 </tr>
104
 </tr>
105
[% END %]
105
[% END %]
106
 <tr>
106
 <tr>
107
    <th colspan="4" class="centerednames">
107
    <th colspan="5" class="centerednames">
108
        <h2><u>REÇU</u></h2>
108
        <h2><u>REÇU</u></h2>
109
    </th>
109
    </th>
110
 </tr>
110
 </tr>
111
 <tr>
111
 <tr>
112
    <th colspan="4" class="centerednames">
112
    <th colspan="5" class="centerednames">
113
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
113
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
114
    </th>
114
    </th>
115
 </tr>
115
 </tr>
116
 <tr>
116
 <tr>
117
    <th colspan="4">
117
    <th colspan="5">
118
        Reçu de [% patron.firstname | html %] [% patron.surname | html %] <br />
118
        Reçu de [% patron.firstname | html %] [% patron.surname | html %] <br />
119
        Numéro de carte : [% patron.cardnumber | html %]<br />
119
        Numéro de carte : [% patron.cardnumber | html %]<br />
120
    </th>
120
    </th>
121
 </tr>
121
 </tr>
122
  <tr>
122
  <tr>
123
    <th>Date</th>
123
    <th>Created</th>
124
    <th>Updated</th>
124
    <th>Description des frais</th>
125
    <th>Description des frais</th>
125
    <th>Note</th>
126
    <th>Note</th>
126
    <th>Montant</th>
127
    <th>Montant</th>
Lines 129-134 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
129
  [% FOREACH account IN accounts %]
130
  [% FOREACH account IN accounts %]
130
    <tr class="highlight">
131
    <tr class="highlight">
131
      <td>[% account.date | $KohaDates %]</td>
132
      <td>[% account.date | $KohaDates %]</td>
133
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
132
      <td>
134
      <td>
133
        [% PROCESS account_type_description account=account %]
135
        [% PROCESS account_type_description account=account %]
134
        [%- IF account.description %], [% account.description | html %][% END %]
136
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 140-146 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
140
  [% END %]
142
  [% END %]
141
<tfoot>
143
<tfoot>
142
  <tr>
144
  <tr>
143
    <td colspan="3">Solde non-réglé : </td>
145
    <td colspan="4">Solde non-réglé : </td>
144
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
146
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
145
  </tr>
147
  </tr>
146
</tfoot>
148
</tfoot>
Lines 150-179 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
150
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
152
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
151
  [% IF ( LibraryName ) %]
153
  [% IF ( LibraryName ) %]
152
    <tr>
154
    <tr>
153
      <th colspan="5" class="centerednames">
155
      <th colspan="6" class="centerednames">
154
        <h3>[% LibraryName | html %]</h3>
156
        <h3>[% LibraryName | html %]</h3>
155
      </th>
157
      </th>
156
    </tr>
158
    </tr>
157
  [% END %]
159
  [% END %]
158
160
159
  <tr>
161
  <tr>
160
    <th colspan="5" class="centerednames">
162
    <th colspan="6" class="centerednames">
161
      <h2><u>FACTURE</u></h2>
163
      <h2><u>FACTURE</u></h2>
162
    </th>
164
    </th>
163
  </tr>
165
  </tr>
164
  <tr>
166
  <tr>
165
    <th colspan="5" class="centerednames">
167
    <th colspan="6" class="centerednames">
166
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
168
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
167
    </th>
169
    </th>
168
  </tr>
170
  </tr>
169
  <tr>
171
  <tr>
170
    <th colspan="5" >
172
    <th colspan="6" >
171
      Facturé à : [% patron.firstname | html %] [% patron.surname | html %] <br />
173
      Facturé à : [% patron.firstname | html %] [% patron.surname | html %] <br />
172
      Numéro de carte : [% patron.cardnumber | html %]<br />
174
      Numéro de carte : [% patron.cardnumber | html %]<br />
173
    </th>
175
    </th>
174
  </tr>
176
  </tr>
175
  <tr>
177
  <tr>
176
    <th>Date</th>
178
    <th>Created</th>
179
    <th>Updated</th>
177
    <th>Description des frais</th>
180
    <th>Description des frais</th>
178
    <th>Note</th>
181
    <th>Note</th>
179
    <th style="text-align:right;">Montant</th>
182
    <th style="text-align:right;">Montant</th>
Lines 183-188 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
183
  [% FOREACH account IN accounts %]
186
  [% FOREACH account IN accounts %]
184
    <tr class="highlight">
187
    <tr class="highlight">
185
      <td>[% account.date | $KohaDates%]</td>
188
      <td>[% account.date | $KohaDates%]</td>
189
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
186
      <td>
190
      <td>
187
        [% PROCESS account_type_description account=account %]
191
        [% PROCESS account_type_description account=account %]
188
        [%- IF account.description %], [% account.description | html %][% END %]
192
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 195-201 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
195
199
196
  <tfoot>
200
  <tfoot>
197
    <tr>
201
    <tr>
198
      <td colspan="4">Solde non-réglé : </td>
202
      <td colspan="5">Solde non-réglé : </td>
199
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
203
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
200
    </tr>
204
    </tr>
201
  </tfoot>
205
  </tfoot>
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql (-12 / +16 lines)
Lines 209-237 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
209
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
209
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
210
[% IF ( LibraryName ) %]
210
[% IF ( LibraryName ) %]
211
 <tr>
211
 <tr>
212
    <th colspan="4" class="centerednames">
212
    <th colspan="5" class="centerednames">
213
        <h3>[% LibraryName | html %]</h3>
213
        <h3>[% LibraryName | html %]</h3>
214
    </th>
214
    </th>
215
 </tr>
215
 </tr>
216
[% END %]
216
[% END %]
217
 <tr>
217
 <tr>
218
    <th colspan="4" class="centerednames">
218
    <th colspan="5" class="centerednames">
219
        <h2><u>Fee receipt</u></h2>
219
        <h2><u>Fee receipt</u></h2>
220
    </th>
220
    </th>
221
 </tr>
221
 </tr>
222
 <tr>
222
 <tr>
223
    <th colspan="4" class="centerednames">
223
    <th colspan="5" class="centerednames">
224
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
224
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
225
    </th>
225
    </th>
226
 </tr>
226
 </tr>
227
 <tr>
227
 <tr>
228
    <th colspan="4">
228
    <th colspan="5">
229
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
229
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
230
        Card number: [% patron.cardnumber | html %]<br />
230
        Card number: [% patron.cardnumber | html %]<br />
231
    </th>
231
    </th>
232
 </tr>
232
 </tr>
233
  <tr>
233
  <tr>
234
    <th>Date</th>
234
    <th>Created</th>
235
    <th>Updated</th>
235
    <th>Description of charges</th>
236
    <th>Description of charges</th>
236
    <th>Note</th>
237
    <th>Note</th>
237
    <th>Amount</th>
238
    <th>Amount</th>
Lines 240-245 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
240
  [% FOREACH account IN accounts %]
241
  [% FOREACH account IN accounts %]
241
    <tr class="highlight">
242
    <tr class="highlight">
242
      <td>[% account.date | $KohaDates %]</td>
243
      <td>[% account.date | $KohaDates %]</td>
244
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
243
      <td>
245
      <td>
244
        [% PROCESS account_type_description account=account %]
246
        [% PROCESS account_type_description account=account %]
245
        [%- IF account.description %], [% account.description | html %][% END %]
247
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 251-257 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
251
  [% END %]
253
  [% END %]
252
<tfoot>
254
<tfoot>
253
  <tr>
255
  <tr>
254
    <td colspan="3">Total outstanding dues as on date: </td>
256
    <td colspan="4">Total outstanding dues as on date: </td>
255
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
257
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
256
  </tr>
258
  </tr>
257
</tfoot>
259
</tfoot>
Lines 261-290 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
261
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
263
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
262
  [% IF ( LibraryName ) %]
264
  [% IF ( LibraryName ) %]
263
    <tr>
265
    <tr>
264
      <th colspan="5" class="centerednames">
266
      <th colspan="6" class="centerednames">
265
        <h3>[% LibraryName | html %]</h3>
267
        <h3>[% LibraryName | html %]</h3>
266
      </th>
268
      </th>
267
    </tr>
269
    </tr>
268
  [% END %]
270
  [% END %]
269
271
270
  <tr>
272
  <tr>
271
    <th colspan="5" class="centerednames">
273
    <th colspan="6" class="centerednames">
272
      <h2><u>INVOICE</u></h2>
274
      <h2><u>INVOICE</u></h2>
273
    </th>
275
    </th>
274
  </tr>
276
  </tr>
275
  <tr>
277
  <tr>
276
    <th colspan="5" class="centerednames">
278
    <th colspan="6" class="centerednames">
277
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
279
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
278
    </th>
280
    </th>
279
  </tr>
281
  </tr>
280
  <tr>
282
  <tr>
281
    <th colspan="5" >
283
    <th colspan="6" >
282
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
284
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
283
      Card number: [% patron.cardnumber | html %]<br />
285
      Card number: [% patron.cardnumber | html %]<br />
284
    </th>
286
    </th>
285
  </tr>
287
  </tr>
286
  <tr>
288
  <tr>
287
    <th>Date</th>
289
    <th>Created</th>
290
    <th>Updated</th>
288
    <th>Description of charges</th>
291
    <th>Description of charges</th>
289
    <th>Note</th>
292
    <th>Note</th>
290
    <th style="text-align:right;">Amount</th>
293
    <th style="text-align:right;">Amount</th>
Lines 294-299 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
294
  [% FOREACH account IN accounts %]
297
  [% FOREACH account IN accounts %]
295
    <tr class="highlight">
298
    <tr class="highlight">
296
      <td>[% account.date | $KohaDates%]</td>
299
      <td>[% account.date | $KohaDates%]</td>
300
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
297
      <td>
301
      <td>
298
        [% PROCESS account_type_description account=account %]
302
        [% PROCESS account_type_description account=account %]
299
        [%- IF account.description %], [% account.description | html %][% END %]
303
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 306-312 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
306
310
307
  <tfoot>
311
  <tfoot>
308
    <tr>
312
    <tr>
309
      <td colspan="4">Total outstanding dues as on date: </td>
313
      <td colspan="5">Total outstanding dues as on date: </td>
310
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
314
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
311
    </tr>
315
    </tr>
312
  </tfoot>
316
  </tfoot>
(-)a/installer/data/mysql/it-IT/necessari/notices.sql (-12 / +16 lines)
Lines 211-239 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
211
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
211
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
212
[% IF ( LibraryName ) %]
212
[% IF ( LibraryName ) %]
213
 <tr>
213
 <tr>
214
    <th colspan="4" class="centerednames">
214
    <th colspan="5" class="centerednames">
215
        <h3>[% LibraryName | html %]</h3>
215
        <h3>[% LibraryName | html %]</h3>
216
    </th>
216
    </th>
217
 </tr>
217
 </tr>
218
[% END %]
218
[% END %]
219
 <tr>
219
 <tr>
220
    <th colspan="4" class="centerednames">
220
    <th colspan="5" class="centerednames">
221
        <h2><u>Fee receipt</u></h2>
221
        <h2><u>Fee receipt</u></h2>
222
    </th>
222
    </th>
223
 </tr>
223
 </tr>
224
 <tr>
224
 <tr>
225
    <th colspan="4" class="centerednames">
225
    <th colspan="5" class="centerednames">
226
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
226
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
227
    </th>
227
    </th>
228
 </tr>
228
 </tr>
229
 <tr>
229
 <tr>
230
    <th colspan="4">
230
    <th colspan="5">
231
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
231
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
232
        Card number: [% patron.cardnumber | html %]<br />
232
        Card number: [% patron.cardnumber | html %]<br />
233
    </th>
233
    </th>
234
 </tr>
234
 </tr>
235
  <tr>
235
  <tr>
236
    <th>Date</th>
236
    <th>Created</th>
237
    <th>Updated</th>
237
    <th>Description of charges</th>
238
    <th>Description of charges</th>
238
    <th>Note</th>
239
    <th>Note</th>
239
    <th>Amount</th>
240
    <th>Amount</th>
Lines 242-247 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
242
  [% FOREACH account IN accounts %]
243
  [% FOREACH account IN accounts %]
243
    <tr class="highlight">
244
    <tr class="highlight">
244
      <td>[% account.date | $KohaDates %]</td>
245
      <td>[% account.date | $KohaDates %]</td>
246
      <td>[% account.timestamp | $KohaDates %]</td>
245
      <td>
247
      <td>
246
        [% PROCESS account_type_description account=account %]
248
        [% PROCESS account_type_description account=account %]
247
        [%- IF account.description %], [% account.description | html %][% END %]
249
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 253-259 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
253
  [% END %]
255
  [% END %]
254
<tfoot>
256
<tfoot>
255
  <tr>
257
  <tr>
256
    <td colspan="3">Total outstanding dues as on date: </td>
258
    <td colspan="4">Total outstanding dues as on date: </td>
257
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
259
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
258
  </tr>
260
  </tr>
259
</tfoot>
261
</tfoot>
Lines 263-292 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
263
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
265
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
264
  [% IF ( LibraryName ) %]
266
  [% IF ( LibraryName ) %]
265
    <tr>
267
    <tr>
266
      <th colspan="5" class="centerednames">
268
      <th colspan="6" class="centerednames">
267
        <h3>[% LibraryName | html %]</h3>
269
        <h3>[% LibraryName | html %]</h3>
268
      </th>
270
      </th>
269
    </tr>
271
    </tr>
270
  [% END %]
272
  [% END %]
271
273
272
  <tr>
274
  <tr>
273
    <th colspan="5" class="centerednames">
275
    <th colspan="6" class="centerednames">
274
      <h2><u>INVOICE</u></h2>
276
      <h2><u>INVOICE</u></h2>
275
    </th>
277
    </th>
276
  </tr>
278
  </tr>
277
  <tr>
279
  <tr>
278
    <th colspan="5" class="centerednames">
280
    <th colspan="6" class="centerednames">
279
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
281
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
280
    </th>
282
    </th>
281
  </tr>
283
  </tr>
282
  <tr>
284
  <tr>
283
    <th colspan="5" >
285
    <th colspan="6" >
284
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
286
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
285
      Card number: [% patron.cardnumber | html %]<br />
287
      Card number: [% patron.cardnumber | html %]<br />
286
    </th>
288
    </th>
287
  </tr>
289
  </tr>
288
  <tr>
290
  <tr>
289
    <th>Date</th>
291
    <th>Created</th>
292
    <th>Updated</th>
290
    <th>Description of charges</th>
293
    <th>Description of charges</th>
291
    <th>Note</th>
294
    <th>Note</th>
292
    <th style="text-align:right;">Amount</th>
295
    <th style="text-align:right;">Amount</th>
Lines 296-301 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
296
  [% FOREACH account IN accounts %]
299
  [% FOREACH account IN accounts %]
297
    <tr class="highlight">
300
    <tr class="highlight">
298
      <td>[% account.date | $KohaDates%]</td>
301
      <td>[% account.date | $KohaDates%]</td>
302
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
299
      <td>
303
      <td>
300
        [% PROCESS account_type_description account=account %]
304
        [% PROCESS account_type_description account=account %]
301
        [%- IF account.description %], [% account.description | html %][% END %]
305
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 308-314 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
308
312
309
  <tfoot>
313
  <tfoot>
310
    <tr>
314
    <tr>
311
      <td colspan="4">Total outstanding dues as on date: </td>
315
      <td colspan="5">Total outstanding dues as on date: </td>
312
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
316
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
313
    </tr>
317
    </tr>
314
  </tfoot>
318
  </tfoot>
(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql (-12 / +16 lines)
Lines 228-256 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
228
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
228
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
229
[% IF ( LibraryName ) %]
229
[% IF ( LibraryName ) %]
230
 <tr>
230
 <tr>
231
    <th colspan="4" class="centerednames">
231
    <th colspan="5" class="centerednames">
232
        <h3>[% LibraryName | html %]</h3>
232
        <h3>[% LibraryName | html %]</h3>
233
    </th>
233
    </th>
234
 </tr>
234
 </tr>
235
[% END %]
235
[% END %]
236
 <tr>
236
 <tr>
237
    <th colspan="4" class="centerednames">
237
    <th colspan="5" class="centerednames">
238
        <h2><u>Fee receipt</u></h2>
238
        <h2><u>Fee receipt</u></h2>
239
    </th>
239
    </th>
240
 </tr>
240
 </tr>
241
 <tr>
241
 <tr>
242
    <th colspan="4" class="centerednames">
242
    <th colspan="5" class="centerednames">
243
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
243
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
244
    </th>
244
    </th>
245
 </tr>
245
 </tr>
246
 <tr>
246
 <tr>
247
    <th colspan="4">
247
    <th colspan="5">
248
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
248
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
249
        Card number: [% patron.cardnumber | html %]<br />
249
        Card number: [% patron.cardnumber | html %]<br />
250
    </th>
250
    </th>
251
 </tr>
251
 </tr>
252
  <tr>
252
  <tr>
253
    <th>Date</th>
253
    <th>Created</th>
254
    <th>Updated</th>
254
    <th>Description of charges</th>
255
    <th>Description of charges</th>
255
    <th>Note</th>
256
    <th>Note</th>
256
    <th>Amount</th>
257
    <th>Amount</th>
Lines 259-264 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
259
  [% FOREACH account IN accounts %]
260
  [% FOREACH account IN accounts %]
260
    <tr class="highlight">
261
    <tr class="highlight">
261
      <td>[% account.date | $KohaDates %]</td>
262
      <td>[% account.date | $KohaDates %]</td>
263
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
262
      <td>
264
      <td>
263
        [% PROCESS account_type_description account=account %]
265
        [% PROCESS account_type_description account=account %]
264
        [%- IF account.description %], [% account.description | html %][% END %]
266
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 270-276 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
270
  [% END %]
272
  [% END %]
271
<tfoot>
273
<tfoot>
272
  <tr>
274
  <tr>
273
    <td colspan="3">Total outstanding dues as on date: </td>
275
    <td colspan="4">Total outstanding dues as on date: </td>
274
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
276
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
275
  </tr>
277
  </tr>
276
</tfoot>
278
</tfoot>
Lines 280-309 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
280
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
282
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
281
  [% IF ( LibraryName ) %]
283
  [% IF ( LibraryName ) %]
282
    <tr>
284
    <tr>
283
      <th colspan="5" class="centerednames">
285
      <th colspan="6" class="centerednames">
284
        <h3>[% LibraryName | html %]</h3>
286
        <h3>[% LibraryName | html %]</h3>
285
      </th>
287
      </th>
286
    </tr>
288
    </tr>
287
  [% END %]
289
  [% END %]
288
290
289
  <tr>
291
  <tr>
290
    <th colspan="5" class="centerednames">
292
    <th colspan="6" class="centerednames">
291
      <h2><u>INVOICE</u></h2>
293
      <h2><u>INVOICE</u></h2>
292
    </th>
294
    </th>
293
  </tr>
295
  </tr>
294
  <tr>
296
  <tr>
295
    <th colspan="5" class="centerednames">
297
    <th colspan="6" class="centerednames">
296
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
298
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
297
    </th>
299
    </th>
298
  </tr>
300
  </tr>
299
  <tr>
301
  <tr>
300
    <th colspan="5" >
302
    <th colspan="6" >
301
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
303
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
302
      Card number: [% patron.cardnumber | html %]<br />
304
      Card number: [% patron.cardnumber | html %]<br />
303
    </th>
305
    </th>
304
  </tr>
306
  </tr>
305
  <tr>
307
  <tr>
306
    <th>Date</th>
308
    <th>Created</th>
309
    <th>Updated</th>
307
    <th>Description of charges</th>
310
    <th>Description of charges</th>
308
    <th>Note</th>
311
    <th>Note</th>
309
    <th style="text-align:right;">Amount</th>
312
    <th style="text-align:right;">Amount</th>
Lines 313-318 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
313
  [% FOREACH account IN accounts %]
316
  [% FOREACH account IN accounts %]
314
    <tr class="highlight">
317
    <tr class="highlight">
315
      <td>[% account.date | $KohaDates%]</td>
318
      <td>[% account.date | $KohaDates%]</td>
319
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
316
      <td>
320
      <td>
317
        [% PROCESS account_type_description account=account %]
321
        [% PROCESS account_type_description account=account %]
318
        [%- IF account.description %], [% account.description | html %][% END %]
322
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 325-331 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
325
329
326
  <tfoot>
330
  <tfoot>
327
    <tr>
331
    <tr>
328
      <td colspan="4">Total outstanding dues as on date: </td>
332
      <td colspan="5">Total outstanding dues as on date: </td>
329
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
333
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
330
    </tr>
334
    </tr>
331
  </tfoot>
335
  </tfoot>
(-)a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql (-12 / +16 lines)
Lines 206-234 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
206
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
206
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
207
[% IF ( LibraryName ) %]
207
[% IF ( LibraryName ) %]
208
 <tr>
208
 <tr>
209
    <th colspan="4" class="centerednames">
209
    <th colspan="5" class="centerednames">
210
        <h3>[% LibraryName | html %]</h3>
210
        <h3>[% LibraryName | html %]</h3>
211
    </th>
211
    </th>
212
 </tr>
212
 </tr>
213
[% END %]
213
[% END %]
214
 <tr>
214
 <tr>
215
    <th colspan="4" class="centerednames">
215
    <th colspan="5" class="centerednames">
216
        <h2><u>Fee receipt</u></h2>
216
        <h2><u>Fee receipt</u></h2>
217
    </th>
217
    </th>
218
 </tr>
218
 </tr>
219
 <tr>
219
 <tr>
220
    <th colspan="4" class="centerednames">
220
    <th colspan="5" class="centerednames">
221
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
221
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
222
    </th>
222
    </th>
223
 </tr>
223
 </tr>
224
 <tr>
224
 <tr>
225
    <th colspan="4">
225
    <th colspan="5">
226
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
226
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
227
        Card number: [% patron.cardnumber | html %]<br />
227
        Card number: [% patron.cardnumber | html %]<br />
228
    </th>
228
    </th>
229
 </tr>
229
 </tr>
230
  <tr>
230
  <tr>
231
    <th>Date</th>
231
    <th>Created</th>
232
    <th>Updated</th>
232
    <th>Description of charges</th>
233
    <th>Description of charges</th>
233
    <th>Note</th>
234
    <th>Note</th>
234
    <th>Amount</th>
235
    <th>Amount</th>
Lines 237-242 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
237
  [% FOREACH account IN accounts %]
238
  [% FOREACH account IN accounts %]
238
    <tr class="highlight">
239
    <tr class="highlight">
239
      <td>[% account.date | $KohaDates %]</td>
240
      <td>[% account.date | $KohaDates %]</td>
241
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
240
      <td>
242
      <td>
241
        [% PROCESS account_type_description account=account %]
243
        [% PROCESS account_type_description account=account %]
242
        [%- IF account.description %], [% account.description | html %][% END %]
244
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 248-254 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
248
  [% END %]
250
  [% END %]
249
<tfoot>
251
<tfoot>
250
  <tr>
252
  <tr>
251
    <td colspan="3">Total outstanding dues as on date: </td>
253
    <td colspan="4">Total outstanding dues as on date: </td>
252
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
254
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
253
  </tr>
255
  </tr>
254
</tfoot>
256
</tfoot>
Lines 258-287 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
258
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
260
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
259
  [% IF ( LibraryName ) %]
261
  [% IF ( LibraryName ) %]
260
    <tr>
262
    <tr>
261
      <th colspan="5" class="centerednames">
263
      <th colspan="6" class="centerednames">
262
        <h3>[% LibraryName | html %]</h3>
264
        <h3>[% LibraryName | html %]</h3>
263
      </th>
265
      </th>
264
    </tr>
266
    </tr>
265
  [% END %]
267
  [% END %]
266
268
267
  <tr>
269
  <tr>
268
    <th colspan="5" class="centerednames">
270
    <th colspan="6" class="centerednames">
269
      <h2><u>INVOICE</u></h2>
271
      <h2><u>INVOICE</u></h2>
270
    </th>
272
    </th>
271
  </tr>
273
  </tr>
272
  <tr>
274
  <tr>
273
    <th colspan="5" class="centerednames">
275
    <th colspan="6" class="centerednames">
274
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
276
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
275
    </th>
277
    </th>
276
  </tr>
278
  </tr>
277
  <tr>
279
  <tr>
278
    <th colspan="5" >
280
    <th colspan="6" >
279
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
281
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
280
      Card number: [% patron.cardnumber | html %]<br />
282
      Card number: [% patron.cardnumber | html %]<br />
281
    </th>
283
    </th>
282
  </tr>
284
  </tr>
283
  <tr>
285
  <tr>
284
    <th>Date</th>
286
    <th>Created</th>
287
    <th>Updated</th>
285
    <th>Description of charges</th>
288
    <th>Description of charges</th>
286
    <th>Note</th>
289
    <th>Note</th>
287
    <th style="text-align:right;">Amount</th>
290
    <th style="text-align:right;">Amount</th>
Lines 291-296 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
291
  [% FOREACH account IN accounts %]
294
  [% FOREACH account IN accounts %]
292
    <tr class="highlight">
295
    <tr class="highlight">
293
      <td>[% account.date | $KohaDates%]</td>
296
      <td>[% account.date | $KohaDates%]</td>
297
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
294
      <td>
298
      <td>
295
        [% PROCESS account_type_description account=account %]
299
        [% PROCESS account_type_description account=account %]
296
        [%- IF account.description %], [% account.description | html %][% END %]
300
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 303-309 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
303
307
304
  <tfoot>
308
  <tfoot>
305
    <tr>
309
    <tr>
306
      <td colspan="4">Total outstanding dues as on date: </td>
310
      <td colspan="5">Total outstanding dues as on date: </td>
307
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
311
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
308
    </tr>
312
    </tr>
309
  </tfoot>
313
  </tfoot>
(-)a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql (-11 / +15 lines)
Lines 208-236 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
208
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
208
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
209
[% IF ( LibraryName ) %]
209
[% IF ( LibraryName ) %]
210
 <tr>
210
 <tr>
211
    <th colspan="4" class="centerednames">
211
    <th colspan="5" class="centerednames">
212
        <h3>[% LibraryName | html %]</h3>
212
        <h3>[% LibraryName | html %]</h3>
213
    </th>
213
    </th>
214
 </tr>
214
 </tr>
215
[% END %]
215
[% END %]
216
 <tr>
216
 <tr>
217
    <th colspan="4" class="centerednames">
217
    <th colspan="5" class="centerednames">
218
        <h2><u>Fee receipt</u></h2>
218
        <h2><u>Fee receipt</u></h2>
219
    </th>
219
    </th>
220
 </tr>
220
 </tr>
221
 <tr>
221
 <tr>
222
    <th colspan="4" class="centerednames">
222
    <th colspan="5" class="centerednames">
223
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
223
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
224
    </th>
224
    </th>
225
 </tr>
225
 </tr>
226
 <tr>
226
 <tr>
227
    <th colspan="4">
227
    <th colspan="5">
228
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
228
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
229
        Card number: [% patron.cardnumber | html %]<br />
229
        Card number: [% patron.cardnumber | html %]<br />
230
    </th>
230
    </th>
231
 </tr>
231
 </tr>
232
  <tr>
232
  <tr>
233
    <th>Date</th>
233
    <th>Created</th>
234
    <th>Updated</th>
234
    <th>Description of charges</th>
235
    <th>Description of charges</th>
235
    <th>Note</th>
236
    <th>Note</th>
236
    <th>Amount</th>
237
    <th>Amount</th>
Lines 239-244 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
239
  [% FOREACH account IN accounts %]
240
  [% FOREACH account IN accounts %]
240
    <tr class="highlight">
241
    <tr class="highlight">
241
      <td>[% account.date | $KohaDates %]</td>
242
      <td>[% account.date | $KohaDates %]</td>
243
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
242
      <td>
244
      <td>
243
        [% PROCESS account_type_description account=account %]
245
        [% PROCESS account_type_description account=account %]
244
        [%- IF account.description %], [% account.description | html %][% END %]
246
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 250-256 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
250
  [% END %]
252
  [% END %]
251
<tfoot>
253
<tfoot>
252
  <tr>
254
  <tr>
253
    <td colspan="3">Total outstanding dues as on date: </td>
255
    <td colspan="4">Total outstanding dues as on date: </td>
254
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
256
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
255
  </tr>
257
  </tr>
256
</tfoot>
258
</tfoot>
Lines 260-289 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
260
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
262
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
261
  [% IF ( LibraryName ) %]
263
  [% IF ( LibraryName ) %]
262
    <tr>
264
    <tr>
263
      <th colspan="5" class="centerednames">
265
      <th colspan="6" class="centerednames">
264
        <h3>[% LibraryName | html %]</h3>
266
        <h3>[% LibraryName | html %]</h3>
265
      </th>
267
      </th>
266
    </tr>
268
    </tr>
267
  [% END %]
269
  [% END %]
268
270
269
  <tr>
271
  <tr>
270
    <th colspan="5" class="centerednames">
272
    <th colspan="6" class="centerednames">
271
      <h2><u>INVOICE</u></h2>
273
      <h2><u>INVOICE</u></h2>
272
    </th>
274
    </th>
273
  </tr>
275
  </tr>
274
  <tr>
276
  <tr>
275
    <th colspan="5" class="centerednames">
277
    <th colspan="6" class="centerednames">
276
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
278
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
277
    </th>
279
    </th>
278
  </tr>
280
  </tr>
279
  <tr>
281
  <tr>
280
    <th colspan="5" >
282
    <th colspan="6" >
281
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
283
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
282
      Card number: [% patron.cardnumber | html %]<br />
284
      Card number: [% patron.cardnumber | html %]<br />
283
    </th>
285
    </th>
284
  </tr>
286
  </tr>
285
  <tr>
287
  <tr>
286
    <th>Date</th>
288
    <th>Created</th>
289
    <th>Updated</th>
287
    <th>Description of charges</th>
290
    <th>Description of charges</th>
288
    <th>Note</th>
291
    <th>Note</th>
289
    <th style="text-align:right;">Amount</th>
292
    <th style="text-align:right;">Amount</th>
Lines 293-298 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
293
  [% FOREACH account IN accounts %]
296
  [% FOREACH account IN accounts %]
294
    <tr class="highlight">
297
    <tr class="highlight">
295
      <td>[% account.date | $KohaDates%]</td>
298
      <td>[% account.date | $KohaDates%]</td>
299
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
296
      <td>
300
      <td>
297
        [% PROCESS account_type_description account=account %]
301
        [% PROCESS account_type_description account=account %]
298
        [%- IF account.description %], [% account.description | html %][% END %]
302
        [%- IF account.description %], [% account.description | html %][% END %]
(-)a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql (-12 / +16 lines)
Lines 299-327 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
299
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
299
('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table>
300
[% IF ( LibraryName ) %]
300
[% IF ( LibraryName ) %]
301
 <tr>
301
 <tr>
302
    <th colspan="4" class="centerednames">
302
    <th colspan="5" class="centerednames">
303
        <h3>[% LibraryName | html %]</h3>
303
        <h3>[% LibraryName | html %]</h3>
304
    </th>
304
    </th>
305
 </tr>
305
 </tr>
306
[% END %]
306
[% END %]
307
 <tr>
307
 <tr>
308
    <th colspan="4" class="centerednames">
308
    <th colspan="5" class="centerednames">
309
        <h2><u>Fee receipt</u></h2>
309
        <h2><u>Fee receipt</u></h2>
310
    </th>
310
    </th>
311
 </tr>
311
 </tr>
312
 <tr>
312
 <tr>
313
    <th colspan="4" class="centerednames">
313
    <th colspan="5" class="centerednames">
314
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
314
        <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
315
    </th>
315
    </th>
316
 </tr>
316
 </tr>
317
 <tr>
317
 <tr>
318
    <th colspan="4">
318
    <th colspan="5">
319
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
319
        Received with thanks from  [% patron.firstname | html %] [% patron.surname | html %] <br />
320
        Card number: [% patron.cardnumber | html %]<br />
320
        Card number: [% patron.cardnumber | html %]<br />
321
    </th>
321
    </th>
322
 </tr>
322
 </tr>
323
  <tr>
323
  <tr>
324
    <th>Date</th>
324
    <th>Created</th>
325
    <th>Updated</th>
325
    <th>Description of charges</th>
326
    <th>Description of charges</th>
326
    <th>Note</th>
327
    <th>Note</th>
327
    <th>Amount</th>
328
    <th>Amount</th>
Lines 330-335 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
330
  [% FOREACH account IN accounts %]
331
  [% FOREACH account IN accounts %]
331
    <tr class="highlight">
332
    <tr class="highlight">
332
      <td>[% account.date | $KohaDates %]</td>
333
      <td>[% account.date | $KohaDates %]</td>
334
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
333
      <td>
335
      <td>
334
        [% PROCESS account_type_description account=account %]
336
        [% PROCESS account_type_description account=account %]
335
        [%- IF account.description %], [% account.description | html %][% END %]
337
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 341-347 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
341
  [% END %]
343
  [% END %]
342
<tfoot>
344
<tfoot>
343
  <tr>
345
  <tr>
344
    <td colspan="3">Total outstanding dues as on date: </td>
346
    <td colspan="4">Total outstanding dues as on date: </td>
345
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
347
    [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
346
  </tr>
348
  </tr>
347
</tfoot>
349
</tfoot>
Lines 351-380 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
351
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
353
('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table>
352
  [% IF ( LibraryName ) %]
354
  [% IF ( LibraryName ) %]
353
    <tr>
355
    <tr>
354
      <th colspan="5" class="centerednames">
356
      <th colspan="6" class="centerednames">
355
        <h3>[% LibraryName | html %]</h3>
357
        <h3>[% LibraryName | html %]</h3>
356
      </th>
358
      </th>
357
    </tr>
359
    </tr>
358
  [% END %]
360
  [% END %]
359
361
360
  <tr>
362
  <tr>
361
    <th colspan="5" class="centerednames">
363
    <th colspan="6" class="centerednames">
362
      <h2><u>INVOICE</u></h2>
364
      <h2><u>INVOICE</u></h2>
363
    </th>
365
    </th>
364
  </tr>
366
  </tr>
365
  <tr>
367
  <tr>
366
    <th colspan="5" class="centerednames">
368
    <th colspan="6" class="centerednames">
367
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
369
      <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2>
368
    </th>
370
    </th>
369
  </tr>
371
  </tr>
370
  <tr>
372
  <tr>
371
    <th colspan="5" >
373
    <th colspan="6" >
372
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
374
      Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />
373
      Card number: [% patron.cardnumber | html %]<br />
375
      Card number: [% patron.cardnumber | html %]<br />
374
    </th>
376
    </th>
375
  </tr>
377
  </tr>
376
  <tr>
378
  <tr>
377
    <th>Date</th>
379
    <th>Created</th>
380
    <th>Updated</th>
378
    <th>Description of charges</th>
381
    <th>Description of charges</th>
379
    <th>Note</th>
382
    <th>Note</th>
380
    <th style="text-align:right;">Amount</th>
383
    <th style="text-align:right;">Amount</th>
Lines 384-389 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
384
  [% FOREACH account IN accounts %]
387
  [% FOREACH account IN accounts %]
385
    <tr class="highlight">
388
    <tr class="highlight">
386
      <td>[% account.date | $KohaDates%]</td>
389
      <td>[% account.date | $KohaDates%]</td>
390
      <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>
387
      <td>
391
      <td>
388
        [% PROCESS account_type_description account=account %]
392
        [% PROCESS account_type_description account=account %]
389
        [%- IF account.description %], [% account.description | html %][% END %]
393
        [%- IF account.description %], [% account.description | html %][% END %]
Lines 396-402 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
396
400
397
  <tfoot>
401
  <tfoot>
398
    <tr>
402
    <tr>
399
      <td colspan="4">Total outstanding dues as on date: </td>
403
      <td colspan="5">Total outstanding dues as on date: </td>
400
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
404
      [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td>
401
    </tr>
405
    </tr>
402
  </tfoot>
406
  </tfoot>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-3 / +5 lines)
Lines 44-50 Link Here
44
<table id="table_account_fines">
44
<table id="table_account_fines">
45
    <thead>
45
    <thead>
46
      <tr>
46
      <tr>
47
          <th class="title-string">Date</th>
47
          <th class="title-string">Created</th>
48
          <th class="title-string">Updated</th>
48
          <th>Account type</th>
49
          <th>Account type</th>
49
          <th>Description of charges</th>
50
          <th>Description of charges</th>
50
          <th>Barcode</th>
51
          <th>Barcode</th>
Lines 62-68 Link Here
62
  [% FOREACH account IN accounts %]
63
  [% FOREACH account IN accounts %]
63
64
64
   <tr>
65
   <tr>
65
   <td><span title="[% account.date | html %]">[% account.date |$KohaDates %]</span></td>
66
   <td><span title="[% account.date | html %]">[% account.date | $KohaDates %]</span></td>
67
   <td><span title="[% account.timestamp | html %]">[% account.timestamp | $KohaDates with_hours = 1 %]</span></td>
66
        <td>[% PROCESS account_type_description account=account %]</td>
68
        <td>[% PROCESS account_type_description account=account %]</td>
67
      <td>
69
      <td>
68
        [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
70
        [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
Lines 103-109 Link Here
103
  [% END %]
105
  [% END %]
104
<tfoot>
106
<tfoot>
105
  <tr>
107
  <tr>
106
    <td colspan="9">Total due</td>
108
    <td colspan="10">Total due</td>
107
    [% IF ( totalcredit ) %]
109
    [% IF ( totalcredit ) %]
108
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
110
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
109
    [% ELSE %]
111
    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-1 / +3 lines)
Lines 133-138 Link Here
133
            <th>Patron name</th>
133
            <th>Patron name</th>
134
            <th>Transaction library</th>
134
            <th>Transaction library</th>
135
            <th>Transaction date</th>
135
            <th>Transaction date</th>
136
            <th>Updated</th>
136
            <th>Transaction type</th>
137
            <th>Transaction type</th>
137
            <th>Notes</th>
138
            <th>Notes</th>
138
            <th>Amount</th>
139
            <th>Amount</th>
Lines 148-153 Link Here
148
                <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
149
                <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
149
                <td>[% loopresul.branchname | html %]</td>
150
                <td>[% loopresul.branchname | html %]</td>
150
                <td>[% loopresul.date | $KohaDates %]</td>
151
                <td>[% loopresul.date | $KohaDates %]</td>
152
                <td>[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td>
151
                <td>
153
                <td>
152
                    [% IF loopresul.credit_type == "ACT" %]
154
                    [% IF loopresul.credit_type == "ACT" %]
153
                        <span>All payments to the library</span>
155
                        <span>All payments to the library</span>
Lines 165-171 Link Here
165
        <tfoot>
167
        <tfoot>
166
        <tr>
168
        <tr>
167
            [% IF transaction_type == "ACT" %]
169
            [% IF transaction_type == "ACT" %]
168
            <th colspan="7" style="text-align:right;">TOTAL</th>
170
            <th colspan="8" style="text-align:right;">TOTAL</th>
169
            <th style="text-align:right;">[% total  | $Price %]</th>
171
            <th style="text-align:right;">[% total  | $Price %]</th>
170
            <th colspan="3">&nbsp;</th>
172
            <th colspan="3">&nbsp;</th>
171
            [% END %]
173
            [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-5 / +10 lines)
Lines 6-12 Link Here
6
        <thead>
6
        <thead>
7
            <tr>
7
            <tr>
8
                [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
8
                [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
9
                <th class="title-string">Date</th>
9
                <th class="title-string">Created</th>
10
                <th class="title-string">Updated</th>
10
                <th>Type</th>
11
                <th>Type</th>
11
                <th>Description</th>
12
                <th>Description</th>
12
                <th>Amount</th>
13
                <th>Amount</th>
Lines 27-32 Link Here
27
                        </td>
28
                        </td>
28
                    [% END %]
29
                    [% END %]
29
                    <td><span title="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td>
30
                    <td><span title="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td>
31
                    <td><span title="[% ACCOUNT_LINE.timestamp | html %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours = 1 %]</span></td>
30
                    <td>
32
                    <td>
31
                        [% PROCESS account_type_description account=ACCOUNT_LINE %]
33
                        [% PROCESS account_type_description account=ACCOUNT_LINE %]
32
                    </td>
34
                    </td>
Lines 44-52 Link Here
44
        <tfoot>
46
        <tfoot>
45
            <tr>
47
            <tr>
46
                [%- IF ENABLE_OPAC_PAYMENTS -%]
48
                [%- IF ENABLE_OPAC_PAYMENTS -%]
47
                    [%- SET COLSPAN = 5 -%]
49
                    [%- SET COLSPAN = 6 -%]
48
                [%- ELSE -%]
50
                [%- ELSE -%]
49
                    [%- SET COLSPAN = 4 -%]
51
                    [%- SET COLSPAN = 5 -%]
50
                [%- END -%]
52
                [%- END -%]
51
                <th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
53
                <th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
52
                <td class="sum">[% total | $Price %]</td>
54
                <td class="sum">[% total | $Price %]</td>
Lines 56-61 Link Here
56
                [% IF outstanding_credit.amountoutstanding < 0 %]<tr class="outstanding">[% ELSE %]<tr>[% END%]
58
                [% IF outstanding_credit.amountoutstanding < 0 %]<tr class="outstanding">[% ELSE %]<tr>[% END%]
57
                    [% IF ENABLE_OPAC_PAYMENTS %]<td></td>[% END %]
59
                    [% IF ENABLE_OPAC_PAYMENTS %]<td></td>[% END %]
58
                    <td><span title="[% outstanding_credit.date | html %]">[% outstanding_credit.date | $KohaDates %]</span></td>
60
                    <td><span title="[% outstanding_credit.date | html %]">[% outstanding_credit.date | $KohaDates %]</span></td>
61
                    <td><span title="[% outstanding_credit.timestamp | html %]">[% outstanding_credit.date | $KohaDates with_hours = 1 %]</span></td>
59
                    <td>
62
                    <td>
60
                        [% PROCESS account_type_description account=outstanding_credit %]
63
                        [% PROCESS account_type_description account=outstanding_credit %]
61
                    </td>
64
                    </td>
Lines 89-95 Link Here
89
        <thead>
92
        <thead>
90
            <tr>
93
            <tr>
91
                [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
94
                [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
92
                <th class="title-string">Date</th>
95
                <th class="title-string">Created</th>
96
                <th class="title-string">Updated</th>
93
                <th>Description</th>
97
                <th>Description</th>
94
                <th>Fine amount</th>
98
                <th>Fine amount</th>
95
                <th>Amount outstanding</th>
99
                <th>Amount outstanding</th>
Lines 111-116 Link Here
111
                        </td>
115
                        </td>
112
                    [% END %]
116
                    [% END %]
113
                    <td><span title="[% a.date | html %]">[% a.date | $KohaDates %]</span></td>
117
                    <td><span title="[% a.date | html %]">[% a.date | $KohaDates %]</span></td>
118
                    <td><span title="[% a.timestamp | html %]">[% a.timestamp | $KohaDates with_hours = 1 %]</span></td>
114
                    <td>
119
                    <td>
115
                        [% PROCESS account_type_description account=a %]
120
                        [% PROCESS account_type_description account=a %]
116
                        [%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) | html %][% END %]
121
                        [%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) | html %][% END %]
Lines 125-131 Link Here
125
130
126
        <tfoot>
131
        <tfoot>
127
            <tr>
132
            <tr>
128
                <th class="sum" colspan="3">Total due</th>
133
                <th class="sum" colspan="4">Total due</th>
129
                <td class="sum">[% account_sum | $Price %]</td>
134
                <td class="sum">[% account_sum | $Price %]</td>
130
            </tr>
135
            </tr>
131
        </tfoot>
136
        </tfoot>
(-)a/reports/cash_register_stats.pl (-2 / +1 lines)
Lines 100-106 if ($do_it) { Link Here
100
    SELECT round(amount,2) AS amount, description,
100
    SELECT round(amount,2) AS amount, description,
101
        bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
101
        bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
102
        bo.cardnumber, br.branchname, bo.borrowernumber,
102
        bo.cardnumber, br.branchname, bo.borrowernumber,
103
        al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note,
103
        al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note, al.timestamp,
104
        bi.title, bi.biblionumber, i.barcode, i.itype
104
        bi.title, bi.biblionumber, i.barcode, i.itype
105
        FROM accountlines al
105
        FROM accountlines al
106
        LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
106
        LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
107
- 

Return to bug 16486