Attachment #79705 for bug #21454

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

Lines 3-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-1 / +1 lines)
3	[% IF fines and fines > 0 %]	3	[% IF fines and fines > 0 %]
4	<li>	4	<li>
5	<span class="circ-hlt">Fees & Charges:</span>	5	<span class="circ-hlt">Fees & Charges:</span>
6	Patron has outstanding fees & charges of [% fines \| $Price \| html %].	6	Patron has outstanding fees & charges of [% fines \| $Price %].
7	[% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]	7	[% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
8	<span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>	8	<span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
9	[% END %]	9	[% END %]




                <td>[% Branches.GetName( loop_budge.budget_branchcode ) | html %]</td>
                <td class="data">
                    [% IF loop_budge.budget_parent_id %]
                        [% loop_budge.budget_amount | $Price %]
                    [% ELSE %]
                        <span class="total_amount">[% loop_budge.budget_amount | $Price %]</span>
                    [% END %]
                </td>
                <td class="data">
                    <a href="ordered.pl?fund=[% loop_budge.budget_id | html %]&amp;fund_code=[% loop_budge.budget_code | html %]">
                    [% IF loop_budge.budget_parent_id %]
                        [% loop_budge.budget_ordered | $Price %]
                    [% ELSE %]
                        <span class="total_amount">[% loop_budge.budget_ordered | $Price %]</span>
                    [% END %]
                    </a>
                </td>
                <td class="data">
                    <a href="spent.pl?fund=[% loop_budge.budget_id | html %]&amp;fund_code=[% loop_budge.budget_code | html %]">
                    [% IF loop_budge.budget_parent_id %]
                        [% loop_budge.budget_spent | $Price %]
                    [% ELSE %]
                        <span class="total_amount">[% loop_budge.budget_spent | $Price %]</span>
                    [% END %]
                    </a>
                </td>
                <td class="data">
                    [% IF loop_budge.budget_parent_id %]
                        [% loop_budge.budget_avail | $Price %]
                    [% ELSE %]
                        <span class="total_amount">[% loop_budge.budget_avail | $Price %]</span>
                    [% END %]
                </td>
            </tr>




                        <th class="tax_included">&nbsp;</th>
                        <th class="replacementprice">&nbsp;</th>
                        <th>[% foot_loo.quantity | html %]</th>
                        <th class="tax_excluded">[% foot_loo.total_tax_excluded | $Price %]</th>
                        <th class="tax_included">[% foot_loo.total_tax_included | $Price %]</th>
                        <th>&nbsp;</th>
                        <th>[% foot_loo.tax_value | $Price %]</th>
                        <th>&nbsp;</th>
                        <th>&nbsp;</th>
                        [% IF ( active ) %]

                    <th class="tax_included">&nbsp;</th>
                    <th class="replacementprice">&nbsp;</th>
                    <th>[% total_quantity | html %]</th>
                    <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
                    <th class="tax_included">[% total_tax_included | $Price %]</th>
                    <th>&nbsp;</th>
                    <th>[% total_tax_value | $Price %]</th>
                    <th>&nbsp;</th>
                    <th>&nbsp;</th>
                    [% IF ( active ) %]

                        </td>
                        [% 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 ... %]
                        [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
                        <td class="number tax_excluded [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td>
                        <td class="number tax_excluded [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td>
                        <td class="number tax_included [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
                        <td class="number tax_included [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
                        <td class="number replacementprice [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td>
                        <td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td>
                        <td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td>
                        <td class="number">[% books_loo.tax_rate * 100 | html %]</td>
                        <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td>
                        <td>[% books_loo.budget_name | html %]</td>
                        <td>[% books_loo.suppliers_report | html %]</td>
                        [% IF ( active ) %]

                        </p>
                      [% END %]
                    </td>
                    <td class="number tax_excluded">[% order.rrp_tax_excluded | $Price %]</td>
                    <td class="number tax_excluded">[% order.ecost_tax_excluded | $Price %]</td>
                    <td class="number tax_included">[% order.rrp_tax_included | $Price %]</td>
                    <td class="number tax_included">[% order.ecost_tax_included | $Price %]</td>
                    <td class="number replacementprice">[% order.replacementprice | $Price %]</td>
                    <td class="number">[% order.quantity | html %]</td>
                    <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
                    <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
                    <td class="number">[% order.tax_rate * 100 | html %]</td>
                    <td class="number">[% order.tax_value | $Price %]</td>
                    <td>[% order.budget_name | html %]
                  </tr>
                [% END %]

Lines 178-184 function submitForm(form) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-2 / +2 lines)
178	No name, basketnumber: [% basket.basketno \| html %]	178	No name, basketnumber: [% basket.basketno \| html %]
179	[% END %]	179	[% END %]
180	</a>, <br />	180	</a>, <br />
181	Total: [% basket.total \| $Price \| html %]	181	Total: [% basket.total \| $Price %]
182	<input type="hidden" class="basket" name="basket" value="[% basket.basketno \| html %]" />	182	<input type="hidden" class="basket" name="basket" value="[% basket.basketno \| html %]" />
183	</li>	183	</li>
184	[% END %]	184	[% END %]
Lines 268-274 function submitForm(form) { Link Here
268	No name, basketnumber: [% selectedbasket.basketno \| html %]	268	No name, basketnumber: [% selectedbasket.basketno \| html %]
269	[% END %]	269	[% END %]
270	</a>, <br />	270	</a>, <br />
271	Total: [% selectedbasket.total \| $Price \| html %]	271	Total: [% selectedbasket.total \| $Price %]
272	<input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno \| html %]" />	272	<input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno \| html %]" />
273	</li>	273	</li>
274	[% END %]	274	[% END %]

Lines 16-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt (-4 / +4 lines)
16	"[% r.collectiontitle \| html %]"[%- delimiter \| html -%]	16	"[% r.collectiontitle \| html %]"[%- delimiter \| html -%]
17	[% r.isbn \| html %][%- delimiter \| html -%]	17	[% r.isbn \| html %][%- delimiter \| html -%]
18	[% r.quantity \| html %][%- delimiter \| html -%]	18	[% r.quantity \| html %][%- delimiter \| html -%]
19	[% r.rrp_tax_included \| $Price \| html %][%- delimiter \| html -%]	19	[% r.rrp_tax_included \| $Price %][%- delimiter \| html -%]
20	[% r.rrp_tax_excluded \| $Price \| html %][%- delimiter \| html -%]	20	[% r.rrp_tax_excluded \| $Price %][%- delimiter \| html -%]
21	[% r.discount \| html %][%- delimiter \| html -%]	21	[% r.discount \| html %][%- delimiter \| html -%]
22	[% r.ecost_tax_included \| $Price \| html %][%- delimiter \| html -%]	22	[% r.ecost_tax_included \| $Price %][%- delimiter \| html -%]
23	[% r.ecost_tax_excluded \| $Price \| html %][%- delimiter \| html -%]	23	[% r.ecost_tax_excluded \| $Price %][%- delimiter \| html -%]
24	"[% r.notes \| html %]"[%- delimiter \| html -%]	24	"[% r.notes \| html %]"[%- delimiter \| html -%]
25	[% r.entrydate \| html %][%- delimiter \| html -%]	25	[% r.entrydate \| html %][%- delimiter \| html -%]
26	"[% r.booksellername \| html %]"[%- delimiter \| html -%]	26	"[% r.booksellername \| html %]"[%- delimiter \| html -%]




                              [% total_adj = total_adj + adjustment.adjustment | html %]
                              <tr>
                                  <td><input type="hidden" name="adjustment_id" value="[% adjustment.adjustment_id | html %]" />[% adjustment.adjustment_id | html %]</td>
                                  <td><input type="text" name="adjustment" id="adjustment_[% adjustment.adjustment_id | html %]" value="[% adjustment.adjustment | $Price %]" /></td>
                                  <td>
                                      [% reasons = AuthorisedValues.Get("ADJ_REASON") | html %]
                                      [% IF reasons.0 %]

                    [% END %]
                  </td>
                  <td><p>[% order.branchcode | html %]</p></td>
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
                  <td class="number replacementprice">[% order.replacementprice | $Price %]</td>
                  <td class="number">[% order.quantity | html %]</td>
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
                  <td class="number">[% order.tax_rate * 100 | html %]</td>
                  <td class="number">[% order.tax_value | $Price %]</td>
                  <td>[% order.budget_name | html %]</td>
                </tr>
              [% END %]

                    <th class="tax_included"></th>
                    <th class="replacementprice"/>
                    <th>[% tf.quantity | html %]</th>
                    <th class="tax_excluded">[% tf.total_tax_excluded | $Price %]</th>
                    <th class="tax_included">[% tf.total_tax_included | $Price %]</th>
                    <th>&nbsp;</th>
                    <th>[% tf.tax_value | $Price %]</th>
                    <th>&nbsp;</th>
                </tr>
              [% END %]

                <th class="tax_included"></th>
                <th class="replacementprice"/>
                <th>[% total_quantity | html %]</th>
                <th class="tax_excluded">[% total_tax_excluded | $Price %]</th>
                <th class="tax_included">[% total_tax_included | $Price %]</th>
                <th>&nbsp;</th>
                <th>[% total_tax_value | $Price %]</th>
                <th>&nbsp;</th>
              </tr>
              <tr>

                <th class="tax_included"></th>
                <th class="replacementprice"/>
                <th>[% total_quantity | html %]</th>
                <th class="tax_excluded">[% total_tax_excluded_shipment + total_adj | $Price %]</th>
                <th class="tax_included">[% total_tax_included_shipment | $Price %]</th>
                <th>&nbsp;</th>
                <th>[% total_tax_value | $Price %]</th>
                <th>&nbsp;</th>
              </tr>
            </tfoot>

        [% ELSE %]
            <div class="dialog message"><p>No orders yet</p>
            [% IF adjustments && adjustments.count > 0 || shipmentcost && shipmentcost > 0 %]
            <p>Adjustments plus shipping:[% total_adj + shipmentcost | $Price %]</p>
            [% END %]
            </div>
        [% END %]




            <input type="hidden" name="tax_rate" value="0" />
        [% END %]

        <li><label for="rrp">Retail price: </label>[% rrp | $Price %]</li>
        <li>
            <label for="replacementprice">Replacement price:</label>
            <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price %]" />
        </li>
        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %]</li>
        <li>
            <label for="unitprice">Actual cost:</label>
            <input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 | html %]" />




                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | html %]" class="previewData">MARC</a><br>
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_order.biblionumber | html %]" class="previewData">Card</a>
                </td>
                <td>[% loop_order.replacementprice | $Price %]</td>
                <td>[% loop_order.quantity | html %]</td>
                <td>[% loop_order.ecost | $Price %]</td>
                <td>[% loop_order.total | $Price %]</td>
                <td>[% loop_order.budget_name | html %]</td>
				<td>
                              <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber | html %]&amp;invoiceid=[% invoiceid | html %]">Receive</a>

                    <td colspan="6" class="total">(Tax exc.)</td>
                [% END %]
                <td colspan="3"><i>Subtotal for</i> [% key | html %]</td>
                <td>[% subtotal_for_funds.$key.ecost | $Price %]</td>
                <td>[% subtotal_for_funds.$key.unitprice | $Price %]</td>
                <td>&nbsp;</td>
                <td>&nbsp;</td>
            </tr>
        [% END %]
        <tr>
            <th colspan="11" class="total">Total tax exc.</th>
            <th>[% total_tax_excluded | $Price %]</th>
            <th></th>
        </tr>
        [% FOREACH book_foot IN book_foot_loop %]
            <tr>
                <th colspan="11">Total (GST [% book_foot.tax_rate * 100 | html %]%)</th>
                <th>[% book_foot.tax_value | $Price %]</th>
                <th></th>
            </tr>
        [% END %]
        <tr>
            <th colspan="11" class="total">Total tax inc.</th>
            <th>[% total_tax_included | $Price %]</th>
            <th></th>
        </tr>
    </tfoot>

                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | html %]" class="previewData">MARC</a><br>
                  <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% order.biblionumber | html %]" class="previewData">Card</a>
                </td>
                <td>[% order.replacementprice | $Price %]</td>
                <td>[% order.quantityreceived | html %]</td>
                <td>[% order.budget.budget_name | html %]</td>
                <td>[% order.ecost | $Price %]</td>
                <td>[% order.unitprice | $Price %]</td>
                <td>[% order.total | $Price %]</td>
                <td>
                    [% IF loop_receive.cannot_cancel or ( order.basket.effective_create_items == "receiving" and loop_receive.holds > 0 ) %]
                      [% IF loop_receive.cannot_cancel %]




            [% IF r.orders_moved.size > 0 %]
              [% FOR order IN r.orders_moved %]
                <tr>
                  <td>[% r.budget.budget_name | html %] (id=[% r.budget.budget_id | html %]) Amount=[% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %]</td>
                  <td>[% order.basketname | html %]</td>
                  <td>[% order.ordernumber | html %]</td>
                  <td>Moved!</td>

          [% ELSE %]
            [% IF r.error == 'budget_code_not_exists' %]
              <tr>
                <td>[% r.budget.budget_id | html %] [% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %]</td>
                <td></td>
                <td></td>
                <td>This fund code does not exist in the destination budget.</td>

                    <span style="color:green;">Locked</span>&nbsp;
                  [% END %]
                </td>
                <td class="data">[% period_active.budget_period_total | $Price %]</td>
                <td>
                    [% PROCESS action_menu block_budget=period_active %]
                </td>

                  <td><span title="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td>
                  <td><span title="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td>
                  <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span>&nbsp;[% ELSE %][% END %] </td>
                  <td class="data">[% period_loo.budget_period_total | $Price %]</td>
                  <td>
                        [% PROCESS action_menu block_budget=period_loo %]
                  </td>




    <tr>
    <th></th>
    <th></th>
    <th colspan="2" style="text-align: left;" nowrap="nowrap">Period allocated [% IF budget_period_total %][% budget_period_total | $Price %][% END %]  </th>
    <th nowrap="nowrap" class="data"> [% period_alloc_total | $Price %]</th>
    <th></th>
    <th class="data">[% ordered_total | $Price %]</th>
    <th></th>
    <th class="data">[% spent_total | $Price %]</th>
    <th></th>
    <th class="data">[% available_total | $Price %]</th>
    <th></th>
    </tr>
    </tfoot>

    <td>[% budget.budget_name | html %]</td>
    <td class="data">
      [% IF budget.budget_parent_id %]
        <span class="child_fund_amount">[% budget.budget_amount | $Price %]</span>
      [% ELSE %]
        <span class="total_amount">[% budget.budget_amount | $Price %]</span>
      [% END %]
    </td>
    <td class="data">
      [% IF budget.budget_parent_id %]
        <span class="child_fund_amount">[% budget.budget_ordered | $Price %]</span>
      [% ELSE %]
        <span class="total_amount">[% budget.budget_ordered | $Price %]</span>
      [% END %]
    </td>
    <td class="data">
      [% IF budget.budget_parent_id %]
        <span class="child_fund_amount">[% budget.total_ordered | $Price %]</span>
      [% ELSE %]
        <span class="total_amount">[% budget.total_ordered | $Price %]</span>
      [% END %]
    </td>
    <td class="data">
      [% IF budget.budget_parent_id %]
        <span class="child_fund_amount">[% budget.budget_spent | $Price %]</span>
      [% ELSE %]
        <span class="total_amount">[% budget.budget_spent | $Price %]</span>
      [% END %]
    </td>
    <td class="data">
      [% IF budget.budget_parent_id %]
        <span class="child_fund_amount">[% budget.total_spent | $Price %]</span>
      [% ELSE %]
        <span class="total_amount">[% budget.total_spent | $Price %]</span>
      [% END %]
    </td>


                <span class="totalamount">
            [% END %]
        [% END %]
            [% value | $Price %]
        </span>
    [% END %]
    <td class="data">

        <table>
            <tr>
            <th scope="row">Fund amount:</th>
            <td>[% budget_amount | $Price %]</td>
            </tr>
        </table>


