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

(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-13 / +17 lines)
Lines 57-85 tables: Link Here
57
            - "<table>"
57
            - "<table>"
58
            - "[% IF ( LibraryName ) %]"
58
            - "[% IF ( LibraryName ) %]"
59
            - " <tr>"
59
            - " <tr>"
60
            - "    <th colspan=\"4\" class=\"centerednames\">"
60
            - "    <th colspan=\"5\" class=\"centerednames\">"
61
            - "        <h3>[% LibraryName | html %]</h3>"
61
            - "        <h3>[% LibraryName | html %]</h3>"
62
            - "    </th>"
62
            - "    </th>"
63
            - " </tr>"
63
            - " </tr>"
64
            - "[% END %]"
64
            - "[% END %]"
65
            - " <tr>"
65
            - " <tr>"
66
            - "    <th colspan=\"4\" class=\"centerednames\">"
66
            - "    <th colspan=\"5\" class=\"centerednames\">"
67
            - "        <h2><u>Fee receipt</u></h2>"
67
            - "        <h2><u>Fee receipt</u></h2>"
68
            - "    </th>"
68
            - "    </th>"
69
            - " </tr>"
69
            - " </tr>"
70
            - " <tr>"
70
            - " <tr>"
71
            - "    <th colspan=\"4\" class=\"centerednames\">"
71
            - "    <th colspan=\"5\" class=\"centerednames\">"
72
            - "        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>"
72
            - "        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>"
73
            - "    </th>"
73
            - "    </th>"
74
            - " </tr>"
74
            - " </tr>"
75
            - " <tr>"
75
            - " <tr>"
76
            - "    <th colspan=\"4\">"
76
            - "    <th colspan=\"5\">"
77
            - "        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
77
            - "        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
78
            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
78
            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
79
            - "    </th>"
79
            - "    </th>"
80
            - " </tr>"
80
            - " </tr>"
81
            - "  <tr>"
81
            - "  <tr>"
82
            - "    <th>Date</th>"
82
            - "    <th>Created</th>"
83
            - "    <th>Updated</th>"
83
            - "    <th>Description of charges</th>"
84
            - "    <th>Description of charges</th>"
84
            - "    <th>Note</th>"
85
            - "    <th>Note</th>"
85
            - "    <th>Amount</th>"
86
            - "    <th>Amount</th>"
Lines 87-92 tables: Link Here
87
            - ""
88
            - ""
88
            - " <tr class=\"highlight\">"
89
            - " <tr class=\"highlight\">"
89
            - "    <td>[% credit.date | $KohaDates %]</td>"
90
            - "    <td>[% credit.date | $KohaDates %]</td>"
91
            - "    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>"
90
            - "    <td>"
92
            - "    <td>"
91
            - "      [% PROCESS account_type_description account=credit %]"
93
            - "      [% PROCESS account_type_description account=credit %]"
92
            - "      [%- IF credit.description %], [% credit.description | html %][% END %]"
94
            - "      [%- IF credit.description %], [% credit.description | html %][% END %]"
Lines 108-114 tables: Link Here
108
            - ""
110
            - ""
109
            - "<tfoot>"
111
            - "<tfoot>"
110
            - "  <tr>"
112
            - "  <tr>"
111
            - "    <td colspan=\"3\">Total outstanding dues as on date: </td>"
113
            - "    <td colspan=\"4\">Total outstanding dues as on date: </td>"
112
            - "    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>"
114
            - "    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>"
113
            - "  </tr>"
115
            - "  </tr>"
114
            - "</tfoot>"
116
            - "</tfoot>"
Lines 128-157 tables: Link Here
128
            - "<table>"
130
            - "<table>"
129
            - "  [% IF ( LibraryName ) %]"
131
            - "  [% IF ( LibraryName ) %]"
130
            - "    <tr>"
132
            - "    <tr>"
131
            - "      <th colspan=\"5\" class=\"centerednames\">"
133
            - "      <th colspan=\"6\" class=\"centerednames\">"
132
            - "        <h3>[% LibraryName | html %]</h3>"
134
            - "        <h3>[% LibraryName | html %]</h3>"
133
            - "      </th>"
135
            - "      </th>"
134
            - "    </tr>"
136
            - "    </tr>"
135
            - "  [% END %]"
137
            - "  [% END %]"
136
            - ""
138
            - ""
137
            - "  <tr>"
139
            - "  <tr>"
138
            - "    <th colspan=\"5\" class=\"centerednames\">"
140
            - "    <th colspan=\"6\" class=\"centerednames\">"
139
            - "      <h2><u>INVOICE</u></h2>"
141
            - "      <h2><u>INVOICE</u></h2>"
140
            - "    </th>"
142
            - "    </th>"
141
            - "  </tr>"
143
            - "  </tr>"
142
            - "  <tr>"
144
            - "  <tr>"
143
            - "    <th colspan=\"5\" class=\"centerednames\">"
145
            - "    <th colspan=\"6\" class=\"centerednames\">"
144
            - "      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>"
146
            - "      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>"
145
            - "    </th>"
147
            - "    </th>"
146
            - "  </tr>"
148
            - "  </tr>"
147
            - "  <tr>"
149
            - "  <tr>"
148
            - "    <th colspan=\"5\" >"
150
            - "    <th colspan=\"6\" >"
149
            - "      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />"
151
            - "      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />"
150
            - "      Card number: [% debit.patron.cardnumber | html %]<br />"
152
            - "      Card number: [% debit.patron.cardnumber | html %]<br />"
151
            - "    </th>"
153
            - "    </th>"
152
            - "  </tr>"
154
            - "  </tr>"
153
            - "  <tr>"
155
            - "  <tr>"
154
            - "    <th>Date</th>"
156
            - "    <th>Created</th>"
157
            - "    <th>Updated</th>"
155
            - "    <th>Description of charges</th>"
158
            - "    <th>Description of charges</th>"
156
            - "    <th>Note</th>"
159
            - "    <th>Note</th>"
157
            - "    <th style=\"text-align:right;\">Amount</th>"
160
            - "    <th style=\"text-align:right;\">Amount</th>"
Lines 160-165 tables: Link Here
160
            - ""
163
            - ""
161
            - "  <tr class=\"highlight\">"
164
            - "  <tr class=\"highlight\">"
162
            - "    <td>[% debit.date | $KohaDates%]</td>"
165
            - "    <td>[% debit.date | $KohaDates%]</td>"
