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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +2 lines)
Lines 367-374 Link Here
367
                <div class="rows">
367
                <div class="rows">
368
                <div class="yui-u first">
368
                <div class="yui-u first">
369
                <ol>
369
                <ol>
370
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote %]</li>[% END %]
370
                [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote |html %]</li>[% END %]
371
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote %]</li>[% END %]
371
                [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote |html %]</li>[% END %]
372
                [% IF ( basketcontractno ) %]
372
                [% IF ( basketcontractno ) %]
373
                    <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno %]&amp;booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>
373
                    <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&amp;contractnumber=[% basketcontractno %]&amp;booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>
374
                [% END %]
374
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-4 / +4 lines)
Lines 19-25 Link Here
19
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
19
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
20
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo;
20
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> &rsaquo;
21
    [% IF ( add_form ) %]
21
    [% IF ( add_form ) %]
22
        [% IF ( basketno ) %]Edit basket '[% basketname %]'
22
        [% IF ( basketno ) %]Edit basket '[% basketname |html %]'
23
        [% ELSE %]Add a basket to [% booksellername %]
23
        [% ELSE %]Add a basket to [% booksellername %]
24
        [% END %]
24
        [% END %]
25
    [% END %]
25
    [% END %]
Lines 32-38 Link Here
32
32
33
    [% IF ( add_form ) %]
33
    [% IF ( add_form ) %]
34
        [% IF ( basketno ) %]
34
        [% IF ( basketno ) %]
35
            <h1>Edit basket [% basketname %]</h1>
35
            <h1>Edit basket [% basketname |html %]</h1>
36
        [% ELSE %]<h1>Add a basket to [% booksellername %]</h1>
36
        [% ELSE %]<h1>Add a basket to [% booksellername %]</h1>
37
        [% END %]
37
        [% END %]
38
    <form name="Aform" action="[% script_name %]" method="post" class="validated">
38
    <form name="Aform" action="[% script_name %]" method="post" class="validated">
Lines 78-88 Link Here
78
                </li>
78
                </li>
79
                <li>
79
                <li>
80
                    <label for="basketnote">Internal note: </label> &nbsp;
80
                    <label for="basketnote">Internal note: </label> &nbsp;
81
                    <textarea name="basketnote" id="basketnote" rows="5" cols="40">[% basketnote %]</textarea>
81
                    <textarea name="basketnote" id="basketnote" rows="5" cols="40">[% basketnote |html %]</textarea>
82
                </li>
82
                </li>
83
                <li>
83
                <li>
84
                    <label for="basketbooksellernote">Vendor note: </label> &nbsp;
84
                    <label for="basketbooksellernote">Vendor note: </label> &nbsp;
85
                    <textarea name="basketbooksellernote" id="basketbooksellernote" rows="5" cols="40">[% basketbooksellernote %]</textarea>
85
                    <textarea name="basketbooksellernote" id="basketbooksellernote" rows="5" cols="40">[% basketbooksellernote |html %]</textarea>
86
                </li>
86
                </li>
87
                [% IF ( contractloop ) %]
87
                [% IF ( contractloop ) %]
88
                    <li><label for="basketcontractnumber">Contract: </label>
88
                    <li><label for="basketcontractnumber">Contract: </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-2 / +1 lines)
Lines 142-148 $(document).ready(function() { Link Here
142
                                        <tr>
142
                                        <tr>
143
                                    [% END %]
143
                                    [% END %]
144
                                        <td>[% basket.basketno %]</td>
144
                                        <td>[% basket.basketno %]</td>
145
                                        <td>[% basket.basketname %]</td>
145
                                        <td>[% basket.basketname |html %]</td>
146
                                        <td>
146
                                        <td>
147
                                            <span title="[% basket.total_items %]">[% basket.total_items %]
147
                                            <span title="[% basket.total_items %]">[% basket.total_items %]
148
                                                [% IF basket.total_items_cancelled %]
148
                                                [% IF basket.total_items_cancelled %]
149
- 

Return to bug 19112