Lines 76-82 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt (-2 / +2 lines)
76	<td>	76	<td>
77	[% END %]	77	[% END %]
78	<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget_line.budget_id \| html %]&budget_period_id=[% budget_period_id \| html %]">[% budget_line.budget_name \| html %]</a></td>	78	<a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget_line.budget_id \| html %]&budget_period_id=[% budget_period_id \| html %]">[% budget_line.budget_name \| html %]</a></td>
79	<td><span id="[% budget_line.budget_amount \| html %]">[% budget_line.budget_amount \| $Price \| html %] </span>	79	<td><span id="[% budget_line.budget_amount \| html %]">[% budget_line.budget_amount \| $Price %] </span>
80		80
81		81
82	<!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->	82	<!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->
Lines 129-135 Link Here
129	[% ELSE %]	129	[% ELSE %]
130	<td id="budget_est_[% budget_line.budget_id \| html %]">	130	<td id="budget_est_[% budget_line.budget_id \| html %]">
131	[% END %]	131	[% END %]
132	[% budget_line.budget_est_remain \| $Price \| html %]	132	[% budget_line.budget_est_remain \| $Price %]
133	</td>	133	</td>
134	</tr>	134	</tr>
135	</table>	135	</table>




                </tr>
                <tr><th scope="row">Age required: </th><td>[% category.dateofbirthrequired | html %] years</td></tr>
                <tr><th scope="row">Upperage limit: </th><td>[% category.upperagelimit | html %] years</td></tr>
                <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price %]</td></tr>
                <tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>
                <tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>
                <tr><th scope="row">Hold fee: </th><td>[% category.reservefee | $Price %]</td></tr>

                [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
                  <tr>

                            <td>-</td>
                        [% END %]
                        [% IF (category.enrolmentfee > 0) %]
                            <td>[% category.enrolmentfee | $Price %]</td>
                        [% ELSE %]
                            <td>-</td>
                        [% END %]
                        <td>[% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]</td>
                        <td>[% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]</td>
                        [% IF (category.reservefee > 0) %]
                            <td>[% category.reservefee | $Price %]</td>
                        [% ELSE %]
                            <td>-</td>
                        [% END %]




                    </td>
                </tr>
            [% END %]
            <tr><th scope="row">Rental charge</th><td>[% itemtype.rentalcharge | $Price %]</td></tr>
        </table>
        <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
            <input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype | html %]" />

            <td>[% IF ( itemtype.hideinopac ) %]Yes[% ELSE %]&nbsp;[% END %]</td>
            <td>
            [% UNLESS ( itemtype.notforloan ) %]
              [% itemtype.rentalcharge | $Price %]
            [% END %]
            </td>
            <td>[% itemtype.defaultreplacecost | $Price %]</td>
            <td>[% itemtype.processfee | $Price %]</td>
            <td>[% itemtype.checkinmsg | html_line_break | $raw %]</td>
            <td class="actions">
              <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&amp;itemtype=[% itemtype.itemtype | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>




[% END %]

[% IF ( DEBT ) %]
    <li>The patron has a debt of [% DEBT | $Price %].</li>
[% END %]

[% IF ( DEBT_GUARANTEES ) %]
    <li>The patron's guarantees collectively have a debt of [% DEBT_GUARANTEES | $Price %].</li>
[% END %]

[% IF ( RENTALCHARGE && RENTALCHARGE > 0 ) %]


            [% IF ( charges_guarantees ) %]
                <li>
                    <span class="circ-hlt">Fees &amp; Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
                        [% IF noissues %]
                            <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
                        [% END %]


            [% IF ( credits ) %]
                <li>
                    <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount | $Price %][% END %]
                </li>
            [% END %]


