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

(-)a/C4/Acquisition.pm (+1 lines)
Lines 2504-2509 sub GetInvoices { Link Here
2504
    my $dbh = C4::Context->dbh;
2504
    my $dbh = C4::Context->dbh;
2505
    my $query = qq{
2505
    my $query = qq{
2506
        SELECT aqinvoices.*, aqbooksellers.name AS suppliername,
2506
        SELECT aqinvoices.*, aqbooksellers.name AS suppliername,
2507
          aqorders.subscriptionid,
2507
          COUNT(
2508
          COUNT(
2508
            DISTINCT IF(
2509
            DISTINCT IF(
2509
              aqorders.datereceived IS NOT NULL,
2510
              aqorders.datereceived IS NOT NULL,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-4 / +20 lines)
Lines 9-24 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": [0, 7] }
18
            { "bSortable": false, "aTargets": [1, 8] },
19
            { "bVisible": false, "aTargets": [0] }
19
        ]
20
        ]
20
    }));
21
    }));
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
    });
32
22
    $('#merge').click(function (ev) {
33
    $('#merge').click(function (ev) {
23
        var booksellerid;
34
        var booksellerid;
24
        var mismatch;
35
        var mismatch;
Lines 86-95 $(document).ready(function() { Link Here
86
      <h1>Invoices</h1>
97
      <h1>Invoices</h1>
87
      [% IF ( do_search ) %]
98
      [% IF ( do_search ) %]
88
        [% IF invoices %]
99
        [% IF invoices %]
100
          <label for="show_only_subscription">
101
            <input type="checkbox" style="vertical-align: middle;" id="show_only_subscription" />
102
            Show only subscriptions
103
          </label>
89
          <table id="resultst">
104
          <table id="resultst">
90
            <thead>
105
            <thead>
91
              <tr>
106
              <tr>
92
                <th>&nbsp;</th>
107
                <th>&nbsp;</th>
108
                <th>&nbsp;</th>
93
                <th>Invoice no.</th>
109
                <th>Invoice no.</th>
94
                <th>Vendor</th>
110
                <th>Vendor</th>
95
                <th>Billing date</th>
111
                <th>Billing date</th>
Lines 102-107 $(document).ready(function() { Link Here
102
            <tbody>
118
            <tbody>
103
              [% FOREACH invoice IN invoices %]
119
              [% FOREACH invoice IN invoices %]
104
                <tr data-invoiceid="[% invoice.invoiceid %]" data-booksellerid="[% invoice.booksellerid %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid %]" data-closedate="[% invoice.closedate | $KohaDates %]">
120
                <tr data-invoiceid="[% invoice.invoiceid %]" data-booksellerid="[% invoice.booksellerid %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid %]" data-closedate="[% invoice.closedate | $KohaDates %]">
121
                  <td>[% invoice.subscriptionid %]</td>
105
                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid %]"></input></td>
122
                  <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid %]"></input></td>
106
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]">[% invoice.invoicenumber %]</a></td>
123
                  <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid %]">[% invoice.invoicenumber %]</a></td>
107
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid %]">[% invoice.suppliername %]</a></td>
124
                  <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid %]">[% invoice.suppliername %]</a></td>
108
- 

Return to bug 7288