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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-12 / +12 lines)
Lines 518-531 Link Here
518
                        </td>
518
                        </td>
519
                        [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
519
                        [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
520
                        [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
520
                        [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
521
                        <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price | html %]</td>
521
                        <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td>
522
                        <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price | html %]</td>
522
                        <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td>
523
                        <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price | html %]</td>
523
                        <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
524
                        <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price | html %]</td>
524
                        <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
525
                        <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
525
                        <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
526
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td>
526
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td>
527
                        <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price | html %]</td>
527
                        <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
528
                        <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price | html %]</td>
528
                        <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
529
                        <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
529
                        <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
530
                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
530
                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
531
                        <td>[% books_loo.budget_name | html %]</td>
531
                        <td>[% books_loo.budget_name | html %]</td>
Lines 634-647 Link Here
634
                        </p>
634
                        </p>
635
                      [% END %]
635
                      [% END %]
636
                    </td>
636
                    </td>
637
                    <td class="number">[% order.rrp_tax_excluded | $Price | html %]</td>
637
                    <td class="number">[% order.rrp_tax_excluded | $Price %]</td>
638
                    <td class="number">[% order.ecost_tax_excluded | $Price | html %]</td>
638
                    <td class="number">[% order.ecost_tax_excluded | $Price %]</td>
639
                    <td class="number">[% order.rrp_tax_included | $Price | html %]</td>
639
                    <td class="number">[% order.rrp_tax_included | $Price %]</td>
640
                    <td class="number">[% order.ecost_tax_included | $Price | html %]</td>
640
                    <td class="number">[% order.ecost_tax_included | $Price %]</td>
641
                    <td class="number">[% order.replacementprice | $Price %]</td>
641
                    <td class="number">[% order.replacementprice | $Price %]</td>
642
                    <td class="number">[% order.quantity | html %]</td>
642
                    <td class="number">[% order.quantity | html %]</td>
643
                    <td class="number">[% order.total_tax_excluded | $Price | html %]</td>
643
                    <td class="number">[% order.total_tax_excluded | $Price %]</td>
644
                    <td class="number">[% order.total_tax_included | $Price | html %]</td>
644
                    <td class="number">[% order.total_tax_included | $Price %]</td>
645
                    <td class="number">[% order.tax_rate * 100 | html %]</td>
645
                    <td class="number">[% order.tax_rate * 100 | html %]</td>
646
                    <td class="number">[% order.tax_value | $Price %]</td>
646
                    <td class="number">[% order.tax_value | $Price %]</td>
647
                    <td>[% order.budget_name | html %]
647
                    <td>[% order.budget_name | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-2 / +2 lines)
Lines 292-303 Link Here
292
        <li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])</span></li>
292
        <li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])</span></li>
293
        <li>
293
        <li>
294
            <label for="replacementprice">Replacement price:</label>
294
            <label for="replacementprice">Replacement price:</label>
295
            <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price | html %]" />
295
            <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price %]" />
296
        </li>
296
        </li>
297
        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span></li>
297
        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span></li>
298
        <li>
298
        <li>
299
            <label for="unitprice">Actual cost:</label>
299
            <label for="unitprice">Actual cost:</label>
300
            <input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 | html %]" /> <span lass="hint">[% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span>
300
            <input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 %]" /> <span lass="hint">[% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span>
301
        </li>
301
        </li>
302
        <li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote | html %]</textarea></li>
302
        <li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote | html %]</textarea></li>
303
        [% IF order_vendornote %]
303
        [% IF order_vendornote %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-1 / +1 lines)
Lines 230-236 Link Here
230
        <!-- ############################## -->
230
        <!-- ############################## -->
231
        <label for="budget_period_total">Total amount: </label>
231
        <label for="budget_period_total">Total amount: </label>
232
        <input type="text" id="budget_period_total" name="budget_period_total"
232
        <input type="text" id="budget_period_total" name="budget_period_total"
