From 6cd7bec6f220109f768ad3258a05f3b15f378870 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 1 Oct 2024 10:34:20 +0000 Subject: [PATCH] Bug 38010: Update links to vendor module --- acqui/basket.pl | 4 ++-- admin/aqcontract.pl | 4 ++-- .../prog/en/includes/acquisitions-toolbar.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/vendor-menu.inc | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 8 ++++---- .../prog/en/modules/acqui/basketgroup.tt | 12 ++++++------ .../prog/en/modules/acqui/basketheader.tt | 4 ++-- .../prog/en/modules/acqui/cancelorder.tt | 2 +- .../prog/en/modules/acqui/duplicate_orders.tt | 4 ++-- .../prog/en/modules/acqui/edifactmsgs.tt | 4 ++-- .../prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/invoice-files.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoices.tt | 2 +- .../prog/en/modules/acqui/moddeliverydate.tt | 2 +- .../prog/en/modules/acqui/modordernotes.tt | 2 +- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/acqui/newordersuggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/supplier.tt | 6 +++--- .../prog/en/modules/acqui/uncertainprice.tt | 4 ++-- .../prog/en/modules/acqui/vendor_issues.tt | 2 +- .../prog/en/modules/acqui/z3950_search.tt | 2 +- .../prog/en/modules/admin/aqcontract.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/reports/serials_stats.tt | 2 +- .../en/modules/serials/subscription-batchedit.tt | 2 +- .../prog/en/modules/serials/subscription-detail.tt | 2 +- .../prog/js/vue/components/ERM/AgreementsList.vue | 2 +- .../prog/js/vue/components/ERM/AgreementsShow.vue | 2 +- .../components/ERM/EHoldingsLocalPackagesList.vue | 2 +- .../components/ERM/EHoldingsLocalPackagesShow.vue | 2 +- .../prog/js/vue/components/ERM/LicensesList.vue | 2 +- .../prog/js/vue/components/ERM/LicensesShow.vue | 2 +- 41 files changed, 60 insertions(+), 60 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 1a6ef3ca478..d1b3cf6aa5c 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -224,7 +224,7 @@ if ( $op eq 'cud-delete-order' ) { basketgroupid => $basketgroupid } ); 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 { @@ -587,7 +587,7 @@ sub edi_close_and_order { } else { print $query->redirect( - "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=$booksellerid" + "/cgi-bin/koha/vendors/$booksellerid" ); } exit; diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl index edb71f583ac..06a57bcc92b 100755 --- a/admin/aqcontract.pl +++ b/admin/aqcontract.pl @@ -122,7 +122,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 @@ -148,7 +148,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' ); 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 bad05751232..57e405c128f 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 631692721e1..f9fb59502bd 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 ) %] @@ -636,7 +636,7 @@

    Transferred from basket: [% basket.basketname | html %] - ([% bookseller.name | html %]) + ([% bookseller.name | html %]) on [% timestamp | $KohaDates %] @@ -823,7 +823,7 @@ [% timestamp = order.transferred_to.timestamp %]

    Transferred to basket: [% basket.basketname | html %] - ([% bookseller.name | html %]) + ([% bookseller.name | html %]) on [% timestamp | $KohaDates %] 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 50168cf25fd..cf198ede45c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -25,7 +25,7 @@ [% END %] [% IF ( grouping ) %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket grouping @@ -35,7 +35,7 @@ [% END %] [% ELSE %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Basket grouping @@ -62,11 +62,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) %] @@ -243,7 +243,7 @@ -

    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 75a54431935..d9ddc5c7baa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -30,7 +30,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% booksellername | html %] + [% booksellername | html %] [% END %] [% IF ( add_form ) %] [% IF ( basketno ) %] @@ -153,7 +153,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 f28f95c72ec..04a722cfcaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -18,7 +18,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 a4302433757..46e4ccb02d6 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 @@ -33,7 +33,7 @@ [% END %] [% UNLESS blocking_error %] [% WRAPPER breadcrumb_item %] - [% vendor.name | html %] + [% vendor.name | html %] [% END %] [% WRAPPER breadcrumb_item %] Basket [% basket.basketno | html %] @@ -122,7 +122,7 @@ [% order.title |html %]
    [% order.author | html %]
    [% order.isbn | html %] - [% order.name | html %] + [% order.name | html %] [% order.creationdate | $KohaDates %] [% order.datereceived | $KohaDates %] 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 69cb4c43c53..fd64b7f2b7f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -114,9 +114,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 18f3d32df02..09ae8f48f00 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -125,7 +125,7 @@ [% order.title | html %]
    [% order.author | html %]
    [% order.isbn | html %] - [% order.name | html %] + [% order.name | html %] [% order.creationdate | $KohaDates %] [% order.datereceived | $KohaDates %] 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 5e502804a94..462ac549595 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 @@ -42,7 +42,7 @@ [% INCLUDE 'messages.inc' %]

    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 edd10da42e2..0ea5dbe828b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -59,7 +59,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 2ed316f2705..a64911614ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -76,7 +76,7 @@ [% END %] [% invoice.invoicenumber | html %] - [% invoice.suppliername | html %] + [% invoice.suppliername | html %] [% invoice.shipmentdate | $KohaDates %] 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 def0a06133a..646247a4d56 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt @@ -20,7 +20,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 3b0f6655d6e..4f2a4d9df11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.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/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 72433c41ef6..d11ce2bacc9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -242,7 +242,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 884fdd79bc6..d9921c3debb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -25,7 +25,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 d53e6f2e719..4c51d45b2be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -25,7 +25,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 b9481227641..923a673251b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -68,7 +68,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 3842519e91e..96ac33eb328 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -85,7 +85,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 5257c3dcc4a..11a5dff0e54 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -43,7 +43,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 6404c1ba936..5bf0e2b064e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -24,7 +24,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item %] - [% name | html %] + [% name | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] Receive shipment from vendor [% name | html %] @@ -41,7 +41,7 @@ [% END %]
    [% INCLUDE 'messages.inc' %] -

    Receive shipment from vendor [% name | html %]

    +

    Receive shipment from vendor [% name | html %]

    [% IF ( error_failed_to_create_invoice ) %]
    @@ -196,7 +196,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 c074de25120..d3f383656cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -67,7 +67,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 36ad96f4ace..317313e791d 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 %] @@ -216,7 +216,7 @@
    [% IF ( booksellerid ) %] - + [% ELSE %] [% END %] Cancel @@ -537,7 +537,7 @@