Lines 50-56 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-2 / +2 lines)
50	[% END %]	50	[% END %]
51	[% IF charges_guarantees %]	51	[% IF charges_guarantees %]
52	<li>	52	<li>
53	<span class="circ-hlt">Fees & Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees \| $Price \| html %].	53	<span class="circ-hlt">Fees & Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees \| $Price %].
54	</li>	54	</li>
55	<li>	55	<li>
56	<span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>	56	<span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
Lines 249-255 Link Here
249	<li><i class="fa fa-li fa-exclamation"></i>The barcode was not found [% checkout_info.barcode \| html %].</li>	249	<li><i class="fa fa-li fa-exclamation"></i>The barcode was not found [% checkout_info.barcode \| html %].</li>
250	[% END %]	250	[% END %]
251	[% IF checkout_info.DEBT %]	251	[% IF checkout_info.DEBT %]
252	<li><i class="fa fa-li fa-exclamation"></i>The patron has a debt of [% checkout_info.DEBT \| $Price \| html %].</li> <!-- Need debt_confirmed -->	252	<li><i class="fa fa-li fa-exclamation"></i>The patron has a debt of [% checkout_info.DEBT \| $Price %].</li> <!-- Need debt_confirmed -->
253	[% END %]	253	[% END %]
254	</p>	254	</p>
255	[% END %]	255	[% END %]




                            </td>

                            <td>
                                [% accountline.amount | $Price %]
                            </td>

                            <td>
                                [% accountline.amountoutstanding | $Price %]
                            </td>
                        </tr>
                    </tbody>

                                    <tr>
                                        <td>[% offset_accountline.date | $KohaDates %]</td>
                                        <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 | html %]</td>
                                        <td>[% offset_accountline.amount | $Price %]</td>
                                        <td>[% offset_accountline.amountoutstanding | $Price %]</td>
                                        <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td>
                                        <td>[% offset_accountline.note | html %]</td>
                                        <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | html %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td>
                                        <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td>
                                        <td>[% ao.amount | $Price %]</td>
                                        <td>[% INCLUDE 'account_offset_type.inc' account_offset => ao %]</td>
                                        <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | html %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td>
                                    </tr>




        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | html %]&amp;itemnumber=[% account.itemnumber | html %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
      <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
      <td>[% account.note | html_line_break %]</td>
      [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price %]</td>
      <td class="actions">
        [% IF ( account.payment ) %]
          <a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id | html %]&amp;borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>

  <tr>
    <td colspan="5">Total due</td>
    [% IF ( totalcredit ) %]
        <td class="credit" style="text-align: right;">[% total | $Price %]</td>
    [% ELSE %]
       <td class="debit"style="text-align: right;">[% total | $Price %]</td>
    [% END %]
    <td></td>
  </tr>

Lines 26-32 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt (-1 / +1 lines)
26	<li>Patron has [% ItemsOnIssues \| html %] item(s) checked out.</li>	26	<li>Patron has [% ItemsOnIssues \| html %] item(s) checked out.</li>
27	[% END %]	27	[% END %]
28	[% IF ( charges ) %]	28	[% IF ( charges ) %]
29	<li>Patron has [% charges \| $Price \| html %] in fines.</li>	29	<li>Patron has [% charges \| $Price %] in fines.</li>
30	[% END %]	30	[% END %]
31	[% IF ( guarantees ) %]	31	[% IF ( guarantees ) %]
32	<li>Patron's record has guaranteed accounts attached.</li>	32	<li>Patron's record has guaranteed accounts attached.</li>




                      <td class="credit" style="text-align: right;">
                  [% ELSE %]
                      <td class="debit" style="text-align: right;">
                  [% END %][% account.amount | $Price %]
                      </td>
                  [% IF ( account.amountoutstanding < 0 ) %]
                      <td class="credit" style="text-align: right;">
                  [% ELSE %]
                      <td class="debit" style="text-align: right;">
                  [% END %]
                          [% account.amountoutstanding | $Price %]
                      </td>
                </tr>
            [% END %]

            <tfoot>
                <tr>
                    <td colspan="4">Total due</td>
                    <td colspan="2" style="text-align:right;">[% totaldue | $Price %]</td>
                </tr>
            </tfoot>
        </table>




<tfoot>
<tr>
    <td class="total" colspan="6">Total due:</td>
    <td style="text-align: right;">[% total | $Price %]</td>
</tr>
</tfoot>
<tbody>

    </td>
    <td><input type="text" name="payment_note_[% line.accountlines_id | html %]" /></td>
    <td>[% line.accounttype | html %]</td>
    <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td>
    <td class="debit" style="text-align: right;">[% line.amountoutstanding | $Price %]</td>
</tr>
[% END %]
[% IF ( account_grp.total ) %]
<tr>

    <td class="total" colspan="8" style="text-align: right;">Sub total:</td>
    <td style="text-align: right;">[% account_grp.total | $Price %]</td>
</tr>
[% END %]
</tbody>

        $(document).ready(function(){
        $('#pay-fines-form').preventDoubleFormSubmit();
            $("#woall").click(function(event){
                var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total | $Price %]" );
                var answer = confirm(msg);
                    if (!answer){
                        event.preventDefault();

Lines 29-35 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (-1 / +1 lines)
29	"dt_od_checkouts":	29	"dt_od_checkouts":
30	"[% IF data.overdues %]<span class='overdue'><strong>[% data.overdues \| html %]</strong></span>[% ELSE %][% data.overdues \| html %][% END %] / [% data.issues \| html %]",	30	"[% IF data.overdues %]<span class='overdue'><strong>[% data.overdues \| html %]</strong></span>[% ELSE %][% data.overdues \| html %][% END %] / [% data.issues \| html %]",
31	"dt_fines":	31	"dt_fines":
32	"<span style='text-align: right; display: block;'>[% IF data.fines < 0 %]<span class='credit'>[% data.fines \| $Price \| html %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines \| $Price \| html %]</strong></span> [% ELSE %] [% data.fines \| $Price \| html %] [% END %]</span>",	32	"<span style='text-align: right; display: block;'>[% IF data.fines < 0 %]<span class='credit'>[% data.fines \| $Price %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines \| $Price %]</strong></span> [% ELSE %] [% data.fines \| $Price %] [% END %]</span>",
33	"dt_borrowernotes":	33	"dt_borrowernotes":
34	"[% data.borrowernotes.replace('\\\\' , '\\\\') \|html_line_break \|collapse %]",	34	"[% data.borrowernotes.replace('\\\\' , '\\\\') \|html_line_break \|collapse %]",
35	"dt_action":	35	"dt_action":

Lines 228-234 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-2 / +2 lines)
228	[% END %]	228	[% END %]
229	</td>	229	</td>
230	<td>[% loopresul.note \| html %]</td>	230	<td>[% loopresul.note \| html %]</td>
231	<td style="text-align:right;">[% loopresul.amount \| $Price \| html %]</td>	231	<td style="text-align:right;">[% loopresul.amount \| $Price %]</td>
232	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber \| html %]">[% loopresul.title \| html %]</a></td>	232	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber \| html %]">[% loopresul.title \| html %]</a></td>
233	<td>[% loopresul.barcode \| html %]</td>	233	<td>[% loopresul.barcode \| html %]</td>
234	<td>[% ItemTypes.GetDescription(loopresul.itype) \| html %]</td>	234	<td>[% ItemTypes.GetDescription(loopresul.itype) \| html %]</td>
Lines 238-244 Link Here
238	<tr>	238	<tr>
239	[% IF transaction_type == "ACT" %]	239	[% IF transaction_type == "ACT" %]
240	<th colspan="7" style="text-align:right;">TOTAL</th>	240	<th colspan="7" style="text-align:right;">TOTAL</th>
241	<th style="text-align:right;">[% total \| $Price \| html %]</th>	241	<th style="text-align:right;">[% total \| $Price %]</th>
242	<th colspan="3"> </th>	242	<th colspan="3"> </th>
243	[% END %]	243	[% END %]
244	</tr>	244	</tr>




            <td>[% ordersloo.authorisedbyname | html %]</td>
            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | html %]"> [% ordersloo.title | html %]</a></td>
            <td>[% ordersloo.currency | html %]</td>
            <td>[% ordersloo.listprice | $Price %]</td>
            <td>[% ordersloo.rrp | $Price %]</td>
            <td>[% ordersloo.ecost | $Price %]</td>
            <td>[% ordersloo.quantity | html %]</td>
            <td>[% ordersloo.total_rrp | $Price %]</td>
            <td>[% ordersloo.total_ecost | $Price %]</td>
            <td>[% ordersloo.entrydate | html %]</td>
            <td>[% ordersloo.datereceived | html %]</td>
            <td>[% ordersloo.order_internalnote | html %]</td>

            </tr>
        [% END %]
        </tbody>
        <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity | html %]</th><th>[% total_rrp | $Price %]</th><th>[% total_ecost | $Price %]</th><th></th><th></th><th></th><th></th></tr></tfoot>
        </table>
    [% END %]
    [% ELSE %]




                        <td>[% order.fund.budget_name | html %]</td>
                        <td>
                            [% UNLESS order.datereceived %]
                                [% order.ecost_tax_excluded | $Price %] / [% order.ecost_tax_included | $Price %]
                            [% END %]
                        </td>
                        <td>
                            [% IF order.datereceived %]
                                [%# FIXME What if unitprice has not been filled? %]
                                [% order.unitprice_tax_excluded | $Price %] / [% order.unitprice_tax_included | $Price %]
                            [% END %]
                        </td>
                    </tr>

Lines 205-214 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-2 / +2 lines)
205	<span class="label">Currency:</span>[% currency \| html %]	205	<span class="label">Currency:</span>[% currency \| html %]
206	</li>	206	</li>
207	<li>	207	<li>
208	<span class="label">Price:</span>[% price \| $Price \| html %]	208	<span class="label">Price:</span>[% price \| $Price %]
209	</li>	209	</li>
210	<li>	210	<li>
211	<span class="label">Total</span>[% total \| $Price \| html %]	211	<span class="label">Total</span>[% total \| $Price %]
212	</li>	212	</li>
213	</ol>	213	</ol>
214	</fieldset>	214	</fieldset>

