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

(-)a/acqui/basketgroup.pl (-10 / +6 lines)
Lines 305-330 if ( $op eq "add" ) { Link Here
305
        # Build the combobox to select the billing place
305
        # Build the combobox to select the billing place
306
        my @billingplaceloop;
306
        my @billingplaceloop;
307
        for (sort keys %$branches) {
307
        for (sort keys %$branches) {
308
            my $selected = 1 if $_ eq $billingplace;
308
            push @billingplaceloop, {
309
            my %row = (
310
                value      => $_,
309
                value      => $_,
311
                selected   => $selected,
310
                selected   => $_ eq $billingplace,
312
                branchname => $branches->{$_}->{branchname},
311
                branchname => $branches->{$_}->{branchname},
313
            );
312
            };
314
            push @billingplaceloop, \%row;
315
        }
313
        }
316
        $template->param( billingplaceloop => \@billingplaceloop );
314
        $template->param( billingplaceloop => \@billingplaceloop );
317
        
315
        
318
        # Build the combobox to select the delivery place
316
        # Build the combobox to select the delivery place
319
        my @deliveryplaceloop;
317
        my @deliveryplaceloop;
320
        for (sort keys %$branches) {
318
        for (sort keys %$branches) {
321
            my $selected = 1 if $_ eq $deliveryplace;
319
            push @deliveryplaceloop, {
322
            my %row = (
323
                value      => $_,
320
                value      => $_,
324
                selected   => $selected,
321
                selected   => $_ eq $deliveryplace,
325
                branchname => $branches->{$_}->{branchname},
322
                branchname => $branches->{$_}->{branchname},
326
            );
323
            };
327
            push @deliveryplaceloop, \%row;
328
        }
324
        }
329
        $template->param( deliveryplaceloop => \@deliveryplaceloop );
325
        $template->param( deliveryplaceloop => \@deliveryplaceloop );
330
326
(-)a/acqui/histsearch.pl (-5 / +10 lines)
Lines 75-85 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
75
    }
75
    }
76
);
76
);
77
77
78
my $from_iso = C4::Dates->new($input->param('from'))->output('iso') if $input->param('from');
78
my ( $from_iso, $to_iso, $d );
79
my   $to_iso =   C4::Dates->new($input->param('to'))->output('iso') if $input->param('iso');
79
if ( $d = $input->param('from') ) {
80
    $from_iso = C4::Dates->new($d)->output('iso');
81
}
82
if ( $d = $input->param('iso') ) {
83
    $to_iso = C4::Dates->new($d)->output('iso');
84
}
85
80
my ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) =
86
my ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) =
81
  &GetHistory( $title, $author, $name, $from_iso, $to_iso );
87
  GetHistory( $title, $author, $name, $from_iso, $to_iso );
82
  
88
83
$template->param(
89
$template->param(
84
    suggestions_loop        => $order_loop,
90
    suggestions_loop        => $order_loop,
85
    total_qty               => $total_qty,
91
    total_qty               => $total_qty,
86
- 

Return to bug 5453