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

(-)a/admin/columns_settings.yml (+40 lines)
Lines 915-920 modules: Link Here
915
            -
915
            -
916
              columnname: notes
916
              columnname: notes
917
917
918
    orders_by_fund:
919
      funds-table:
920
        default_display_length: 20
921
        default_sort_order: 0
922
        columns:
923
            -
924
              columnname: fund
925
            -
926
              columnname: basket
927
              cannot_be_toggled: 1
928
              cannot_be_modified: 1
929
            -
930
              columnname: basket_name
931
            -
932
              columnname: basket_by
933
            -
934
              columnname: title
935
            -
936
              columnname: currency
937
            -
938
              columnname: list_price
939
            -
940
              columnname: rrp
941
            -
942
              columnname: budgeted_cost
943
            -
944
              columnname: quantity
945
            -
946
              columnname: total_rrp
947
            -
948
              columnname: total_cost
949
            -
950
              columnname: entry_date
951
            -
952
              columnname: date_received
953
            -
954
              columnname: internal_note
955
            -
956
              columnname: vendor_note
957
918
    saved-sql:
958
    saved-sql:
919
      table_reports:
959
      table_reports:
920
        columns:
960
        columns:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt (-9 / +13 lines)
Lines 1-6 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Price %]
3
[% USE Price %]
4
[% USE TablesSettings %]
4
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Reports &rsaquo; Orders by fund</title>
7
<title>Koha &rsaquo; Reports &rsaquo; Orders by fund</title>
Lines 23-35 Link Here
23
[% END %]
24
[% END %]
24
25
25
[% IF ( get_orders ) %]
26
[% IF ( get_orders ) %]
26
    <div class="results">
27
        [% IF ( total ) %]
28
            Orders found: [% total | html %]
29
        [% ELSE %]
30
            No order found
31
        [% END %]
32
    </div>
33
27
34
    [% IF ( ordersloop ) %]<table id="funds">
28
    [% IF ( ordersloop ) %]<table id="funds">
35
        <thead>
29
        <thead>
Lines 150-158 Link Here
150
144
151
[% MACRO jsinclude BLOCK %]
145
[% MACRO jsinclude BLOCK %]
152
    [% INCLUDE 'datatables.inc' %]
146
    [% INCLUDE 'datatables.inc' %]
147
    [% INCLUDE 'columns_settings.inc' %]
153
    <script>
148
    <script>
149
        var columns_settings = [% TablesSettings.GetColumns( 'reports', 'orders_by_fund', 'funds-table', 'json' ) | $raw %];
150
        [% SET table_settings = TablesSettings.GetTableSettings( 'reports', 'orders_by_fund', 'funds-table' ) %];
154
        $(document).ready( function () {
151
        $(document).ready( function () {
155
            $('#funds').DataTable($.extend(true, {}, dataTablesDefaults,{"sPaginationType": "full_numbers"}));
152
            var funds_table = KohaTable("funds", {
153
                "columnDefs": [
154
                    { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] },
155
                    { "type": "title-string", "targets" : [ "title-string" ] }
156
                ],
157
                "pageLength": [% table_settings.default_display_length | html %],
158
                "order": [[ [% table_settings.default_sort_order | html %], 'asc']],
159
                'autoWidth': false,
160
            }, columns_settings );
156
161
157
            showallbudgets = $('#budgetfilter').html();
162
            showallbudgets = $('#budgetfilter').html();
158
            $('#budgetfilter .b_inactive').remove();
163
            $('#budgetfilter .b_inactive').remove();
159
- 

Return to bug 26087