Lines 89-95 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (-3 / +3 lines)
89	[%- SET COLSPAN = 3 -%]	89	[%- SET COLSPAN = 3 -%]
90	[%- END -%]	90	[%- END -%]
91	<th class="sum" colspan="[% COLSPAN \| html %]">Total due</th>	91	<th class="sum" colspan="[% COLSPAN \| html %]">Total due</th>
92	<td class="sum">[% total \| $Price \| html %]</td>	92	<td class="sum">[% total \| $Price %]</td>
93	</tr>	93	</tr>
94	</tfoot>	94	</tfoot>
95		95
Lines 134-141 Link Here
134	[%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description \| html %][% END %]	134	[%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description \| html %][% END %]
135	[% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title \| html %])[% END %]	135	[% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title \| html %])[% END %]
136	</td>	136	</td>
137	[% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount \| $Price \| html %]</td>	137	[% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount \| $Price %]</td>
138	[% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amountoutstanding \| $Price \| html %]</td>	138	[% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amountoutstanding \| $Price %]</td>
139	</tr>	139	</tr>
140	[% END %]	140	[% END %]
141	</tbody>	141	</tbody>

Lines 65-71 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-1 / +1 lines)
65		65
66	[% IF ( too_much_oweing ) %]	66	[% IF ( too_much_oweing ) %]
67	<li id="too_much_oweing">	67	<li id="too_much_oweing">
68	You have unpaid fines. Amount: [% too_much_oweing \| $Price \| html %].	68	You have unpaid fines. Amount: [% too_much_oweing \| $Price %].
69	</li>	69	</li>
70	[% END %]	70	[% END %]
71		71




                                    <li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. <em>If this is an error, please contact the library.</em></li>
                                [% END %]
                                [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %]
                                    <li id="renewal_blocked_fines"><strong>Please note: </strong>You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0  %]Your fines exceed <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines | $Price %]</span>.[% ELSE %]You have fines.[% END %]
                                [% END %]
                            </ul>
                        </div>

                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count | html %])</a></li>[% END %]
                            [% IF ( OPACFinesTab ) %]
                                [% IF ( borrower.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
                                [% IF ( borrower.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
                                [% IF ( borrower.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %]
                            [% END %]

                            [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]

                                                            <input type="checkbox" name="item" value="[% ISSUE.itemnumber | html %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber | html %]&amp;borrowernumber=[% ISSUE.borrowernumber | html %]">Renew</a>
                                                        [% END %]
                                                        [% IF ISSUE.renewalfee > 0 %]
                                                            <span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %]</span>
                                                        [% END %]
                                                        <span class="renewals">([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)</span>
                                                    [% ELSIF ( ISSUE.on_reserve ) %]

                                        <tbody>
                                            <tr>
                                                <td>You currently owe fines and charges amounting to:</td>
                                                <td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price %]</a></td>
                                            </tr>
                                        </tbody>
                                    </table>

                                        <tbody>
                                            <tr>
                                                <td>You currently owe fines and charges amounting to:</td>
                                                <td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price %]</a></td>
                                            </tr>
                                        </tbody>
                                    </table>

                                        <thead><tr><th colspan="2">Amount</th></tr></thead>
                                        <tbody>
                                            <tr>
                                                <td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price %]</a></td>
                                            </tr>
                                        </tbody>
                                    </table>

Lines 56-62 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-2 / +1 lines)
56	[% ELSIF ( circ_error_NOT_FOR_LOAN ) %]	56	[% ELSIF ( circ_error_NOT_FOR_LOAN ) %]
57	This item is not for loan.	57	This item is not for loan.
58	[% ELSIF ( circ_error_DEBT ) %]	58	[% ELSIF ( circ_error_DEBT ) %]
59	You owe the library [% DEBT \| $Price \| html %] and cannot check out.	59	You owe the library [% DEBT \| $Price %] and cannot check out.
60	[% ELSIF ( circ_error_WTHDRAWN ) %]	60	[% ELSIF ( circ_error_WTHDRAWN ) %]
61	This item has been withdrawn from the collection.	61	This item has been withdrawn from the collection.
62	[% ELSIF ( circ_error_RESTRICTED ) %]	62	[% ELSIF ( circ_error_RESTRICTED ) %]
63	-

Return to bug 21454

Lines 109-115 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-17 / +17 lines)
109	[% total_adj = total_adj + adjustment.adjustment \| html %]	109	[% total_adj = total_adj + adjustment.adjustment \| html %]
110	<tr>	110	<tr>
111	<td><input type="hidden" name="adjustment_id" value="[% adjustment.adjustment_id \| html %]" />[% adjustment.adjustment_id \| html %]</td>	111	<td><input type="hidden" name="adjustment_id" value="[% adjustment.adjustment_id \| html %]" />[% adjustment.adjustment_id \| html %]</td>
112	<td><input type="text" name="adjustment" id="adjustment_[% adjustment.adjustment_id \| html %]" value="[% adjustment.adjustment \| $Price \| html %]" /></td>	112	<td><input type="text" name="adjustment" id="adjustment_[% adjustment.adjustment_id \| html %]" value="[% adjustment.adjustment \| $Price %]" /></td>
113	<td>	113	<td>
114	[% reasons = AuthorisedValues.Get("ADJ_REASON") \| html %]	114	[% reasons = AuthorisedValues.Get("ADJ_REASON") \| html %]
115	[% IF reasons.0 %]	115	[% IF reasons.0 %]
Lines 273-286 Link Here
273	[% END %]	273	[% END %]
274	</td>	274	</td>
275	<td><p>[% order.branchcode \| html %]</p></td>	275	<td><p>[% order.branchcode \| html %]</p></td>
276	<td class="number tax_excluded">[% order.unitprice_tax_excluded \| $Price \| html %]</td>	276	<td class="number tax_excluded">[% order.unitprice_tax_excluded \| $Price %]</td>
277	<td class="number tax_included">[% order.unitprice_tax_included \| $Price \| html %]</td>	277	<td class="number tax_included">[% order.unitprice_tax_included \| $Price %]</td>
278	<td class="number replacementprice">[% order.replacementprice \| $Price \| html %]</td>	278	<td class="number replacementprice">[% order.replacementprice \| $Price %]</td>
279	<td class="number">[% order.quantity \| html %]</td>	279	<td class="number">[% order.quantity \| html %]</td>
280	<td class="number tax_excluded">[% order.total_tax_excluded \| $Price \| html %]</td>	280	<td class="number tax_excluded">[% order.total_tax_excluded \| $Price %]</td>
281	<td class="number tax_included">[% order.total_tax_included \| $Price \| html %]</td>	281	<td class="number tax_included">[% order.total_tax_included \| $Price %]</td>
282	<td class="number">[% order.tax_rate * 100 \| html %]</td>	282	<td class="number">[% order.tax_rate * 100 \| html %]</td>
283	<td class="number">[% order.tax_value \| $Price \| html %]</td>	283	<td class="number">[% order.tax_value \| $Price %]</td>
284	<td>[% order.budget_name \| html %]</td>	284	<td>[% order.budget_name \| html %]</td>
285	</tr>	285	</tr>
286	[% END %]	286	[% END %]
Lines 293-302 Link Here
293	<th class="tax_included"></th>	293	<th class="tax_included"></th>
294	<th class="replacementprice"/>	294	<th class="replacementprice"/>
295	<th>[% tf.quantity \| html %]</th>	295	<th>[% tf.quantity \| html %]</th>
296	<th class="tax_excluded">[% tf.total_tax_excluded \| $Price \| html %]</th>	296	<th class="tax_excluded">[% tf.total_tax_excluded \| $Price %]</th>
297	<th class="tax_included">[% tf.total_tax_included \| $Price \| html %]</th>	297	<th class="tax_included">[% tf.total_tax_included \| $Price %]</th>
298	<th> </th>	298	<th> </th>
299	<th>[% tf.tax_value \| $Price \| html %]</th>	299	<th>[% tf.tax_value \| $Price %]</th>
300	<th> </th>	300	<th> </th>
301	</tr>	301	</tr>
302	[% END %]	302	[% END %]
Lines 306-315 Link Here
306	<th class="tax_included"></th>	306	<th class="tax_included"></th>
307	<th class="replacementprice"/>	307	<th class="replacementprice"/>
308	<th>[% total_quantity \| html %]</th>	308	<th>[% total_quantity \| html %]</th>
309	<th class="tax_excluded">[% total_tax_excluded \| $Price \| html %]</th>	309	<th class="tax_excluded">[% total_tax_excluded \| $Price %]</th>
310	<th class="tax_included">[% total_tax_included \| $Price \| html %]</th>	310	<th class="tax_included">[% total_tax_included \| $Price %]</th>
311	<th> </th>	311	<th> </th>
312	<th>[% total_tax_value \| $Price \| html %]</th>	312	<th>[% total_tax_value \| $Price %]</th>
313	<th> </th>	313	<th> </th>
314	</tr>	314	</tr>
315	<tr>	315	<tr>
Lines 318-327 Link Here
318	<th class="tax_included"></th>	318	<th class="tax_included"></th>
319	<th class="replacementprice"/>	319	<th class="replacementprice"/>
320	<th>[% total_quantity \| html %]</th>	320	<th>[% total_quantity \| html %]</th>
321	<th class="tax_excluded">[% total_tax_excluded_shipment + total_adj \| $Price \| html %]</th>	321	<th class="tax_excluded">[% total_tax_excluded_shipment + total_adj \| $Price %]</th>
322	<th class="tax_included">[% total_tax_included_shipment \| $Price \| html %]</th>	322	<th class="tax_included">[% total_tax_included_shipment \| $Price %]</th>
323	<th> </th>	323	<th> </th>
324	<th>[% total_tax_value \| $Price \| html %]</th>	324	<th>[% total_tax_value \| $Price %]</th>
325	<th> </th>	325	<th> </th>
326	</tr>	326	</tr>
327	</tfoot>	327	</tfoot>
Lines 329-335 Link Here
329	[% ELSE %]	329	[% ELSE %]
330	<div class="dialog message"><p>No orders yet</p>	330	<div class="dialog message"><p>No orders yet</p>
331	[% IF adjustments && adjustments.count > 0 \|\| shipmentcost && shipmentcost > 0 %]	331	[% IF adjustments && adjustments.count > 0 \|\| shipmentcost && shipmentcost > 0 %]
332	<p>Adjustments plus shipping:[% total_adj + shipmentcost \| $Price \| html %]</p>	332	<p>Adjustments plus shipping:[% total_adj + shipmentcost \| $Price %]</p>
333	[% END %]	333	[% END %]
334	</div>	334	</div>
335	[% END %]	335	[% END %]

