Bugzilla – Attachment 181787 Details for
Bug 38010
Migrate vendors to Vue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38010: (QA follow-up) Update routes to include 'acquisition'
Bug-38010-QA-follow-up-Update-routes-to-include-ac.patch (text/plain), 52.64 KB, created by
Jonathan Druart
on 2025-04-30 21:03:48 UTC
(
hide
)
Description:
Bug 38010: (QA follow-up) Update routes to include 'acquisition'
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-04-30 21:03:48 UTC
Size:
52.64 KB
patch
obsolete
>From e29b809d9acd0fee7f89dd71e5ee662fd112e68d Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> >Date: Tue, 22 Apr 2025 10:58:55 +0100 >Subject: [PATCH] Bug 38010: (QA follow-up) Update routes to include > 'acquisition' > >Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu> >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > admin/aqcontract.pl | 4 ++-- > debian/templates/apache-shared-intranet.conf | 2 +- > .../prog/en/includes/acquisitions-search.inc | 2 +- > .../prog/en/includes/acquisitions-toolbar.inc | 6 +++--- > .../prog/en/modules/acqui/acqui-home.tt | 2 +- > .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 12 ++++++------ > .../prog/en/modules/acqui/basketgroup.tt | 12 ++++++------ > .../prog/en/modules/acqui/basketheader.tt | 4 ++-- > .../prog/en/modules/acqui/booksellers.tt | 2 +- > .../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 +- > .../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/admin/marc_order_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 +- > koha-tmpl/intranet-tmpl/prog/js/acq.js | 2 +- > .../prog/js/vue/components/ERM/AgreementsList.vue | 2 +- > .../components/ERM/EHoldingsLocalPackagesList.vue | 2 +- > .../prog/js/vue/components/ERM/LicensesList.vue | 2 +- > .../prog/js/vue/components/Vendors/VendorList.vue | 2 +- > .../intranet-tmpl/prog/js/vue/routes/acquisitions.js | 2 +- > t/cypress/integration/Acquisitions/Vendors_spec.ts | 12 ++++++------ > 44 files changed, 68 insertions(+), 68 deletions(-) > >diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl >index dd4ca667a98..00f1ea45a04 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/vendors/$booksellerid"); >+ print $input->redirect("/cgi-bin/koha/acquisition/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/vendors/$booksellerid"); >+ print $input->redirect("/cgi-bin/koha/acquisition/vendors/$booksellerid"); > exit; > } else { > $template->param( error => 'not_deleted' ); >diff --git a/debian/templates/apache-shared-intranet.conf b/debian/templates/apache-shared-intranet.conf >index d34a65c20f7..1c389e28c9e 100644 >--- a/debian/templates/apache-shared-intranet.conf >+++ b/debian/templates/apache-shared-intranet.conf >@@ -24,7 +24,7 @@ RewriteRule ^/cgi-bin/koha/erm/.*$ /cgi-bin/koha/erm/erm.pl [PT] > RewriteCond %{REQUEST_URI} !^/cgi-bin/koha/preservation/.*.pl$ > RewriteRule ^/cgi-bin/koha/preservation/.*$ /cgi-bin/koha/preservation/home.pl [PT] > RewriteRule ^/cgi-bin/koha/admin/record_sources(.*)?$ /cgi-bin/koha/admin/record_sources.pl$1 [PT] >-RewriteRule ^/cgi-bin/koha/vendors(.*)?$ /cgi-bin/koha/acqui/vendors.pl$1 [PT] >+RewriteRule ^/cgi-bin/koha/acquisition/vendors(.*)?$ /cgi-bin/koha/acqui/vendors.pl$1 [PT] > > Alias "/api" "/usr/share/koha/api" > <Directory "/usr/share/koha/api"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >index 2d3b54118c3..c2761b86b7f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc >@@ -6,7 +6,7 @@ > > [% WRAPPER tab_panels %] > [% WRAPPER tab_panel tabname="supplier_search" bt_active= 1 %] >- <form name="findsupplier" action="/cgi-bin/koha/vendors" method="get"> >+ <form name="findsupplier" action="/cgi-bin/koha/acquisition/vendors" method="get"> > <div class="form-title"> > <label class="control-label" for="supplier"><span class="control-text">Vendor search</span> <i class="fa fa-fw fa-upload" aria-hidden="true"></i></label> > </div> >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 3e3cbc0faa9..5e6394593dd 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 @@ > <li><a class="dropdown-item" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]">Contract</a></li> > [% END %] > [% IF ( CAN_user_acquisition_vendors_manage ) %] >- <li><a class="dropdown-item" href="/cgi-bin/koha/vendors/add">Vendor</a></li> >+ <li><a class="dropdown-item" href="/cgi-bin/koha/acquisition/vendors/add">Vendor</a></li> > [% END %] > </ul> > </div> > [% IF ( CAN_user_acquisition_vendors_manage ) %] > <div class="btn-group"> >- <a class="btn btn-default" id="editsupplier" href="/cgi-bin/koha/vendors/[% booksellerid | html %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit vendor</a> >+ <a class="btn btn-default" id="editsupplier" href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | html %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit vendor</a> > </div> > [% UNLESS ( basketcount OR subscriptioncount ) %] > <div class="btn-group"> >@@ -33,7 +33,7 @@ > [% END %] > [% ELSIF ( CAN_user_acquisition_vendors_manage ) %] > <div class="btn-group" >- ><a class="btn btn-default" href="/cgi-bin/koha/vendors/add"><i class="fa fa-plus"></i> New vendor</a></div >+ ><a class="btn btn-default" href="/cgi-bin/koha/acquisition/vendors/add"><i class="fa fa-plus"></i> New vendor</a></div > > > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index a4aa54b7d8d..ecdefbb0a4c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -49,7 +49,7 @@ > <div id="acqui_acqui_home_order"> > <fieldset> > <legend>Search vendors</legend> >- <form name="findsupplier" action="/cgi-bin/koha/vendors" method="get"> >+ <form name="findsupplier" action="/cgi-bin/koha/acquisition/vendors" method="get"> > <p > ><label for="supplierpage">Vendor: </label><input type="text" size="25" name="supplier" id="supplierpage" class="focus" /> > <input type="submit" class="btn btn-primary" value="Search" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 812922cfa01..d0e834b57a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -68,7 +68,7 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index bdad5d6f406..25592a3b50f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -51,7 +51,7 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > [% UNLESS ( basketno ) %] >@@ -280,10 +280,10 @@ > [% END %] > </ul> > </div> >- <a href="/cgi-bin/koha/vendors">Go back to vendor page</a> >+ <a href="/cgi-bin/koha/acquisition/vendors">Go back to vendor page</a> > [% ELSE %] > <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> >- <a href="/cgi-bin/koha/vendors" class="btn btn-default btn-sm">Show all active baskets</a> >+ <a href="/cgi-bin/koha/acquisition/vendors" class="btn btn-default btn-sm">Show all active baskets</a> > [% END # /IF (cannotdelbiblios) %] > [% ELSE # IF ( delete_confirmed ) %] > >@@ -304,7 +304,7 @@ > </div> > [% END # /FOR m %] > >- <h1>[% UNLESS ( basketno ) %]New[% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="../vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h1>[% UNLESS ( basketno ) %]New[% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="../acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > > [% IF ( basketno ) %] > <div id="acqui_basket_summary" class="row"> >@@ -740,7 +740,7 @@ > <p> > Transferred from basket: > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a> >- (<a href="/cgi-bin/koha/vendors/[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on >+ (<a href="/cgi-bin/koha/acquisition/vendors/[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on > <span title="[% timestamp | $KohaDates with_hours = 1 %]"> [% timestamp | $KohaDates %] </span> > </p> > [% END %] >@@ -914,7 +914,7 @@ > <p > >Transferred to basket: > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a> >- (<a href="/cgi-bin/koha/vendors/[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on >+ (<a href="/cgi-bin/koha/acquisition/vendors/[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on > <span title="[% timestamp | $KohaDates with_hours = 1 %]"> [% timestamp | $KohaDates %] </span> > </p> > [% 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 dc0ac43c28f..caa57b1f9ec 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 %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket grouping</a> >@@ -37,7 +37,7 @@ > [% END %] > [% ELSE %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > <span>Basket grouping</span> >@@ -77,11 +77,11 @@ > </div> > [% END %] > [% IF (name && closedbg) %] >- <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% ELSIF (name) %] >- <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% ELSE %] >- <h1>Add basket group for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h1>Add basket group for <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% END %] > <div id="basketgroupcolumns" class="row"> > [% UNLESS (closedbg) %] >@@ -253,7 +253,7 @@ > ><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add_form&booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div > > > </div> >- <h1>Basket grouping for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h1>Basket grouping for <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% IF (NoEDIMessage && Koha.Preference('EDIFACT')) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% 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 8adf6348dbe..1468aab6da8 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% IF ( add_form ) %] > [% IF ( basketno ) %] >@@ -156,7 +156,7 @@ > [% IF ( basketno ) %] > <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a> > [% ELSE %] >- <a class="cancel" href="/cgi-bin/koha/vendors/[% booksellerid | html %]">Cancel</a> >+ <a class="cancel" href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | html %]">Cancel</a> > [% END %] > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index beb68c736aa..8aa135aa6f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -54,7 +54,7 @@ > [% SET h2_class="inactive" %] > [% END %] > <h2 class="suppliername [% h2_class | html %]"> >- <a id="vendor[% supplier.booksellerid | html %]" href="/cgi-bin/koha/vendors/[% supplier.booksellerid | uri %]"> >+ <a id="vendor[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acquisition/vendors/[% supplier.booksellerid | uri %]"> > [% IF (supplier.name) %] > [% supplier.name | html %] > [% ELSE %] >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 6d9a5dc8cd7..f7bc66f8595 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% basket.bookseller.id | uri %]">[% basket.bookseller.name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% basket.bookseller.id | uri %]">[% basket.bookseller.name | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %]</a> >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 a92186cbbac..c2aa5452452 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 %] >- <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% vendor.name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% vendor.id | uri %]">[% vendor.name | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketno | html %]</a> >@@ -130,7 +130,7 @@ > <br />[% order.author | html %] <br /> > [% order.isbn | html %] > </td> >- <td><a href="/cgi-bin/koha/vendors/[% order.id | uri %]">[% order.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acquisition/vendors/[% order.id | uri %]">[% order.name | html %]</a></td> > <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td> > <td data-order="[% order.datereceived | html %]"> [% order.datereceived | $KohaDates %] </td> > <td>[% order.quantityreceived | html %]</td> >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 1ab14ccf767..1c8d8a56a17 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 = '<a href="/cgi-bin/koha/vendors/'+row.vendor_id+'">'+row.vendor.name+'</a>'; >+ link = '<a href="/cgi-bin/koha/acquisition/vendors/'+row.vendor_id+'">'+row.vendor.name+'</a>'; > } else { >- link = '<a href="/cgi-bin/koha/vendors/'+row.vendor_id+'">'+row.vendor_id+'</a>'; >+ link = '<a href="/cgi-bin/koha/acquisition/vendors/'+row.vendor_id+'">'+row.vendor_id+'</a>'; > } > 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 159770c14af..59a838856be 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 @@ > <br />[% order.author | html %] <br /> > [% order.isbn | html %] > </td> >- <td><a href="/cgi-bin/koha/vendors/[% order.id | uri %]">[% order.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acquisition/vendors/[% order.id | uri %]">[% order.name | html %]</a></td> > <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td> > <td data-order="[% order.datereceived | html %]"> [% order.datereceived | $KohaDates %] </td> > <td>[% order.quantityreceived | html %]</td> >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 39af104cc08..aeb50dbc9dd 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' %] > <h1>Files for invoice: [% invoicenumber | html %]</h1> >- <p><strong>Vendor: </strong><a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% suppliername | html %]</a></p> >+ <p><strong>Vendor: </strong><a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% suppliername | html %]</a></p> > <br /> > [% IF errors %] > <div class="alert alert-warning"> >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 45b7e447e34..75cce41d388 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 @@ > </div> > [% END %] > >- <p>Vendor: <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% suppliername | html %]</a></p> >+ <p>Vendor: <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% suppliername | html %]</a></p> > > <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated"> > [% 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 dde20e5ff13..5066a25a45e 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 %] > <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td> > <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td> >- <td><a href="/cgi-bin/koha/vendors/[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acquisition/vendors/[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td> > <td data-order="[% invoice.shipmentdate | html %]"> [% invoice.shipmentdate | $KohaDates %] </td> > <td data-order="[% invoice.billingdate | html %]"> [% invoice.billingdate | $KohaDates %] </td> > <td>[% invoice.receivedbiblios | html %]</td> >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 5e5a7bf3f54..110af9918f2 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a> >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 5234b8389e2..2b026c2f697 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a> >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 74e9dc52a1d..b6ebb232f46 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% name | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> >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 76207bdd7eb..a7b4b57b7c2 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> >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 1baa4a6a881..613b56588b6 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% name | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> >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 95337e6c2f1..2e4fc530963 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 %] > </td> > <td class="cell"> >- <a href="/cgi-bin/koha/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a> > </td> > <td class="cell"> > [% 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 4de4232aee2..b36f1d39b92 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% vendor.id | uri %]">[% name | html %]</a> > [% 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 85abb2ec5c6..4dfc2d6ddef 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 %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% name | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > <span>Receive orders from [% name | html %]</span> >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 2afbbabff07..ee915a541b7 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% name | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > <span>Receive shipment from vendor [% name | html %]</span> >@@ -38,7 +38,7 @@ > <div class="col-md-10 order-md-2 order-sm-2"> > <main> > [% INCLUDE 'messages.inc' %] >- <h1>Receive shipment from vendor <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a></h1> >+ <h1>Receive shipment from vendor <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% name | html %]</a></h1> > > [% IF closed_invoices %] > <p>[% 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 }) %]</p> >@@ -197,7 +197,7 @@ > [% IF available_additional_fields %] > [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %] > [% END %] >- <fieldset class="action"><input type="submit" class="btn btn-default" value="Next" /> <a class="cancel" href="/cgi-bin/koha/vendors/[% booksellerid | html %]">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit" class="btn btn-default" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | html %]">Cancel</a></fieldset> > </form> > </div> > </main> >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 3e782786fd2..84ec2f98b13 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 @@ > </td> > <td class="cell"> [% order.ordernumber | html %] </td> > <td class="cell"> >- <a href="/cgi-bin/koha/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a> > </td> > <td class="cell"> > <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a> >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 e4cefd52bbc..abdb566a100 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 %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item bc_active= 1 %] > <span>Uncertain prices for vendor [% booksellername | html %]</span> >@@ -51,7 +51,7 @@ > <meta http-equiv="Refresh" content="[% metacontent | html %]" /> > [% ELSE %] > [% IF ( booksellername ) %] >- <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > > <div class="page-section"> > <h2>Contact information</h2> >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 d9f1e58aa8b..c52799f92a8 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% vendor.name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% vendor.id | uri %]">[% vendor.name | html %]</a> > [% 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 8be3301830a..4b7acc6314f 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% name | html %]</a> > [% END %] > [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a> >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 e57d68735be..1743ad819cc 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 @@ > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > [% END %] > [% WRAPPER breadcrumb_item %] >- <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a> > [% 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 4a14562aafc..7c591889cfa 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 %] > <tr> > <td>[% account.id | html %]</td> >- <td><a href="/cgi-bin/koha/vendors/[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acquisition/vendors/[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td> > <td>[% account.description | html %]</td> > <td>[% account.transport | html %]</td> > <td>[% account.host | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt >index 824dd9a0ac2..53c4541a9b7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt >@@ -58,7 +58,7 @@ > [% FOREACH account IN accounts %] > <tr> > <td>[% account.id | html %]</td> >- <td><a href="/cgi-bin/koha/vendors/[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acquisition/vendors/[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td> > <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% account.budget.budget_period_id | uri %]">[% account.budget.budget_name | html %]</a></td> > <td>[% account.description | html %]</td> > <td>[% account.download_directory | html %]</td> >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 0666397a68d..dd588e48741 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 %] > <tr> > <td> >- <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]" title="Vendor detail page">[% vendor.name | html %]</a> >+ <a href="/cgi-bin/koha/acquisition/vendors/[% vendor.id | uri %]" title="Vendor detail page">[% vendor.name | html %]</a> > </td> > <td> > [% 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 aea94db24b3..4a185e469f1 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 @@ > <tbody> > [% FOREACH data IN datas %] > <tr> >- <td><a href="/cgi-bin/koha/vendors/[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acquisition/vendors/[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td> > <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | uri %]">[% data.title | html %]</a></td> > <td>[% data.subscriptionid | html %]</td> > <td>[% Branches.GetName( data.branchcode ) | html %]</td> >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 6037cca03e3..37d5a9f357f 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 @@ > <tr> > <td>[% subscription.biblio.biblioitem.issn | html %]</td> > <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td> >- <td><a href="/cgi-bin/koha/vendors/[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acquisition/vendors/[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td> > <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %]</td> > <td>[% Branches.GetName(subscription.branchcode) | html %]</td> > <td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td> >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 ae8ffb35f33..6d25533f1ad 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 @@ > <ol> > <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li> > <li><span class="label">Librarian identity:</span> [% librarian | html %]</li> >- <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/vendors/[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li> >+ <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acquisition/vendors/[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li> > <li> > <span class="label">Bibliographic record:</span> > [%- INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 1 -%] <em>([% subscription.biblionumber | html %])</em> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/acq.js b/koha-tmpl/intranet-tmpl/prog/js/acq.js >index 8da6391b643..627bdb1381e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/acq.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/acq.js >@@ -445,7 +445,7 @@ $(document).ready(function () { > contentType: "application/json", > }; > $.ajax(options).then(function (thing, result) { >- window.location.href = "/cgi-bin/koha/vendors"; >+ window.location.href = "/cgi-bin/koha/acquisition/vendors"; > }); > }); > }); >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 16c5076d465..8e0989f35d0 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 >- ? '<a href="/cgi-bin/koha/vendors/' + >+ ? '<a href="/cgi-bin/koha/acquisition/vendors/' + > row.vendor_id + > '">' + > escape_str(row.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 49c148186bd..8f931267cf5 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 >- ? '<a href="/cgi-bin/koha/vendors/' + >+ ? '<a href="/cgi-bin/koha/acquisition/vendors/' + > row.vendor_id + > '">' + > escape_str(row.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 7a9606cb6e0..7e5409856df 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 >- ? '<a href="/cgi-bin/koha/vendors/' + >+ ? '<a href="/cgi-bin/koha/acquisition/vendors/' + > row.vendor_id + > '">' + > escape_str(row.vendor.name) + >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >index f8b2d8ff780..2fc5ec1cd2d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >@@ -201,7 +201,7 @@ export default { > orderable: true, > render(data, type, row, meta) { > return ( >- '<a href="/cgi-bin/koha/vendors/' + >+ '<a href="/cgi-bin/koha/acquisition/vendors/' + > row.id + > '" class="show">' + > escape_str(`${row.name} (#${row.id})`) + >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/acquisitions.js b/koha-tmpl/intranet-tmpl/prog/js/vue/routes/acquisitions.js >index aa6ee9a597f..49ab9629198 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/routes/acquisitions.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/routes/acquisitions.js >@@ -21,7 +21,7 @@ export const routes = [ > is_navigation_item: false, > }, > { >- path: "/cgi-bin/koha/vendors", >+ path: "/cgi-bin/koha/acquisition/vendors", > title: $__("Vendors"), > icon: "fa fa-shopping-cart", > is_end_node: true, >diff --git a/t/cypress/integration/Acquisitions/Vendors_spec.ts b/t/cypress/integration/Acquisitions/Vendors_spec.ts >index 51d4d0f2024..f15b71afe51 100644 >--- a/t/cypress/integration/Acquisitions/Vendors_spec.ts >+++ b/t/cypress/integration/Acquisitions/Vendors_spec.ts >@@ -66,7 +66,7 @@ describe("Vendor CRUD operations", () => { > cy.visit("/cgi-bin/koha/acqui/acqui-home.pl"); > > cy.intercept("GET", "/api/v1/acquisitions/vendors*", []); >- cy.visit("/cgi-bin/koha/vendors"); >+ cy.visit("/cgi-bin/koha/acquisition/vendors"); > cy.get("#vendors_list").contains("There are no vendors defined"); > > const vendor = getVendor(); >@@ -79,7 +79,7 @@ describe("Vendor CRUD operations", () => { > }, > }); > cy.intercept("GET", "/api/v1/acquisitions/vendors/*", vendor); >- cy.visit("/cgi-bin/koha/vendors"); >+ cy.visit("/cgi-bin/koha/acquisition/vendors"); > cy.get("#vendors_list").contains("Showing 1 to 1 of 1 entries"); > }); > >@@ -92,7 +92,7 @@ describe("Vendor CRUD operations", () => { > }); > > // Click the button in the toolbar >- cy.visit("/cgi-bin/koha/vendors"); >+ cy.visit("/cgi-bin/koha/acquisition/vendors"); > cy.contains("New vendor").click(); > cy.get("#vendor_add h1").contains("Add vendor"); > >@@ -180,7 +180,7 @@ describe("Vendor CRUD operations", () => { > it("should edit a vendor", () => { > const vendor = getVendor(); > >- cy.visit("/cgi-bin/koha/vendors"); >+ cy.visit("/cgi-bin/koha/acquisition/vendors"); > cy.intercept("GET", "/api/v1/acquisitions/vendors/*", vendor).as( > "get-vendor" > ); >@@ -218,7 +218,7 @@ describe("Vendor CRUD operations", () => { > "X-Total-Count": "1", > }, > }); >- cy.visit("/cgi-bin/koha/vendors"); >+ cy.visit("/cgi-bin/koha/acquisition/vendors"); > const name_link = cy.get( > "#vendors_list table tbody tr:first td:first a" > ); >@@ -244,7 +244,7 @@ describe("Vendor CRUD operations", () => { > }, > }); > cy.intercept("GET", "/api/v1/acquisitions/vendors/*", vendor); >- cy.visit("/cgi-bin/koha/vendors"); >+ cy.visit("/cgi-bin/koha/acquisition/vendors"); > > cy.get("#vendors_list table tbody tr:first").contains("Delete").click(); > cy.get(".alert-warning.confirmation h1").contains("remove this vendor"); >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38010
:
174119
|
174120
|
174121
|
174122
|
174123
|
174124
|
174125
|
174126
|
174128
|
174129
|
174130
|
174131
|
174132
|
174133
|
174134
|
174135
|
174136
|
174137
|
174138
|
174139
|
174140
|
174141
|
174142
|
174143
|
174144
|
174145
|
174146
|
174147
|
174148
|
174151
|
174152
|
174153
|
174154
|
174155
|
174156
|
174157
|
174158
|
174159
|
174160
|
174161
|
174162
|
174163
|
174164
|
174165
|
174166
|
174167
|
174168
|
174169
|
174170
|
174171
|
174172
|
174173
|
174174
|
174175
|
174176
|
174177
|
174178
|
174179
|
174194
|
174196
|
174197
|
174198
|
174199
|
174200
|
174201
|
174202
|
174203
|
174204
|
174205
|
174206
|
174207
|
174208
|
174209
|
174210
|
174211
|
174212
|
174213
|
174214
|
174215
|
174216
|
174217
|
174218
|
174220
|
174221
|
174222
|
174223
|
174224
|
174225
|
174226
|
174248
|
174266
|
174267
|
174269
|
174270
|
174273
|
174327
|
174328
|
174329
|
174330
|
174331
|
174332
|
174333
|
174334
|
174335
|
174336
|
174337
|
174338
|
174339
|
174340
|
174341
|
174342
|
174343
|
174344
|
174345
|
174346
|
174347
|
174348
|
174349
|
174350
|
174351
|
174352
|
174353
|
174354
|
174355
|
174356
|
174357
|
174358
|
174359
|
174360
|
174603
|
175098
|
175099
|
175100
|
175101
|
175102
|
175103
|
175104
|
175105
|
175106
|
175107
|
175108
|
175109
|
175110
|
175111
|
175112
|
175113
|
175114
|
175115
|
175116
|
175117
|
175118
|
175119
|
175120
|
175121
|
175122
|
175123
|
175124
|
175125
|
175126
|
175127
|
175128
|
175129
|
175130
|
175131
|
175133
|
175134
|
175135
|
175136
|
175137
|
175167
|
175168
|
175170
|
175240
|
175241
|
175242
|
175243
|
175248
|
175249
|
175266
|
175791
|
175799
|
176547
|
178182
|
178183
|
178184
|
178185
|
178186
|
178187
|
178188
|
178189
|
178190
|
178191
|
178192
|
178193
|
178194
|
178195
|
178196
|
178197
|
178198
|
178199
|
178200
|
178201
|
178202
|
178203
|
178204
|
178205
|
178206
|
178207
|
178208
|
178209
|
178210
|
178211
|
178212
|
178213
|
178214
|
178215
|
178216
|
178217
|
178218
|
178219
|
178220
|
178221
|
178222
|
178223
|
178224
|
178225
|
178226
|
178227
|
178228
|
178229
|
178230
|
178231
|
178232
|
178233
|
178234
|
178235
|
178236
|
178237
|
178238
|
178239
|
178240
|
178241
|
178242
|
181579
|
181585
|
181727
|
181728
|
181729
|
181730
|
181731
|
181732
|
181733
|
181734
|
181735
|
181736
|
181737
|
181738
|
181739
|
181740
|
181741
|
181742
|
181743
|
181744
|
181745
|
181746
|
181747
|
181748
|
181749
|
181750
|
181751
|
181752
|
181753
|
181754
|
181755
|
181756
|
181757
|
181758
|
181759
|
181760
|
181761
|
181762
|
181763
|
181764
|
181765
|
181766
|
181767
|
181768
|
181769
|
181770
|
181771
|
181772
|
181773
|
181774
|
181775
|
181776
|
181777
|
181778
|
181779
|
181780
|
181781
|
181782
|
181783
|
181784
|
181785
|
181786
| 181787 |
181788
|
181789
|
181790
|
181791
|
181792
|
181793
|
181794
|
181795
|
181796
|
181797
|
181798
|
181799
|
181800
|
181801
|
181802
|
181803
|
181804
|
181805
|
181806
|
181807
|
181808
|
181809
|
181810
|
181811
|
181812
|
181813
|
181814
|
181815
|
181816
|
181817
|
181818
|
181819
|
181820
|
181821
|
181891
|
181898
|
181901
|
181963
|
181964
|
182053
|
182351
|
182438