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

(-)a/catalogue/ISBDdetail.pl (-4 lines)
Lines 154-168 $template->param ( Link Here
154
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
154
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
155
my @deletedorders_using_biblio;
155
my @deletedorders_using_biblio;
156
my @orders_using_biblio;
156
my @orders_using_biblio;
157
my @baskets_deletedorders;
158
157
159
foreach my $myorder (@allorders_using_biblio) {
158
foreach my $myorder (@allorders_using_biblio) {
160
    my $basket = $myorder->{'basketno'};
159
    my $basket = $myorder->{'basketno'};
161
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
160
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
162
        push @deletedorders_using_biblio, $myorder;
161
        push @deletedorders_using_biblio, $myorder;
163
        unless (grep{ $_ eq $basket } @baskets_deletedorders){
164
            push @baskets_deletedorders,$myorder->{'basketno'};
165
        }
166
    }
162
    }
167
    else {
163
    else {
168
        push @orders_using_biblio, $myorder;
164
        push @orders_using_biblio, $myorder;
(-)a/catalogue/MARCdetail.pl (-4 lines)
Lines 347-361 $template->param ( Link Here
347
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
347
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
348
my @deletedorders_using_biblio;
348
my @deletedorders_using_biblio;
349
my @orders_using_biblio;
349
my @orders_using_biblio;
350
my @baskets_deletedorders;
351
350
352
foreach my $myorder (@allorders_using_biblio) {
351
foreach my $myorder (@allorders_using_biblio) {
353
    my $basket = $myorder->{'basketno'};
352
    my $basket = $myorder->{'basketno'};
354
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
353
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
355
        push @deletedorders_using_biblio, $myorder;
354
        push @deletedorders_using_biblio, $myorder;
356
        unless (grep{ $_ eq $basket } @baskets_deletedorders){
357
            push @baskets_deletedorders,$myorder->{'basketno'};
358
        }
359
    }
355
    }
360
    else {
356
    else {
361
        push @orders_using_biblio, $myorder;
357
        push @orders_using_biblio, $myorder;
(-)a/catalogue/detail.pl (-6 lines)
Lines 560-574 if ($StaffDetailItemSelection) { Link Here
560
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
560
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
561
my @deletedorders_using_biblio;
561
my @deletedorders_using_biblio;
562
my @orders_using_biblio;
562
my @orders_using_biblio;
563
my @baskets_deletedorders;
564
563
565
foreach my $myorder (@allorders_using_biblio) {
564
foreach my $myorder (@allorders_using_biblio) {
566
    my $basket = $myorder->{'basketno'};
565
    my $basket = $myorder->{'basketno'};
567
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
566
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
568
        push @deletedorders_using_biblio, $myorder;
567
        push @deletedorders_using_biblio, $myorder;
569
        unless (grep{ $_ eq $basket } @baskets_deletedorders){
570
            push @baskets_deletedorders,$myorder->{'basketno'};
571
        }
572
    }
568
    }
573
    else {
569
    else {
574
        push @orders_using_biblio, $myorder;
570
        push @orders_using_biblio, $myorder;
Lines 583-588 $template->param (countorders => $count_orders_using_biblio); Link Here
583
my $count_deletedorders_using_biblio = scalar @deletedorders_using_biblio ;
579
my $count_deletedorders_using_biblio = scalar @deletedorders_using_biblio ;
584
$template->param (countdeletedorders => $count_deletedorders_using_biblio);
580
$template->param (countdeletedorders => $count_deletedorders_using_biblio);
585
581
586
$template->param (basketsdeletedorders => \@baskets_deletedorders);
587
588
output_html_with_http_headers $query, $cookie, $template->output;
582
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/catalogue/imageviewer.pl (-4 lines)
Lines 90-104 $template->{VARS}->{'biblio'} = $biblio; Link Here
90
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
90
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
91
my @deletedorders_using_biblio;
91
my @deletedorders_using_biblio;
92
my @orders_using_biblio;
92
my @orders_using_biblio;
93
my @baskets_deletedorders;
94
93
95
foreach my $myorder (@allorders_using_biblio) {
94
foreach my $myorder (@allorders_using_biblio) {
96
    my $basket = $myorder->{'basketno'};
95
    my $basket = $myorder->{'basketno'};
97
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
96
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
98
        push @deletedorders_using_biblio, $myorder;
97
        push @deletedorders_using_biblio, $myorder;
99
        unless (grep{ $_ eq $basket } @baskets_deletedorders){
100
            push @baskets_deletedorders,$myorder->{'basketno'};
101
        }
102
    }
98
    }
103
    else {
99
    else {
104
        push @orders_using_biblio, $myorder;
100
        push @orders_using_biblio, $myorder;
(-)a/catalogue/labeledMARCdetail.pl (-4 lines)
Lines 136-150 $template->param ( Link Here
136
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
136
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
137
my @deletedorders_using_biblio;
137
my @deletedorders_using_biblio;
138
my @orders_using_biblio;
138
my @orders_using_biblio;
139
my @baskets_deletedorders;
140
139
141
foreach my $myorder (@allorders_using_biblio) {
140
foreach my $myorder (@allorders_using_biblio) {
142
    my $basket = $myorder->{'basketno'};
141
    my $basket = $myorder->{'basketno'};
143
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
142
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
144
        push @deletedorders_using_biblio, $myorder;
143
        push @deletedorders_using_biblio, $myorder;
145
        unless (grep { $_ eq $basket } @baskets_deletedorders){
146
            push @baskets_deletedorders,$myorder->{'basketno'};
147
        }
148
    }
144
    }
149
    else {
145
    else {
150
        push @orders_using_biblio, $myorder;
146
        push @orders_using_biblio, $myorder;
(-)a/catalogue/moredetail.pl (-5 lines)
Lines 274-288 $template->{'VARS'}->{'searchid'} = $query->param('searchid'); Link Here
274
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
274
my @allorders_using_biblio = GetOrdersByBiblionumber ($biblionumber);
275
my @deletedorders_using_biblio;
275
my @deletedorders_using_biblio;
276
my @orders_using_biblio;
276
my @orders_using_biblio;
277
my @baskets_deletedorders;
278
277
279
foreach my $myorder (@allorders_using_biblio) {
278
foreach my $myorder (@allorders_using_biblio) {
280
    my $basket = $myorder->{'basketno'};
279
    my $basket = $myorder->{'basketno'};
281
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
280
    if ((defined $myorder->{'datecancellationprinted'}) and  ($myorder->{'datecancellationprinted'} ne '0000-00-00') ){
282
        push @deletedorders_using_biblio, $myorder;
281
        push @deletedorders_using_biblio, $myorder;
283
        unless (grep{ $_ eq $basket } @baskets_deletedorders){
284
            push @baskets_deletedorders,$myorder->{'basketno'};
285
        }
286
    }
282
    }
287
    else {
283
    else {
288
        push @orders_using_biblio, $myorder;
284
        push @orders_using_biblio, $myorder;
289
- 

Return to bug 23166