Lines 368-374 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt (-4 / +4 lines)
368	[% IF r.orders_moved.size > 0 %]	368	[% IF r.orders_moved.size > 0 %]
369	[% FOR order IN r.orders_moved %]	369	[% FOR order IN r.orders_moved %]
370	<tr>	370	<tr>
371	<td>[% r.budget.budget_name \| html %] (id=[% r.budget.budget_id \| html %]) Amount=[% r.budget.budget_amount \| $Price \| html %][% IF r.unspent_moved %] ([% r.unspent_moved \| $Price \| html %] remaining has been moved)[% END %]</td>	371	<td>[% r.budget.budget_name \| html %] (id=[% r.budget.budget_id \| html %]) Amount=[% r.budget.budget_amount \| $Price %][% IF r.unspent_moved %] ([% r.unspent_moved \| $Price %] remaining has been moved)[% END %]</td>
372	<td>[% order.basketname \| html %]</td>	372	<td>[% order.basketname \| html %]</td>
373	<td>[% order.ordernumber \| html %]</td>	373	<td>[% order.ordernumber \| html %]</td>
374	<td>Moved!</td>	374	<td>Moved!</td>
Lines 385-391 Link Here
385	[% ELSE %]	385	[% ELSE %]
386	[% IF r.error == 'budget_code_not_exists' %]	386	[% IF r.error == 'budget_code_not_exists' %]
387	<tr>	387	<tr>
388	<td>[% r.budget.budget_id \| html %] [% r.budget.budget_amount \| $Price \| html %][% IF r.unspent_moved %] ([% r.unspent_moved \| $Price \| html %] remaining has been moved)[% END %]</td>	388	<td>[% r.budget.budget_id \| html %] [% r.budget.budget_amount \| $Price %][% IF r.unspent_moved %] ([% r.unspent_moved \| $Price %] remaining has been moved)[% END %]</td>
389	<td></td>	389	<td></td>
390	<td></td>	390	<td></td>
391	<td>This fund code does not exist in the destination budget.</td>	391	<td>This fund code does not exist in the destination budget.</td>
Lines 439-445 Link Here
439	<span style="color:green;">Locked</span>	439	<span style="color:green;">Locked</span>
440	[% END %]	440	[% END %]
441	</td>	441	</td>
442	<td class="data">[% period_active.budget_period_total \| $Price \| html %]</td>	442	<td class="data">[% period_active.budget_period_total \| $Price %]</td>
443	<td>	443	<td>
444	[% PROCESS action_menu block_budget=period_active %]	444	[% PROCESS action_menu block_budget=period_active %]
445	</td>	445	</td>
Lines 471-477 Link Here
471	<td><span title="[% period_loo.budget_period_startdate \| html %]">[% period_loo.budget_period_startdate \| $KohaDates %]</span></td>	471	<td><span title="[% period_loo.budget_period_startdate \| html %]">[% period_loo.budget_period_startdate \| $KohaDates %]</span></td>
472	<td><span title="[% period_loo.budget_period_enddate \| html %]">[% period_loo.budget_period_enddate \| $KohaDates %]</span></td>	472	<td><span title="[% period_loo.budget_period_enddate \| html %]">[% period_loo.budget_period_enddate \| $KohaDates %]</span></td>
473	<td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span> [% ELSE %][% END %] </td>	473	<td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span> [% ELSE %][% END %] </td>
474	<td class="data">[% period_loo.budget_period_total \| $Price \| html %]</td>	474	<td class="data">[% period_loo.budget_period_total \| $Price %]</td>
475	<td>	475	<td>
476	[% PROCESS action_menu block_budget=period_loo %]	476	[% PROCESS action_menu block_budget=period_loo %]
477	</td>	477	</td>

Lines 279-288 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-4 / +4 lines)
279	</tr>	279	</tr>
280	<tr><th scope="row">Age required: </th><td>[% category.dateofbirthrequired \| html %] years</td></tr>	280	<tr><th scope="row">Age required: </th><td>[% category.dateofbirthrequired \| html %] years</td></tr>
281	<tr><th scope="row">Upperage limit: </th><td>[% category.upperagelimit \| html %] years</td></tr>	281	<tr><th scope="row">Upperage limit: </th><td>[% category.upperagelimit \| html %] years</td></tr>
282	<tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee \| $Price \| html %]</td></tr>	282	<tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee \| $Price %]</td></tr>
283	<tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>	283	<tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr>
284	<tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>	284	<tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr>
285	<tr><th scope="row">Hold fee: </th><td>[% category.reservefee \| $Price \| html %]</td></tr>	285	<tr><th scope="row">Hold fee: </th><td>[% category.reservefee \| $Price %]</td></tr>
286		286
287	[% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' \|\| Koha.Preference('CheckPrevCheckout') == 'softno' ) %]	287	[% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' \|\| Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
288	<tr>	288	<tr>
Lines 397-410 Link Here
397	<td>-</td>	397	<td>-</td>
398	[% END %]	398	[% END %]
399	[% IF (category.enrolmentfee > 0) %]	399	[% IF (category.enrolmentfee > 0) %]
400	<td>[% category.enrolmentfee \| $Price \| html %]</td>	400	<td>[% category.enrolmentfee \| $Price %]</td>
401	[% ELSE %]	401	[% ELSE %]
402	<td>-</td>	402	<td>-</td>
403	[% END %]	403	[% END %]
404	<td>[% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]</td>	404	<td>[% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]</td>
405	<td>[% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]</td>	405	<td>[% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]</td>
406	[% IF (category.reservefee > 0) %]	406	[% IF (category.reservefee > 0) %]
407	<td>[% category.reservefee \| $Price \| html %]</td>	407	<td>[% category.reservefee \| $Price %]</td>
408	[% ELSE %]	408	[% ELSE %]
409	<td>-</td>	409	<td>-</td>
410	[% END %]	410	[% END %]

Lines 307-313 Item types administration Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt (-4 / +4 lines)
307	</td>	307	</td>
308	</tr>	308	</tr>
309	[% END %]	309	[% END %]
310	<tr><th scope="row">Rental charge</th><td>[% itemtype.rentalcharge \| $Price \| html %]</td></tr>	310	<tr><th scope="row">Rental charge</th><td>[% itemtype.rentalcharge \| $Price %]</td></tr>
311	</table>	311	</table>
312	<form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">	312	<form action="/cgi-bin/koha/admin/itemtypes.pl" method="post">
313	<input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype \| html %]" />	313	<input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype \| html %]" />
Lines 369-379 Item types administration Link Here
369	<td>[% IF ( itemtype.hideinopac ) %]Yes[% ELSE %] [% END %]</td>	369	<td>[% IF ( itemtype.hideinopac ) %]Yes[% ELSE %] [% END %]</td>
370	<td>	370	<td>
371	[% UNLESS ( itemtype.notforloan ) %]	371	[% UNLESS ( itemtype.notforloan ) %]
372	[% itemtype.rentalcharge \| $Price \| html %]	372	[% itemtype.rentalcharge \| $Price %]
373	[% END %]	373	[% END %]
374	</td>	374	</td>
375	<td>[% itemtype.defaultreplacecost \| $Price \| html %]</td>	375	<td>[% itemtype.defaultreplacecost \| $Price %]</td>
376	<td>[% itemtype.processfee \| $Price \| html %]</td>	376	<td>[% itemtype.processfee \| $Price %]</td>
377	<td>[% itemtype.checkinmsg \| html_line_break \| $raw %]</td>	377	<td>[% itemtype.checkinmsg \| html_line_break \| $raw %]</td>
378	<td class="actions">	378	<td class="actions">
379	<a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype \| html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>	379	<a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype \| html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>

