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

(-)a/acqui/finishreceive.pl (-2 / +25 lines)
Lines 72-81 if ( any { $order->{$_} ne $tplorder{$_} } qw(quantity quantityreceived notes rr Link Here
72
    ModOrder($order);
72
    ModOrder($order);
73
}
73
}
74
74
75
my $items_created;
76
75
#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
77
#need old recievedate if we update the order, parcel.pl only shows the right parcel this way FIXME
76
if ($quantityrec > $origquantityrec ) {
78
if ($quantityrec > $origquantityrec ) {
77
    # now, add items if applicable
79
    # now, add items if applicable
78
    if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
80
    if (C4::Context->preference('AcqCreateItem') eq 'receiving') {
81
        $items_created = 1;
82
79
        my @tags         = $input->param('tag');
83
        my @tags         = $input->param('tag');
80
        my @subfields    = $input->param('subfield');
84
        my @subfields    = $input->param('subfield');
81
        my @field_values = $input->param('field_value');
85
        my @field_values = $input->param('field_value');
Lines 106-111 if ($quantityrec > $origquantityrec ) { Link Here
106
                                    $itemhash{$item}->{'indicator'},'ITEM');
110
                                    $itemhash{$item}->{'indicator'},'ITEM');
107
            my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
111
            my $record=MARC::Record::new_from_xml($xml, 'UTF-8');
108
            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
112
            my ($biblionumber,$bibitemnum,$itemnumber) = AddItemFromMarc($record,$biblionumber);
113
            update_item( $itemnumber, $record );
109
        }
114
        }
110
    }
115
    }
111
    
116
    
Lines 114-117 if ($quantityrec > $origquantityrec ) { Link Here
114
    	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
119
    	$datereceived = ModReceiveOrder($biblionumber,$ordernumber, $quantityrec ,$user,$unitprice,$invoiceno,$freight,$replacement,undef,$datereceived);
115
	}
120
	}
116
}
121
}
117
    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
122
123
unless ( $items_created ) {
124
    update_item( $_ ) foreach GetItemnumbersFromOrder( $ordernumber );
125
}
126
127
print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str");
128
129
################################ End of script ################################
130
131
sub update_item {
132
    my ( $itemnumber, $record ) = @_;
133
134
    ModItem( {
135
        booksellerid         => $supplierid,
136
        dateaccessioned      => $datereceived,
137
        price                => $unitprice,
138
        replacementprice     => $replacement,
139
        replacementpricedate => $datereceived,
140
    }, $biblionumber, $itemnumber, $record );
141
}
118
- 

Return to bug 5473