166
            - "    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>"
163
            - "    <td>"
167
            - "    <td>"
164
            - "      [% PROCESS account_type_description account=debit %]"
168
            - "      [% PROCESS account_type_description account=debit %]"
165
            - "      [%- IF debit.description %], [% debit.description | html %][% END %]"
169
            - "      [%- IF debit.description %], [% debit.description | html %][% END %]"
Lines 171-178 tables: Link Here
171
            - ""
175
            - ""
172
            - "  <tfoot>"
176
            - "  <tfoot>"
173
            - "    <tr>"
177
            - "    <tr>"
174
            - "      <td colspan=\"4\">Total outstanding dues as on date: </td>"
178
            - "      <td colspan=\"5\">Total outstanding dues as on date: </td>"
175
            - "      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>"
179
            - "      [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
176
            - "    </tr>"
180
            - "    </tr>"
177
            - "  </tfoot>"
181
            - "  </tfoot>"
178
            - "</table>"
182
            - "</table>"
(-)a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql (-12 / +16 lines)
Lines 115-143 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
115
<table>
115
<table>
116
[% IF ( LibraryName ) %]
116
[% IF ( LibraryName ) %]
117
 <tr>
117
 <tr>
118
    <th colspan=\"4\" class=\"centerednames\">
118
    <th colspan=\"5\" class=\"centerednames\">
119
        <h3>[% LibraryName | html %]</h3>
119
        <h3>[% LibraryName | html %]</h3>
120
    </th>
120
    </th>
121
 </tr>
121
 </tr>
122
[% END %]
122
[% END %]
123
 <tr>
123
 <tr>
124
    <th colspan=\"4\" class=\"centerednames\">
124
    <th colspan=\"5\" class=\"centerednames\">
125
        <h2><u>Fee receipt</u></h2>
125
        <h2><u>Fee receipt</u></h2>
126
    </th>
126
    </th>
127
 </tr>
127
 </tr>
128
 <tr>
128
 <tr>
129
    <th colspan=\"4\" class=\"centerednames\">
129
    <th colspan=\"5\" class=\"centerednames\">
130
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
130
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
131
    </th>
131
    </th>
132
 </tr>
132
 </tr>
133
 <tr>
133
 <tr>
134
    <th colspan=\"4\">
134
    <th colspan=\"5\">
135
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
135
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
136
        Card number: [% credit.patron.cardnumber | html %]<br />
136
        Card number: [% credit.patron.cardnumber | html %]<br />
137
    </th>
137
    </th>
138
 </tr>
138
 </tr>
139
  <tr>
139
  <tr>
140
    <th>Date</th>
140
    <th>Created</th>
141
    <th>Updated</th>
141
    <th>Description of charges</th>
142
    <th>Description of charges</th>
142
    <th>Note</th>
143
    <th>Note</th>
143
    <th>Amount</th>
144
    <th>Amount</th>
Lines 145-150 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
145
146
146
 <tr class=\"highlight\">
147
 <tr class=\"highlight\">
147
    <td>[% credit.date | $KohaDates %]</td>
148
    <td>[% credit.date | $KohaDates %]</td>
149
    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>
148
    <td>
150
    <td>
149
      [% PROCESS account_type_description account=credit %]
151
      [% PROCESS account_type_description account=credit %]
150
      [%- IF credit.description %], [% credit.description | html %][% END %]
152
      [%- IF credit.description %], [% credit.description | html %][% END %]
Lines 166-172 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
166
168
167
<tfoot>
169
<tfoot>
168
  <tr>
170
  <tr>
169
    <td colspan=\"3\">Total outstanding dues as on date: </td>
171
    <td colspan=\"4\">Total outstanding dues as on date: </td>
170
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
172
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
171
  </tr>
173
  </tr>
172
</tfoot>
174
</tfoot>
Lines 178-207 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
178
<table>
180
<table>
179
  [% IF ( LibraryName ) %]
181
  [% IF ( LibraryName ) %]
180
    <tr>
182
    <tr>
181
      <th colspan=\"5\" class=\"centerednames\">
183
      <th colspan=\"6\" class=\"centerednames\">
182
        <h3>[% LibraryName | html %]</h3>
184
        <h3>[% LibraryName | html %]</h3>
183
      </th>
185
      </th>
184
    </tr>
186
    </tr>
185
  [% END %]
187
  [% END %]
186
188
187
  <tr>
189
  <tr>
188
    <th colspan=\"5\" class=\"centerednames\">
190
    <th colspan=\"6\" class=\"centerednames\">
189
      <h2><u>INVOICE</u></h2>
191
      <h2><u>INVOICE</u></h2>
190
    </th>
192
    </th>
191
  </tr>
193
  </tr>
192
  <tr>
194
  <tr>
193
    <th colspan=\"5\" class=\"centerednames\">
195
    <th colspan=\"6\" class=\"centerednames\">
194
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
196
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
195
    </th>
197
    </th>
196
  </tr>
198
  </tr>
197
  <tr>
199
  <tr>
198
    <th colspan=\"5\" >
200
    <th colspan=\"6\" >
199
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
201
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
200
      Card number: [% debit.patron.cardnumber | html %]<br />
202
      Card number: [% debit.patron.cardnumber | html %]<br />
201
    </th>
203
    </th>
202
  </tr>
204
  </tr>
203
  <tr>
205
  <tr>
204
    <th>Date</th>
206
    <th>Created</th>
207
    <th>Updated</th>
205
    <th>Description of charges</th>
208
    <th>Description of charges</th>
206
    <th>Note</th>
209
    <th>Note</th>
207
    <th style=\"text-align:right;\">Amount</th>
210
    <th style=\"text-align:right;\">Amount</th>
Lines 210-215 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
210
213
211
  <tr class=\"highlight\">
214
  <tr class=\"highlight\">
212
    <td>[% debit.date | $KohaDates%]</td>
215
    <td>[% debit.date | $KohaDates%]</td>
216
    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>
213
    <td>
217
    <td>
214
      [% PROCESS account_type_description account=debit %]
218
      [% PROCESS account_type_description account=debit %]
215
      [%- IF debit.description %], [% debit.description | html %][% END %]
219
      [%- IF debit.description %], [% debit.description | html %][% END %]
Lines 221-227 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
221
225
222
  <tfoot>
226
  <tfoot>
223
    <tr>
227
    <tr>
