Attachment #47490 for bug #13321

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

Lines 263-268 if ( $orderinfo->{quantity} ne '0' ) { Link Here

(-)a/acqui/addorder.pl (+8 lines)
263		263
264	$orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';	264	$orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
265		265
		266	$orderinfo = C4::Acquisition::populate_order_with_prices(
		267	{
		268	order => $orderinfo,
		269	booksellerid => $orderinfo->{booksellerid},
		270	ordering => 1,
		271	}
		272	);
		273
266	# if we already have $ordernumber, then it's an ordermodif	274	# if we already have $ordernumber, then it's an ordermodif
267	my $order = Koha::Acquisition::Order->new($orderinfo);	275	my $order = Koha::Acquisition::Order->new($orderinfo);
268	if ( $orderinfo->{ordernumber} ) {	276	if ( $orderinfo->{ordernumber} ) {





        # remove uncertainprice flag if we have found a price in the MARC record
        $orderinfo{uncertainprice} = 0 if $orderinfo{listprice};

        %orderinfo = %{
            C4::Acquisition::populate_order_with_prices(
                {
                    order        => \%orderinfo,
                    booksellerid => $booksellerid,
                    ordering     => 1,
                    receiving    => 1,
                }
            )
        };

        my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert;

        # 4th, add items if applicable

Lines 103-108 if ($quantityrec > $origquantityrec ) { Link Here

(-)a/acqui/finishreceive.pl (-1 / +8 lines)
103	}	103	}
104	}	104	}
105		105
		106	$order = C4::Acquisition::populate_order_with_prices(
		107	{
		108	order => $order,
		109	booksellerid => $booksellerid,
		110	receiving => 1
		111	}
		112	);
		113
106	# save the quantity received.	114	# save the quantity received.
107	if ( $quantityrec > 0 ) {	115	if ( $quantityrec > 0 ) {
108	( $datereceived, $new_ordernumber ) = ModReceiveOrder(	116	( $datereceived, $new_ordernumber ) = ModReceiveOrder(
109	-

Return to bug 13321

Lines 261-266 if ($op eq ""){ Link Here

(-)a/acqui/addorderiso2709.pl (+12 lines)
261		261
262	# remove uncertainprice flag if we have found a price in the MARC record	262	# remove uncertainprice flag if we have found a price in the MARC record
263	$orderinfo{uncertainprice} = 0 if $orderinfo{listprice};	263	$orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
		264
		265	%orderinfo = %{
		266	C4::Acquisition::populate_order_with_prices(
		267	{
		268	order => \%orderinfo,
		269	booksellerid => $booksellerid,
		270	ordering => 1,
		271	receiving => 1,
		272	}
		273	)
		274	};
		275
264	my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert;	276	my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert;
265		277
266	# 4th, add items if applicable	278	# 4th, add items if applicable