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

(-)a/C4/Acquisition.pm (+1 lines)
Lines 2189-2194 sub GetInvoices { Link Here
2189
    my $dbh = C4::Context->dbh;
2189
    my $dbh = C4::Context->dbh;
2190
    my $query = qq{
2190
    my $query = qq{
2191
        SELECT aqinvoices.*, aqbooksellers.name AS suppliername,
2191
        SELECT aqinvoices.*, aqbooksellers.name AS suppliername,
2192
          aqorders.subscriptionid,
2192
          COUNT(
2193
          COUNT(
2193
            DISTINCT IF(
2194
            DISTINCT IF(
2194
              aqorders.datereceived IS NOT NULL,
2195
              aqorders.datereceived IS NOT NULL,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-4 / +19 lines)
Lines 11-25 Link Here
11
<script type="text/javascript">
11
<script type="text/javascript">
12
//<![CDATA[
12
//<![CDATA[
13
$(document).ready(function() {
13
$(document).ready(function() {
14
    $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
14
    var resultst = $("#resultst").dataTable($.extend(true, {}, dataTablesDefaults, {
15
        bInfo: false,
15
        bInfo: false,
16
        bPaginate: false,
16
        bPaginate: false,
17
        bFilter: false,
18
        sDom: "t",
17
        sDom: "t",
19
        aoColumnDefs: [
18
        aoColumnDefs: [
20
            { "bSortable": false, "aTargets": [6] }
19
            { "aTargets": [-1], "bSortable": false, "bSearchable": false },
20
            { "aTargets": [0],  "bSortable": false, "bSearchable": false, "bVisible": false },
21
        ]
21
        ]
22
    }));
22
    }));
23
24
    $("#show_only_subscription").attr("checked", false);
25
26
    $("#show_only_subscription").click(function(){
27
        if ( $(this).attr("checked") ) {
28
            resultst.fnFilter( "[0-9]+", 0, true );
29
        } else {
30
            resultst.fnFilter( '', 0 );
31
        }
32
    });
23
});
33
});
24
//]]>
34
//]]>
25
</script>
35
</script>
Lines 39-47 $(document).ready(function() { Link Here
39
      <h1>Invoices</h1>
49
      <h1>Invoices</h1>
40
      [% IF ( do_search ) %]
50
      [% IF ( do_search ) %]
41
        [% IF ( results_loop ) %]
51
        [% IF ( results_loop ) %]
52
          <label for="show_only_subscription">
53
            <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription" />
54
            Show only subscriptions
55
          </label>
42
          <table id="resultst">
56
          <table id="resultst">
43
            <thead>
57
            <thead>
44
              <tr>
58
              <tr>
59
                <th>Subscriptionid</td>
45
                <th>Invoice no.</th>
60
                <th>Invoice no.</th>
46
                <th>Vendor</th>
61
                <th>Vendor</th>
47
                <th>Billing date</th>
62
                <th>Billing date</th>
Lines 54-59 $(document).ready(function() { Link Here
54
            <tbody>
69
            <tbody>
55
              [% FOREACH result IN results_loop %]
70
              [% FOREACH result IN results_loop %]
56
                <tr>
71
                <tr>
72
                  <td>[% result.subscriptionid %]</td>
57
                  <td>[% result.invoicenumber %]</td>
73
                  <td>[% result.invoicenumber %]</td>
58
                  <td>[% result.suppliername %]</td>
74
                  <td>[% result.suppliername %]</td>
59
                  <td>
75
                  <td>
60
- 

Return to bug 7288