224
      <td colspan=\"4\">Total outstanding dues as on date: </td>
228
      <td colspan=\"5\">Total outstanding dues as on date: </td>
225
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
229
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
226
    </tr>
230
    </tr>
227
  </tfoot>
231
  </tfoot>
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql (-12 / +16 lines)
Lines 228-256 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
228
<table>
228
<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( credit.patron.branchcode ) | html %]</h2>
243
        <h2>[% Branches.GetName( credit.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  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
248
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
249
        Card number: [% credit.patron.cardnumber | html %]<br />
249
        Card number: [% credit.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 258-263 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
258
259
259
 <tr class=\"highlight\">
260
 <tr class=\"highlight\">
260
    <td>[% credit.date | $KohaDates %]</td>
261
    <td>[% credit.date | $KohaDates %]</td>
262
    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>
261
    <td>
263
    <td>
262
      [% PROCESS account_type_description account=credit %]
264
      [% PROCESS account_type_description account=credit %]
263
      [%- IF credit.description %], [% credit.description | html %][% END %]
265
      [%- IF credit.description %], [% credit.description | html %][% END %]
Lines 279-285 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
279
281
280
<tfoot>
282
<tfoot>
281
  <tr>
283
  <tr>
282
    <td colspan=\"3\">Total outstanding dues as on date: </td>
284
    <td colspan=\"4\">Total outstanding dues as on date: </td>
283
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
285
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
284
  </tr>
286
  </tr>
285
</tfoot>
287
</tfoot>
Lines 291-320 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
291
<table>
293
<table>
292
  [% IF ( LibraryName ) %]
294
  [% IF ( LibraryName ) %]
293
    <tr>
295
    <tr>
294
      <th colspan=\"5\" class=\"centerednames\">
296
      <th colspan=\"6\" class=\"centerednames\">
295
        <h3>[% LibraryName | html %]</h3>
297
        <h3>[% LibraryName | html %]</h3>
296
      </th>
298
      </th>
297
    </tr>
299
    </tr>
298
  [% END %]
300
  [% END %]
299
301
300
  <tr>
302
  <tr>
301
    <th colspan=\"5\" class=\"centerednames\">
303
    <th colspan=\"6\" class=\"centerednames\">
302
      <h2><u>INVOICE</u></h2>
304
      <h2><u>INVOICE</u></h2>
303
    </th>
305
    </th>
304
  </tr>
306
  </tr>
305
  <tr>
307
  <tr>
306
    <th colspan=\"5\" class=\"centerednames\">
308
    <th colspan=\"6\" class=\"centerednames\">
307
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
309
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
308
    </th>
310
    </th>
309
  </tr>
311
  </tr>
310
  <tr>
312
  <tr>
311
    <th colspan=\"5\" >
313
    <th colspan=\"6\" >
312
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
314
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
313
      Card number: [% debit.patron.cardnumber | html %]<br />
315
      Card number: [% debit.patron.cardnumber | html %]<br />
314
    </th>
316
    </th>
315
  </tr>
317
  </tr>
316
  <tr>
318
  <tr>
317
    <th>Date</th>
319
    <th>Created</th>
320
    <th>Updated</th>
318
    <th>Description of charges</th>
321
    <th>Description of charges</th>
319
    <th>Note</th>
322
    <th>Note</th>
320
    <th style=\"text-align:right;\">Amount</th>
323
    <th style=\"text-align:right;\">Amount</th>
Lines 323-328 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
323
326
324
  <tr class=\"highlight\">
327
  <tr class=\"highlight\">
325
    <td>[% debit.date | $KohaDates%]</td>
328
    <td>[% debit.date | $KohaDates%]</td>
329
    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>
326
    <td>
330
    <td>
327
      [% PROCESS account_type_description account=debit %]
331
      [% PROCESS account_type_description account=debit %]
328
      [%- IF debit.description %], [% debit.description | html %][% END %]
332
      [%- IF debit.description %], [% debit.description | html %][% END %]
Lines 334-340 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
334
338
335
  <tfoot>
339
  <tfoot>
336
    <tr>
340
    <tr>
337
      <td colspan=\"4\">Total outstanding dues as on date: </td>
341
      <td colspan=\"5\">Total outstanding dues as on date: </td>
338
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
342
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
339
    </tr>
343
    </tr>
340
  </tfoot>
344
  </tfoot>
(-)a/installer/data/mysql/it-IT/necessari/notices.sql (-12 / +16 lines)
Lines 230-258 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
230
<table>
230
<table>
231
[% IF ( LibraryName ) %]
231
[% IF ( LibraryName ) %]
232
 <tr>
232
 <tr>
233
    <th colspan=\"4\" class=\"centerednames\">
233
    <th colspan=\"5\" class=\"centerednames\">
234
        <h3>[% LibraryName | html %]</h3>
234
        <h3>[% LibraryName | html %]</h3>
235
    </th>
235
    </th>
236
 </tr>
236
 </tr>
237
[% END %]
237
[% END %]
238
 <tr>
238
 <tr>
239
    <th colspan=\"4\" class=\"centerednames\">
239
    <th colspan=\"5\" class=\"centerednames\">
240
        <h2><u>Fee receipt</u></h2>
240
        <h2><u>Fee receipt</u></h2>
241
    </th>
241
    </th>
242
 </tr>
242
 </tr>
243
 <tr>
243
 <tr>
244
    <th colspan=\"4\" class=\"centerednames\">
244
    <th colspan=\"5\" class=\"centerednames\">
245
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
245
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
246
    </th>
246
    </th>
247
 </tr>
247
 </tr>
248
 <tr>
248
 <tr>
249
    <th colspan=\"4\">
249
    <th colspan=\"5\">
250
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
250
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
251
        Card number: [% credit.patron.cardnumber | html %]<br />
251
        Card number: [% credit.patron.cardnumber | html %]<br />
252
    </th>
252
    </th>
253
 </tr>
253
 </tr>
254
  <tr>
254
  <tr>
255
    <th>Date</th>
255
    <th>Created</th>
256
    <th>Updated</th>
256
    <th>Description of charges</th>
257
    <th>Description of charges</th>
257
    <th>Note</th>
258
    <th>Note</th>
258
    <th>Amount</th>
259
    <th>Amount</th>
Lines 260-265 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
260
261
261
 <tr class=\"highlight\">
262
 <tr class=\"highlight\">
262
    <td>[% credit.date | $KohaDates %]</td>
263
    <td>[% credit.date | $KohaDates %]</td>
264
    <td>[% credit.timestamp | $KohaDates %]</td>
263
    <td>
265
    <td>
264
      [% PROCESS account_type_description account=credit %]
266
      [% PROCESS account_type_description account=credit %]
265
      [%- IF credit.description %], [% credit.description | html %][% END %]
267
      [%- IF credit.description %], [% credit.description | html %][% END %]
Lines 281-287 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
281
283
282
<tfoot>
284
<tfoot>
283
  <tr>
285
  <tr>
284
    <td colspan=\"3\">Total outstanding dues as on date: </td>
286
    <td colspan=\"4\">Total outstanding dues as on date: </td>
285
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
287
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
286
  </tr>
288
  </tr>
287
</tfoot>
289
</tfoot>
Lines 293-322 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
293
<table>
295
<table>
294
  [% IF ( LibraryName ) %]
296
  [% IF ( LibraryName ) %]
295
    <tr>
297
    <tr>
296
      <th colspan=\"5\" class=\"centerednames\">
298
      <th colspan=\"6\" class=\"centerednames\">
297
        <h3>[% LibraryName | html %]</h3>
299
        <h3>[% LibraryName | html %]</h3>
298
      </th>
300
      </th>
299
    </tr>
301
    </tr>
300
  [% END %]
302
  [% END %]
301
303
302
  <tr>
304
  <tr>
303
    <th colspan=\"5\" class=\"centerednames\">
305
    <th colspan=\"6\" class=\"centerednames\">
304
      <h2><u>INVOICE</u></h2>
306
      <h2><u>INVOICE</u></h2>
305
    </th>
307
    </th>
306
  </tr>
308
  </tr>
307
  <tr>
309
  <tr>
308
    <th colspan=\"5\" class=\"centerednames\">
310
    <th colspan=\"6\" class=\"centerednames\">
309
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
311
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
310
    </th>
312
    </th>
311
  </tr>
313
  </tr>
312
  <tr>
314
  <tr>
313
    <th colspan=\"5\" >
315
    <th colspan=\"6\" >
314
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
316
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
315
      Card number: [% debit.patron.cardnumber | html %]<br />
317
      Card number: [% debit.patron.cardnumber | html %]<br />
316
    </th>
318
    </th>
317
  </tr>
319
  </tr>
318
  <tr>
320
  <tr>
319
    <th>Date</th>
321
    <th>Created</th>
322
    <th>Updated</th>
320
    <th>Description of charges</th>
323
    <th>Description of charges</th>
321
    <th>Note</th>
324
    <th>Note</th>
322
    <th style=\"text-align:right;\">Amount</th>
325
    <th style=\"text-align:right;\">Amount</th>
Lines 325-330 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
325
328
326
  <tr class=\"highlight\">
329
  <tr class=\"highlight\">
327
    <td>[% debit.date | $KohaDates%]</td>
330
    <td>[% debit.date | $KohaDates%]</td>
331
    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>
328
    <td>
332
    <td>
329
      [% PROCESS account_type_description account=debit %]
333
      [% PROCESS account_type_description account=debit %]
330
      [%- IF debit.description %], [% debit.description | html %][% END %]
334
      [%- IF debit.description %], [% debit.description | html %][% END %]
Lines 336-342 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
336
340
337
  <tfoot>
341
  <tfoot>
338
    <tr>
342
    <tr>
339
      <td colspan=\"4\">Total outstanding dues as on date: </td>
343
      <td colspan=\"5\">Total outstanding dues as on date: </td>
340
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
344
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
341
    </tr>
345
    </tr>
342
  </tfoot>
346
  </tfoot>
(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql (-12 / +16 lines)
Lines 246-274 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
246
<table>
246
<table>
247
[% IF ( LibraryName ) %]
247
[% IF ( LibraryName ) %]
248
 <tr>
248
 <tr>
249
    <th colspan=\"4\" class=\"centerednames\">
249
    <th colspan=\"5\" class=\"centerednames\">
250
        <h3>[% LibraryName | html %]</h3>
250
        <h3>[% LibraryName | html %]</h3>
251
    </th>
251
    </th>
252
 </tr>
252
 </tr>
253
[% END %]
253
[% END %]
254
 <tr>
254
 <tr>
255
    <th colspan=\"4\" class=\"centerednames\">
255
    <th colspan=\"5\" class=\"centerednames\">
256
        <h2><u>Fee receipt</u></h2>
256
        <h2><u>Fee receipt</u></h2>
257
    </th>
257
    </th>
258
 </tr>
258
 </tr>
259
 <tr>
259
 <tr>
260
    <th colspan=\"4\" class=\"centerednames\">
260
    <th colspan=\"5\" class=\"centerednames\">
261
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
261
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
262
    </th>
262
    </th>
263
 </tr>
263
 </tr>
264
 <tr>
264
 <tr>
265
    <th colspan=\"4\">
265
    <th colspan=\"5\">
266
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
266
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
267
        Card number: [% credit.patron.cardnumber | html %]<br />
267
        Card number: [% credit.patron.cardnumber | html %]<br />
268
    </th>
268
    </th>
269
 </tr>
269
 </tr>
270
  <tr>
270
  <tr>
271
    <th>Date</th>
271
    <th>Created</th>
272
    <th>Updated</th>
272
    <th>Description of charges</th>
273
    <th>Description of charges</th>
273
    <th>Note</th>
274
    <th>Note</th>
274
    <th>Amount</th>
275
    <th>Amount</th>
Lines 276-281 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
276
277
277
 <tr class=\"highlight\">
278
 <tr class=\"highlight\">
278
    <td>[% credit.date | $KohaDates %]</td>
279
    <td>[% credit.date | $KohaDates %]</td>
280
    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>
279
    <td>
281
    <td>
280
      [% PROCESS account_type_description account=credit %]
282
      [% PROCESS account_type_description account=credit %]
281
      [%- IF credit.description %], [% credit.description | html %][% END %]
283
      [%- IF credit.description %], [% credit.description | html %][% END %]
Lines 297-303 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
297
299
298
<tfoot>
300
<tfoot>
299
  <tr>
301
  <tr>
300
    <td colspan=\"3\">Total outstanding dues as on date: </td>
302
    <td colspan=\"4\">Total outstanding dues as on date: </td>
301
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
303
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
302
  </tr>
304
  </tr>
303
</tfoot>
305
</tfoot>
Lines 309-338 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
309
<table>
311
<table>
310
  [% IF ( LibraryName ) %]
312
  [% IF ( LibraryName ) %]
311
    <tr>
313
    <tr>
312
      <th colspan=\"5\" class=\"centerednames\">
314
      <th colspan=\"6\" class=\"centerednames\">
313
        <h3>[% LibraryName | html %]</h3>
315
        <h3>[% LibraryName | html %]</h3>
314
      </th>
316
      </th>
315
    </tr>
317
    </tr>
316
  [% END %]
318
  [% END %]
317
319
318
  <tr>
320
  <tr>
319
    <th colspan=\"5\" class=\"centerednames\">
321
    <th colspan=\"6\" class=\"centerednames\">
320
      <h2><u>INVOICE</u></h2>
322
      <h2><u>INVOICE</u></h2>
321
    </th>
323
    </th>
322
  </tr>
324
  </tr>
323
  <tr>
325
  <tr>
324
    <th colspan=\"5\" class=\"centerednames\">
326
    <th colspan=\"6\" class=\"centerednames\">
325
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
327
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
326
    </th>
328
    </th>
327
  </tr>
329
  </tr>
328
  <tr>
330
  <tr>
329
    <th colspan=\"5\" >
331
    <th colspan=\"6\" >
330
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
332
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
331
      Card number: [% debit.patron.cardnumber | html %]<br />
333
      Card number: [% debit.patron.cardnumber | html %]<br />
332
    </th>
334
    </th>
333
  </tr>
335
  </tr>
334
  <tr>
336
  <tr>
335
    <th>Date</th>
337
    <th>Created</th>
338
    <th>Updated</th>
336
    <th>Description of charges</th>
339
    <th>Description of charges</th>
337
    <th>Note</th>
340
    <th>Note</th>
338
    <th style=\"text-align:right;\">Amount</th>
341
    <th style=\"text-align:right;\">Amount</th>
Lines 341-346 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
341
344
342
  <tr class=\"highlight\">
345
  <tr class=\"highlight\">
343
    <td>[% debit.date | $KohaDates%]</td>
346
    <td>[% debit.date | $KohaDates%]</td>
347
    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>
344
    <td>
348
    <td>
345
      [% PROCESS account_type_description account=debit %]
349
      [% PROCESS account_type_description account=debit %]
346
      [%- IF debit.description %], [% debit.description | html %][% END %]
350
      [%- IF debit.description %], [% debit.description | html %][% END %]
Lines 352-358 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
352
356
353
  <tfoot>
357
  <tfoot>
354
    <tr>
358
    <tr>
355
      <td colspan=\"4\">Total outstanding dues as on date: </td>
359
      <td colspan=\"5\">Total outstanding dues as on date: </td>
356
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
360
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
357
    </tr>
361
    </tr>
358
  </tfoot>
362
  </tfoot>
(-)a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql (-12 / +16 lines)
Lines 225-253 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
225
<table>
225
<table>
226
[% IF ( LibraryName ) %]
226
[% IF ( LibraryName ) %]
227
 <tr>
227
 <tr>
228
    <th colspan=\"4\" class=\"centerednames\">
228
    <th colspan=\"5\" class=\"centerednames\">
229
        <h3>[% LibraryName | html %]</h3>
229
        <h3>[% LibraryName | html %]</h3>
230
    </th>
230
    </th>
231
 </tr>
231
 </tr>
232
[% END %]
232
[% END %]
233
 <tr>
233
 <tr>
234
    <th colspan=\"4\" class=\"centerednames\">
234
    <th colspan=\"5\" class=\"centerednames\">
235
        <h2><u>Fee receipt</u></h2>
235
        <h2><u>Fee receipt</u></h2>
236
    </th>
236
    </th>
237
 </tr>
237
 </tr>
238
 <tr>
238
 <tr>
239
    <th colspan=\"4\" class=\"centerednames\">
239
    <th colspan=\"5\" class=\"centerednames\">
240
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
240
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
241
    </th>
241
    </th>
242
 </tr>
242
 </tr>
243
 <tr>
243
 <tr>
244
    <th colspan=\"4\">
244
    <th colspan=\"5\">
245
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
245
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
246
        Card number: [% credit.patron.cardnumber | html %]<br />
246
        Card number: [% credit.patron.cardnumber | html %]<br />
247
    </th>
247
    </th>
248
 </tr>
248
 </tr>
249
  <tr>
249
  <tr>
250
    <th>Date</th>
250
    <th>Created</th>
251
    <th>Updated</th>
251
    <th>Description of charges</th>
252
    <th>Description of charges</th>
252
    <th>Note</th>
253
    <th>Note</th>
253
    <th>Amount</th>
254
    <th>Amount</th>
Lines 255-260 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
255
256
256
 <tr class=\"highlight\">
257
 <tr class=\"highlight\">
257
    <td>[% credit.date | $KohaDates %]</td>
258
    <td>[% credit.date | $KohaDates %]</td>
259
    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>
258
    <td>
260
    <td>
259
      [% PROCESS account_type_description account=credit %]
261
      [% PROCESS account_type_description account=credit %]
260
      [%- IF credit.description %], [% credit.description | html %][% END %]
262
      [%- IF credit.description %], [% credit.description | html %][% END %]
Lines 276-282 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
276
278
277
<tfoot>
279
<tfoot>
278
  <tr>
280
  <tr>
279
    <td colspan=\"3\">Total outstanding dues as on date: </td>
281
    <td colspan=\"4\">Total outstanding dues as on date: </td>
280
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
282
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
281
  </tr>
283
  </tr>
282
</tfoot>
284
</tfoot>
Lines 288-317 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
288
<table>
290
<table>
289
  [% IF ( LibraryName ) %]
291
  [% IF ( LibraryName ) %]
290
    <tr>
292
    <tr>
291
      <th colspan=\"5\" class=\"centerednames\">
293
      <th colspan=\"6\" class=\"centerednames\">
292
        <h3>[% LibraryName | html %]</h3>
294
        <h3>[% LibraryName | html %]</h3>
293
      </th>
295
      </th>
294
    </tr>
296
    </tr>
295
  [% END %]
297
  [% END %]
296
298
297
  <tr>
299
  <tr>
298
    <th colspan=\"5\" class=\"centerednames\">
300
    <th colspan=\"6\" class=\"centerednames\">
299
      <h2><u>INVOICE</u></h2>
301
      <h2><u>INVOICE</u></h2>
300
    </th>
302
    </th>
301
  </tr>
303
  </tr>
302
  <tr>
304
  <tr>
303
    <th colspan=\"5\" class=\"centerednames\">
305
    <th colspan=\"6\" class=\"centerednames\">
304
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
306
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
305
    </th>
307
    </th>
306
  </tr>
308
  </tr>
307
  <tr>
309
  <tr>
308
    <th colspan=\"5\" >
310
    <th colspan=\"6\" >
309
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
311
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
310
      Card number: [% debit.patron.cardnumber | html %]<br />
312
      Card number: [% debit.patron.cardnumber | html %]<br />
311
    </th>
313
    </th>
312
  </tr>
314
  </tr>
313
  <tr>
315
  <tr>
314
    <th>Date</th>
316
    <th>Created</th>
317
    <th>Updated</th>
315
    <th>Description of charges</th>
318
    <th>Description of charges</th>
316
    <th>Note</th>
319
    <th>Note</th>
317
    <th style=\"text-align:right;\">Amount</th>
320
    <th style=\"text-align:right;\">Amount</th>
Lines 320-325 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
320
323
321
  <tr class=\"highlight\">
324
  <tr class=\"highlight\">
322
    <td>[% debit.date | $KohaDates%]</td>
325
    <td>[% debit.date | $KohaDates%]</td>
326
    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>
323
    <td>
327
    <td>
324
      [% PROCESS account_type_description account=debit %]
328
      [% PROCESS account_type_description account=debit %]
325
      [%- IF debit.description %], [% debit.description | html %][% END %]
329
      [%- IF debit.description %], [% debit.description | html %][% END %]
Lines 331-337 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
331
335
332
  <tfoot>
336
  <tfoot>
333
    <tr>
337
    <tr>
334
      <td colspan=\"4\">Total outstanding dues as on date: </td>
338
      <td colspan=\"5\">Total outstanding dues as on date: </td>
335
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
339
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
336
    </tr>
340
    </tr>
337
  </tfoot>
341
  </tfoot>
(-)a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql (-11 / +15 lines)
Lines 227-255 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
227
<table>
227
<table>
228
[% IF ( LibraryName ) %]
228
[% IF ( LibraryName ) %]
229
 <tr>
229
 <tr>
230
    <th colspan=\"4\" class=\"centerednames\">
230
    <th colspan=\"5\" class=\"centerednames\">
231
        <h3>[% LibraryName | html %]</h3>
231
        <h3>[% LibraryName | html %]</h3>
232
    </th>
232
    </th>
233
 </tr>
233
 </tr>
234
[% END %]
234
[% END %]
235
 <tr>
235
 <tr>
236
    <th colspan=\"4\" class=\"centerednames\">
236
    <th colspan=\"5\" class=\"centerednames\">
237
        <h2><u>Fee receipt</u></h2>
237
        <h2><u>Fee receipt</u></h2>
238
    </th>
238
    </th>
239
 </tr>
239
 </tr>
240
 <tr>
240
 <tr>
241
    <th colspan=\"4\" class=\"centerednames\">
241
    <th colspan=\"5\" class=\"centerednames\">
242
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
242
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
243
    </th>
243
    </th>
244
 </tr>
244
 </tr>
245
 <tr>
245
 <tr>
246
    <th colspan=\"4\">
246
    <th colspan=\"5\">
247
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
247
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
248
        Card number: [% credit.patron.cardnumber | html %]<br />
248
        Card number: [% credit.patron.cardnumber | html %]<br />
249
    </th>
249
    </th>
250
 </tr>
250
 </tr>
251
  <tr>
251
  <tr>
252
    <th>Date</th>
252
    <th>Created</th>
253
    <th>Updated</th>
253
    <th>Description of charges</th>
254
    <th>Description of charges</th>
254
    <th>Note</th>
255
    <th>Note</th>
255
    <th>Amount</th>
256
    <th>Amount</th>
Lines 257-262 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
257
258
258
 <tr class=\"highlight\">
259
 <tr class=\"highlight\">
259
    <td>[% credit.date | $KohaDates %]</td>
260
    <td>[% credit.date | $KohaDates %]</td>
261
    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>
260
    <td>
262
    <td>
261
      [% PROCESS account_type_description account=credit %]
263
      [% PROCESS account_type_description account=credit %]
262
      [%- IF credit.description %], [% credit.description | html %][% END %]
264
      [%- IF credit.description %], [% credit.description | html %][% END %]
Lines 278-284 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
278
280
279
<tfoot>
281
<tfoot>
280
  <tr>
282
  <tr>
281
    <td colspan=\"3\">Total outstanding dues as on date: </td>
283
    <td colspan=\"4\">Total outstanding dues as on date: </td>
282
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
284
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
283
  </tr>
285
  </tr>
284
</tfoot>
286
</tfoot>
Lines 290-319 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
290
<table>
292
<table>
291
  [% IF ( LibraryName ) %]
293
  [% IF ( LibraryName ) %]
292
    <tr>
294
    <tr>
293
      <th colspan=\"5\" class=\"centerednames\">
295
      <th colspan=\"6\" class=\"centerednames\">
294
        <h3>[% LibraryName | html %]</h3>
296
        <h3>[% LibraryName | html %]</h3>
295
      </th>
297
      </th>
296
    </tr>
298
    </tr>
297
  [% END %]
299
  [% END %]
298
300
299
  <tr>
301
  <tr>
300
    <th colspan=\"5\" class=\"centerednames\">
302
    <th colspan=\"6\" class=\"centerednames\">
301
      <h2><u>INVOICE</u></h2>
303
      <h2><u>INVOICE</u></h2>
302
    </th>
304
    </th>
303
  </tr>
305
  </tr>
304
  <tr>
306
  <tr>
305
    <th colspan=\"5\" class=\"centerednames\">
307
    <th colspan=\"6\" class=\"centerednames\">
306
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
308
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
307
    </th>
309
    </th>
308
  </tr>
310
  </tr>
309
  <tr>
311
  <tr>
310
    <th colspan=\"5\" >
312
    <th colspan=\"6\" >
311
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
313
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
312
      Card number: [% debit.patron.cardnumber | html %]<br />
314
      Card number: [% debit.patron.cardnumber | html %]<br />
313
    </th>
315
    </th>
314
  </tr>
316
  </tr>
315
  <tr>
317
  <tr>
316
    <th>Date</th>
318
    <th>Created</th>
319
    <th>Updated</th>
317
    <th>Description of charges</th>
320
    <th>Description of charges</th>
318
    <th>Note</th>
321
    <th>Note</th>
319
    <th style=\"text-align:right;\">Amount</th>
322
    <th style=\"text-align:right;\">Amount</th>
Lines 322-327 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
322
325
323
  <tr class=\"highlight\">
326
  <tr class=\"highlight\">
324
    <td>[% debit.date | $KohaDates%]</td>
327
    <td>[% debit.date | $KohaDates%]</td>
328
    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>
325
    <td>
329
    <td>
326
      [% PROCESS account_type_description account=debit %]
330
      [% PROCESS account_type_description account=debit %]
327
      [%- IF debit.description %], [% debit.description | html %][% END %]
331
      [%- IF debit.description %], [% debit.description | html %][% END %]
(-)a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql (-12 / +16 lines)
Lines 321-349 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
321
<table>
321
<table>
322
[% IF ( LibraryName ) %]
322
[% IF ( LibraryName ) %]
323
 <tr>
323
 <tr>
324
    <th colspan=\"4\" class=\"centerednames\">
324
    <th colspan=\"5\" class=\"centerednames\">
325
        <h3>[% LibraryName | html %]</h3>
325
        <h3>[% LibraryName | html %]</h3>
326
    </th>
326
    </th>
327
 </tr>
327
 </tr>
328
[% END %]
328
[% END %]
329
 <tr>
329
 <tr>
330
    <th colspan=\"4\" class=\"centerednames\">
330
    <th colspan=\"5\" class=\"centerednames\">
331
        <h2><u>Fee receipt</u></h2>
331
        <h2><u>Fee receipt</u></h2>
332
    </th>
332
    </th>
333
 </tr>
333
 </tr>
334
 <tr>
334
 <tr>
335
    <th colspan=\"4\" class=\"centerednames\">
335
    <th colspan=\"5\" class=\"centerednames\">
336
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
336
        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
337
    </th>
337
    </th>
338
 </tr>
338
 </tr>
339
 <tr>
339
 <tr>
340
    <th colspan=\"4\">
340
    <th colspan=\"5\">
341
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
341
        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
342
        Card number: [% credit.patron.cardnumber | html %]<br />
342
        Card number: [% credit.patron.cardnumber | html %]<br />
343
    </th>
343
    </th>
344
 </tr>
344
 </tr>
345
  <tr>
345
  <tr>
346
    <th>Date</th>
346
    <th>Created</th>
347
    <th>Updated</th>
347
    <th>Description of charges</th>
348
    <th>Description of charges</th>
348
    <th>Note</th>
349
    <th>Note</th>
349
    <th>Amount</th>
350
    <th>Amount</th>
Lines 351-356 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
351
352
352
 <tr class=\"highlight\">
353
 <tr class=\"highlight\">
353
    <td>[% credit.date | $KohaDates %]</td>
354
    <td>[% credit.date | $KohaDates %]</td>
355
    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>
354
    <td>
356
    <td>
355
      [% PROCESS account_type_description account=credit %]
357
      [% PROCESS account_type_description account=credit %]
356
      [%- IF credit.description %], [% credit.description | html %][% END %]
358
      [%- IF credit.description %], [% credit.description | html %][% END %]
Lines 372-378 INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` Link Here
372
374
373
<tfoot>
375
<tfoot>
374
  <tr>
376
  <tr>
375
    <td colspan=\"3\">Total outstanding dues as on date: </td>
377
    <td colspan=\"4\">Total outstanding dues as on date: </td>
376
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
378
    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>
377
  </tr>
379
  </tr>
378
</tfoot>
380
</tfoot>
Lines 384-413 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
384
<table>
386
<table>
385
  [% IF ( LibraryName ) %]
387
  [% IF ( LibraryName ) %]
386
    <tr>
388
    <tr>
387
      <th colspan=\"5\" class=\"centerednames\">
389
      <th colspan=\"6\" class=\"centerednames\">
388
        <h3>[% LibraryName | html %]</h3>
390
        <h3>[% LibraryName | html %]</h3>
389
      </th>
391
      </th>
390
    </tr>
392
    </tr>
391
  [% END %]
393
  [% END %]
392
394
393
  <tr>
395
  <tr>
394
    <th colspan=\"5\" class=\"centerednames\">
396
    <th colspan=\"6\" class=\"centerednames\">
395
      <h2><u>INVOICE</u></h2>
397
      <h2><u>INVOICE</u></h2>
396
    </th>
398
    </th>
397
  </tr>
399
  </tr>
398
  <tr>
400
  <tr>
399
    <th colspan=\"5\" class=\"centerednames\">
401
    <th colspan=\"6\" class=\"centerednames\">
400
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
402
      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
401
    </th>
403
    </th>
402
  </tr>
404
  </tr>
403
  <tr>
405
  <tr>
404
    <th colspan=\"5\" >
406
    <th colspan=\"6\" >
405
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
407
      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />
406
      Card number: [% debit.patron.cardnumber | html %]<br />
408
      Card number: [% debit.patron.cardnumber | html %]<br />
407
    </th>
409
    </th>
408
  </tr>
410
  </tr>
409
  <tr>
411
  <tr>
410
    <th>Date</th>
412
    <th>Created</th>
413
    <th>Updated</th>
411
    <th>Description of charges</th>
414
    <th>Description of charges</th>
412
    <th>Note</th>
415
    <th>Note</th>
413
    <th style=\"text-align:right;\">Amount</th>
416
    <th style=\"text-align:right;\">Amount</th>
Lines 416-421 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
416
419
417
  <tr class=\"highlight\">
420
  <tr class=\"highlight\">
418
    <td>[% debit.date | $KohaDates%]</td>
421
    <td>[% debit.date | $KohaDates%]</td>
422
    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>
419
    <td>
423
    <td>
420
      [% PROCESS account_type_description account=debit %]
424
      [% PROCESS account_type_description account=debit %]
421
      [%- IF debit.description %], [% debit.description | html %][% END %]
425
      [%- IF debit.description %], [% debit.description | html %][% END %]
Lines 427-433 INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, Link Here
427
431
428
  <tfoot>
432
  <tfoot>
429
    <tr>
433
    <tr>
430
      <td colspan=\"4\">Total outstanding dues as on date: </td>
434
      <td colspan=\"5\">Total outstanding dues as on date: </td>
431
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
435
      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
432
    </tr>
436
    </tr>
433
  </tfoot>
437
  </tfoot>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt (-1 / +1 lines)
Line 1 Link Here
1
[%- BLOCK -%]Manager name[% sep | html %]Patron cardnumber[% sep | html %]Patron name[% sep | html %]Transaction library[% sep | html %]Transaction date[% sep | html %]Transaction type[% sep |html %]Notes[% sep | html %]Amount[% sep | html %]Title[% sep | html %]Barcode[% sep | html %]Item type[%- END -%]
1
[%- BLOCK -%]Manager name[% sep | html %]Patron cardnumber[% sep | html %]Patron name[% sep | html %]Transaction library[% sep | html %]Transaction date[% sep | html %]Updated[% sep | html %]Transaction type[% sep |html %]Notes[% sep | html %]Amount[% sep | html %]Title[% sep | html %]Barcode[% sep | html %]Item type[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-3 / +5 lines)
Lines 60-66 Link Here
60
<table id="table_account_fines">
60
<table id="table_account_fines">
61
    <thead>
61
    <thead>
62
      <tr>
62
      <tr>
63
          <th>Date</th>
63
          <th>Created</th>
64
          <th>Updated</th>
64
          <th>Credit number</th>
65
          <th>Credit number</th>
65
          <th>Account type</th>
66
          <th>Account type</th>
66
          <th>Description of charges</th>
67
          <th>Description of charges</th>
Lines 81-87 Link Here
81
  [% FOREACH account IN accounts %]
82
  [% FOREACH account IN accounts %]
82
83
83
   <tr>
84
   <tr>
84
   <td data-order="[% account.date | html %]">[% account.date |$KohaDates %]</td>
85
   <td data-order="[% account.date | html %]">[% account.date | $KohaDates %]</td>
86
   <td data-order="[% account.timestamp | html %]">[% account.timestamp | $KohaDates with_hours = 1 %]</td>
85
        <td>[% account.credit_number | html %]</td>
87
        <td>[% account.credit_number | html %]</td>
86
        <td>[% PROCESS account_type_description account=account %]</td>
88
        <td>[% PROCESS account_type_description account=account %]</td>
87
      <td>
89
      <td>
Lines 140-146 Link Here
140
  [% END %]
142
  [% END %]
141
<tfoot>
143
<tfoot>
142
  <tr>
144
  <tr>
143
    <td colspan="12">Total due</td>
145
    <td colspan="13">Total due</td>
144
    [% IF ( totalcredit ) %]
146
    [% IF ( totalcredit ) %]
145
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
147
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
146
        <td>
148
        <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-1 / +3 lines)
Lines 161-166 Link Here
161
            <th>Patron name</th>
161
            <th>Patron name</th>
162
            <th>Transaction library</th>
162
            <th>Transaction library</th>
163
            <th>Transaction date</th>
163
            <th>Transaction date</th>
164
            <th>Updated</th>
164
            <th>Transaction type</th>
165
            <th>Transaction type</th>
165
            <th>Notes</th>
166
            <th>Notes</th>
166
            <th>Amount</th>
167
            <th>Amount</th>
Lines 176-181 Link Here
176
                <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
177
                <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
177
                <td>[% loopresul.branchname | html %]</td>
178
                <td>[% loopresul.branchname | html %]</td>
178
                <td>[% loopresul.date | $KohaDates %]</td>
179
                <td>[% loopresul.date | $KohaDates %]</td>
180
                <td>[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td>
179
                <td>
181
                <td>
180
                    [% IF loopresul.credit_type == "ACT" %]
182
                    [% IF loopresul.credit_type == "ACT" %]
181
                        <span>All payments to the library</span>
183
                        <span>All payments to the library</span>
Lines 193-199 Link Here
193
        <tfoot>
195
        <tfoot>
194
        <tr>
196
        <tr>
195
            [% IF transaction_type == "ACT" %]
197
            [% IF transaction_type == "ACT" %]
196
            <th colspan="7" style="text-align:right;">TOTAL</th>
198
            <th colspan="8" style="text-align:right;">TOTAL</th>
197
            <th style="text-align:right;">[% total  | $Price %]</th>
199
            <th style="text-align:right;">[% total  | $Price %]</th>
198
            <th colspan="3">&nbsp;</th>
200
            <th colspan="3">&nbsp;</th>
199
            [% END %]
201
            [% 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>Date</th>
9
                    <th>Created</th>
10
                    <th>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 data-order="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</td>
30
                        <td data-order="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</td>
31
                        <td data-order="[% ACCOUNT_LINE.timestamp | html %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours = 1 %]</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>Date</th>
95
                    <th>Created</th>
96
                    <th>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 data-order="[% a.date | html %]">[% a.date | $KohaDates %]</td>
117
                        <td data-order="[% a.date | html %]">[% a.date | $KohaDates %]</td>
118
                        <td data-order="[% a.timestamp | html %]">[% a.timestamp | $KohaDates with_hours = 1 %]</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 / +2 lines)
Lines 106-112 if ($do_it) { Link Here
106
    SELECT round(amount,2) AS amount, description,
106
    SELECT round(amount,2) AS amount, description,
107
        bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
107
        bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
108
        bo.cardnumber, br.branchname, bo.borrowernumber,
108
        bo.cardnumber, br.branchname, bo.borrowernumber,
109
        al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note,
109
        al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note, al.timestamp,
110
        bi.title, bi.biblionumber, i.barcode, i.itype
110
        bi.title, bi.biblionumber, i.barcode, i.itype
111
        FROM accountlines al
111
        FROM accountlines al
112
        LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
112
        LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
Lines 166-171 if ($do_it) { Link Here
166
                        $row->{bfirstname} . ' ' . $row->{bsurname},
166
                        $row->{bfirstname} . ' ' . $row->{bsurname},
167
                        $row->{branchname},
167
                        $row->{branchname},
168
                        $row->{date},
168
                        $row->{date},
169
                        $row->{timestamp},
169
                        $row->{credit_type},
170
                        $row->{credit_type},
170
                        $row->{debit_type},
171
                        $row->{debit_type},
171
                        $row->{note},
172
                        $row->{note},
172
- 

Return to bug 16486