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

(-)a/acqui/basket.pl (-2 / +2 lines)
Lines 224-230 if ( $op eq 'cud-delete-order' ) { Link Here
224
                         basketgroupid => $basketgroupid } );
224
                         basketgroupid => $basketgroupid } );
225
            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
225
            print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
226
        } else {
226
        } else {
227
            print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);
227
            print $query->redirect('/cgi-bin/koha/vendors/' . $booksellerid);
228
        }
228
        }
229
        exit;
229
        exit;
230
    } else {
230
    } else {
Lines 587-593 sub edi_close_and_order { Link Here
587
        }
587
        }
588
        else {
588
        else {
589
            print $query->redirect(
589
            print $query->redirect(
590
                "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=$booksellerid"
590
                "/cgi-bin/koha/vendors/$booksellerid"
591
            );
591
            );
592
        }
592
        }
593
        exit;
593
        exit;
(-)a/admin/aqcontract.pl (-2 / +2 lines)
Lines 122-128 elsif ( $op eq 'cud-add_validate' ) { Link Here
122
        });
122
        });
123
    }
123
    }
124
124
125
    print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid");
125
    print $input->redirect("/cgi-bin/koha/vendors/$booksellerid");
126
    exit;
126
    exit;
127
127
128
    # END $OP eq ADD_VALIDATE
128
    # END $OP eq ADD_VALIDATE
Lines 148-154 elsif ( $op eq 'cud-delete_confirmed' ) { Link Here
148
    my $deleted = DelContract( { contractnumber => $contractnumber } );
148
    my $deleted = DelContract( { contractnumber => $contractnumber } );
149
149
150
    if ( $deleted ) {
150
    if ( $deleted ) {
151
        print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid");
151
        print $input->redirect("/cgi-bin/koha/vendors/$booksellerid");
152
        exit;
152
        exit;
153
    } else {
153
    } else {
154
        $template->param( error => 'not_deleted' );
154
        $template->param( error => 'not_deleted' );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-2 / +2 lines)
Lines 12-24 Link Here
12
                <li><a class="dropdown-item" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Contract</a></li>
12
                <li><a class="dropdown-item" href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]">Contract</a></li>
13
            [% END %]
13
            [% END %]
14
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
14
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
15
                <li><a class="dropdown-item" href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li>
15
                <li><a class="dropdown-item" href="/cgi-bin/koha/vendors/add">Vendor</a></li>
16
            [% END %]
16
            [% END %]
17
        </ul>
17
        </ul>
18
        </div>
18
        </div>
19
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
19
            [% IF ( CAN_user_acquisition_vendors_manage ) %]
20
                <div class="btn-group">
20
                <div class="btn-group">
21
                    <a class="btn btn-default" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&amp;op=enter"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit vendor</a>
21
                    <a class="btn btn-default" id="editsupplier" href="/cgi-bin/koha/vendors/[% booksellerid | html %]&amp;op=enter"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit vendor</a>
22
                </div>
22
                </div>
23
                [% UNLESS ( basketcount OR subscriptioncount ) %]
23
                [% UNLESS ( basketcount OR subscriptioncount ) %]
24
                    <div class="btn-group">
24
                    <div class="btn-group">
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc (-1 / +1 lines)
Lines 1-7 Link Here
1
[% IF ( booksellerid ) %]
1
[% IF ( booksellerid ) %]
2
<div id="menu">
2
<div id="menu">
3
    <ul>
3
    <ul>
4
        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %]
4
        [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">Baskets</a></li>[% END %]
5
        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %]
5
        [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %]
6
        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a></li>[% END %]
6
        [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a></li>[% END %]
7
        [% IF ( CAN_user_acquisition_issue_manage ) %]<li><a href="/cgi-bin/koha/acqui/vendor_issues.pl?booksellerid=[% booksellerid | uri %]">Vendor issues</a></li>[% END %]
7
        [% IF ( CAN_user_acquisition_issue_manage ) %]<li><a href="/cgi-bin/koha/acqui/vendor_issues.pl?booksellerid=[% booksellerid | uri %]">Vendor issues</a></li>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-1 / +1 lines)
Lines 67-73 Link Here
67
                <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
67
                <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
68
            [% END %]
68
            [% END %]
