diff --git a/acqui/basket.pl b/acqui/basket.pl index 791acd3250..51f5c99417 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -241,7 +241,7 @@ if ( $op eq 'cud-delete-order' ) { ); print $query->redirect( '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid . '&closed=1' ); } else { - print $query->redirect( '/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid ); + print $query->redirect( '/cgi-bin/koha/vendors/' . $booksellerid ); } exit; } else { @@ -609,7 +609,7 @@ sub edi_close_and_order { ); print $query->redirect("/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=$booksellerid&closed=1"); } else { - print $query->redirect("/cgi-bin/koha/acqui/booksellers.pl?booksellerid=$booksellerid"); + print $query->redirect("/cgi-bin/koha/vendors/$booksellerid"); } exit; } else { diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl index 5f1975a68f..dd4ca667a9 100755 --- a/admin/aqcontract.pl +++ b/admin/aqcontract.pl @@ -126,7 +126,7 @@ elsif ( $op eq 'cud-add_validate' ) { ); } - print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid"); + print $input->redirect("/cgi-bin/koha/vendors/$booksellerid"); exit; # END $OP eq ADD_VALIDATE @@ -154,7 +154,7 @@ elsif ( $op eq 'cud-delete_confirmed' ) { my $deleted = DelContract( { contractnumber => $contractnumber } ); if ($deleted) { - print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid"); + print $input->redirect("/cgi-bin/koha/vendors/$booksellerid"); exit; } else { $template->param( error => 'not_deleted' ); @@ -177,4 +177,3 @@ if ( $op eq 'list' ) { } output_html_with_http_headers $input, $cookie, $template->output; - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index ce2881324a..9da2534058 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -12,13 +12,13 @@
  • Contract
    • [% END %] [% IF ( CAN_user_acquisition_vendors_manage ) %] -
  • Vendor
    • +
  • Vendor
    • [% END %] [% IF ( CAN_user_acquisition_vendors_manage ) %]
    - Edit vendor + Edit vendor
    [% UNLESS ( basketcount OR subscriptioncount ) %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc index 399b41d994..b2f1bd967c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc @@ -1,7 +1,7 @@ [% IF ( booksellerid ) %] Go back to vendor page [% ELSE %] - Show baskets for vendor [% booksellername | html %] - Show all active baskets + Show baskets for vendor [% booksellername | html %] + Show all active baskets [% END # /IF (cannotdelbiblios) %] [% ELSE # IF ( delete_confirmed ) %] @@ -740,7 +740,7 @@

    Transferred from basket: [% basket.basketname | html %] - ([% bookseller.name | html %]) on + ([% bookseller.name | html %]) on [% timestamp | $KohaDates %]

    [% END %] @@ -914,7 +914,7 @@

    Transferred to basket: [% basket.basketname | html %] - ([% bookseller.name | html %]) on + ([% bookseller.name | html %]) on [% timestamp | $KohaDates %]

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 94931205ec..dc0ac43c28 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -27,7 +27,7 @@ [% END %] [% IF ( grouping ) %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket grouping @@ -37,7 +37,7 @@ [% END %] [% ELSE %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Basket grouping @@ -77,11 +77,11 @@
    [% END %] [% IF (name && closedbg) %] -

    Basket group [% name | html %] ([% basketgroupid | html %]) for [% booksellername | html %]

    +

    Basket group [% name | html %] ([% basketgroupid | html %]) for [% booksellername | html %]

    [% ELSIF (name) %] -

    Edit basket group [% name | html %] ([% basketgroupid | html %]) for [% booksellername | html %]

    +

    Edit basket group [% name | html %] ([% basketgroupid | html %]) for [% booksellername | html %]

    [% ELSE %] -

    Add basket group for [% booksellername | html %]

    +

    Add basket group for [% booksellername | html %]

    [% END %]
    [% UNLESS (closedbg) %] @@ -253,7 +253,7 @@ > New basket group
    -

    Basket grouping for [% booksellername | html %]

    +

    Basket grouping for [% booksellername | html %]

    [% IF (NoEDIMessage && Koha.Preference('EDIFACT')) %]
    No EDIFACT configuration for [% booksellername | html %]
    [% END %] [% WRAPPER tabs id= "basket_groups" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index 5bbf5da8e3..8adf6348db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -31,7 +31,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% IF ( add_form ) %] [% IF ( basketno ) %] @@ -156,7 +156,7 @@ [% IF ( basketno ) %] Cancel [% ELSE %] - Cancel + Cancel [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt index cdde8f4425..6d9a5dc8cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -20,7 +20,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% basket.bookseller.name | html %] + [% basket.bookseller.name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index ae59facca8..a92186cbba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -39,7 +39,7 @@ [% END %] [% UNLESS blocking_error %] [% WRAPPER breadcrumb_item %] - [% vendor.name | html %] + [% vendor.name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basket.basketno | html %] @@ -130,7 +130,7 @@
    [% order.author | html %]
    [% order.isbn | html %] - [% order.name | html %] + [% order.name | html %] [% order.creationdate | $KohaDates %] [% order.datereceived | $KohaDates %] [% order.quantityreceived | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index 63ea0e1155..1ab14ccf76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -140,9 +140,9 @@ "render": function(data, type, row, meta) { let link; if ( row.vendor ) { - link = ''+row.vendor.name+''; + link = ''+row.vendor.name+''; } else { - link = ''+row.vendor_id+''; + link = ''+row.vendor_id+''; } return link; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 16ce86bbb0..159770c14a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -131,7 +131,7 @@
    [% order.author | html %]
    [% order.isbn | html %] - [% order.name | html %] + [% order.name | html %] [% order.creationdate | $KohaDates %] [% order.datereceived | $KohaDates %] [% order.quantityreceived | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt index 4a55d795e7..39af104cc0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt @@ -38,7 +38,7 @@ [% WRAPPER 'main-container.inc' aside='acquisitions-menu' %]

    Files for invoice: [% invoicenumber | html %]

    -

    Vendor: [% suppliername | html %]

    +

    Vendor: [% suppliername | html %]


    [% IF errors %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 9b240c4e82..45b7e447e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -55,7 +55,7 @@
    [% END %] -

    Vendor: [% suppliername | html %]

    +

    Vendor: [% suppliername | html %]

    [% INCLUDE 'csrf-token.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 0fbc15f523..dde20e5ff1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -86,7 +86,7 @@ [% END %] [% invoice.invoicenumber | html %] - [% invoice.suppliername | html %] + [% invoice.suppliername | html %] [% invoice.shipmentdate | $KohaDates %] [% invoice.billingdate | $KohaDates %] [% invoice.receivedbiblios | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt index 45cbc2b45a..5e5a7bf3f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt @@ -22,7 +22,7 @@ Acquisition [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketname | html %] ([% basketno | html %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index 7daf6c1daf..5234b8389e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -24,7 +24,7 @@ Acquisition [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketname | html %] ([% basketno | html %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 1e63aec53b..74e9dc52a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -241,7 +241,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index 77eb0df363..76207bdd7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -26,7 +26,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index 9dd3bba0ec..1baa4a6a88 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -27,7 +27,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index bdf04dacf3..95337e6c2f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -65,7 +65,7 @@ [% END %] - [% order.vendorname | html %] + [% order.vendorname | html %] [% FOREACH itemtype IN order.itemtypes %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index e18662c856..4de4232aee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -90,7 +90,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF ( invoice ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index a9e0e44174..85abb2ec5c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -44,7 +44,7 @@ [% END %] [% ELSE %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Receive orders from [% name | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 81aef2a1f6..2afbbabff0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -25,7 +25,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Receive shipment from vendor [% name | html %] @@ -38,7 +38,7 @@
    [% INCLUDE 'messages.inc' %] -

    Receive shipment from vendor [% name | html %]

    +

    Receive shipment from vendor [% name | html %]

    [% IF closed_invoices %]

    [% I18N.tnx("There is one closed invoice not included in this search.", "There are {closed_invoices} closed invoices not included in this search.", closed_invoices, { closed_invoices => closed_invoices }) %]

    @@ -197,7 +197,7 @@ [% IF available_additional_fields %] [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %] [% END %] -
    Cancel
    +
    Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index c8a7684cbe..3e782786fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -59,7 +59,7 @@ [% order.ordernumber | html %] - [% order.vendorname | html %] + [% order.vendorname | html %] [% order.invoicenumber | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index 0a38913927..6b6c99bf18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -174,7 +174,7 @@ [% IF ( enter ) %] [% IF ( booksellerid ) %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% tx("Modify vendor '{vendor}'", { vendor = name }) | html %] @@ -210,7 +210,7 @@
    [% IF ( booksellerid ) %] - [% SET a_href = '/cgi-bin/koha/acqui/supplier.pl?booksellerid=' _ booksellerid %] + [% ELSE %] [% SET a_href = '/cgi-bin/koha/acqui/acqui-home.pl' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index 14baed47c1..e4cefd52bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -30,7 +30,7 @@ [% END %] [% IF ( booksellername ) %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Uncertain prices for vendor [% booksellername | html %] @@ -51,7 +51,7 @@ [% ELSE %] [% IF ( booksellername ) %] -

    Orders with uncertain prices for vendor [% booksellername | html %]

    +

    Orders with uncertain prices for vendor [% booksellername | html %]

    Contact information

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt index 0c0d327327..d9f1e58aa8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt @@ -39,7 +39,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% vendor.name | html %] + [% vendor.name | html %] [% END %] [% IF op == 'list' %] [% WRAPPER breadcrumb_item bc_active= 1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 3d5932d68a..8be3301830 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -62,7 +62,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basketno | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt index b08cd683ed..e57d68735b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -37,7 +37,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% IF ( else ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index e218d11071..4a14562aaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -315,7 +315,7 @@ [% FOREACH account IN ediaccounts %] [% account.id | html %] - [% account.vendor.name | html %] + [% account.vendor.name | html %] [% account.description | html %] [% account.transport | html %] [% account.host | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index ad7b1828d3..0666397a68 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -600,7 +600,7 @@ [% SET vendor = basket.bookseller %] - [% vendor.name | html %] + [% vendor.name | html %] [% IF order.invoiceid %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt index c809cb46be..aea94db24b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt @@ -64,7 +64,7 @@ [% FOREACH data IN datas %] - [% data.name | html %] + [% data.name | html %] [% data.title | html %] [% data.subscriptionid | html %] [% Branches.GetName( data.branchcode ) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt index 44faed0345..6037cca03e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt @@ -58,7 +58,7 @@ [% subscription.biblio.biblioitem.issn | html %] [% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %]) - [% subscription.vendor.name | html %] + [% subscription.vendor.name | html %] [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %] [% Branches.GetName(subscription.branchcode) | html %] [% ItemTypes.GetDescription( subscription.itemtype ) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index e5fc207fe5..ae8ffb35f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -110,7 +110,7 @@
    1. Subscription ID: [% subscriptionid | html %]
    2. Librarian identity: [% librarian | html %]
      3. -
    3. Vendor: [% aqbooksellername | html %]
      4. +
    4. Vendor: [% aqbooksellername | html %]
    5. Bibliographic record: [%- INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 1 -%] ([% subscription.biblionumber | html %]) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue index f3a3884766..16c5076d46 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue @@ -335,7 +335,7 @@ export default { orderable: true, render: function (data, type, row, meta) { return row.vendor_id != undefined - ? '' + escape_str(row.vendor.name) + diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue index e096ec4f88..2e302fe361 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue @@ -35,7 +35,7 @@ {{ agreement.vendor.name }} diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue index 58f26069c4..49c148186b 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue @@ -235,7 +235,7 @@ export default { orderable: true, render: function (data, type, row, meta) { return row.vendor_id != undefined - ? '' + escape_str(row.vendor.name) + diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue index 2a266c6f2a..11cb6aa9c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue @@ -35,7 +35,7 @@ {{ erm_package.vendor.name }} diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue index 126b400a65..7a9606cb6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue @@ -227,7 +227,7 @@ export default { orderable: true, render: function (data, type, row, meta) { return row.vendor_id != undefined - ? '' + escape_str(row.vendor.name) + diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue index 0d1a4aa092..0d0323cf56 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue @@ -33,7 +33,7 @@ {{ license.vendor.name }}