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

(-)a/acqui/supplier.pl (+1 lines)
Lines 111-116 if ( $op eq 'display' ) { Link Here
111
        basketcount   => $supplier->{'basketcount'},
111
        basketcount   => $supplier->{'basketcount'},
112
        subscriptioncount   => $supplier->{'subscriptioncount'},
112
        subscriptioncount   => $supplier->{'subscriptioncount'},
113
        contracts     => $contracts,
113
        contracts     => $contracts,
114
        dateformat    => C4::Context->preference("dateformat"),
114
    );
115
    );
115
} elsif ( $op eq 'delete' ) {
116
} elsif ( $op eq 'delete' ) {
116
    # no further message needed for the user
117
    # no further message needed for the user
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (-3 / +29 lines)
Lines 1-7 Link Here
1
[% USE KohaDates %]
1
[% USE KohaDates %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Vendor [% bookselname %]</title>
3
<title>Koha &rsaquo; Vendor [% bookselname %]</title>
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
7
[% INCLUDE 'datatables-strings.inc' %]
8
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
9
5
<script type="text/javascript">
10
<script type="text/javascript">
6
//<![CDATA[
11
//<![CDATA[
7
function confirm_deletion() {
12
function confirm_deletion() {
Lines 16-21 if (f.company.value == "") { Link Here
16
}
21
}
17
    f.submit();
22
    f.submit();
18
}
23
}
24
25
 $(document).ready(function() {
26
    [% IF (dateformat == 'metric') %]
27
        dt_add_type_uk_date();
28
    [% END %]
29
    var contractst = $("#contractst").dataTable($.extend(true, {}, dataTablesDefaults, {
30
        "aoColumnDefs": [
31
          { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
32
          [% IF (dateformat == 'metric') %]
33
            { "aTargets": [ 2, 3 ], "sType": "uk_date" },
34
          [% END %]
35
        ],
36
        'bPaginate': false,
37
        'bFilter': false,
38
        'bInfo': false,
39
    } ) );
40
 });
19
//]]>
41
//]]>
20
</script>
42
</script>
21
</head>
43
</head>
Lines 212-225 if (f.company.value == "") { Link Here
212
        [% IF ( contracts ) %]
234
        [% IF ( contracts ) %]
213
            <div id="supplier-contracts" class="yui-g">
235
            <div id="supplier-contracts" class="yui-g">
214
                <h2>Contract(s)</h2>
236
                <h2>Contract(s)</h2>
215
                <table>
237
                <table id="contractst">
238
                  <thead>
216
                    <tr>
239
                    <tr>
217
                        <th scope="col">Name</th>
240
                        <th scope="col">Name</th>
218
                        <th scope="col">Description</th>
241
                        <th scope="col">Description</th>
219
                        <th scope="col">Start date</th>
242
                        <th scope="col">Start date</th>
220
                        <th scope="col">End date</th>
243
                        <th scope="col">End date</th>
221
                        <th scope="col" colspan="2">&nbsp; </th>
244
                        <th scope="col">&nbsp; </th>
245
                        <th scope="col">&nbsp; </th>
222
                    </tr>
246
                    </tr>
247
                  </thead>
248
                  <tbody>
223
                    [% FOREACH contract IN contracts %]
249
                    [% FOREACH contract IN contracts %]
224
                        [% IF ( loop.even ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
250
                        [% IF ( loop.even ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
225
                        <td>
251
                        <td>
Lines 232-237 if (f.company.value == "") { Link Here
232
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
258
                        <td><a href="/cgi-bin/koha/admin/aqcontract.pl?op=delete_confirm&amp;contractnumber=[% contract.contractnumber %]&amp;booksellerid=[% contract.booksellerid %]">Delete</a></td>
233
                        </tr>
259
                        </tr>
234
                    [% END %]
260
                    [% END %]
261
                  </tbody>
235
                </table>
262
                </table>
236
            </div>
263
            </div>
237
        [% END %]
264
        [% END %]
238
- 

Return to bug 8102