69
            [% WRAPPER breadcrumb_item %]
69
            [% WRAPPER breadcrumb_item %]
70
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
70
                <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
71
            [% END %]
71
            [% END %]
72
            [% WRAPPER breadcrumb_item %]
72
            [% WRAPPER breadcrumb_item %]
73
                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
73
                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-4 / +4 lines)
Lines 48-54 Link Here
48
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
48
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
49
        [% END %]
49
        [% END %]
50
        [% WRAPPER breadcrumb_item %]
50
        [% WRAPPER breadcrumb_item %]
51
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
51
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
52
        [% END %]
52
        [% END %]
53
        [% WRAPPER breadcrumb_item bc_active= 1 %]
53
        [% WRAPPER breadcrumb_item bc_active= 1 %]
54
            [% UNLESS ( basketno ) %]
54
            [% UNLESS ( basketno ) %]
Lines 237-243 Link Here
237
                                    </div>
237
                                    </div>
238
                                    <a href="booksellers.pl">Go back to vendor page</a>
238
                                    <a href="booksellers.pl">Go back to vendor page</a>
239
                                [% ELSE %]
239
                                [% ELSE %]
240
                                    <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/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
240
                                    <a href="/cgi-bin/koha/vendors/[% 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>
241
                                [% END # /IF (cannotdelbiblios) %]
241
                                [% END # /IF (cannotdelbiblios) %]
242
                            [% ELSE # IF ( delete_confirmed ) %]
242
                            [% ELSE # IF ( delete_confirmed ) %]
243
243
Lines 636-642 Link Here
636
                                                                <p>
636
                                                                <p>
637
                                                                    Transferred from basket:
637
                                                                    Transferred from basket:
638
                                                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
638
                                                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
639
                                                                    (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
639
                                                                    (<a href="/cgi-bin/koha/vendors/[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
640
                                                                    on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
640
                                                                    on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
641
                                                                    [% timestamp | $KohaDates %]
641
                                                                    [% timestamp | $KohaDates %]
642
                                                                    </span>
642
                                                                    </span>
Lines 823-829 Link Here
823
                                                                [% timestamp = order.transferred_to.timestamp %]
823
                                                                [% timestamp = order.transferred_to.timestamp %]
824
                                                                <p>Transferred to basket:
824
                                                                <p>Transferred to basket:
825
                                                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
825
                                                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
826
                                                                    (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
826
                                                                    (<a href="/cgi-bin/koha/vendors/[% bookseller.id | uri %]">[% bookseller.name | html %]</a>)
827
                                                                    on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
827
                                                                    on <span title="[% timestamp | $KohaDates with_hours = 1 %]">
828
                                                                        [% timestamp | $KohaDates %]
828
                                                                        [% timestamp | $KohaDates %]
829
                                                                    </span>
829
                                                                    </span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-6 / +6 lines)
Lines 25-31 Link Here
25
        [% END %]
25
        [% END %]
26
        [% IF ( grouping ) %]
26
        [% IF ( grouping ) %]
27
            [% WRAPPER breadcrumb_item %]
27
            [% WRAPPER breadcrumb_item %]
28
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
28
                <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
29
            [% END %]
29
            [% END %]
30
            [% WRAPPER breadcrumb_item %]
30
            [% WRAPPER breadcrumb_item %]
31
                <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket grouping</a>
31
                <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket grouping</a>
Lines 35-41 Link Here
35
            [% END %]
35
            [% END %]
36
        [% ELSE %]
36
        [% ELSE %]
37
            [% WRAPPER breadcrumb_item %]
37
            [% WRAPPER breadcrumb_item %]
38
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
38
                <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
39
            [% END %]
39
            [% END %]
40
            [% WRAPPER breadcrumb_item bc_active= 1 %]
40
            [% WRAPPER breadcrumb_item bc_active= 1 %]
41
                <span>Basket grouping</span>
41
                <span>Basket grouping</span>
Lines 62-72 Link Here
62
                        </div>
62
                        </div>
63
                    [% END %]
63
                    [% END %]
64
                    [% IF (name && closedbg) %]
64
                    [% IF (name && closedbg) %]
65
                        <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
65
                        <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
66
                    [% ELSIF (name) %]
66
                    [% ELSIF (name) %]
67
                        <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
67
                        <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
68
                    [% ELSE %]
68
                    [% ELSE %]
69
                        <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
69
                        <h1>Add basket group for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
70
                    [% END %]
70
                    [% END %]
71
                    <div id="basketgroupcolumns" class="row">
71
                    <div id="basketgroupcolumns" class="row">
72
                        [% UNLESS (closedbg) %]
72
                        [% UNLESS (closedbg) %]
Lines 243-249 Link Here
243
                    <div id="toolbar" class="btn-toolbar">
243
                    <div id="toolbar" class="btn-toolbar">
244
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
244
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add_form&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
245
                    </div>
245
                    </div>
246
                    <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
246
                    <h1>Basket grouping for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
247
                    [% IF (NoEDIMessage && Koha.Preference('EDIFACT')) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
247
                    [% IF (NoEDIMessage && Koha.Preference('EDIFACT')) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
248
248
249
                    [% WRAPPER tabs id= "basket_groups" %]
249
                    [% WRAPPER tabs id= "basket_groups" %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-2 / +2 lines)
Lines 30-36 Link Here
30
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
30
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
31
        [% END %]
31
        [% END %]
32
        [% WRAPPER breadcrumb_item %]
32
        [% WRAPPER breadcrumb_item %]
33
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
33
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
34
        [% END %]
34
        [% END %]
35
        [% IF ( add_form ) %]
35
        [% IF ( add_form ) %]
36
            [% IF ( basketno ) %]
36
            [% IF ( basketno ) %]
Lines 153-159 Link Here
153
            [% IF ( basketno ) %]
153
            [% IF ( basketno ) %]
154
                <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
154
                <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
155
            [% ELSE %]
155
            [% ELSE %]
156
                <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a>
156
                <a class="cancel" href="/cgi-bin/koha/vendors/[% booksellerid | html %]">Cancel</a>
157
            [% END %]
157
            [% END %]
158
        </fieldset>
158
        </fieldset>
159
    </form>
159
    </form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-1 / +1 lines)
Lines 18-24 Link Here
18
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
18
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
19
        [% END %]
19
        [% END %]
20
        [% WRAPPER breadcrumb_item %]
20
        [% WRAPPER breadcrumb_item %]
21
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.bookseller.id | uri %]">[% basket.bookseller.name | html %]</a>
21
            <a href="/cgi-bin/koha/vendors/[% basket.bookseller.id | uri %]">[% basket.bookseller.name | html %]</a>
22
        [% END %]
22
        [% END %]
23
        [% WRAPPER breadcrumb_item %]
23
        [% WRAPPER breadcrumb_item %]
24
            <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>
24
            <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>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt (-2 / +2 lines)
Lines 33-39 Link Here
33
        [% END %]
33
        [% END %]
34
        [% UNLESS blocking_error %]
34
        [% UNLESS blocking_error %]
35
            [% WRAPPER breadcrumb_item %]
35
            [% WRAPPER breadcrumb_item %]
36
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]">[% vendor.name | html %]</a>
36
                <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% vendor.name | html %]</a>
37
            [% END %]
37
            [% END %]
38
            [% WRAPPER breadcrumb_item %]
38
            [% WRAPPER breadcrumb_item %]
39
                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketno | html %]</a>
39
                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketno | html %]</a>
Lines 122-128 Link Here
122
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title |html %]</a>
122
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title |html %]</a>
123
            <br />[% order.author | html %] <br /> [% order.isbn | html %]