233
        size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 | html %]" />
233
        size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
234
    </li>
234
    </li>
235
235
236
    <li>
236
    <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-2 / +2 lines)
Lines 232-238 Link Here
232
232
233
    <li>
233
    <li>
234
    <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
234
    <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
235
    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 | html %]" size="8" />
235
    <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
236
    </li>
236
    </li>
237
237
238
    <li>
238
    <li>
Lines 243-249 Link Here
243
243
244
    <li>
244
    <li>
245
      <label for="budget_expend">Warning at (amount): </label>
245
      <label for="budget_expend">Warning at (amount): </label>
246
      <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend | $Price on_editing => 1 | html %]" size="10" />
246
      <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend | $Price on_editing => 1 %]" size="10" />
247
      <span class="hint">0 to disable</span>
247
      <span class="hint">0 to disable</span>
248
    </li>
248
    </li>
249
249
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-2 / +2 lines)
Lines 108-114 Link Here
108
                </li>
108
                </li>
109
                <li>
109
                <li>
110
                    <label for="enrolmentfee">Enrollment fee: </label>
110
                    <label for="enrolmentfee">Enrollment fee: </label>
111
                    <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="[% category.enrolmentfee | $Price on_editing => 1 | html %]" />
111
                    <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="[% category.enrolmentfee | $Price on_editing => 1 %]" />
112
                </li>
112
                </li>
113
                <li>
113
                <li>
114
                    <label for="overduenoticerequired">Overdue notice required: </label>
114
                    <label for="overduenoticerequired">Overdue notice required: </label>
Lines 136-142 Link Here
136
                </li>
136
                </li>
137
                <li>
137
                <li>
138
                    <label for="reservefee">Hold fee: </label>
138
                    <label for="reservefee">Hold fee: </label>
139
                    <input type="text" name="reservefee" id="reservefee" size="6" value="[% category.reservefee | $Price on_editing => 1 | html %]" />
139
                    <input type="text" name="reservefee" id="reservefee" size="6" value="[% category.reservefee | $Price on_editing => 1 %]" />
140
                </li>
140
                </li>
141
                <li>
141
                <li>
142
                    <label for="category_type" class="required">Category type: </label>
142
                    <label for="category_type" class="required">Category type: </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-1 / +1 lines)
Lines 157-163 Link Here
157
                <li>
157
                <li>
158
                    <label for="paid">Writeoff amount: </label>
158
                    <label for="paid">Writeoff amount: </label>
159
                    <!-- default to writing off all -->
159
                    <!-- default to writing off all -->
160
                    <input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding | $Price on_editing => 1 | html %]" type="text" />
160
                    <input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding | $Price on_editing => 1 %]" type="text" />
161
                </li>
161
                </li>
162
            </ol>
162
            </ol>
163
        </fieldset>
163
        </fieldset>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-1 / +1 lines)
Lines 161-167 Link Here
161
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span> hold(s) waiting</a></li>
161
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span> hold(s) waiting</a></li>
162
                                    [% END %]
162
                                    [% END %]
163
                                    [% IF total_owing && total_owing > 0 %]
163
                                    [% IF total_owing && total_owing > 0 %]
164
                                        <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 | html %]</span> due in fines and charges</a></li>
164
                                        <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> due in fines and charges</a></li>
165
                                    [% END %]
165
                                    [% END %]
166
                                </ul>
166
                                </ul>
167
                            </div>
167
                            </div>
(-)a/t/LangInstaller/templates/simple.tt (-1 / +1 lines)
Lines 1-3 Link Here
1
[% USE raw %]
1
[% PROCESS 'i18n.inc' %]
2
[% PROCESS 'i18n.inc' %]
2
[% t('hello') | $raw %]
3
[% t('hello') | $raw %]
3
[% tx('hello {name}', { name = 'Bob' }) | $raw %]
4
[% tx('hello {name}', { name = 'Bob' }) | $raw %]
4
- 

Return to bug 22007