Lines 128-161 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-8 / +8 lines)
128	<td>[% Branches.GetName( loop_budge.budget_branchcode ) \| html %]</td>	128	<td>[% Branches.GetName( loop_budge.budget_branchcode ) \| html %]</td>
129	<td class="data">	129	<td class="data">
130	[% IF loop_budge.budget_parent_id %]	130	[% IF loop_budge.budget_parent_id %]
131	[% loop_budge.budget_amount \| $Price \| html %]	131	[% loop_budge.budget_amount \| $Price %]
132	[% ELSE %]	132	[% ELSE %]
133	<span class="total_amount">[% loop_budge.budget_amount \| $Price \| html %]</span>	133	<span class="total_amount">[% loop_budge.budget_amount \| $Price %]</span>
134	[% END %]	134	[% END %]
135	</td>	135	</td>
136	<td class="data">	136	<td class="data">
137	<a href="ordered.pl?fund=[% loop_budge.budget_id \| html %]&fund_code=[% loop_budge.budget_code \| html %]">	137	<a href="ordered.pl?fund=[% loop_budge.budget_id \| html %]&fund_code=[% loop_budge.budget_code \| html %]">
138	[% IF loop_budge.budget_parent_id %]	138	[% IF loop_budge.budget_parent_id %]
139	[% loop_budge.budget_ordered \| $Price \| html %]	139	[% loop_budge.budget_ordered \| $Price %]
140	[% ELSE %]	140	[% ELSE %]
141	<span class="total_amount">[% loop_budge.budget_ordered \| $Price \| html %]</span>	141	<span class="total_amount">[% loop_budge.budget_ordered \| $Price %]</span>
142	[% END %]	142	[% END %]
143	</a>	143	</a>
144	</td>	144	</td>
145	<td class="data">	145	<td class="data">
146	<a href="spent.pl?fund=[% loop_budge.budget_id \| html %]&fund_code=[% loop_budge.budget_code \| html %]">	146	<a href="spent.pl?fund=[% loop_budge.budget_id \| html %]&fund_code=[% loop_budge.budget_code \| html %]">
147	[% IF loop_budge.budget_parent_id %]	147	[% IF loop_budge.budget_parent_id %]
148	[% loop_budge.budget_spent \| $Price \| html %]	148	[% loop_budge.budget_spent \| $Price %]
149	[% ELSE %]	149	[% ELSE %]
150	<span class="total_amount">[% loop_budge.budget_spent \| $Price \| html %]</span>	150	<span class="total_amount">[% loop_budge.budget_spent \| $Price %]</span>
151	[% END %]	151	[% END %]
152	</a>	152	</a>
153	</td>	153	</td>
154	<td class="data">	154	<td class="data">
155	[% IF loop_budge.budget_parent_id %]	155	[% IF loop_budge.budget_parent_id %]
156	[% loop_budge.budget_avail \| $Price \| html %]	156	[% loop_budge.budget_avail \| $Price %]
157	[% ELSE %]	157	[% ELSE %]
158	<span class="total_amount">[% loop_budge.budget_avail \| $Price \| html %]</span>	158	<span class="total_amount">[% loop_budge.budget_avail \| $Price %]</span>
159	[% END %]	159	[% END %]
160	</td>	160	</td>
161	</tr>	161	</tr>

Lines 385-394 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-22 / +22 lines)
385	<th class="tax_included"> </th>	385	<th class="tax_included"> </th>
386	<th class="replacementprice"> </th>	386	<th class="replacementprice"> </th>
387	<th>[% foot_loo.quantity \| html %]</th>	387	<th>[% foot_loo.quantity \| html %]</th>
388	<th class="tax_excluded">[% foot_loo.total_tax_excluded \| $Price \| html %]</th>	388	<th class="tax_excluded">[% foot_loo.total_tax_excluded \| $Price %]</th>
389	<th class="tax_included">[% foot_loo.total_tax_included \| $Price \| html %]</th>	389	<th class="tax_included">[% foot_loo.total_tax_included \| $Price %]</th>
390	<th> </th>	390	<th> </th>
391	<th>[% foot_loo.tax_value \| $Price \| html %]</th>	391	<th>[% foot_loo.tax_value \| $Price %]</th>
392	<th> </th>	392	<th> </th>
393	<th> </th>	393	<th> </th>
394	[% IF ( active ) %]	394	[% IF ( active ) %]
Lines 408-417 Link Here
408	<th class="tax_included"> </th>	408	<th class="tax_included"> </th>
409	<th class="replacementprice"> </th>	409	<th class="replacementprice"> </th>
410	<th>[% total_quantity \| html %]</th>	410	<th>[% total_quantity \| html %]</th>
411	<th class="tax_excluded">[% total_tax_excluded \| $Price \| html %]</th>	411	<th class="tax_excluded">[% total_tax_excluded \| $Price %]</th>
412	<th class="tax_included">[% total_tax_included \| $Price \| html %]</th>	412	<th class="tax_included">[% total_tax_included \| $Price %]</th>
413	<th> </th>	413	<th> </th>
414	<th>[% total_tax_value \| $Price \| html %]</th>	414	<th>[% total_tax_value \| $Price %]</th>
415	<th> </th>	415	<th> </th>
416	<th> </th>	416	<th> </th>
417	[% IF ( active ) %]	417	[% IF ( active ) %]
Lines 478-493 Link Here
478	</td>	478	</td>
479	[% 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 ... %]	479	[% 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 ... %]
480	[%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]	480	[%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
481	<td class="number tax_excluded [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded \| $Price \| html %]</td>	481	<td class="number tax_excluded [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded \| $Price %]</td>
482	<td class="number tax_excluded [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded \| $Price \| html %]</td>	482	<td class="number tax_excluded [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded \| $Price %]</td>
483	<td class="number tax_included [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included \| $Price \| html %]</td>	483	<td class="number tax_included [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included \| $Price %]</td>
484	<td class="number tax_included [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included \| $Price \| html %]</td>	484	<td class="number tax_included [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included \| $Price %]</td>
485	<td class="number replacementprice [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice \| $Price \| html %]</td>	485	<td class="number replacementprice [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice \| $Price %]</td>
486	<td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity \| html %]</td>	486	<td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity \| html %]</td>
487	<td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded \| $Price \| html %]</td>	487	<td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded \| $Price %]</td>
488	<td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included \| $Price \| html %]</td>	488	<td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included \| $Price %]</td>
489	<td class="number">[% books_loo.tax_rate * 100 \| html %]</td>	489	<td class="number">[% books_loo.tax_rate * 100 \| html %]</td>
490	<td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value \| $Price \| html %]</td>	490	<td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value \| $Price %]</td>
491	<td>[% books_loo.budget_name \| html %]</td>	491	<td>[% books_loo.budget_name \| html %]</td>
492	<td>[% books_loo.suppliers_report \| html %]</td>	492	<td>[% books_loo.suppliers_report \| html %]</td>
493	[% IF ( active ) %]	493	[% IF ( active ) %]
Lines 594-609 Link Here
594	</p>	594	</p>
595	[% END %]	595	[% END %]
596	</td>	596	</td>
597	<td class="number tax_excluded">[% order.rrp_tax_excluded \| $Price \| html %]</td>	597	<td class="number tax_excluded">[% order.rrp_tax_excluded \| $Price %]</td>
598	<td class="number tax_excluded">[% order.ecost_tax_excluded \| $Price \| html %]</td>	598	<td class="number tax_excluded">[% order.ecost_tax_excluded \| $Price %]</td>
599	<td class="number tax_included">[% order.rrp_tax_included \| $Price \| html %]</td>	599	<td class="number tax_included">[% order.rrp_tax_included \| $Price %]</td>
600	<td class="number tax_included">[% order.ecost_tax_included \| $Price \| html %]</td>	600	<td class="number tax_included">[% order.ecost_tax_included \| $Price %]</td>
601	<td class="number replacementprice">[% order.replacementprice \| $Price \| html %]</td>	601	<td class="number replacementprice">[% order.replacementprice \| $Price %]</td>
602	<td class="number">[% order.quantity \| html %]</td>	602	<td class="number">[% order.quantity \| html %]</td>
603	<td class="number tax_excluded">[% order.total_tax_excluded \| $Price \| html %]</td>	603	<td class="number tax_excluded">[% order.total_tax_excluded \| $Price %]</td>
604	<td class="number tax_included">[% order.total_tax_included \| $Price \| html %]</td>	604	<td class="number tax_included">[% order.total_tax_included \| $Price %]</td>
605	<td class="number">[% order.tax_rate * 100 \| html %]</td>	605	<td class="number">[% order.tax_rate * 100 \| html %]</td>
606	<td class="number">[% order.tax_value \| $Price \| html %]</td>	606	<td class="number">[% order.tax_value \| $Price %]</td>
607	<td>[% order.budget_name \| html %]	607	<td>[% order.budget_name \| html %]
608	</tr>	608	</tr>
609	[% END %]	609	[% END %]