123
            <br />[% order.author | html %] <br /> [% order.isbn | html %]
124
        </td>
124
        </td>
125
        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
125
        <td><a href="/cgi-bin/koha/vendors/[% order.id | uri %]">[% order.name | html %]</a></td>
126
        <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
126
        <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
127
        <td data-order="[% order.datereceived | html %]">
127
        <td data-order="[% order.datereceived | html %]">
128
            [% order.datereceived | $KohaDates %]
128
            [% order.datereceived | $KohaDates %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt (-2 / +2 lines)
Lines 114-122 Link Here
114
                        "render": function(data, type, row, meta) {
114
                        "render": function(data, type, row, meta) {
115
                            let link;
115
                            let link;
116
                            if ( row.vendor ) {
116
                            if ( row.vendor ) {
117
                               link = '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid='+row.vendor_id+'">'+row.vendor.name+'</a>';
117
                               link = '<a href="/cgi-bin/koha/vendors/'+row.vendor_id+'">'+row.vendor.name+'</a>';
118
                            } else {
118
                            } else {
119
                               link = '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid='+row.vendor_id+'">'+row.vendor_id+'</a>';
119
                               link = '<a href="/cgi-bin/koha/vendors/'+row.vendor_id+'">'+row.vendor_id+'</a>';
120
                            }
120
                            }
121
                            return link;
121
                            return link;
122
                        }
122
                        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +1 lines)
Lines 125-131 Link Here
125
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a>
125
                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a>
126
                        <br />[% order.author | html %] <br /> [% order.isbn | html %]
126
                        <br />[% order.author | html %] <br /> [% order.isbn | html %]
127
                    </td>
127
                    </td>
128
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
128
                    <td><a href="/cgi-bin/koha/vendors/[% order.id | uri %]">[% order.name | html %]</a></td>
129
                    <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
129
                    <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
130
                    <td data-order="[% order.datereceived | html %]">
130
                    <td data-order="[% order.datereceived | html %]">
131
                        [% order.datereceived | $KohaDates %]
131
                        [% order.datereceived | $KohaDates %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-1 / +1 lines)
Lines 42-48 Link Here
42
                [% INCLUDE 'messages.inc' %]
42
                [% INCLUDE 'messages.inc' %]
43
43
44
      <h1>Files for invoice: [% invoicenumber | html %]</h1>
44
      <h1>Files for invoice: [% invoicenumber | html %]</h1>
45
      <p><strong>Vendor: </strong><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
45
      <p><strong>Vendor: </strong><a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% suppliername | html %]</a></p>
