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

(-)a/acqui/orderreceive.pl (-1 lines)
Lines 195-201 foreach my $budget (@{$budgets}) { Link Here
195
        b_sort1_authcat => $budget->{'sort1_authcat'},
195
        b_sort1_authcat => $budget->{'sort1_authcat'},
196
        b_sort2_authcat => $budget->{'sort2_authcat'},
196
        b_sort2_authcat => $budget->{'sort2_authcat'},
197
        b_active => $budget->{budget_period_active},
197
        b_active => $budget->{budget_period_active},
198
        # b_sel => ( $budget->{budget_id} == $order->budget_id ) ? 1 : 0,
199
        b_level => $budget->{budget_level},
198
        b_level => $budget->{budget_level},
200
    };
199
    };
201
}
200
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-26 lines)
Lines 1112-1130 Link Here
1112
                if(row.subscription_id) {
1112
                if(row.subscription_id) {
1113
                    $('#modal-order-main #items-panel').removeClass('show').addClass('hide');
1113
                    $('#modal-order-main #items-panel').removeClass('show').addClass('hide');
1114
                    $('#modal-order-main #history-panel').removeClass('hide').addClass('show');
1114
                    $('#modal-order-main #history-panel').removeClass('hide').addClass('show');
1115
                    /*$('#modal-order-main').tabs("disable", "#items-panel");
1116
                    $('#modal-order-main').tabs("enable", "#history-panel");
1117
                    if($('#modal-order-main').tabs( "option", "active" ) == 3) {
1118
                        $('#modal-order-main').tabs( "option", "active", 0);
1119
                    }*/
1120
                } else {
1115
                } else {
1121
                    $('#modal-order-main #history-panel').removeClass('show').addClass('hide');
1116
                    $('#modal-order-main #history-panel').removeClass('show').addClass('hide');
1122
                    $('#modal-order-main #items-panel').removeClass('hide').addClass('show');
1117
                    $('#modal-order-main #items-panel').removeClass('hide').addClass('show');
1123
                    /*$('#modal-order-main').tabs("enable", "#items-panel");
1124
                    $('#modal-order-main').tabs("disable", "#history-panel");
1125
                    if($('#modal-order-main').tabs( "option", "active" ) == 2) {
1126
                        $('#modal-order-main').tabs( "option", "active", 0);
1127
                    }*/
1128
                    if(effective_create_items == 'receiving') {
1118
                    if(effective_create_items == 'receiving') {
1129
                        $("#acq-create-receiving").show();
1119
                        $("#acq-create-receiving").show();
1130
                        $("#acq-create-ordering").hide();
1120
                        $("#acq-create-ordering").hide();
Lines 1161-1172 Link Here
1161
                        }
1151
                        }
1162
                    } else {
1152
                    } else {
1163
                        $('#modal-order-main #items-panel').removeClass('show').addClass('hide');
1153
                        $('#modal-order-main #items-panel').removeClass('show').addClass('hide');
1164
                        /*
1165
                        if($('#modal-order-main').tabs( "option", "active" ) == 3) {
1166
                            $('#modal-order-main').tabs( "option", "active", 0);
1167
                        }
1168
                        $('#modal-order-main').tabs("disable", "#items-panel");
1169
                        */
1170
                    }
1154
                    }
1171
                }
1155
                }
1172
                $("#select_currency").hide();
1156
                $("#select_currency").hide();
Lines 1226-1240 Link Here
1226
                $("#order_edit").modal('hide');
1210
                $("#order_edit").modal('hide');
1227
            })
1211
            })
1228
1212
1229
            /*$('#modal-order-main').tabs({
1230
                activate: function(event, ui) {
1231
                    var active = ui.newPanel.attr('id')
1232
                    if(active == 'history-panel') {
1233
                        show_subs($("#order_edit").data('row'));
1234
                    }
1235
                }
1236
            });*/
1237
1238
            $("#order_edit").on("show.bs.modal", function (event) {
1213
            $("#order_edit").on("show.bs.modal", function (event) {
1239
                var anchor = $(event.relatedTarget);
1214
                var anchor = $(event.relatedTarget);
1240
                var n = anchor.data("row");
1215
                var n = anchor.data("row");
1241
- 

Return to bug 8179