Lines 239-250 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-3 / +3 lines)
239	<input type="hidden" name="tax_rate" value="0" />	239	<input type="hidden" name="tax_rate" value="0" />
240	[% END %]	240	[% END %]
241		241
242	<li><label for="rrp">Retail price: </label>[% rrp \| $Price \| html %]</li>	242	<li><label for="rrp">Retail price: </label>[% rrp \| $Price %]</li>
243	<li>	243	<li>
244	<label for="replacementprice">Replacement price:</label>	244	<label for="replacementprice">Replacement price:</label>
245	<input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice \| $Price \| html %]" />	245	<input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice \| $Price %]" />
246	</li>	246	</li>
247	<li><label for="ecost">Budgeted cost: </label>[% ecost \| $Price \| html %]</li>	247	<li><label for="ecost">Budgeted cost: </label>[% ecost \| $Price %]</li>
248	<li>	248	<li>
249	<label for="unitprice">Actual cost:</label>	249	<label for="unitprice">Actual cost:</label>
250	<input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice \| $Price on_editing => 1 \| html %]" />	250	<input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice \| $Price on_editing => 1 \| html %]" />

Lines 171-180 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-12 / +12 lines)
171	<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber \| html %]" class="previewData">MARC</a><br>	171	<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber \| html %]" class="previewData">MARC</a><br>
172	<a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber \| html %]" class="previewData">Card</a>	172	<a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber \| html %]" class="previewData">Card</a>
173	</td>	173	</td>
174	<td>[% loop_order.replacementprice \| $Price \| html %]</td>	174	<td>[% loop_order.replacementprice \| $Price %]</td>
175	<td>[% loop_order.quantity \| html %]</td>	175	<td>[% loop_order.quantity \| html %]</td>
176	<td>[% loop_order.ecost \| $Price \| html %]</td>	176	<td>[% loop_order.ecost \| $Price %]</td>
177	<td>[% loop_order.total \| $Price \| html %]</td>	177	<td>[% loop_order.total \| $Price %]</td>
178	<td>[% loop_order.budget_name \| html %]</td>	178	<td>[% loop_order.budget_name \| html %]</td>
179	<td>	179	<td>
180	<a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber \| html %]&invoiceid=[% invoiceid \| html %]">Receive</a>	180	<a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber \| html %]&invoiceid=[% invoiceid \| html %]">Receive</a>
Lines 250-276 Link Here
250	<td colspan="6" class="total">(Tax exc.)</td>	250	<td colspan="6" class="total">(Tax exc.)</td>
251	[% END %]	251	[% END %]
252	<td colspan="3"><i>Subtotal for</i> [% key \| html %]</td>	252	<td colspan="3"><i>Subtotal for</i> [% key \| html %]</td>
253	<td>[% subtotal_for_funds.$key.ecost \| $Price \| html %]</td>	253	<td>[% subtotal_for_funds.$key.ecost \| $Price %]</td>
254	<td>[% subtotal_for_funds.$key.unitprice \| $Price \| html %]</td>	254	<td>[% subtotal_for_funds.$key.unitprice \| $Price %]</td>
255	<td> </td>	255	<td> </td>
256	<td> </td>	256	<td> </td>
257	</tr>	257	</tr>
258	[% END %]	258	[% END %]
259	<tr>	259	<tr>
260	<th colspan="11" class="total">Total tax exc.</th>	260	<th colspan="11" class="total">Total tax exc.</th>
261	<th>[% total_tax_excluded \| $Price \| html %]</th>	261	<th>[% total_tax_excluded \| $Price %]</th>
262	<th></th>	262	<th></th>
263	</tr>	263	</tr>
264	[% FOREACH book_foot IN book_foot_loop %]	264	[% FOREACH book_foot IN book_foot_loop %]
265	<tr>	265	<tr>
266	<th colspan="11">Total (GST [% book_foot.tax_rate * 100 \| html %]%)</th>	266	<th colspan="11">Total (GST [% book_foot.tax_rate * 100 \| html %]%)</th>
267	<th>[% book_foot.tax_value \| $Price \| html %]</th>	267	<th>[% book_foot.tax_value \| $Price %]</th>
268	<th></th>	268	<th></th>
269	</tr>	269	</tr>
270	[% END %]	270	[% END %]
271	<tr>	271	<tr>
272	<th colspan="11" class="total">Total tax inc.</th>	272	<th colspan="11" class="total">Total tax inc.</th>
273	<th>[% total_tax_included \| $Price \| html %]</th>	273	<th>[% total_tax_included \| $Price %]</th>
274	<th></th>	274	<th></th>
275	</tr>	275	</tr>
276	</tfoot>	276	</tfoot>
Lines 324-335 Link Here
324	<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber \| html %]" class="previewData">MARC</a><br>	324	<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber \| html %]" class="previewData">MARC</a><br>
325	<a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber \| html %]" class="previewData">Card</a>	325	<a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber \| html %]" class="previewData">Card</a>
326	</td>	326	</td>
327	<td>[% order.replacementprice \| $Price \| html %]</td>	327	<td>[% order.replacementprice \| $Price %]</td>
328	<td>[% order.quantityreceived \| html %]</td>	328	<td>[% order.quantityreceived \| html %]</td>
329	<td>[% order.budget.budget_name \| html %]</td>	329	<td>[% order.budget.budget_name \| html %]</td>
330	<td>[% order.ecost \| $Price \| html %]</td>	330	<td>[% order.ecost \| $Price %]</td>
331	<td>[% order.unitprice \| $Price \| html %]</td>	331	<td>[% order.unitprice \| $Price %]</td>
332	<td>[% order.total \| $Price \| html %]</td>	332	<td>[% order.total \| $Price %]</td>
333	<td>	333	<td>
334	[% IF loop_receive.cannot_cancel or ( order.basket.effective_create_items == "receiving" and loop_receive.holds > 0 ) %]	334	[% IF loop_receive.cannot_cancel or ( order.basket.effective_create_items == "receiving" and loop_receive.holds > 0 ) %]
335	[% IF loop_receive.cannot_cancel %]	335	[% IF loop_receive.cannot_cancel %]