46
      <br />
46
      <br />
47
      [% IF errors %]
47
      [% IF errors %]
48
        <div class="alert alert-warning">
48
        <div class="alert alert-warning">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +1 lines)
Lines 59-65 Link Here
59
                    </div>
59
                    </div>
60
                [% END %]
60
                [% END %]
61
61
62
                <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
62
                <p>Vendor: <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% suppliername | html %]</a></p>
63
63
64
                <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
64
                <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
65
                    [% INCLUDE 'csrf-token.inc' %]
65
                    [% INCLUDE 'csrf-token.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-1 / +1 lines)
Lines 76-82 Link Here
76
                                            [% END %]
76
                                            [% END %]
77
                                            <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
77
                                            <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
78
                                            <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
78
                                            <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
79
                                            <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
79
                                            <td><a href="/cgi-bin/koha/vendors/[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
80
                                            <td data-order="[% invoice.shipmentdate | html %]">
80
                                            <td data-order="[% invoice.shipmentdate | html %]">
81
                                                [% invoice.shipmentdate | $KohaDates %]
81
                                                [% invoice.shipmentdate | $KohaDates %]
82
                                            </td>
82
                                            </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.tt (-1 / +1 lines)
Lines 20-26 Link Here
20
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
20
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
21
        [% END %]
21
        [% END %]
22
        [% WRAPPER breadcrumb_item %]
22
        [% WRAPPER breadcrumb_item %]
23
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
23
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
24
        [% END %]
24
        [% END %]
25
        [% WRAPPER breadcrumb_item %]
25
        [% WRAPPER breadcrumb_item %]
26
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a>
26
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt (-1 / +1 lines)
Lines 22-28 Link Here
22
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
22
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
23
        [% END %]
23
        [% END %]
24
        [% WRAPPER breadcrumb_item %]
24
        [% WRAPPER breadcrumb_item %]
25
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
25
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
26
        [% END %]
26
        [% END %]
27
        [% WRAPPER breadcrumb_item %]
27
        [% WRAPPER breadcrumb_item %]
28
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a>
28
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +1 lines)
Lines 242-248 Link Here
242
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
242
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
243
        [% END %]
243
        [% END %]
244
        [% WRAPPER breadcrumb_item %]
244
        [% WRAPPER breadcrumb_item %]
245
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
245
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
246
        [% END %]
246
        [% END %]
247
        [% WRAPPER breadcrumb_item %]
