@@ -, +, @@
---
.../prog/en/includes/filter-orders.inc | 2 +-
.../prog/en/modules/acqui/duplicate_orders.tt | 73 +++++++++++-----------
2 files changed, 38 insertions(+), 37 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc
@@ -78,7 +78,7 @@
[% ELSE %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
@@ -1,3 +1,4 @@
+[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]
@@ -5,11 +6,11 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Acquisitions ›
[% UNLESS blocking_error %]
-Basket [% basket.basketno %] › Duplicate existing orders
+Basket [% basket.basketno | html %] › Duplicate existing orders
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-[% Asset.css("css/datatables.css") %]
+[% Asset.css("css/datatables.css") | $raw %]
@@ -24,8 +25,8 @@ Basket [% basket.basketno %] › Duplicate existing orders
Home
› Acquisitions
[% UNLESS blocking_error %]
- › [% vendor.name %]
- › Basket [% basket.basketno %]
+ › [% vendor.name | html %]
+ › Basket [% basket.basketno | html %]
› Duplicate existing orders
[% END %]
@@ -54,9 +55,9 @@ Basket [% basket.basketno %] › Duplicate existing orders
[% INCLUDE 'filter-orders.inc' %]
-
+
-
+
@@ -65,18 +66,18 @@ Basket [% basket.basketno %] › Duplicate existing orders
[% BLOCK display_order_line %]
[% IF selected %]
-
+
[% ELSE %]
-
+
[% END %]
[% IF selected %]
-
+
[% ELSE %]
-
+
[% END %]
[% order.ordernumber %]
- [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber %])[% END %]
+ [% IF order.ordernumber != order.parent_ordernumber %]([% order.parent_ordernumber | html %])[% END %]
|
[% SWITCH order.orderstatus %]
@@ -87,38 +88,38 @@ Basket [% basket.basketno %] › Duplicate existing orders
[% CASE 'cancelled' %]Cancelled
[% END %]
|
- [% order.basketname %] ([% order.basketno %]) |
- [% order.authorisedbyname %] |
+ [% order.basketname | html %] ([% order.basketno | html %]) |
+ [% order.authorisedbyname | html %] |
[% IF ( order.basketgroupid ) %]
- [% order.groupname %] ([% order.basketgroupid %])
+ [% order.groupname | html %] ([% order.basketgroupid | html %])
[% ELSE %]
[% END %]
|
[% IF ( order.invoicenumber ) %]
- [% order.invoicenumber %]
+ [% order.invoicenumber | html %]
[% ELSE %]
[% END %]
|
- [% order.title |html %]
- [% order.author %] [% order.isbn %]
+ [% order.title |html %]
+ [% order.author | html %] [% order.isbn | html %]
|
- [% order.name %] |
+ [% order.name | html %] |
[% order.creationdate | $KohaDates %] |
[% IF order.datereceived %]
- [% order.datereceived | $KohaDates %]
+ [% order.datereceived | $KohaDates %]
[% ELSE %]
[% END %]
|
- [% order.quantityreceived %] |
- [% order.quantity %] |
- [% order.ecost %] |
- [% order.budget_name %] |
+ [% order.quantityreceived | html %] |
+ [% order.quantity | html %] |
+ [% order.ecost | html %] |
+ [% order.budget_name | html %] |
[% END %]
@@ -163,7 +164,7 @@ Basket [% basket.basketno %] › Duplicate existing orders
@@ -188,9 +189,9 @@ Basket [% basket.basketno %] › Duplicate existing orders
@@ -202,8 +203,8 @@ Basket [% basket.basketno %] › Duplicate existing orders
@@ -244,10 +245,10 @@ Basket [% basket.basketno %] › Duplicate existing orders
@@ -297,14 +298,14 @@ Basket [% basket.basketno %] › Duplicate existing orders
[% MACRO jsinclude BLOCK %]
- [% Asset.js("js/acquisitions-menu.js") %]
+ [% Asset.js("js/acquisitions-menu.js") | $raw %]
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
- [% Asset.js("js/autocomplete/patrons.js") %]
- [% Asset.js("js/acq.js") %]
- [% Asset.js("js/funds_sorts.js") %]
- [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
+ [% Asset.js("js/autocomplete/patrons.js") | $raw %]
+ [% Asset.js("js/acq.js") | $raw %]
+ [% Asset.js("js/funds_sorts.js") | $raw %]
+ [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]