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

(-)a/acqui/basket.pl (-2 / +2 lines)
Lines 241-247 if ( $op eq 'cud-delete-order' ) { Link Here
241
            );
241
            );
242
            print $query->redirect( '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid . '&closed=1' );
242
            print $query->redirect( '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid . '&closed=1' );
243
        } else {
243
        } else {
244
            print $query->redirect( '/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid );
244
            print $query->redirect( '/cgi-bin/koha/vendors/' . $booksellerid );
245
        }
245
        }
246
        exit;
246
        exit;
247
    } else {
247
    } else {
Lines 609-615 sub edi_close_and_order { Link Here
609
            );
609
            );
610
            print $query->redirect("/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=$booksellerid&closed=1");
610
            print $query->redirect("/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=$booksellerid&closed=1");
611
        } else {
611
        } else {
612
            print $query->redirect("/cgi-bin/koha/acqui/booksellers.pl?booksellerid=$booksellerid");
612
            print $query->redirect("/cgi-bin/koha/vendors/$booksellerid");
613
        }
613
        }
614
        exit;
614
        exit;
615
    } else {
615
    } else {
(-)a/admin/aqcontract.pl (-3 / +2 lines)
Lines 126-132 elsif ( $op eq 'cud-add_validate' ) { Link Here
126
        );
126
        );
127
    }
127
    }
128
128
129
    print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid");
129
    print $input->redirect("/cgi-bin/koha/vendors/$booksellerid");
130
    exit;
130
    exit;
131
131
132
    # END $OP eq ADD_VALIDATE
132
    # END $OP eq ADD_VALIDATE