247
        [% WRAPPER breadcrumb_item %]
248
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
248
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt (-1 / +1 lines)
Lines 25-31 Link Here
25
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
25
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
26
        [% END %]
26
        [% END %]
27
        [% WRAPPER breadcrumb_item %]
27
        [% WRAPPER breadcrumb_item %]
28
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
28
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
29
        [% END %]
29
        [% END %]
30
        [% WRAPPER breadcrumb_item %]
30
        [% WRAPPER breadcrumb_item %]
31
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
31
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt (-1 / +1 lines)
Lines 25-31 Link Here
25
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
25
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
26
        [% END %]
26
        [% END %]
27
        [% WRAPPER breadcrumb_item %]
27
        [% WRAPPER breadcrumb_item %]
28
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
28
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
29
        [% END %]
29
        [% END %]
30
        [% WRAPPER breadcrumb_item %]
30
        [% WRAPPER breadcrumb_item %]
31
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
31
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt (-1 / +1 lines)
Lines 68-74 Link Here
68
                            [% END %]
68
                            [% END %]
69
                        </td>
69
                        </td>
70
                        <td class="cell">
70
                        <td class="cell">
71
                            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
71
                            <a href="/cgi-bin/koha/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
72
                        </td>
72
                        </td>
73
                        <td class="cell">
73
                        <td class="cell">
74
                            [% FOREACH itemtype IN order.itemtypes %]
74
                            [% FOREACH itemtype IN order.itemtypes %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +1 lines)
Lines 85-91 Link Here
85
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
85
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
86
        [% END %]
86
        [% END %]
87
        [% WRAPPER breadcrumb_item %]
87
        [% WRAPPER breadcrumb_item %]
88
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]">[% name | html %]</a>
88
            <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% name | html %]</a>
89
        [% END %]
89
        [% END %]
90
        [% WRAPPER breadcrumb_item bc_active= 1 %]
90
        [% WRAPPER breadcrumb_item bc_active= 1 %]
91
            [% IF ( invoice ) %]
91
            [% IF ( invoice ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +1 lines)
Lines 43-49 Link Here
43
            [% END %]
43
            [% END %]
44
        [% ELSE %]
44
        [% ELSE %]
45
            [% WRAPPER breadcrumb_item %]
45
            [% WRAPPER breadcrumb_item %]
46
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
46
                <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
47
            [% END %]
47
            [% END %]
48
            [% WRAPPER breadcrumb_item bc_active= 1 %]
48
            [% WRAPPER breadcrumb_item bc_active= 1 %]
49
                <span>Receive orders from [% name | html %]</span>
49
                <span>Receive orders from [% name | html %]</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-3 / +3 lines)
Lines 24-30 Link Here
24
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
24
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
25
        [% END %]
25
        [% END %]
26
        [% WRAPPER breadcrumb_item %]
26
        [% WRAPPER breadcrumb_item %]
27
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
27
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
28
        [% END %]
28
        [% END %]
29
        [% WRAPPER breadcrumb_item bc_active= 1 %]
29
        [% WRAPPER breadcrumb_item bc_active= 1 %]
30
            <span>Receive shipment from vendor [% name | html %]</span>
30
            <span>Receive shipment from vendor [% name | html %]</span>
Lines 41-47 Link Here
41
        [% END %]
41
        [% END %]
42
            <main>
42
            <main>
43
                [% INCLUDE 'messages.inc' %]
43
                [% INCLUDE 'messages.inc' %]
44
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
44
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a></h1>
45
45
46
[% IF ( error_failed_to_create_invoice ) %]
46
[% IF ( error_failed_to_create_invoice ) %]
47
    <div id="error" class="alert alert-warning">
47
    <div id="error" class="alert alert-warning">
Lines 196-202 Link Here
196
            [% IF available_additional_fields %]
196
            [% IF available_additional_fields %]