Lines 67-74 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-4 / +4 lines)
67	[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber \| html %]&itemnumber=[% account.itemnumber \| html %]">[% account.item.biblio.title \| html %]</a>[% END %]</td>	67	[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber \| html %]&itemnumber=[% account.itemnumber \| html %]">[% account.item.biblio.title \| html %]</a>[% END %]</td>
68	<td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) \| html %][% END %]</td>	68	<td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) \| html %][% END %]</td>
69	<td>[% account.note \| html_line_break %]</td>	69	<td>[% account.note \| html_line_break %]</td>
70	[% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount \| $Price \| html %]</td>	70	[% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount \| $Price %]</td>
71	[% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding \| $Price \| html %]</td>	71	[% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding \| $Price %]</td>
72	<td class="actions">	72	<td class="actions">
73	[% IF ( account.payment ) %]	73	[% IF ( account.payment ) %]
74	<a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id \| html %]&borrowernumber=[% account.borrowernumber \| html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>	74	<a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id \| html %]&borrowernumber=[% account.borrowernumber \| html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
Lines 96-104 Link Here
96	<tr>	96	<tr>
97	<td colspan="5">Total due</td>	97	<td colspan="5">Total due</td>
98	[% IF ( totalcredit ) %]	98	[% IF ( totalcredit ) %]
99	<td class="credit" style="text-align: right;">[% total \| $Price \| html %]</td>	99	<td class="credit" style="text-align: right;">[% total \| $Price %]</td>
100	[% ELSE %]	100	[% ELSE %]
101	<td class="debit"style="text-align: right;">[% total \| $Price \| html %]</td>	101	<td class="debit"style="text-align: right;">[% total \| $Price %]</td>
102	[% END %]	102	[% END %]
103	<td></td>	103	<td></td>
104	</tr>	104	</tr>

Lines 52-58 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-5 / +5 lines)
52	<tfoot>	52	<tfoot>
53	<tr>	53	<tr>
54	<td class="total" colspan="6">Total due:</td>	54	<td class="total" colspan="6">Total due:</td>
55	<td style="text-align: right;">[% total \| $Price \| html %]</td>	55	<td style="text-align: right;">[% total \| $Price %]</td>
56	</tr>	56	</tr>
57	</tfoot>	57	</tfoot>
58	<tbody>	58	<tbody>
Lines 105-119 Link Here
105	</td>	105	</td>
106	<td><input type="text" name="payment_note_[% line.accountlines_id \| html %]" /></td>	106	<td><input type="text" name="payment_note_[% line.accountlines_id \| html %]" /></td>
107	<td>[% line.accounttype \| html %]</td>	107	<td>[% line.accounttype \| html %]</td>
108	<td class="debit" style="text-align: right;">[% line.amount \| $Price \| html %]</td>	108	<td class="debit" style="text-align: right;">[% line.amount \| $Price %]</td>
109	<td class="debit" style="text-align: right;">[% line.amountoutstanding \| $Price \| html %]</td>	109	<td class="debit" style="text-align: right;">[% line.amountoutstanding \| $Price %]</td>
110	</tr>	110	</tr>
111	[% END %]	111	[% END %]
112	[% IF ( account_grp.total ) %]	112	[% IF ( account_grp.total ) %]
113	<tr>	113	<tr>
114		114
115	<td class="total" colspan="8" style="text-align: right;">Sub total:</td>	115	<td class="total" colspan="8" style="text-align: right;">Sub total:</td>
116	<td style="text-align: right;">[% account_grp.total \| $Price \| html %]</td>	116	<td style="text-align: right;">[% account_grp.total \| $Price %]</td>
117	</tr>	117	</tr>
118	[% END %]	118	[% END %]
119	</tbody>	119	</tbody>
Lines 155-161 Link Here
155	$(document).ready(function(){	155	$(document).ready(function(){
156	$('#pay-fines-form').preventDoubleFormSubmit();	156	$('#pay-fines-form').preventDoubleFormSubmit();
157	$("#woall").click(function(event){	157	$("#woall").click(function(event){
158	var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total \| $Price \| html %]" );	158	var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total \| $Price %]" );
159	var answer = confirm(msg);	159	var answer = confirm(msg);
160	if (!answer){	160	if (!answer){
161	event.preventDefault();	161	event.preventDefault();

Lines 64-75 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt (-6 / +6 lines)
64	<td>[% ordersloo.authorisedbyname \| html %]</td>	64	<td>[% ordersloo.authorisedbyname \| html %]</td>
65	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber \| html %]"> [% ordersloo.title \| html %]</a></td>	65	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber \| html %]"> [% ordersloo.title \| html %]</a></td>
66	<td>[% ordersloo.currency \| html %]</td>	66	<td>[% ordersloo.currency \| html %]</td>
67	<td>[% ordersloo.listprice \| $Price \| html %]</td>	67	<td>[% ordersloo.listprice \| $Price %]</td>
68	<td>[% ordersloo.rrp \| $Price \| html %]</td>	68	<td>[% ordersloo.rrp \| $Price %]</td>
69	<td>[% ordersloo.ecost \| $Price \| html %]</td>	69	<td>[% ordersloo.ecost \| $Price %]</td>
70	<td>[% ordersloo.quantity \| html %]</td>	70	<td>[% ordersloo.quantity \| html %]</td>
71	<td>[% ordersloo.total_rrp \| $Price \| html %]</td>	71	<td>[% ordersloo.total_rrp \| $Price %]</td>
72	<td>[% ordersloo.total_ecost \| $Price \| html %]</td>	72	<td>[% ordersloo.total_ecost \| $Price %]</td>
73	<td>[% ordersloo.entrydate \| html %]</td>	73	<td>[% ordersloo.entrydate \| html %]</td>
74	<td>[% ordersloo.datereceived \| html %]</td>	74	<td>[% ordersloo.datereceived \| html %]</td>
75	<td>[% ordersloo.order_internalnote \| html %]</td>	75	<td>[% ordersloo.order_internalnote \| html %]</td>
Lines 77-83 Link Here
77	</tr>	77	</tr>
78	[% END %]	78	[% END %]
79	</tbody>	79	</tbody>
80	<tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity \| html %]</th><th>[% total_rrp \| $Price \| html %]</th><th>[% total_ecost \| $Price \| html %]</th><th></th><th></th><th></th><th></th></tr></tfoot>	80	<tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity \| html %]</th><th>[% total_rrp \| $Price %]</th><th>[% total_ecost \| $Price %]</th><th></th><th></th><th></th><th></th></tr></tfoot>
81	</table>	81	</table>
82	[% END %]	82	[% END %]
83	[% ELSE %]	83	[% ELSE %]

Lines 387-399 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +2 lines)
387	<td>[% order.fund.budget_name \| html %]</td>	387	<td>[% order.fund.budget_name \| html %]</td>
388	<td>	388	<td>
389	[% UNLESS order.datereceived %]	389	[% UNLESS order.datereceived %]
390	[% order.ecost_tax_excluded \| $Price \| html %] / [% order.ecost_tax_included \| $Price \| html %]	390	[% order.ecost_tax_excluded \| $Price %] / [% order.ecost_tax_included \| $Price %]
391	[% END %]	391	[% END %]
392	</td>	392	</td>
393	<td>	393	<td>
394	[% IF order.datereceived %]	394	[% IF order.datereceived %]
395	[%# FIXME What if unitprice has not been filled? %]	395	[%# FIXME What if unitprice has not been filled? %]
396	[% order.unitprice_tax_excluded \| $Price \| html %] / [% order.unitprice_tax_included \| $Price \| html %]	396	[% order.unitprice_tax_excluded \| $Price %] / [% order.unitprice_tax_included \| $Price %]
397	[% END %]	397	[% END %]
398	</td>	398	</td>
399	</tr>	399	</tr>

Lines 129-135 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-8 / +8 lines)
129	<li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. <em>If this is an error, please contact the library.</em></li>	129	<li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. <em>If this is an error, please contact the library.</em></li>
130	[% END %]	130	[% END %]
131	[% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %]	131	[% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %]
132	<li id="renewal_blocked_fines"><strong>Please note: </strong>You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0 %]Your fines exceed <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines \| $Price \| html %]</span>.[% ELSE %]You have fines.[% END %]	132	<li id="renewal_blocked_fines"><strong>Please note: </strong>You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0 %]Your fines exceed <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines \| $Price %]</span>.[% ELSE %]You have fines.[% END %]
133	[% END %]	133	[% END %]
134	</ul>	134	</ul>
135	</div>	135	</div>
Lines 145-153 Link Here
145	[% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]	145	[% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
146	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count \| html %])</a></li>[% END %]	146	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count \| html %])</a></li>[% END %]
147	[% IF ( OPACFinesTab ) %]	147	[% IF ( OPACFinesTab ) %]
148	[% IF ( borrower.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding \| $Price \| html %])</a></li>[% END %]	148	[% IF ( borrower.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding \| $Price %])</a></li>[% END %]
149	[% IF ( borrower.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding \| $Price \| html %])</a></li>[% END %]	149	[% IF ( borrower.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding \| $Price %])</a></li>[% END %]
150	[% IF ( borrower.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding \| $Price \| html %])</a></li>[% END %]	150	[% IF ( borrower.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding \| $Price %])</a></li>[% END %]
151	[% END %]	151	[% END %]
152		152
153	[% IF borrower_club_enrollments.count \|\| borrower_enrollable_clubs.count %]	153	[% IF borrower_club_enrollments.count \|\| borrower_enrollable_clubs.count %]
Lines 284-290 Link Here
284	<input type="checkbox" name="item" value="[% ISSUE.itemnumber \| html %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% ISSUE.itemnumber \| html %]&borrowernumber=[% ISSUE.borrowernumber \| html %]">Renew</a>	284	<input type="checkbox" name="item" value="[% ISSUE.itemnumber \| html %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% ISSUE.itemnumber \| html %]&borrowernumber=[% ISSUE.borrowernumber \| html %]">Renew</a>
285	[% END %]	285	[% END %]
286	[% IF ISSUE.renewalfee > 0 %]	286	[% IF ISSUE.renewalfee > 0 %]
287	<span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) \| html %]': [% ISSUE.renewalfee \| $Price \| html %]</span>	287	<span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) \| html %]': [% ISSUE.renewalfee \| $Price %]</span>
288	[% END %]	288	[% END %]
289	<span class="renewals">([% ISSUE.renewsleft \| html %] of [% ISSUE.renewsallowed \| html %] renewals remaining)</span>	289	<span class="renewals">([% ISSUE.renewsleft \| html %] of [% ISSUE.renewsallowed \| html %] renewals remaining)</span>
290	[% ELSIF ( ISSUE.on_reserve ) %]	290	[% ELSIF ( ISSUE.on_reserve ) %]
Lines 374-380 Link Here
374	<tbody>	374	<tbody>
375	<tr>	375	<tr>
376	<td>You currently owe fines and charges amounting to:</td>	376	<td>You currently owe fines and charges amounting to:</td>
377	<td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding \| $Price \| html %]</a></td>	377	<td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding \| $Price %]</a></td>
378	</tr>	378	</tr>
379	</tbody>	379	</tbody>
380	</table>	380	</table>
Lines 388-394 Link Here
388	<tbody>	388	<tbody>
389	<tr>	389	<tr>
390	<td>You currently owe fines and charges amounting to:</td>	390	<td>You currently owe fines and charges amounting to:</td>
391	<td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding \| $Price \| html %]</a></td>	391	<td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding \| $Price %]</a></td>
392	</tr>	392	</tr>
393	</tbody>	393	</tbody>
394	</table>	394	</table>
Lines 401-407 Link Here
401	<thead><tr><th colspan="2">Amount</th></tr></thead>	401	<thead><tr><th colspan="2">Amount</th></tr></thead>
402	<tbody>	402	<tbody>
403	<tr>	403	<tr>
404	<td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding \| $Price \| html %]</a></td>	404	<td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding \| $Price %]</a></td>
405	</tr>	405	</tr>
406	</tbody>	406	</tbody>
407	</table>	407	</table>