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

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

Return to bug 7288