197
                [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
197
                [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
198
            [% END %]
198
            [% END %]
199
            <fieldset class="action"><input type="submit" class="btn btn-default" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
199
            <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>
200
        </form>
200
        </form>
201
    </div>
201
    </div>
202
</main>
202
</main>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-1 / +1 lines)
Lines 67-73 Link Here
67
                    [% order.ordernumber | html %]
67
                    [% order.ordernumber | html %]
68
                </td>
68
                </td>
69
                <td class="cell">
69
                <td class="cell">
70
                    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
70
                    <a href="/cgi-bin/koha/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
71
                </td>
71
                </td>
72
                <td class="cell">
72
                <td class="cell">
73
                    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
73
                    <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-3 / +3 lines)
Lines 174-180 Link Here
174
        [% IF ( enter ) %]
174
        [% IF ( enter ) %]
175
            [% IF ( booksellerid ) %]
175
            [% IF ( booksellerid ) %]
176
                [% WRAPPER breadcrumb_item %]
176
                [% WRAPPER breadcrumb_item %]
177
                    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
177
                    <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
178
                [% END %]
178
                [% END %]
179
                [% WRAPPER breadcrumb_item bc_active= 1 %]
179
                [% WRAPPER breadcrumb_item bc_active= 1 %]
180
                    [% tx("Modify vendor '{vendor}'", { vendor = name }) | html %]
180
                    [% tx("Modify vendor '{vendor}'", { vendor = name }) | html %]
Lines 216-222 Link Here
216
        <div id="toolbar" class="btn-toolbar sticky">
216
        <div id="toolbar" class="btn-toolbar sticky">
217
            <button class="btn btn-primary" type="submit"><i class="fa fa-save"></i> Save</button>
217
            <button class="btn btn-primary" type="submit"><i class="fa fa-save"></i> Save</button>
218
            [% IF ( booksellerid ) %]
218
            [% IF ( booksellerid ) %]
219
                <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">
219
                <a class="btn btn-default cancel" href="/cgi-bin/koha/vendors/[% booksellerid | html %]">
220
            [% ELSE %]
220
            [% ELSE %]
221
                <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
221
                <a class="btn btn-default cancel" href="/cgi-bin/koha/acqui/acqui-home.pl">
222
            [% END %] <i class="fa fa-times"></i> Cancel</a>
222
            [% END %] <i class="fa fa-times"></i> Cancel</a>
Lines 537-543 Link Here
537
    <script>
537
    <script>
538
        function confirm_deletion() {
538
        function confirm_deletion() {
539
            if (confirm(_("Confirm deletion of this vendor ?"))) {
539
            if (confirm(_("Confirm deletion of this vendor ?"))) {
540
                window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]&op=delete";
540
                window.location="/cgi-bin/koha/vendors/[% booksellerid | html %]&op=delete";
541
            }
541
            }
542
        }
542
        }
543
543
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-2 / +2 lines)
Lines 29-35 Link Here
29
        [% END %]
29
        [% END %]
30
        [% IF ( booksellername ) %]
30
        [% IF ( booksellername ) %]
31
            [% WRAPPER breadcrumb_item %]
31
            [% WRAPPER breadcrumb_item %]
32
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
32
                <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
33
            [% END %]
33
            [% END %]
34
            [% WRAPPER breadcrumb_item bc_active= 1 %]
34
            [% WRAPPER breadcrumb_item bc_active= 1 %]
35
                <span>Uncertain prices for vendor [% booksellername | html %]</span>
35
                <span>Uncertain prices for vendor [% booksellername | html %]</span>
Lines 54-60 Link Here
54
            <META HTTP-EQUIV=Refresh CONTENT="[% metacontent | html %]">
54
            <META HTTP-EQUIV=Refresh CONTENT="[% metacontent | html %]">
55
        [% ELSE %]
55
        [% ELSE %]
56
        [% IF ( booksellername ) %]
56
        [% IF ( booksellername ) %]
57
            <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
57
            <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
58
58
59
            <div class="page-section">
59
            <div class="page-section">
60
                <h2>Contact information</h2>
60
                <h2>Contact information</h2>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt (-1 / +1 lines)
Lines 36-42 Link Here
36
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
36
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
37
        [% END %]
37
        [% END %]
38
        [% WRAPPER breadcrumb_item %]
38
        [% WRAPPER breadcrumb_item %]
39
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]">[% vendor.name | html %]</a>
39
            <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% vendor.name | html %]</a>
40
        [% END %]
40
        [% END %]
41
        [% IF op == 'list' %]
41
        [% IF op == 'list' %]
