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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-19 / +18 lines)
Lines 962-967 Link Here
962
        });
962
        });
963
        [% ELSIF multiple_orders %]
963
        [% ELSIF multiple_orders %]
964
964
965
        function display_string(key, strings, fallback) {
966
            if ( strings.hasOwnProperty(key) ) {
967
                return strings[key].str && escape_str(strings[key].str) || '';
968
            }
969
            return fallback != null ? fallback : '';
970
        }
971
965
        var _build_item = function(item, tr) {
972
        var _build_item = function(item, tr) {
966
            var chb = $('<input type="checkbox" name="items_to_receive" value="'+item.item_id+'" />')
973
            var chb = $('<input type="checkbox" name="items_to_receive" value="'+item.item_id+'" />')
967
                .prop('checked', item._checked)
974
                .prop('checked', item._checked)
Lines 971-987 Link Here
971
            tr.append($('<td style="text-align:center"></td>').append(chb));
978
            tr.append($('<td style="text-align:center"></td>').append(chb));
972
            tr.append('<td><a style="cursor:pointer" onclick="PopupEditPage('+item.biblio_id+', '+item.item_id+');">'+EDIT[0].toUpperCase()+EDIT.substr(1).toLowerCase()+'</a></td>');
979
            tr.append('<td><a style="cursor:pointer" onclick="PopupEditPage('+item.biblio_id+', '+item.item_id+');">'+EDIT[0].toUpperCase()+EDIT.substr(1).toLowerCase()+'</a></td>');
973
            tr.append('<td>'+(item.external_id||'')+'</td>');
980
            tr.append('<td>'+(item.external_id||'')+'</td>');
974
            tr.append('<td>'+(item.home_branch && item.home_branch.name||'')+'</td>');
981
            tr.append('<td>'+display_string( 'home_library_id', item._strings, item.home_library_id ) || ''+'</td>');
975
            tr.append('<td>'+(item.holding_branch && item.holding_branch.name||'')+'</td>');
982
            tr.append('<td>'+display_string( 'holding_library_id', item._strings, item.holding_library_id )+'</td>');
976
            tr.append('<td>'+(item._authorised_values.not_for_loan_status && item._authorised_values.not_for_loan_status.lib||'')+'</td>');
983
            tr.append('<td>'+display_string( 'not_for_loan_status', item._strings, item.not_for_loan_status )+'</td>');
977
            tr.append('<td>'+(item._authorised_values.restricted_status && item._authorised_values.restricted_status.lib||'')+'</td>');
984
            tr.append('<td>'+display_string( 'restricted_status', item._strings, item.restricted_status )+'</td>');
978
            tr.append('<td><span class="shelvingloc">'+(item._authorised_values.location && item._authorised_values.location.lib||'')+'</span></td>');
985
            tr.append('<td><span class="shelvingloc">'+display_string( 'location', item._strings, item.location )+'</span></td>');
979
            tr.append('<td>'+(item.callnumber||'')+'</td>');
986
            tr.append('<td>'+(item.callnumber||'')+'</td>');
980
            tr.append('<td>'+(item.copy_number||'')+'</td>');
987
            tr.append('<td>'+(item.copy_number||'')+'</td>');
981
            tr.append('<td>'+(item.inventory_number||'')+'</td>');
988
            tr.append('<td>'+(item.inventory_number||'')+'</td>');
982
            tr.append('<td>'+(item._authorised_values.collection_code && item._authorised_values.collection_code.lib||'')+'</td>');
989
            tr.append('<td>'+display_string( 'collection', item._strings, item.collection )+'</td>');
983
            tr.append('<td>'+(item.itemtype && item.itemtype.description || '')+'</td>');
990
            tr.append('<td>'+display_string( 'item_type_id', item._strings, item.item_type_id )+'</td>');
984
            tr.append('<td>'+(item._authorised_values.materials_notes && item._authorised_values.materials_notes.lib||'')+'</td>')
991
            tr.append('<td>'+display_string( 'materials_notes', item._strings, item.materials_notes )+'</td>');
985
            tr.append('<td>'+(item.public_notes||'')+'</td>');
992
            tr.append('<td>'+(item.public_notes||'')+'</td>');
986
        };
993
        };
987
994
Lines 1000-1007 Link Here
1000
                    $.ajax({
1007
                    $.ajax({
1001
                        dataType: "json",
1008
                        dataType: "json",
1002
                        headers: {
1009
                        headers: {
1003
                            "x-koha-embed": "home_branch,holding_branch,itemtype",
1010
                            "x-koha-embed": "+strings"
1004
                            "x-koha-av": "1"
1005
                        },
1011
                        },
1006
                        url: '/api/v1/items/'+itemnumber,
1012
                        url: '/api/v1/items/'+itemnumber,
1007
                        success: function(item) {
1013
                        success: function(item) {
Lines 1045-1063 Link Here
1045
            var pending_orders_url = "/api/v1/acquisitions/orders?only_active=1";
1051
            var pending_orders_url = "/api/v1/acquisitions/orders?only_active=1";
1046
            var options = {
1052
            var options = {
1047
                "ajax": {
1053
                "ajax": {
1048
                    "url": pending_orders_url + "&q=" + encodeURI(JSON.stringify(base_query)),
1054
                    "url": pending_orders_url + "&q=" + encodeURI(JSON.stringify(base_query))
1049
                    "headers": {
1050
                        'x-koha-av': '1'
1051
                    }
1052
                },
1055
                },
1053
                "header_filter": true,
1054
                "embed": [
1056
                "embed": [
1055
                    "basket",
1057
                    "basket",
1056
                    "biblio.suggestions.suggester",
1058
                    "biblio.suggestions.suggester",
1057
                    "fund.budget",
1059
                    "fund.budget",
1058
                    "items.home_branch",
1060
                    "items+strings",
1059
                    "items.holding_branch",
1060
                    "items.itemtype",
1061
                    "creator"
1061
                    "creator"
1062
                ],
1062
                ],
1063
                'dom': 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1063
                'dom': 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1064
- 

Return to bug 8179