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

(-)a/Koha/MarcOrder.pm (-3 / +3 lines)
Lines 849-855 sub parse_input_into_order_line_fields { Link Here
849
    my $fields       = $args->{fields};
849
    my $fields       = $args->{fields};
850
    my $marcrecord   = $args->{marcrecord};
850
    my $marcrecord   = $args->{marcrecord};
851
851
852
    my $quantity          = $fields->{quantity} || 1;
852
    my $quantity          = $fields->{quantity} || $fields->{c_quantity} || 1;
853
    my @homebranches      = $fields->{homebranches}      ? @{ $fields->{homebranches} }      : ();
853
    my @homebranches      = $fields->{homebranches}      ? @{ $fields->{homebranches} }      : ();
854
    my @holdingbranches   = $fields->{holdingbranches}   ? @{ $fields->{holdingbranches} }   : ();
854
    my @holdingbranches   = $fields->{holdingbranches}   ? @{ $fields->{holdingbranches} }   : ();
855
    my @itypes            = $fields->{itypes}            ? @{ $fields->{itypes} }            : ();
855
    my @itypes            = $fields->{itypes}            ? @{ $fields->{itypes} }            : ();
Lines 996-1004 sub create_items_and_generate_order_hash { Link Here
996
        for ( my $i = 0 ; $i < $loop_limit ; $i++ ) {
996
        for ( my $i = 0 ; $i < $loop_limit ; $i++ ) {
997
            $budget_ids[$i] = $budget_id if !$budget_ids[$i];    # Use default budget if no budget provided
997
            $budget_ids[$i] = $budget_id if !$budget_ids[$i];    # Use default budget if no budget provided
998
            $budget_hash->{ $budget_ids[$i] }->{quantity} += 1;
998
            $budget_hash->{ $budget_ids[$i] }->{quantity} += 1;
999
            $budget_hash->{ $budget_ids[$i] }->{price} = @{ $fields->{price} }[$i];
999
            $budget_hash->{ $budget_ids[$i] }->{price} = @{ $fields->{price} }[$i] || $fields->{c_price};
1000
            $budget_hash->{ $budget_ids[$i] }->{replacementprice} =
1000
            $budget_hash->{ $budget_ids[$i] }->{replacementprice} =
1001
                @{ $fields->{replacementprice} }[$i];
1001
                @{ $fields->{replacementprice} }[$i] || $fields->{c_replacement_price};
1002
            $budget_hash->{ $budget_ids[$i] }->{itemnumbers} //= [];
1002
            $budget_hash->{ $budget_ids[$i] }->{itemnumbers} //= [];
1003
            push @{ $budget_hash->{ $budget_ids[$i] }->{itemnumbers} },
1003
            push @{ $budget_hash->{ $budget_ids[$i] }->{itemnumbers} },
1004
                $itemnumbers[$i];
1004
                $itemnumbers[$i];
(-)a/misc/cronjobs/marc_ordering_process.pl (-2 / +1 lines)
Lines 132-138 foreach my $acct (@accounts) { Link Here
132
                } else {
132
                } else {
133
                    mkdir "$working_dir/archive" unless -d "$working_dir/archive";
133
                    mkdir "$working_dir/archive" unless -d "$working_dir/archive";
134
                    say sprintf "Moving file to archive: %s", $filename if $verbose;
134
                    say sprintf "Moving file to archive: %s", $filename if $verbose;
135
                    move( $full_path, "$working_dir/archive/$filename" );
135
                    # move( $full_path, "$working_dir/archive/$filename" );
136
                }
136
                }
137
            } else {
137
            } else {
138
                say sprintf "Error processing file: %s", $filename        if $verbose;
138
                say sprintf "Error processing file: %s", $filename        if $verbose;
139
- 

Return to bug 34355