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

(-)a/C4/Acquisition.pm (+1 lines)
Lines 2303-2308 sub GetInvoices { Link Here
2303
    my $dbh = C4::Context->dbh;
2303
    my $dbh = C4::Context->dbh;
2304
    my $query = qq{
2304
    my $query = qq{
2305
        SELECT aqinvoices.*, aqbooksellers.name AS suppliername,
2305
        SELECT aqinvoices.*, aqbooksellers.name AS suppliername,
2306
          aqorders.subscriptionid,
2306
          COUNT(
2307
          COUNT(
2307
            DISTINCT IF(
2308
            DISTINCT IF(
2308
              aqorders.datereceived IS NOT NULL,
2309
              aqorders.datereceived IS NOT NULL,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-4 / +19 lines)
Lines 14-28 $(document).ready(function() { Link Here
14
    [% IF (dateformat == 'metric') %]
14
    [% IF (dateformat == 'metric') %]
15
        dt_add_type_uk_date();
15
        dt_add_type_uk_date();
16
    [% END %]
16
    [% END %]
17
    $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
17
    var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
18
        bInfo: false,
18
        bInfo: false,
19
        bPaginate: false,
19
        bPaginate: false,
20
        bFilter: false,
21
        sDom: "t",
20
        sDom: "t",
22
        aoColumnDefs: [
21
        aoColumnDefs: [
23
            { "bSortable": false, "aTargets": [6] }
22
            { "aTargets": [-1], "bSortable": false, "bSearchable": false },
23
            { "aTargets": [0],  "bSortable": false, "bSearchable": false, "bVisible": false },
24
        ]
24
        ]
25
    }));
25
    }));
26
27
    $("#show_only_subscription").attr("checked", false);
28
29
    $("#show_only_subscription").click(function(){
30
        if ( $(this).attr("checked") ) {
31
            resultst.fnFilter( "[0-9]+", 0, true );
32
        } else {
33
            resultst.fnFilter( '', 0 );
34
        }
35
    });
26
});
36
});
27
//]]>
37
//]]>
28
</script>
38
</script>
Lines 42-50 $(document).ready(function() { Link Here
42
      <h1>Invoices</h1>
52
      <h1>Invoices</h1>
43
      [% IF ( do_search ) %]
53
      [% IF ( do_search ) %]
44
        [% IF invoices %]
54
        [% IF invoices %]
55
          <label for="show_only_subscription">
56
            <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription" />
57
            Show only subscriptions
58
          </label>
45
          <table id="resultst">
59
          <table id="resultst">
46
            <thead>
60
            <thead>
47
              <tr>
61
              <tr>
62
                <th>Subscriptionid</td>
48
                <th>Invoice no.</th>
63
                <th>Invoice no.</th>
49
                <th>Vendor</th>
64
                <th>Vendor</th>
50
                <th>Billing date</th>
65
                <th>Billing date</th>
Lines 57-62 $(document).ready(function() { Link Here
57
            <tbody>
72
            <tbody>
58
              [% FOREACH invoice IN invoices %]
73
              [% FOREACH invoice IN invoices %]
59
                <tr>
74
                <tr>
75
                  <td>[% invoice.subscriptionid %]</td>
60
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]">[% invoice.invoicenumber %]</a></td>
76
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]">[% invoice.invoicenumber %]</a></td>
61
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid %]">[% invoice.suppliername %]</a></td>
77
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid %]">[% invoice.suppliername %]</a></td>
62
                  <td>
78
                  <td>
63
- 

Return to bug 7288