42
            [% WRAPPER breadcrumb_item bc_active= 1 %]
42
            [% WRAPPER breadcrumb_item bc_active= 1 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-1 / +1 lines)
Lines 59-65 tr.selected td { Link Here
59
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
59
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
60
        [% END %]
60
        [% END %]
61
        [% WRAPPER breadcrumb_item %]
61
        [% WRAPPER breadcrumb_item %]
62
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
62
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
63
        [% END %]
63
        [% END %]
64
        [% WRAPPER breadcrumb_item %]
64
        [% WRAPPER breadcrumb_item %]
65
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
65
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt (-1 / +1 lines)
Lines 38-44 Link Here
38
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
38
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
39
        [% END %]
39
        [% END %]
40
        [% WRAPPER breadcrumb_item %]
40
        [% WRAPPER breadcrumb_item %]
41
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
41
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
42
        [% END %]
42
        [% END %]
43
43
44
        [% IF ( else ) %]
44
        [% IF ( else ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt (-1 / +1 lines)
Lines 334-340 Link Here
334
    [% FOREACH account IN ediaccounts %]
334
    [% FOREACH account IN ediaccounts %]
335
    <tr>
335
    <tr>
336
      <td>[% account.id | html %]</td>
336
      <td>[% account.id | html %]</td>
337
      <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td>
337
      <td><a href="/cgi-bin/koha/vendors/[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td>
338
      <td>[% account.description | html %]</td>
338
      <td>[% account.description | html %]</td>
339
      <td>[% account.transport | html %]</td>
339
      <td>[% account.transport | html %]</td>
340
      <td>[% account.host | html %]</td>
340
      <td>[% account.host | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +1 lines)
Lines 585-591 Link Here
585
                                                    [% SET vendor = basket.bookseller %]
585
                                                    [% SET vendor = basket.bookseller %]
586
                                                    <tr>
586
                                                    <tr>
587
                                                        <td>
587
                                                        <td>
588
                                                            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]" title="Vendor detail page">[% vendor.name | html %]</a>
588
                                                            <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]" title="Vendor detail page">[% vendor.name | html %]</a>
589
                                                        </td>
589
                                                        </td>
590
                                                        <td>
590
                                                        <td>
591
                                                            [% IF order.invoiceid %]
591
                                                            [% IF order.invoiceid %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (-1 / +1 lines)
Lines 65-71 Link Here
65
		<tbody>
65
		<tbody>
66
				[% FOREACH data IN datas %]
66
				[% FOREACH data IN datas %]
67
                <tr>
67
                <tr>
68
                    <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td>
68
                    <td><a href="/cgi-bin/koha/vendors/[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td>
69
                    <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | uri %]">[% data.title | html %]</a></td>
69
                    <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | uri %]">[% data.title | html %]</a></td>
70
					<td>[% data.subscriptionid | html %]</td>
70
					<td>[% data.subscriptionid | html %]</td>
71
                    <td>[% Branches.GetName( data.branchcode ) | html %]</td>
71
                    <td>[% Branches.GetName( data.branchcode ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt (-1 / +1 lines)
Lines 61-67 Link Here
61
                                    <tr>
61
                                    <tr>
62
                                        <td>[% subscription.biblio.biblioitem.issn | html %]</td>
62
                                        <td>[% subscription.biblio.biblioitem.issn | html %]</td>
63
                                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td>
63
                                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td>
64
                                        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td>
64
                                        <td><a href="/cgi-bin/koha/vendors/[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td>
65
                                        <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %]</td>
65
                                        <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %]</td>
66
                                        <td>[% Branches.GetName(subscription.branchcode) | html %]</td>
66
                                        <td>[% Branches.GetName(subscription.branchcode) | html %]</td>
67
                                        <td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td>
67
                                        <td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-1 / +1 lines)
Lines 111-117 Link Here
111
                                        <ol>
111
                                        <ol>
112
                                            <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
112
                                            <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
113
                                            <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
113
                                            <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
114
                                            <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
