Attachment #56423 for bug #13321

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

Lines 268-273 if ( $basket->{is_standing} \|\| $orderinfo->{quantity} ne '0' ) { Link Here

(-)a/acqui/addorder.pl (+8 lines)
268		268
269	$orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';	269	$orderinfo->{unitprice} = $orderinfo->{ecost} if not defined $orderinfo->{unitprice} or $orderinfo->{unitprice} eq '';
270		270
		271	$orderinfo = C4::Acquisition::populate_order_with_prices(
		272	{
		273	order => $orderinfo,
		274	booksellerid => $orderinfo->{booksellerid},
		275	ordering => 1,
		276	}
		277	);
		278
271	# if we already have $ordernumber, then it's an ordermodif	279	# if we already have $ordernumber, then it's an ordermodif
272	my $order = Koha::Acquisition::Order->new($orderinfo);	280	my $order = Koha::Acquisition::Order->new($orderinfo);
273	if ( $orderinfo->{ordernumber} ) {	281	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 233-238 if ($op eq ""){ Link Here

(-)a/acqui/addorderiso2709.pl (+12 lines)
233		233
234	# remove uncertainprice flag if we have found a price in the MARC record	234	# remove uncertainprice flag if we have found a price in the MARC record
235	$orderinfo{uncertainprice} = 0 if $orderinfo{listprice};	235	$orderinfo{uncertainprice} = 0 if $orderinfo{listprice};
		236
		237	%orderinfo = %{
		238	C4::Acquisition::populate_order_with_prices(
		239	{
		240	order => \%orderinfo,
		241	booksellerid => $booksellerid,
		242	ordering => 1,
		243	receiving => 1,
		244	}
		245	)
		246	};
		247
236	my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert;	248	my $order = Koha::Acquisition::Order->new( \%orderinfo )->insert;
237		249
238	# 4th, add items if applicable	250	# 4th, add items if applicable