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

(-)a/installer/data/mysql/atomicupdate/bug_24381.perl (-15 / +59 lines)
Lines 3-9 if ( CheckVersion($DBversion) ) { Link Here
3
3
4
    # ACCOUNT_CREDIT
4
    # ACCOUNT_CREDIT
5
    my $account_credit = q{
5
    my $account_credit = q{
6
        [% PROCESS "accounts.inc" %]
6
        [%- USE AuthorisedValues -%]
7
        [%- PROCESS "accounts.inc" -%]
7
        <table>
8
        <table>
8
            [% IF ( LibraryName ) %]
9
            [% IF ( LibraryName ) %]
9
            <tr>
10
            <tr>
Lines 21-27 if ( CheckVersion($DBversion) ) { Link Here
21
            [% END %]
22
            [% END %]
22
            <tr>
23
            <tr>
23
              <th colspan="2" class="centerednames">
24
              <th colspan="2" class="centerednames">
24
                <h3>[% credit.date | $KohaDates %]</h3>
25
                <h3>[% today | $KohaDates %]</h3>
25
              </th>
26
              </th>
26
            </tr>
27
            </tr>
27
            <tr>
28
            <tr>
Lines 32-71 if ( CheckVersion($DBversion) ) { Link Here
32
              <td>Operator ID: </td>
33
              <td>Operator ID: </td>
33
              <td>[% credit.manager_id %]</td>
34
              <td>[% credit.manager_id %]</td>
34
            </tr>
35
            </tr>
36
            [% IF credit.payment_type %]
35
            <tr>
37
            <tr>
36
              <td>Payment type: </td>
38
              <td>Payment type: </td>
37
              <td>[% credit.payment_type %]</td>
39
              <td>[% AuthorisedValues.GetByCode('PAYMENT_TYPE', credit.payment_type) %]</td>
38
            </tr>
40
            </tr>
41
            [% END %]
39
            <tr>
42
            <tr>
40
              <th colspan="2" class="centerednames">
43
              <th colspan="2" class="centerednames">
41
                <h2><u>Payment receipt</u></h2>
44
                <h2><u>[%- PROCESS credit_type_description credit_type = credit.credit_type -%] receipt</u></h2>
42
              </th>
45
              </th>
43
            </tr>
46
            </tr>
47
            [% IF ( credit.credit_type_code == 'PAYMENT' ) %]
44
            <tr>
48
            <tr>
45
              <th colspan="2">
49
              <th colspan="2">
46
                Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
50
                Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
47
                Card number: [% credit.patron.cardnumber | html %]<br />
51
                Card number: [% credit.patron.cardnumber | html %]<br />
48
              </th>
52
              </th>
49
            </tr>
53
            </tr>
54
            [% ELSIF ( credit.credit_type_code == 'CREDIT' ) %]
55
            <tr>
56
              <th colspan="2">
57
                Credit added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
58
                Card number: [% credit.patron.cardnumber | html %]<br />
59
              </th>
60
            </tr>
61
            [% ELSIF ( credit.credit_type_code == 'WRITEOFF' ) %]
62
            <tr>
63
              <th colspan="2">
64
                Writeoff added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
65
                Card number: [% credit.patron.cardnumber | html %]<br />
66
              </th>
67
            </tr>
68
            [% END %]
69
            [% IF credit.amountoutstanding + 0 != 0 %]
70
            <tr>
71
              <th>Description of credit</th>
72
              <th>Amount</th>
73
            </tr>
74
            <tr>
75
              <td>[%- PROCESS credit_type_description credit_type = credit.credit_type -%]</td>
76
              <td>[% credit.amount * -1 | $Price %]</td>
77
            </tr>
78
            <tr>
79
              <th style="text-align:right;">Total available:</th>
80
              <td>[% credit.amountoutstanding * -1 | $Price %]</td>
81
            </tr>
82
            [% END %]
83
            [% IF credit.amount != credit.amountoutstanding %]
50
            <tr>
84
            <tr>
51
              <th>Description of charges</th>
85
              <th>Description of charges</th>
52
              <th>Amount</th>
86
              <th>Amount</th>
53
            </tr>
87
            </tr>
54
            [% FOREACH offset IN credit.credit_offsets %]
88
            [% FOREACH offset IN credit.credit_offsets %]
55
            <tr>
89
            <tr>
56
              <td>[% PROCESS account_type_description account=offset.debit %]</td>
90
              <td>[% PROCESS account_type_description account=offset.debit %][% IF ( offset.debit.itemnumber ) %] - [% offset.debit.item.biblio.title %][% END %]</td>
57
              <td>[% offset.amount * -1 | $Price %]</td>
91
              <td>[% offset.amount * -1 | $Price %]</td>
58
            </tr>
92
            </tr>
59
            [% END %]
93
            [% END %]
94
            [% END %]
60
          <tfoot>
95
          <tfoot>
61
            <tr class="highlight">
96
            <tr class="highlight">
62
              <td>Total:</td>
97
              <td>Total:</td>
63
              <td>[% credit.amount * -1 | $Price %]</td>
98
              <td>[% credit.amount * -1 | $Price %]</td>
64
            </tr>
99
            </tr>
100
            [% IF change.defined %]
65
            <tr>
101
            <tr>
66
              <td>Change given: </td>
102
              <td>Change given: </td>
67
              <td>[% change | $Price %]</td>
103
              <td>[% change | $Price %]</td>
68
            </tr>
104
            </tr>
105
            [% END %]
69
            <tr>
106
            <tr>
70
              <td colspan="2"></td>
107
              <td colspan="2"></td>
71
            </tr>
108
            </tr>
Lines 111-121 q{UPDATE letter SET content = ? WHERE code = 'ACCOUNT_CREDIT' AND REPLACE(REPLAC Link Here
111
              </th>
148
              </th>
112
            </tr>
149
            </tr>
113
            [% END %]
150
            [% END %]
114
            <tr>
115
              <th colspan="3" class="centerednames">
116
                <h3>[% debit.date | $KohaDates %]</h3>
117
              </th>
118
            </tr>
119
            <tr>
151
            <tr>
120
              <td colspan="2" style="text-align:right;">Fee ID: </td>
152
              <td colspan="2" style="text-align:right;">Fee ID: </td>
121
              <td>[% debit.accountlines_id %]</td>
153
              <td>[% debit.accountlines_id %]</td>
Lines 137-142 q{UPDATE letter SET content = ? WHERE code = 'ACCOUNT_CREDIT' AND REPLACE(REPLAC Link Here
137
                Card number: [% debit.patron.cardnumber | html %]<br />
169
                Card number: [% debit.patron.cardnumber | html %]<br />
138
              </th>
170
              </th>
139
            </tr>
171
            </tr>
172
            [% IF debit.amountoutstanding != 0 %]
173
            <tr>
174
              <th>Date</th>
175
              <th>Description of charges</th>
176
              <th>Amount</th>
177
            </tr>
178
            <tr>
179
              <td>[% debit.date | $KohaDates %]</td>
180
              <td>[% PROCESS account_type_description account=debit %]</td>
181
              <td>[% debit.amount | $Price %]</td>
182
            </tr>
183
            <tr>
184
              <td colspan="2" style="text-align:right;">Total owed:</td>
185
              <td>[% debit.amount | $Price %]</td>
186
            </tr>
187
            [% END %]
140
            [% IF debit.amount != debit.amountoutstanding %]
188
            [% IF debit.amount != debit.amountoutstanding %]
141
            <tr>
189
            <tr>
142
              <th>Date</th>
190
              <th>Date</th>
Lines 160-170 q{UPDATE letter SET content = ? WHERE code = 'ACCOUNT_CREDIT' AND REPLACE(REPLAC Link Here
160
            <tr>
208
            <tr>
161
          <tfoot>
209
          <tfoot>
162
            <tr>
210
            <tr>
163
              <td colspan="2" style="text-align:right;">Total owed:</td>
211
              <th colspan="2" style="text-align:right;">Total outstanding:</th>
164
              <td>[% debit.amount | $Price %]</td>
165
            </tr>
166
            <tr>
167
              <td colspan="2" style="text-align:right;">Total outstanding:</td>
168
              <td>[% debit.amountoutstanding | $Price %]</td>
212
              <td>[% debit.amountoutstanding | $Price %]</td>
169
            </tr>
213
            </tr>
170
          </tfoot>
214
          </tfoot>
(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-16 / +59 lines)
Lines 52-58 tables: Link Here
52
          message_transport_type: print
52
          message_transport_type: print
53
          lang: default
53
          lang: default
54
          content:
54
          content:
55
            - "[% PROCESS \"accounts.inc\" %]"
55
            - "[%- USE AuthorisedValues -%]"
56
            - "[%- PROCESS \"accounts.inc\" -%]"
56
            - "<table>"
57
            - "<table>"
57
            - "    [% IF ( LibraryName ) %]"
58
            - "    [% IF ( LibraryName ) %]"
58
            - "    <tr>"
59
            - "    <tr>"
Lines 70-76 tables: Link Here
70
            - "    [% END %]"
71
            - "    [% END %]"
71
            - "    <tr>"
72
            - "    <tr>"
72
            - "      <th colspan=\"2\" class=\"centerednames\">"
73
            - "      <th colspan=\"2\" class=\"centerednames\">"
73
            - "        <h3>[% credit.date | $KohaDates %]</h3>"
74
            - "        <h3>[% today | $KohaDates %]</h3>"
74
            - "      </th>"
75
            - "      </th>"
75
            - "    </tr>"
76
            - "    </tr>"
76
            - "    <tr>"
77
            - "    <tr>"
Lines 81-120 tables: Link Here
81
            - "      <td>Operator ID: </td>"
82
            - "      <td>Operator ID: </td>"
82
            - "      <td>[% credit.manager_id %]</td>"
83
            - "      <td>[% credit.manager_id %]</td>"
83
            - "    </tr>"
84
            - "    </tr>"
85
            - "    [% IF credit.payment_type %]"
84
            - "    <tr>"
86
            - "    <tr>"
85
            - "      <td>Payment type: </td>"
87
            - "      <td>Payment type: </td>"
86
            - "      <td>[% credit.payment_type %]</td>"
88
            - "      <td>[% AuthorisedValues.GetByCode('PAYMENT_TYPE', credit.payment_type) %]</td>"
87
            - "    </tr>"
89
            - "    </tr>"
90
            - "    [% END %]"
88
            - "    <tr>"
91
            - "    <tr>"
89
            - "      <th colspan=\"2\" class=\"centerednames\">"
92
            - "      <th colspan=\"2\" class=\"centerednames\">"
90
            - "        <h2><u>Payment receipt</u></h2>"
93
            - "        <h2><u>[%- PROCESS credit_type_description credit_type = credit.credit_type -%] receipt</u></h2>"
91
            - "      </th>"
94
            - "      </th>"
92
            - "    </tr>"
95
            - "    </tr>"
96
            - "    [% IF ( credit.credit_type_code == 'PAYMENT' ) %]"
93
            - "    <tr>"
97
            - "    <tr>"
94
            - "      <th colspan=\"2\">"
98
            - "      <th colspan=\"2\">"
95
            - "        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
99
            - "        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
96
            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
100
            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
97
            - "      </th>"
101
            - "      </th>"
98
            - "    </tr>"
102
            - "    </tr>"
103
            - "    [% ELSIF ( credit.credit_type_code == 'CREDIT' ) %]"
104
            - "    <tr>"
105
            - "      <th colspan=\"2\">"
106
            - "        Credit added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
107
            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
108
            - "      </th>"
109
            - "    </tr>"
110
            - "    [% ELSIF ( credit.credit_type_code == 'WRITEOFF' ) %]"
111
            - "    <tr>"
112
            - "      <th colspan=\"2\">"
113
            - "        Writeoff added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
114
            - "        Card number: [% credit.patron.cardnumber | html %]<br />"
115
            - "      </th>"
116
            - "    </tr>"
117
            - "    [% END %]"
118
            - "    [% IF credit.amountoutstanding + 0 != 0 %]"
119
            - "    <tr>"
120
            - "      <th>Description of credit</th>"
121
            - "      <th>Amount</th>"
122
            - "    </tr>"
123
            - "    <tr>"
124
            - "      <td>[%- PROCESS credit_type_description credit_type = credit.credit_type -%]</td>"
125
            - "      <td>[% credit.amount * -1 | $Price %]</td>"
126
            - "    </tr>"
127
            - "    <tr>"
128
            - "      <th style=\"text-align:right;\">Total available:</th>"
129
            - "      <td>[% credit.amountoutstanding * -1 | $Price %]</td>"
130
            - "    </tr>"
131
            - "    [% END %]"
132
            - "    [% IF credit.amount != credit.amountoutstanding %]"
99
            - "    <tr>"
133
            - "    <tr>"
100
            - "      <th>Description of charges</th>"
134
            - "      <th>Description of charges</th>"
101
            - "      <th>Amount</th>"
135
            - "      <th>Amount</th>"
102
            - "    </tr>"
136
            - "    </tr>"
103
            - "    [% FOREACH offset IN credit.credit_offsets %]"
137
            - "    [% FOREACH offset IN credit.credit_offsets %]"
104
            - "    <tr>"
138
            - "    <tr>"
105
            - "      <td>[% PROCESS account_type_description account=offset.debit %]</td>"
139
            - "      <td>[% PROCESS account_type_description account=offset.debit %][% IF ( offset.debit.itemnumber ) %] - [% offset.debit.item.biblio.title %][% END %]</td>"
106
            - "      <td>[% offset.amount * -1 | $Price %]</td>"
140
            - "      <td>[% offset.amount * -1 | $Price %]</td>"
107
            - "    </tr>"
141
            - "    </tr>"
108
            - "    [% END %]"
142
            - "    [% END %]"
143
            - "    [% END %]"
109
            - "  <tfoot>"
144
            - "  <tfoot>"
110
            - "    <tr class=\"highlight\">"
145
            - "    <tr class=\"highlight\">"
111
            - "      <td>Total:</td>"
146
            - "      <td>Total:</td>"
112
            - "      <td>[% credit.amount * -1 | $Price %]</td>"
147
            - "      <td>[% credit.amount * -1 | $Price %]</td>"
113
            - "    </tr>"
148
            - "    </tr>"
149
            - "    [% IF change.defined %]"
114
            - "    <tr>"
150
            - "    <tr>"
115
            - "      <td>Change given: </td>"
151
            - "      <td>Change given: </td>"
116
            - "      <td>[% change | $Price %]</td>"
152
            - "      <td>[% change | $Price %]</td>"
117
            - "    </tr>"
153
            - "    </tr>"
154
            - "    [% END %]"
118
            - "    <tr>"
155
            - "    <tr>"
119
            - "      <td colspan=\"2\"></td>"
156
            - "      <td colspan=\"2\"></td>"
120
            - "    </tr>"
157
            - "    </tr>"
Lines 151-161 tables: Link Here
151
            - "    </tr>"
188
            - "    </tr>"
152
            - "    [% END %]"
189
            - "    [% END %]"
153
            - "    <tr>"
190
            - "    <tr>"
154
            - "      <th colspan=\"3\" class=\"centerednames\">"
155
            - "        <h3>[% debit.date | $KohaDates %]</h3>"
156
            - "      </th>"
157
            - "    </tr>"
158
            - "    <tr>"
159
            - "      <td colspan=\"2\" style=\"text-align:right;\">Fee ID: </td>"
191
            - "      <td colspan=\"2\" style=\"text-align:right;\">Fee ID: </td>"
160
            - "      <td>[% debit.accountlines_id %]</td>"
192
            - "      <td>[% debit.accountlines_id %]</td>"
161
            - "    </tr>"
193
            - "    </tr>"
Lines 176-181 tables: Link Here
176
            - "        Card number: [% debit.patron.cardnumber | html %]<br />"
208
            - "        Card number: [% debit.patron.cardnumber | html %]<br />"
177
            - "      </th>"
209
            - "      </th>"
178
            - "    </tr>"
210
            - "    </tr>"
211
            - "    [% IF debit.amountoutstanding != 0 %]"
212
            - "    <tr>"
213
            - "      <th>Date</th>"
214
            - "      <th>Description of charges</th>"
215
            - "      <th>Amount</th>"
216
            - "    </tr>"
217
            - "    <tr>"
218
            - "      <td>[% debit.date | $KohaDates %]</td>"
219
            - "      <td>[% PROCESS account_type_description account=debit %]</td>"
220
            - "      <td>[% debit.amount | $Price %]</td>"
221
            - "    </tr>"
222
            - "    <tr>"
223
            - "      <td colspan=\"2\" style=\"text-align:right;\">Total owed:</td>"
224
            - "      <td>[% debit.amount | $Price %]</td>"
225
            - "    </tr>"
226
            - "    [% END %]"
179
            - "    [% IF debit.amount != debit.amountoutstanding %]"
227
            - "    [% IF debit.amount != debit.amountoutstanding %]"
180
            - "    <tr>"
228
            - "    <tr>"
181
            - "      <th>Date</th>"
229
            - "      <th>Date</th>"
Lines 199-209 tables: Link Here
199
            - "    <tr>"
247
            - "    <tr>"
200
            - "  <tfoot>"
248
            - "  <tfoot>"
201
            - "    <tr>"
249
            - "    <tr>"
202
            - "      <td colspan=\"2\" style=\"text-align:right;\">Total owed:</td>"
250
            - "      <th colspan=\"2\" style=\"text-align:right;\">Total outstanding:</th>"
203
            - "      <td>[% debit.amount | $Price %]</td>"
204
            - "    </tr>"
205
            - "    <tr>"
206
            - "      <td colspan=\"2\" style=\"text-align:right;\">Total outstanding:</td>"
207
            - "      <td>[% debit.amountoutstanding | $Price %]</td>"
251
            - "      <td>[% debit.amountoutstanding | $Price %]</td>"
208
            - "    </tr>"
252
            - "    </tr>"
209
            - "  </tfoot>"
253
            - "  </tfoot>"
210
- 

Return to bug 24381