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

(-)a/acqui/finishreceive.pl (-1 / +5 lines)
Lines 41-46 checkauth($input, 0, $flagsrequired, 'intranet'); Link Here
41
my $user             = $input->remote_user;
41
my $user             = $input->remote_user;
42
my $biblionumber     = $input->param('biblionumber');
42
my $biblionumber     = $input->param('biblionumber');
43
my $ordernumber      = $input->param('ordernumber');
43
my $ordernumber      = $input->param('ordernumber');
44
my $resordernumber   = $ordernumber;
44
my $origquantityrec  = $input->param('origquantityrec');
45
my $origquantityrec  = $input->param('origquantityrec');
45
my $quantityrec      = $input->param('quantityrec');
46
my $quantityrec      = $input->param('quantityrec');
46
my $quantity         = $input->param('quantity');
47
my $quantity         = $input->param('quantity');
Lines 136-146 if ($quantityrec > $origquantityrec ) { Link Here
136
        }
137
        }
137
    }
138
    }
138
139
140
    if ($new_ordernumber) {
141
        $resordernumber = $new_ordernumber;
142
    }
139
}
143
}
140
144
141
update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber );
145
update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber );
142
146
143
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid");
147
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&resbiblionumber=$biblionumber&resordernumber=$resordernumber");
144
148
145
################################ End of script ################################
149
################################ End of script ################################
146
150
(-)a/acqui/parcel.pl (+45 lines)
Lines 69-74 use C4::Dates qw/format_date format_date_in_iso/; Link Here
69
use C4::Suggestions;
69
use C4::Suggestions;
70
use JSON;
70
use JSON;
71
71
72
use C4::Reserves;
73
72
my $input=new CGI;
74
my $input=new CGI;
73
75
74
sub get_value_with_gst_params {
76
sub get_value_with_gst_params {
Lines 130-135 unless( $invoiceid and $invoice->{invoiceid} ) { Link Here
130
    exit;
132
    exit;
131
}
133
}
132
134
135
my $received_biblionumber = $input->param('resbiblionumber');
136
my $received_ordernumber = $input->param('resordernumber');
137
if ($received_biblionumber && $received_ordernumber) {
138
    my ($reserve_count, $title_reserves) = GetReservesFromBiblionumber($received_biblionumber);
139
    if ($reserve_count > 0) {
140
141
        my $bib_level_hold = 0;
142
        my @matches;
143
144
        my $received_biblio_data = GetBiblioData($received_biblionumber);
145
        my @received_items = GetItemnumbersFromOrder($received_ordernumber);
146
147
        foreach my $reserved_title (@$title_reserves) {
148
            my $reserve_itemnumber = $reserved_title->{itemnumber};
149
            if (defined $reserve_itemnumber) {
150
                push(@matches, grep( $_ == $reserve_itemnumber, @received_items ));
151
            }
152
            else {
153
                $bib_level_hold++;
154
            }
155
        }
156
157
        if ($bib_level_hold > 0) {
158
            $template->param('bib_level_holds'  => $bib_level_hold);
159
        }
160
        if (@matches) {
161
            my @reserve_barcodes;
162
            foreach my $itemnumber_match (@matches) {
163
                my $result_barcode = GetBarcodeFromItemnumber($itemnumber_match);
164
                push(@reserve_barcodes,$result_barcode);
165
            }
166
            if(@reserve_barcodes){
167
                $template->param('item_level_holds' =>  \@reserve_barcodes);
168
            }
169
        }
170
171
        $template->param(
172
            bib_has_reserves => 1,
173
            bib_title => $received_biblio_data->{title},
174
        );
175
    }
176
}
177
133
my $op = $input->param('op') // '';
178
my $op = $input->param('op') // '';
134
179
135
if ($op eq 'cancelreceipt') {
180
if ($op eq 'cancelreceipt') {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-1 / +14 lines)
Lines 166-171 Link Here
166
        </div>
166
        </div>
167
    [% END %]
167
    [% END %]
168
168
169
    [% IF bib_has_reserves %]
170
        <div class="dialog alert">
171
            The record [% IF ( bib_title ) %] for "[% bib_title %]"[% END %] has
172
            [% IF ( bib_level_holds ) %][% bib_level_holds %] bib-level [% END %]
173
            [% IF ( item_level_holds ) %][% IF ( bib_level_holds ) %] and [% END %][% item_level_holds.size %] item-level [% END %]pending reserves.
174
            <br /><br />
175
            [% IF ( item_level_holds ) %]The item-level reserves are for the following barcodes:
176
                <ul>
177
                [% FOREACH item_hold IN item_level_holds %]<li>[% item_hold %]</li>[% END %]
178
                </ul>
179
            [% END %]
180
        </div>
181
    [% END %]
182
169
[% UNLESS no_orders_to_display %]
183
[% UNLESS no_orders_to_display %]
170
<div id="acqui_receive_summary">
184
<div id="acqui_receive_summary">
171
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
185
<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
172
- 

Return to bug 10638