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

(-)a/admin/columns_settings.yml (+22 lines)
Lines 568-570 modules: Link Here
568
          columnname: serial_status
568
          columnname: serial_status
569
        -
569
        -
570
          columnname: serial_notes
570
          columnname: serial_notes
571
572
  serials:
573
    subscription-detail:
574
      orders:
575
        -
576
          columnname: invoice
577
        -
578
          columnname: basket
579
        -
580
          columnname: ordernumber
581
        -
582
          columnname: creation_date
583
        -
584
          columnname: receive_date
585
        -
586
          columnname: status
587
        -
588
          columnname: fund
589
        -
590
          columnname: ordered
591
        -
592
          columnname: spent
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt (+6 lines)
Lines 158-163 Link Here
158
            [% PROCESS pagelist module=modules.reports modulename="reports" %]
158
            [% PROCESS pagelist module=modules.reports modulename="reports" %]
159
          </div>
159
          </div>
160
160
161
          <h3><a href="#serials">Serials</a></h3>
162
          <div id="serials">
163
            <h4>Serials tables</h4>
164
            [% PROCESS pagelist module=modules.serials modulename="serials" %]
165
          </div>
166
161
        </div>
167
        </div>
162
            </main>
168
            </main>
163
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
169
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-3 / +5 lines)
Lines 5-10 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% USE AuthorisedValues %]
6
[% USE AuthorisedValues %]
7
[% USE Price %]
7
[% USE Price %]
8
[% USE ColumnsSettings %]
8
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
9
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
<title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid | html %]</title>
11
<title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid | html %]</title>
Lines 420-425 Link Here
420
    </script>
421
    </script>
421
    [% Asset.js("js/serials-toolbar.js") | $raw %]
422
    [% Asset.js("js/serials-toolbar.js") | $raw %]
422
    [% INCLUDE 'datatables.inc' %]
423
    [% INCLUDE 'datatables.inc' %]
424
    [% INCLUDE 'columns_settings.inc' %]
423
    <script type="text/javascript">
425
    <script type="text/javascript">
424
        // the english words used in display purposes
426
        // the english words used in display purposes
425
        var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern",
427
        var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern",
Lines 431-444 Link Here
431
                return false;
433
                return false;
432
            })
434
            })
433
435
434
            var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
436
            var columns_settings = [% ColumnsSettings.GetColumns( 'serials', 'subscription-detail', 'orders', 'json' ) | $raw %];
437
            var table = KohaTable("orders", {
435
                'bPaginate': false,
438
                'bPaginate': false,
436
                'bAutoWidth': false,
439
                'bAutoWidth': false,
437
                "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber
440
                "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber
438
                "aoColumnDefs": [
441
                "aoColumnDefs": [
439
                    { "aTargets": "title-string", "sType": "title-string" }
442
                    { "aTargets": "title-string", "sType": "title-string" }
440
                ]
443
                ]
441
            }));
444
            }, columns_settings);
442
445
443
            $("#hide_received_orders").click(function(e){
446
            $("#hide_received_orders").click(function(e){
444
                e.preventDefault();
447
                e.preventDefault();
445
- 

Return to bug 17877