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

(-)a/acqui/parcel.pl (-12 / +13 lines)
Lines 117-122 my ($template, $loggedinuser, $cookie) Link Here
117
                 debug => 1,
117
                 debug => 1,
118
});
118
});
119
119
120
my $op = $input->param('op') // '';
121
122
# process cancellation first so that list of
123
# orders to display is calculated after
124
if ($op eq 'cancelreceipt') {
125
    my $ordernumber = $input->param('ordernumber');
126
    my $parent_ordernumber = CancelReceipt($ordernumber);
127
    unless($parent_ordernumber) {
128
        $template->param(error_cancelling_receipt => 1);
129
    }
130
}
131
120
my $invoiceid = $input->param('invoiceid');
132
my $invoiceid = $input->param('invoiceid');
121
my $invoice;
133
my $invoice;
122
$invoice = GetInvoiceDetails($invoiceid) if $invoiceid;
134
$invoice = GetInvoiceDetails($invoiceid) if $invoiceid;
Lines 130-145 unless( $invoiceid and $invoice->{invoiceid} ) { Link Here
130
    exit;
142
    exit;
131
}
143
}
132
144
133
my $op = $input->param('op') // '';
134
135
if ($op eq 'cancelreceipt') {
136
    my $ordernumber = $input->param('ordernumber');
137
    my $parent_ordernumber = CancelReceipt($ordernumber);
138
    unless($parent_ordernumber) {
139
        $template->param(error_cancelling_receipt => 1);
140
    }
141
}
142
143
my $booksellerid = $invoice->{booksellerid};
145
my $booksellerid = $invoice->{booksellerid};
144
my $bookseller = GetBookSellerFromId($booksellerid);
146
my $bookseller = GetBookSellerFromId($booksellerid);
145
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
147
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
Lines 203-209 push @book_foot_loop, map { $_ } values %foot; Link Here
203
my @loop_orders = ();
205
my @loop_orders = ();
204
if(!defined $invoice->{closedate}) {
206
if(!defined $invoice->{closedate}) {
205
    my $pendingorders;
207
    my $pendingorders;
206
    if($input->param('op') eq "search"){
208
    if($op eq "search"){
207
        my $search   = $input->param('summaryfilter') || '';
209
        my $search   = $input->param('summaryfilter') || '';
208
        my $ean      = $input->param('eanfilter') || '';
210
        my $ean      = $input->param('eanfilter') || '';
209
        my $basketname = $input->param('basketfilter') || '';
211
        my $basketname = $input->param('basketfilter') || '';
210
- 

Return to bug 11108