114
                                            <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/vendors/[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
115
                                            <li>
115
                                            <li>
116
                                                <span class="label">Bibliographic record:</span>
116
                                                <span class="label">Bibliographic record:</span>
117
                                                [%- INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 1 -%] <em>([% subscription.biblionumber | html %])</em>
117
                                                [%- INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 1 -%] <em>([% subscription.biblionumber | html %])</em>
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue (-1 / +1 lines)
Lines 272-278 export default { Link Here
272
                    orderable: true,
272
                    orderable: true,
273
                    render: function (data, type, row, meta) {
273
                    render: function (data, type, row, meta) {
274
                        return row.vendor_id != undefined
274
                        return row.vendor_id != undefined
275
                            ? '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=' +
275
                            ? '<a href="/cgi-bin/koha/vendors/' +
276
                                  row.vendor_id +
276
                                  row.vendor_id +
277
                                  '">' +
277
                                  '">' +
278
                                  escape_str(row.vendor.name) +
278
                                  escape_str(row.vendor.name) +
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue (-1 / +1 lines)
Lines 36-42 Link Here
36
                        <label>{{ $__("Vendor") }}:</label>
36
                        <label>{{ $__("Vendor") }}:</label>
37
                        <span v-if="agreement.vendor_id">
37
                        <span v-if="agreement.vendor_id">
38
                            <a
38
                            <a
39
                                :href="`/cgi-bin/koha/acqui/booksellers.pl?booksellerid=${agreement.vendor_id}`"
39
                                :href="`/cgi-bin/koha/vendors/${agreement.vendor_id}`"
40
                            >
40
                            >
41
                                {{ agreement.vendor.name }}
41
                                {{ agreement.vendor.name }}
42
                            </a>
42
                            </a>
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue (-1 / +1 lines)
Lines 188-194 export default { Link Here
188
                    orderable: true,
188
                    orderable: true,
189
                    render: function (data, type, row, meta) {
189
                    render: function (data, type, row, meta) {
190
                        return row.vendor_id != undefined
190
                        return row.vendor_id != undefined
191
                            ? '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=' +
191
                            ? '<a href="/cgi-bin/koha/vendors/' +
192
                                  row.vendor_id +
192
                                  row.vendor_id +
193
                                  '">' +
193
                                  '">' +
194
                                  escape_str(row.vendor.name) +
194
                                  escape_str(row.vendor.name) +
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue (-1 / +1 lines)
Lines 36-42 Link Here
36
                        <label>{{ $__("Vendor") }}:</label>
36
                        <label>{{ $__("Vendor") }}:</label>
37
                        <span>
37
                        <span>
38
                            <a
38
                            <a
39
                                :href="`/cgi-bin/koha/acqui/booksellers.pl?booksellerid=${erm_package.vendor_id}`"
39
                                :href="`/cgi-bin/koha/vendors/${erm_package.vendor_id}`"
40
                                >{{ erm_package.vendor.name }}</a
40
                                >{{ erm_package.vendor.name }}</a
41
                            >
41
                            >
42
                        </span>
42
                        </span>
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue (-1 / +1 lines)
Lines 212-218 export default { Link Here
212
                    orderable: true,
212
                    orderable: true,
213
                    render: function (data, type, row, meta) {
213
                    render: function (data, type, row, meta) {
214
                        return row.vendor_id != undefined
214
                        return row.vendor_id != undefined
215
                            ? '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=' +
215
                            ? '<a href="/cgi-bin/koha/vendors/' +
216
                                  row.vendor_id +
216
                                  row.vendor_id +
217
                                  '">' +
217
                                  '">' +
218
                                  escape_str(row.vendor.name) +
218
                                  escape_str(row.vendor.name) +
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue (-2 / +1 lines)
Lines 34-40 Link Here
34
                        <label>{{ $__("Vendor") }}:</label>
34
                        <label>{{ $__("Vendor") }}:</label>
35
                        <span v-if="license.vendor_id">
35
                        <span v-if="license.vendor_id">
36
                            <a
36
                            <a
37
                                :href="`/cgi-bin/koha/acqui/booksellers.pl?booksellerid=${license.vendor_id}`"
37
                                :href="`/cgi-bin/koha/vendors/${license.vendor_id}`"
38
                            >
38
                            >
39
                                {{ license.vendor.name }}
39
                                {{ license.vendor.name }}
40
                            </a>
40
                            </a>
41
- 

Return to bug 38010