Lines 154-160 elsif ( $op eq 'cud-delete_confirmed' ) { Link Here
154
    my $deleted = DelContract( { contractnumber => $contractnumber } );
154
    my $deleted = DelContract( { contractnumber => $contractnumber } );
155
155
156
    if ($deleted) {
156
    if ($deleted) {
157
        print $input->redirect("/cgi-bin/koha/acqui/supplier.pl?booksellerid=$booksellerid");
157
        print $input->redirect("/cgi-bin/koha/vendors/$booksellerid");
158
        exit;
158
        exit;
159
    } else {
159
    } else {
160
        $template->param( error => 'not_deleted' );
160
        $template->param( error => 'not_deleted' );
Lines 177-180 if ( $op eq 'list' ) { Link Here
177
}
177
}
178
178
179
output_html_with_http_headers $input, $cookie, $template->output;
179
output_html_with_http_headers $input, $cookie, $template->output;
180
(-)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 68-74 Link Here
68
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
68
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
69
        [% END %]
69
        [% END %]
70
        [% WRAPPER breadcrumb_item %]
70
        [% WRAPPER breadcrumb_item %]
71
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
71
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
72
        [% END %]
72
        [% END %]
73
        [% WRAPPER breadcrumb_item %]
73
        [% WRAPPER breadcrumb_item %]
74
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
74
            <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 (-5 / +5 lines)
Lines 51-57 Link Here
51
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
51
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
52
        [% END %]
52
        [% END %]
53
        [% WRAPPER breadcrumb_item %]
53
        [% WRAPPER breadcrumb_item %]
54
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
54
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
55
        [% END %]
55
        [% END %]
56
        [% WRAPPER breadcrumb_item bc_active= 1 %]
56
        [% WRAPPER breadcrumb_item bc_active= 1 %]
57
            [% UNLESS ( basketno ) %]
57
            [% UNLESS ( basketno ) %]
Lines 282-289 Link Here
282
                        </div>
282
                        </div>
283
                        <a href="booksellers.pl">Go back to vendor page</a>
283
                        <a href="booksellers.pl">Go back to vendor page</a>
284
                    [% ELSE %]
284
                    [% ELSE %]
285
                        <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a>
285
                        <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a>
286
                        <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
286
                        <a href="/cgi-bin/koha/vendors" class="btn btn-default btn-sm">Show all active baskets</a>
287
                    [% END # /IF (cannotdelbiblios) %]
287
                    [% END # /IF (cannotdelbiblios) %]
288
                [% ELSE # IF ( delete_confirmed ) %]
288
                [% ELSE # IF ( delete_confirmed ) %]
289
289
Lines 740-746 Link Here
740
                                                    <p>
740
                                                    <p>
741
                                                        Transferred from basket:
741
                                                        Transferred from basket:
742
                                                        <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
742
                                                        <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
743
                                                        (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on
743
                                                        (<a href="/cgi-bin/koha/vendors/[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on
744
                                                        <span title="[% timestamp | $KohaDates with_hours = 1 %]"> [% timestamp | $KohaDates %] </span>
744
                                                        <span title="[% timestamp | $KohaDates with_hours = 1 %]"> [% timestamp | $KohaDates %] </span>
745
                                                    </p>
745
                                                    </p>
746
                                                [% END %]
746
                                                [% END %]
Lines 914-920 Link Here
914
                                                    <p
914
                                                    <p
915
                                                        >Transferred to basket:
915
                                                        >Transferred to basket:
916
                                                        <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
916
                                                        <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a>
917
                                                        (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on
917
                                                        (<a href="/cgi-bin/koha/vendors/[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on
918
                                                        <span title="[% timestamp | $KohaDates with_hours = 1 %]"> [% timestamp | $KohaDates %] </span>
918
                                                        <span title="[% timestamp | $KohaDates with_hours = 1 %]"> [% timestamp | $KohaDates %] </span>
919
                                                    </p>
919
                                                    </p>
920
                                                [% END %]
920
                                                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-6 / +6 lines)
Lines 27-33 Link Here
27
        [% END %]
27
        [% END %]
28
        [% IF ( grouping ) %]
28
        [% IF ( grouping ) %]
29
            [% WRAPPER breadcrumb_item %]
29
            [% WRAPPER breadcrumb_item %]
30
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
30
                <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
31
            [% END %]
31
            [% END %]
32
            [% WRAPPER breadcrumb_item %]
32
            [% WRAPPER breadcrumb_item %]
33
                <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket grouping</a>
33
                <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket grouping</a>
Lines 37-43 Link Here
37
            [% END %]
37
            [% END %]
38
        [% ELSE %]
38
        [% ELSE %]
39
            [% WRAPPER breadcrumb_item %]
39
            [% WRAPPER breadcrumb_item %]
40
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
40
                <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
41
            [% END %]
41
            [% END %]
42
            [% WRAPPER breadcrumb_item bc_active= 1 %]
42
            [% WRAPPER breadcrumb_item bc_active= 1 %]
43
                <span>Basket grouping</span>
43
                <span>Basket grouping</span>
Lines 77-87 Link Here
77
            </div>
77
            </div>
78
        [% END %]
78
        [% END %]
79
        [% IF (name && closedbg) %]
79
        [% IF (name && closedbg) %]
80
            <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
80
            <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
81
        [% ELSIF (name) %]
81
        [% ELSIF (name) %]
82
            <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
82
            <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
83
        [% ELSE %]
83
        [% ELSE %]
84
            <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
84
            <h1>Add basket group for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
85
        [% END %]
85
        [% END %]
86
        <div id="basketgroupcolumns" class="row">
86
        <div id="basketgroupcolumns" class="row">
87
            [% UNLESS (closedbg) %]
87
            [% UNLESS (closedbg) %]
Lines 253-259 Link Here
253
                ><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
253
                ><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
254
            >
254
            >
255
        </div>
255
        </div>
256
        <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
256
        <h1>Basket grouping for <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
257
        [% IF (NoEDIMessage && Koha.Preference('EDIFACT')) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
257
        [% IF (NoEDIMessage && Koha.Preference('EDIFACT')) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
258
258
259
        [% WRAPPER tabs id= "basket_groups" %]
259
        [% WRAPPER tabs id= "basket_groups" %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-2 / +2 lines)
Lines 31-37 Link Here
31
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
31
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
32
        [% END %]
32
        [% END %]
33
        [% WRAPPER breadcrumb_item %]
33
        [% WRAPPER breadcrumb_item %]
34
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
34
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
35
        [% END %]
35
        [% END %]
36
        [% IF ( add_form ) %]
36
        [% IF ( add_form ) %]
37
            [% IF ( basketno ) %]
37
            [% IF ( basketno ) %]
Lines 156-162 Link Here
156
                [% IF ( basketno ) %]
156
                [% IF ( basketno ) %]
157
                    <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
157
                    <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Cancel</a>
158
                [% ELSE %]
158
                [% ELSE %]
159
                    <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a>
159
                    <a class="cancel" href="/cgi-bin/koha/vendors/[% booksellerid | html %]">Cancel</a>
160
                [% END %]
160
                [% END %]
161
            </fieldset>
161
            </fieldset>
162
        </form>
162
        </form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-1 / +1 lines)
Lines 20-26 Link Here
20
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
20
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
21
        [% END %]
21
        [% END %]
22
        [% WRAPPER breadcrumb_item %]
22
        [% WRAPPER breadcrumb_item %]
23
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.bookseller.id | uri %]">[% basket.bookseller.name | html %]</a>
23
            <a href="/cgi-bin/koha/vendors/[% basket.bookseller.id | uri %]">[% basket.bookseller.name | html %]</a>
24
        [% END %]
24
        [% END %]
25
        [% WRAPPER breadcrumb_item %]
25
        [% WRAPPER breadcrumb_item %]
26
            <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>
26
            <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 39-45 Link Here
39
        [% END %]
39
        [% END %]
40
        [% UNLESS blocking_error %]
40
        [% UNLESS blocking_error %]
41
            [% WRAPPER breadcrumb_item %]
41
            [% WRAPPER breadcrumb_item %]
42
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]">[% vendor.name | html %]</a>
42
                <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% vendor.name | html %]</a>
43
            [% END %]
43
            [% END %]
44
            [% WRAPPER breadcrumb_item %]
44
            [% WRAPPER breadcrumb_item %]
45
                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketno | html %]</a>
45
                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketno | html %]</a>
Lines 130-136 Link Here
130
                <br />[% order.author | html %] <br />
130
                <br />[% order.author | html %] <br />
131
                [% order.isbn | html %]
131
                [% order.isbn | html %]
132
            </td>
132
            </td>
133
            <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
133
            <td><a href="/cgi-bin/koha/vendors/[% order.id | uri %]">[% order.name | html %]</a></td>
134
            <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
134
            <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
135
            <td data-order="[% order.datereceived | html %]"> [% order.datereceived | $KohaDates %] </td>
135
            <td data-order="[% order.datereceived | html %]"> [% order.datereceived | $KohaDates %] </td>
136
            <td>[% order.quantityreceived | html %]</td>
136
            <td>[% order.quantityreceived | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt (-2 / +2 lines)
Lines 102-110 Link Here
102
                        "render": function(data, type, row, meta) {
102
                        "render": function(data, type, row, meta) {
103
                            let link;
103
                            let link;
104
                            if ( row.vendor ) {
104
                            if ( row.vendor ) {
105
                               link = '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid='+row.vendor_id+'">'+row.vendor.name+'</a>';
105
                               link = '<a href="/cgi-bin/koha/vendors/'+row.vendor_id+'">'+row.vendor.name+'</a>';
106
                            } else {
106
                            } else {
107
                               link = '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid='+row.vendor_id+'">'+row.vendor_id+'</a>';
107
                               link = '<a href="/cgi-bin/koha/vendors/'+row.vendor_id+'">'+row.vendor_id+'</a>';
108
                            }
108
                            }
109
                            return link;
109
                            return link;
110
                        }
110
                        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-1 / +1 lines)
Lines 131-137 Link Here
131
                                            <br />[% order.author | html %] <br />
131
                                            <br />[% order.author | html %] <br />
132
                                            [% order.isbn | html %]
132
                                            [% order.isbn | html %]
133
                                        </td>
133
                                        </td>
134
                                        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td>
134
                                        <td><a href="/cgi-bin/koha/vendors/[% order.id | uri %]">[% order.name | html %]</a></td>
135
                                        <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
135
                                        <td data-order="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</td>
136
                                        <td data-order="[% order.datereceived | html %]"> [% order.datereceived | $KohaDates %] </td>
136
                                        <td data-order="[% order.datereceived | html %]"> [% order.datereceived | $KohaDates %] </td>
137
                                        <td>[% order.quantityreceived | html %]</td>
137
                                        <td>[% order.quantityreceived | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt (-1 / +1 lines)
Lines 38-44 Link Here
38
38
39
[% WRAPPER 'main-container.inc' aside='acquisitions-menu' %]
39
[% WRAPPER 'main-container.inc' aside='acquisitions-menu' %]
40
    <h1>Files for invoice: [% invoicenumber | html %]</h1>
40
    <h1>Files for invoice: [% invoicenumber | html %]</h1>
41
    <p><strong>Vendor: </strong><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
41
    <p><strong>Vendor: </strong><a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% suppliername | html %]</a></p>
42
    <br />
42
    <br />
43
    [% IF errors %]
43
    [% IF errors %]
44
        <div class="alert alert-warning">
44
        <div class="alert alert-warning">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +1 lines)
Lines 55-61 Link Here
55
        </div>
55
        </div>
56
    [% END %]
56
    [% END %]
57
57
58
    <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p>
58
    <p>Vendor: <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% suppliername | html %]</a></p>
59
59
60
    <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
60
    <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
61
        [% INCLUDE 'csrf-token.inc' %]
61
        [% INCLUDE 'csrf-token.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-1 / +1 lines)
Lines 86-92 Link Here
86
                                            [% END %]
86
                                            [% END %]
87
                                            <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
87
                                            <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td>
88
                                            <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
88
                                            <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td>
89
                                            <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
89
                                            <td><a href="/cgi-bin/koha/vendors/[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td>
90
                                            <td data-order="[% invoice.shipmentdate | html %]"> [% invoice.shipmentdate | $KohaDates %] </td>
90
                                            <td data-order="[% invoice.shipmentdate | html %]"> [% invoice.shipmentdate | $KohaDates %] </td>
91
                                            <td data-order="[% invoice.billingdate | html %]"> [% invoice.billingdate | $KohaDates %] </td>
91
                                            <td data-order="[% invoice.billingdate | html %]"> [% invoice.billingdate | $KohaDates %] </td>
92
                                            <td>[% invoice.receivedbiblios | html %]</td>
92
                                            <td>[% invoice.receivedbiblios | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/moddeliverydate.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/modordernotes.tt (-1 / +1 lines)
Lines 24-30 Link Here
24
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a>
24
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</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 %]">[% booksellername | html %]</a>
27
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
28
        [% END %]
28
        [% END %]
29
        [% WRAPPER breadcrumb_item %]
29
        [% WRAPPER breadcrumb_item %]
30
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketname | html %] ([% basketno | html %])</a>
30
            <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 241-247 Link Here
241
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
241
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
242
        [% END %]
242
        [% END %]
243
        [% WRAPPER breadcrumb_item %]
243
        [% WRAPPER breadcrumb_item %]
244
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
244
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
245
        [% END %]
245
        [% END %]
246
        [% WRAPPER breadcrumb_item %]
246
        [% WRAPPER breadcrumb_item %]
247
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
247
            <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 26-32 Link Here
26
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
26
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
27
        [% END %]
27
        [% END %]
28
        [% WRAPPER breadcrumb_item %]
28
        [% WRAPPER breadcrumb_item %]
29
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
29
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
30
        [% END %]
30
        [% END %]
31
        [% WRAPPER breadcrumb_item %]
31
        [% WRAPPER breadcrumb_item %]
32
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
32
            <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 27-33 Link Here
27
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
27
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
28
        [% END %]
28
        [% END %]
29
        [% WRAPPER breadcrumb_item %]
29
        [% WRAPPER breadcrumb_item %]
30
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
30
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
31
        [% END %]
31
        [% END %]
32
        [% WRAPPER breadcrumb_item %]
32
        [% WRAPPER breadcrumb_item %]
33
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
33
            <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 65-71 Link Here
65
                            [% END %]
65
                            [% END %]
66
                        </td>
66
                        </td>
67
                        <td class="cell">
67
                        <td class="cell">
68
                            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
68
                            <a href="/cgi-bin/koha/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
69
                        </td>
69
                        </td>
70
                        <td class="cell">
70
                        <td class="cell">
71
                            [% FOREACH itemtype IN order.itemtypes %]
71
                            [% FOREACH itemtype IN order.itemtypes %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-1 / +1 lines)
Lines 90-96 Link Here
90
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
90
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
91
        [% END %]
91
        [% END %]
92
        [% WRAPPER breadcrumb_item %]
92
        [% WRAPPER breadcrumb_item %]
93
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]">[% name | html %]</a>
93
            <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% name | html %]</a>
94
        [% END %]
94
        [% END %]
95
        [% WRAPPER breadcrumb_item bc_active= 1 %]
95
        [% WRAPPER breadcrumb_item bc_active= 1 %]
96
            [% IF ( invoice ) %]
96
            [% IF ( invoice ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +1 lines)
Lines 44-50 Link Here
44
            [% END %]
44
            [% END %]
45
        [% ELSE %]
45
        [% ELSE %]
46
            [% WRAPPER breadcrumb_item %]
46
            [% WRAPPER breadcrumb_item %]
47
                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
47
                <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
48
            [% END %]
48
            [% END %]
49
            [% WRAPPER breadcrumb_item bc_active= 1 %]
49
            [% WRAPPER breadcrumb_item bc_active= 1 %]
50
                <span>Receive orders from [% name | html %]</span>
50
                <span>Receive orders from [% name | html %]</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt (-3 / +3 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 bc_active= 1 %]
30
        [% WRAPPER breadcrumb_item bc_active= 1 %]
31
            <span>Receive shipment from vendor [% name | html %]</span>
31
            <span>Receive shipment from vendor [% name | html %]</span>
Lines 38-44 Link Here
38
        <div class="col-md-10 order-md-2 order-sm-2">
38
        <div class="col-md-10 order-md-2 order-sm-2">
39
            <main>
39
            <main>
40
                [% INCLUDE 'messages.inc' %]
40
                [% INCLUDE 'messages.inc' %]
41
                <h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
41
                <h1>Receive shipment from vendor <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a></h1>
42
42
43
                [% IF closed_invoices %]
43
                [% IF closed_invoices %]
44
                    <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>
44
                    <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>
Lines 197-203 Link Here
197
                        [% IF available_additional_fields %]
197
                        [% IF available_additional_fields %]
198
                            [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
198
                            [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
199
                        [% END %]
199
                        [% END %]
200
                        <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>
200
                        <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>
201
                    </form>
201
                    </form>
202
                </div>
202
                </div>
203
            </main>
203
            </main>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt (-1 / +1 lines)
Lines 59-65 Link Here
59
                    </td>
59
                    </td>
60
                    <td class="cell"> [% order.ordernumber | html %] </td>
60
                    <td class="cell"> [% order.ordernumber | html %] </td>
61
                    <td class="cell">
61
                    <td class="cell">
62
                        <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
62
                        <a href="/cgi-bin/koha/vendors/[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
63
                    </td>
63
                    </td>
64
                    <td class="cell">
64
                    <td class="cell">
65
                        <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
65
                        <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 (-2 / +2 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 210-216 Link Here
210
            <div id="toolbar" class="btn-toolbar sticky">
210
            <div id="toolbar" class="btn-toolbar sticky">
211
                <button class="btn btn-primary" type="submit"><i class="fa fa-save"></i> Save</button>
211
                <button class="btn btn-primary" type="submit"><i class="fa fa-save"></i> Save</button>
212
                [% IF ( booksellerid ) %]
212
                [% IF ( booksellerid ) %]
213
                    [% SET a_href = '/cgi-bin/koha/acqui/supplier.pl?booksellerid=' _ booksellerid %]
213
                    <a class="btn btn-default cancel" href="/cgi-bin/koha/vendors/[% booksellerid | html %]"> </a>
214
                [% ELSE %]
214
                [% ELSE %]
215
                    [% SET a_href = '/cgi-bin/koha/acqui/acqui-home.pl' %]
215
                    [% SET a_href = '/cgi-bin/koha/acqui/acqui-home.pl' %]
216
                [% END %]
216
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (-2 / +2 lines)
Lines 30-36 Link Here
30
        [% END %]
30
        [% END %]
31
        [% IF ( booksellername ) %]
31
        [% IF ( booksellername ) %]
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
            [% WRAPPER breadcrumb_item bc_active= 1 %]
35
            [% WRAPPER breadcrumb_item bc_active= 1 %]
36
                <span>Uncertain prices for vendor [% booksellername | html %]</span>
36
                <span>Uncertain prices for vendor [% booksellername | html %]</span>
Lines 51-57 Link Here
51
        <meta http-equiv="Refresh" content="[% metacontent | html %]" />
51
        <meta http-equiv="Refresh" content="[% metacontent | html %]" />
52
    [% ELSE %]
52
    [% ELSE %]
53
        [% IF ( booksellername ) %]
53
        [% IF ( booksellername ) %]
54
            <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
54
            <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
55
55
56
            <div class="page-section">
56
            <div class="page-section">
57
                <h2>Contact information</h2>
57
                <h2>Contact information</h2>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendor_issues.tt (-1 / +1 lines)
Lines 39-45 Link Here
39
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
39
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
40
        [% END %]
40
        [% END %]
41
        [% WRAPPER breadcrumb_item %]
41
        [% WRAPPER breadcrumb_item %]
42
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]">[% vendor.name | html %]</a>
42
            <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]">[% vendor.name | html %]</a>
43
        [% END %]
43
        [% END %]
44
        [% IF op == 'list' %]
44
        [% IF op == 'list' %]
45
            [% WRAPPER breadcrumb_item bc_active= 1 %]
45
            [% WRAPPER breadcrumb_item bc_active= 1 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-1 / +1 lines)
Lines 62-68 Link Here
62
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
62
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
63
        [% END %]
63
        [% END %]
64
        [% WRAPPER breadcrumb_item %]
64
        [% WRAPPER breadcrumb_item %]
65
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
65
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% name | html %]</a>
66
        [% END %]
66
        [% END %]
67
        [% WRAPPER breadcrumb_item %]
67
        [% WRAPPER breadcrumb_item %]
68
            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
68
            <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 37-43 Link Here
37
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
37
            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
38
        [% END %]
38
        [% END %]
39
        [% WRAPPER breadcrumb_item %]
39
        [% WRAPPER breadcrumb_item %]
40
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
40
            <a href="/cgi-bin/koha/vendors/[% booksellerid | uri %]">[% booksellername | html %]</a>
41
        [% END %]
41
        [% END %]
42
42
43
        [% IF ( else ) %]
43
        [% IF ( else ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt (-1 / +1 lines)
Lines 315-321 Link Here
315
                    [% FOREACH account IN ediaccounts %]
315
                    [% FOREACH account IN ediaccounts %]
316
                        <tr>
316
                        <tr>
317
                            <td>[% account.id | html %]</td>
317
                            <td>[% account.id | html %]</td>
318
                            <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td>
318
                            <td><a href="/cgi-bin/koha/vendors/[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td>
319
                            <td>[% account.description | html %]</td>
319
                            <td>[% account.description | html %]</td>
320
                            <td>[% account.transport | html %]</td>
320
                            <td>[% account.transport | html %]</td>
321
                            <td>[% account.host | html %]</td>
321
                            <td>[% account.host | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +1 lines)
Lines 600-606 Link Here
600
                                    [% SET vendor = basket.bookseller %]
600
                                    [% SET vendor = basket.bookseller %]
601
                                    <tr>
601
                                    <tr>
602
                                        <td>
602
                                        <td>
603
                                            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% vendor.id | uri %]" title="Vendor detail page">[% vendor.name | html %]</a>
603
                                            <a href="/cgi-bin/koha/vendors/[% vendor.id | uri %]" title="Vendor detail page">[% vendor.name | html %]</a>
604
                                        </td>
604
                                        </td>
605
                                        <td>
605
                                        <td>
606
                                            [% IF order.invoiceid %]
606
                                            [% IF order.invoiceid %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (-1 / +1 lines)
Lines 64-70 Link Here
64
            <tbody>
64
            <tbody>
65
                [% FOREACH data IN datas %]
65
                [% FOREACH data IN datas %]
66
                    <tr>
66
                    <tr>
67
                        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td>
67
                        <td><a href="/cgi-bin/koha/vendors/[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td>
68
                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | uri %]">[% data.title | html %]</a></td>
68
                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | uri %]">[% data.title | html %]</a></td>
69
                        <td>[% data.subscriptionid | html %]</td>
69
                        <td>[% data.subscriptionid | html %]</td>
70
                        <td>[% Branches.GetName( data.branchcode ) | html %]</td>
70
                        <td>[% Branches.GetName( data.branchcode ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt (-1 / +1 lines)
Lines 58-64 Link Here
58
                    <tr>
58
                    <tr>
59
                        <td>[% subscription.biblio.biblioitem.issn | html %]</td>
59
                        <td>[% subscription.biblio.biblioitem.issn | html %]</td>
60
                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td>
60
                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td>
61
                        <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td>
61
                        <td><a href="/cgi-bin/koha/vendors/[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td>
62
                        <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %]</td>
62
                        <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %]</td>
63
                        <td>[% Branches.GetName(subscription.branchcode) | html %]</td>
63
                        <td>[% Branches.GetName(subscription.branchcode) | html %]</td>
64
                        <td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td>
64
                        <td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-1 / +1 lines)
Lines 110-116 Link Here
110
                            <ol>
110
                            <ol>
111
                                <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
111
                                <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li>
112
                                <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
112
                                <li><span class="label">Librarian identity:</span> [% librarian | html %]</li>
113
                                <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
113
                                <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/vendors/[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li>
114
                                <li>
114
                                <li>
115
                                    <span class="label">Bibliographic record:</span>
115
                                    <span class="label">Bibliographic record:</span>
116
                                    [%- INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 1 -%] <em>([% subscription.biblionumber | html %])</em>
116
                                    [%- 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 341-347 export default { Link Here
341
                    orderable: true,
341
                    orderable: true,
342
                    render: function (data, type, row, meta) {
342
                    render: function (data, type, row, meta) {
343
                        return row.vendor_id != undefined
343
                        return row.vendor_id != undefined
344
                            ? '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=' +
344
                            ? '<a href="/cgi-bin/koha/vendors/' +
345
                                  row.vendor_id +
345
                                  row.vendor_id +
346
                                  '">' +
346
                                  '">' +
347
                                  escape_str(row.vendor.name) +
347
                                  escape_str(row.vendor.name) +
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue (-1 / +1 lines)
Lines 35-41 Link Here
35
                        <label>{{ $__("Vendor") }}:</label>
35
                        <label>{{ $__("Vendor") }}:</label>
36
                        <span v-if="agreement.vendor_id">
36
                        <span v-if="agreement.vendor_id">
37
                            <a
37
                            <a
38
                                :href="`/cgi-bin/koha/acqui/booksellers.pl?booksellerid=${agreement.vendor_id}`"
38
                                :href="`/cgi-bin/koha/vendors/${agreement.vendor_id}`"
39
                            >
39
                            >
40
                                {{ agreement.vendor.name }}
40
                                {{ agreement.vendor.name }}
41
                            </a>
41
                            </a>
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue (-1 / +1 lines)
Lines 235-241 export default { Link Here
235
                    orderable: true,
235
                    orderable: true,
236
                    render: function (data, type, row, meta) {
236
                    render: function (data, type, row, meta) {
237
                        return row.vendor_id != undefined
237
                        return row.vendor_id != undefined
238
                            ? '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=' +
238
                            ? '<a href="/cgi-bin/koha/vendors/' +
239
                                  row.vendor_id +
239
                                  row.vendor_id +
240
                                  '">' +
240
                                  '">' +
241
                                  escape_str(row.vendor.name) +
241
                                  escape_str(row.vendor.name) +
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue (-1 / +1 lines)
Lines 35-41 Link Here
35
                        <label>{{ $__("Vendor") }}:</label>
35
                        <label>{{ $__("Vendor") }}:</label>
36
                        <span>
36
                        <span>
37
                            <a
37
                            <a
38
                                :href="`/cgi-bin/koha/acqui/booksellers.pl?booksellerid=${erm_package.vendor_id}`"
38
                                :href="`/cgi-bin/koha/vendors/${erm_package.vendor_id}`"
39
                                >{{ erm_package.vendor.name }}</a
39
                                >{{ erm_package.vendor.name }}</a
40
                            >
40
                            >
41
                        </span>
41
                        </span>
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue (-1 / +1 lines)
Lines 227-233 export default { Link Here
227
                    orderable: true,
227
                    orderable: true,
228
                    render: function (data, type, row, meta) {
228
                    render: function (data, type, row, meta) {
229
                        return row.vendor_id != undefined
229
                        return row.vendor_id != undefined
230
                            ? '<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=' +
230
                            ? '<a href="/cgi-bin/koha/vendors/' +
231
                                  row.vendor_id +
231
                                  row.vendor_id +
232
                                  '">' +
232
                                  '">' +
233
                                  escape_str(row.vendor.name) +
233
                                  escape_str(row.vendor.name) +
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue (-2 / +1 lines)
Lines 33-39 Link Here
33
                        <label>{{ $__("Vendor") }}:</label>
33
                        <label>{{ $__("Vendor") }}:</label>
34
                        <span v-if="license.vendor_id">
34
                        <span v-if="license.vendor_id">
35
                            <a
35
                            <a
36
                                :href="`/cgi-bin/koha/acqui/booksellers.pl?booksellerid=${license.vendor_id}`"
36
                                :href="`/cgi-bin/koha/vendors/${license.vendor_id}`"
37
                            >
37
                            >
38
                                {{ license.vendor.name }}
38
                                {{ license.vendor.name }}
39
                            </a>
39
                            </a>
40
- 

Return to bug 38010