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

(-)a/acqui/addorderiso2709.pl (-3 / +1 lines)
Lines 333-345 sub import_batches_list { Link Here
333
            # check if there is at least 1 line still staged
333
            # check if there is at least 1 line still staged
334
            my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, undef, 'staged');
334
            my $stagedList=GetImportRecordsRange($batch->{'import_batch_id'}, undef, undef, 'staged');
335
            if (scalar @$stagedList) {
335
            if (scalar @$stagedList) {
336
                my ($staged_date, $staged_hour) = split (/ /, $batch->{'upload_timestamp'});
337
                push @list, {
336
                push @list, {
338
                        import_batch_id => $batch->{'import_batch_id'},
337
                        import_batch_id => $batch->{'import_batch_id'},
339
                        num_biblios => $batch->{'num_biblios'},
338
                        num_biblios => $batch->{'num_biblios'},
340
                        num_items => $batch->{'num_items'},
339
                        num_items => $batch->{'num_items'},
341
                        staged_date => $staged_date,
340
                        staged_date => $batch->{'upload_timestamp'},
342
                        staged_hour => $staged_hour,
343
                        import_status => $batch->{'import_status'},
341
                        import_status => $batch->{'import_status'},
344
                        file_name => $batch->{'file_name'},
342
                        file_name => $batch->{'file_name'},
345
                        comments => $batch->{'comments'},
343
                        comments => $batch->{'comments'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-3 / +8 lines)
Lines 20-28 Link Here
20
    $(document).ready(function() {
20
    $(document).ready(function() {
21
        var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
21
        var srlt = $("#files").dataTable($.extend(true, {}, dataTablesDefaults, {
22
            "aoColumnDefs": [
22
            "aoColumnDefs": [
23
             [% IF (dateformat == 'metric') %]
24
                { "aTargets": [ 3 ], "sType": "uk_date" },
25
             [% END %]
23
                { "aTargets": [ 5 ], "bSortable": false, "bSearchable": false },
26
                { "aTargets": [ 5 ], "bSortable": false, "bSearchable": false },
24
            ],
27
            ],
25
            "sPaginationType": "four_button"
28
            "sPaginationType": "four_button",
29
            "aaSorting": []
30
26
        } ) );
31
        } ) );
27
32
28
        $("form#Aform").submit(function() {
33
        $("form#Aform").submit(function() {
Lines 37-42 Link Here
37
            return true;
42
            return true;
38
        });
43
        });
39
    });
44
    });
45
40
//]]>
46
//]]>
41
</script>
47
</script>
42
</head>
48
</head>
Lines 109-115 Link Here
109
                        <td>[% batch_lis.file_name %]</td>
115
                        <td>[% batch_lis.file_name %]</td>
110
                       <td>[% batch_lis.comments %]</td>
116
                       <td>[% batch_lis.comments %]</td>
111
                       <td>[% batch_lis.import_status %]</td>
117
                       <td>[% batch_lis.import_status %]</td>
112
                       <td>[% batch_lis.staged_date | $KohaDates %] [% batch_lis.staged_hour %]</td>
118
                       <td>[% batch_lis.staged_date | $KohaDates %]</td>
113
                       <td>[% batch_lis.num_biblios %]</td>
119
                       <td>[% batch_lis.num_biblios %]</td>
114
                       <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]">Add orders</a></td>
120
                       <td><a href="[% batch_lis.scriptname %]?import_batch_id=[% batch_lis.import_batch_id %]&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]">Add orders</a></td>
115
                     </tr>
121
                     </tr>
116
- 

Return to bug 11059