Attachment #77698 for bug #21205

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




        &DelInvoice
        &MergeInvoices

        &GetItemnumbersFromOrder

        &AddClaim
        &GetBiblioCountByBasketno



}

# Returns the itemnumber(s) associated with the ordernumber given in parameter
sub GetItemnumbersFromOrder {
    my ($ordernumber) = @_;
    my $dbh          = C4::Context->dbh;
    my $query        = "SELECT itemnumber FROM aqorders_items WHERE ordernumber=?";
    my $sth = $dbh->prepare($query);
    $sth->execute($ordernumber);
    my @tab;

    while (my $order = $sth->fetchrow_hashref) {
    push @tab, $order->{'itemnumber'};
    }

    return @tab;

}






=head1 NAME

C4::Acquisition - Koha functions for dealing with orders and acquisitions


    my $parent_ordernumber = $order->{'parent_ordernumber'};

    my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
    my $order_obj = Koha::Acquisition::Orders->find( $ordernumber ); # FIXME rewrite all this subroutine using this object
    my @itemnumbers = $order_obj->items->get_column('itemnumber');

    if($parent_ordernumber == $ordernumber || not $parent_ordernumber) {
        # The order line has no parent, just mark it as not received

        my @affects = split q{\|}, C4::Context->preference("AcqItemSetSubfieldsWhenReceiptIsCancelled");
        if ( @affects ) {
            for my $in ( @itemnumbers ) {
                my $item = Koha::Items->find( $in ); # FIXME We do not need that, we already have Koha::Items from $order_obj->items
                my $biblio = $item->biblio;
                my ( $itemfield ) = GetMarcFromKohaField( 'items.itemnumber', $biblio->frameworkcode );
                my $item_marc = C4::Items::GetMarcItem( $biblio->biblionumber, $in );

    my ( $order, $parent_ordernumber ) = @_;
    $parent_ordernumber ||= $order->ordernumber;

    my $items = $order->items;
    if ( $order->basket->effective_create_items eq 'receiving' ) {
        # Remove items that were created at receipt
        my $query = qq{

        };
        my $dbh = C4::Context->dbh;
        my $sth = $dbh->prepare($query);
        while ( my $item = $items->next ) {
            $sth->execute($item->itemnumber, $item->itemnumber);
        }
    } else {
        # Update items
        while ( my $item = $items->next ) {
            ModItemOrder($item->itemnumber, $parent_ordernumber);
        }
    }
}

    }
    $sth->finish;

    my $order = Koha::Acquisition::Orders->find($ordernumber);
    my $items = $order->items;
    while ( my $item = $items->next ) { # Should be moved to Koha::Acquisition::Order->delete
        my $delcheck = C4::Items::DelItemCheck( $bibnum, $item->itemnumber );

        if($delcheck != 1) {
            $error->{'delitem'} = 1;




use C4::Suggestions;
use Koha::Biblios;
use Koha::Acquisition::Booksellers;
use Koha::Acquisition::Orders;
use Koha::Libraries;
use C4::Letters qw/SendAlerts/;
use Date::Calc qw/Add_Delta_Days/;

        my $cnt_subscriptions = $biblio->subscriptions->count;
        my $itemcount   = $biblio->items->count;
        my $holds_count = $biblio->holds->count;
        my $order = Koha::Acquisition::Orders->find($ordernumber); # FIXME We should certainly do that at the beginning of this sub
        my $items = $order->items;
        my $itemholds  = $biblio->holds->search({ itemnumber => { -in => [ $items->get_column('itemnumber') ] } })->count;

        # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
        $line{can_del_bib}          = 1 if $countbiblio <= 1 && $itemcount == $items->count && !($cnt_subscriptions) && !($holds_count);
        $line{items}                = $itemcount - $items->count;
        $line{left_item}            = 1 if $line{items} >= 1;
        $line{left_biblio}          = 1 if $countbiblio > 1;
        $line{biblios}              = $countbiblio - 1;




    }
}

my $new_order_object = Koha::Acquisition::Orders->find( $new_ordernumber ); # FIXME we should not need to refetch it
my $items = $new_order_object->items;
while ( my $item = $items->next )  {
    ModItem(
        {
            booksellerid         => $booksellerid,
            dateaccessioned      => $datereceived,
            datelastseen         => $datereceived,
            price                => $unitprice,
            replacementprice     => $order->{rrp},
            replacementpricedate => $datereceived,
        },
        $biblionumber,
        $item->itemnumber,
    );
}

print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");





# prepare the form for receiving
my $order = $results->[0];
my $order_object = Koha::Acquisition::Orders->find( $ordernumber );
my $basket = $order_object->basket;

# Check if ACQ framework exists
my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );

    );
} elsif ($AcqCreateItem eq 'ordering') {
    my $fw = ($acq_fw) ? 'ACQ' : '';
    my @itemnumbers = $order_object->items->get_column('itemnumbers');
    my @items;
    foreach (@itemnumbers) {
        my $item = GetItem($_); # FIXME We do not need this call, we already have the Koha::Items
        my $descriptions;
        $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} });
        $item->{notforloan} = $descriptions->{lib} // '';





use Koha::Acquisition::Baskets;
use Koha::Acquisition::Bookseller;
use Koha::Acquisition::Orders;
use Koha::Biblios;
use Koha::DateUtils;
use Koha::Biblios;

for my $order ( @orders ) {
    $order->{'unitprice'} += 0;

    my $order_object = Koha::Acquisition::Orders->find($order->{ordernumber});
    if ( $bookseller->invoiceincgst ) {
        $order->{ecost}     = $order->{ecost_tax_included};
        $order->{unitprice} = $order->{unitprice_tax_included};


    my %line = %{ $order };
    $line{invoice} = $invoice->{invoicenumber};
    my @itemnumbers = $order_object->items->get_column('itemnumbers');
    my $biblio = Koha::Biblios->find( $line{biblionumber} );
    $line{total_holds} = $biblio ? $biblio->holds->count : 0;
    $line{item_holds} = $biblio ? $biblio->current_holds->search(

        my $biblio = Koha::Biblios->find( $biblionumber );
        my $countbiblio = CountBiblioInOrders($biblionumber);
        my $ordernumber = $line{'ordernumber'};
        my $order_object = Koha::Acquisition::Orders->find($ordernumber);
        my $cnt_subscriptions = $biblio ? $biblio->subscriptions->count: 0;
        my $itemcount   = $biblio ? $biblio->items->count : 0;
        my $holds_count = $biblio ? $biblio->holds->count : 0;
        my @itemnumbers = $order_object->items->get_column('itemnumbers');
        my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@itemnumbers } })->count : 0;

        my $suggestion   = GetSuggestionInfoFromBiblionumber($line{biblionumber});
        $line{suggestionid}         = $suggestion->{suggestionid};

        $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};

        # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
        $line{can_del_bib}          = 1 if $countbiblio <= 1 && $itemcount == scalar @itemnumbers && !($cnt_subscriptions) && !($holds_count);
        $line{items}                = ($itemcount) - (scalar @itemnumbers);
        $line{left_item}            = 1 if $line{items} >= 1;
        $line{left_biblio}          = 1 if $countbiblio > 1;
        $line{biblios}              = $countbiblio - 1;




    });
    my $total_quantity = 0;
    for my $order ( @$orders ) {
        my $order = Koha::Acquisition::Orders->find( $order->{ordernumber} );
        my $basket = $order->basket;
        if ( $basket->effective_create_items eq 'ordering' ) {
            @itemnumbers_on_order = $order->items->get_column('itemnumber');
                push @itemnumbers_on_order, $itemnumber;
            }
        }
        $total_quantity += $order->{quantity};
    }





CancelReceipt($ordernumber);

is($order->items->count, 0, "Create items on receiving: 0 item exist after cancelling a receipt");

my $itemnumber1 = AddItem( { itype => $itemtype }, $biblionumber );
my $itemnumber2 = AddItem( { itype => $itemtype }, $biblionumber );

$order->add_item( $itemnumber2 );

is(
    $order->items->count,
    2,
    "Create items on ordering: 2 items should be linked to the order before receiving"
);

    }
);

my $new_order = Koha::Acquisition::Orders->find( $new_ordernumber );

is( $new_order->ordernumber, $new_ordernumber,
    "ModReceiveOrder should return a correct ordernumber" );
isnt( $new_ordernumber, $ordernumber,
    "ModReceiveOrder should return a different ordernumber" );
is( $new_order->parent_ordernumber, $ordernumber,
    "The new order created by ModReceiveOrder should be linked to the parent order"
);

is(
    $order->items->count,
    1,
    "Create items on ordering: 1 item should still be linked to the original order after receiving"
);
is(
    $new_order->items->count,
    1,
    "Create items on ordering: 1 item should be linked to new order after receiving"
);

CancelReceipt($new_ordernumber);

is(
    $new_order->items->count,
    0,
    "Create items on ordering: no item should be linked to the cancelled order"
);
is(
    $order->items->count,
    2,
    "Create items on ordering: items are not deleted after cancelling a receipt"
);




# Begin tests
is(scalar GetOrders($basketno1), 1, "1 order in basket1");
($order) = GetOrders($basketno1);
$order = Koha::Acquisition::Orders->find($order->{ordernumber});
is($order->items->count, 1, "1 item in basket1's order");
is(scalar GetOrders($basketno2), 0, "0 order in basket2");

# Transfering order to basket2

is(scalar GetOrders($basketno2), 1, "1 order in basket2");

# Determine if the transfer marked things cancelled properly.
is($order->orderstatus,'new','Before the transfer, the order status should be new');
$order = Koha::Acquisition::Orders->find($order->ordernumber);
is($order->orderstatus,'cancelled','After the transfer, the order status should be set to cancelled');

($order) = GetOrders($basketno2);
$order = Koha::Acquisition::Orders->find($order->{ordernumber});
is($order->items->count, 1, "1 item in basket2's order");

# Bug 11552
my $orders = SearchOrders({ ordernumber => $newordernumber });
- 

Return to bug 21205

Lines 83-90 BEGIN { Link Here

(-)a/C4/Acquisition.pm (-34 / +11 lines)
83	&DelInvoice	83	&DelInvoice
84	&MergeInvoices	84	&MergeInvoices
85		85
86	&GetItemnumbersFromOrder
87
88	&AddClaim	86	&AddClaim
89	&GetBiblioCountByBasketno	87	&GetBiblioCountByBasketno
90		88
Lines 120-147 sub GetOrderFromItemnumber { Link Here
120		118
121	}	119	}
122		120
123	# Returns the itemnumber(s) associated with the ordernumber given in parameter
124	sub GetItemnumbersFromOrder {
125	my ($ordernumber) = @_;
126	my $dbh = C4::Context->dbh;
127	my $query = "SELECT itemnumber FROM aqorders_items WHERE ordernumber=?";
128	my $sth = $dbh->prepare($query);
129	$sth->execute($ordernumber);
130	my @tab;
131
132	while (my $order = $sth->fetchrow_hashref) {
133	push @tab, $order->{'itemnumber'};
134	}
135
136	return @tab;
137
138	}
139
140
141
142
143
144
145	=head1 NAME	121	=head1 NAME
146		122
147	C4::Acquisition - Koha functions for dealing with orders and acquisitions	123	C4::Acquisition - Koha functions for dealing with orders and acquisitions
Lines 1591-1598 sub CancelReceipt { Link Here
1591		1567
1592	my $parent_ordernumber = $order->{'parent_ordernumber'};	1568	my $parent_ordernumber = $order->{'parent_ordernumber'};
1593		1569
1594	my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
1595	my $order_obj = Koha::Acquisition::Orders->find( $ordernumber ); # FIXME rewrite all this subroutine using this object	1570	my $order_obj = Koha::Acquisition::Orders->find( $ordernumber ); # FIXME rewrite all this subroutine using this object
		1571	my @itemnumbers = $order_obj->items->get_column('itemnumber');
1596		1572
1597	if($parent_ordernumber == $ordernumber \|\| not $parent_ordernumber) {	1573	if($parent_ordernumber == $ordernumber \|\| not $parent_ordernumber) {
1598	# The order line has no parent, just mark it as not received	1574	# The order line has no parent, just mark it as not received
Lines 1668-1674 sub CancelReceipt { Link Here
1668	my @affects = split q{\\|}, C4::Context->preference("AcqItemSetSubfieldsWhenReceiptIsCancelled");	1644	my @affects = split q{\\|}, C4::Context->preference("AcqItemSetSubfieldsWhenReceiptIsCancelled");
1669	if ( @affects ) {	1645	if ( @affects ) {
1670	for my $in ( @itemnumbers ) {	1646	for my $in ( @itemnumbers ) {
1671	my $item = Koha::Items->find( $in );	1647	my $item = Koha::Items->find( $in ); # FIXME We do not need that, we already have Koha::Items from $order_obj->items
1672	my $biblio = $item->biblio;	1648	my $biblio = $item->biblio;
1673	my ( $itemfield ) = GetMarcFromKohaField( 'items.itemnumber', $biblio->frameworkcode );	1649	my ( $itemfield ) = GetMarcFromKohaField( 'items.itemnumber', $biblio->frameworkcode );
1674	my $item_marc = C4::Items::GetMarcItem( $biblio->biblionumber, $in );	1650	my $item_marc = C4::Items::GetMarcItem( $biblio->biblionumber, $in );
Lines 1690-1696 sub _cancel_items_receipt { Link Here
1690	my ( $order, $parent_ordernumber ) = @_;	1666	my ( $order, $parent_ordernumber ) = @_;
1691	$parent_ordernumber \|\|= $order->ordernumber;	1667	$parent_ordernumber \|\|= $order->ordernumber;
1692		1668
1693	my @itemnumbers = GetItemnumbersFromOrder($order->ordernumber); # FIXME Must be $order->items	1669	my $items = $order->items;
1694	if ( $order->basket->effective_create_items eq 'receiving' ) {	1670	if ( $order->basket->effective_create_items eq 'receiving' ) {
1695	# Remove items that were created at receipt	1671	# Remove items that were created at receipt
1696	my $query = qq{	1672	my $query = qq{
Lines 1700-1712 sub _cancel_items_receipt { Link Here
1700	};	1676	};
1701	my $dbh = C4::Context->dbh;	1677	my $dbh = C4::Context->dbh;
1702	my $sth = $dbh->prepare($query);	1678	my $sth = $dbh->prepare($query);
1703	foreach my $itemnumber (@itemnumbers) {	1679	while ( my $item = $items->next ) {
1704	$sth->execute($itemnumber, $itemnumber);	1680	$sth->execute($item->itemnumber, $item->itemnumber);
1705	}	1681	}
1706	} else {	1682	} else {
1707	# Update items	1683	# Update items
1708	foreach my $itemnumber (@itemnumbers) {	1684	while ( my $item = $items->next ) {
1709	ModItemOrder($itemnumber, $parent_ordernumber);	1685	ModItemOrder($item->itemnumber, $parent_ordernumber);
1710	}	1686	}
1711	}	1687	}
1712	}	1688	}
Lines 1910-1918 sub DelOrder { Link Here
1910	}	1886	}
1911	$sth->finish;	1887	$sth->finish;
1912		1888
1913	my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );	1889	my $order = Koha::Acquisition::Orders->find($ordernumber);
1914	foreach my $itemnumber (@itemnumbers){	1890	my $items = $order->items;
1915	my $delcheck = C4::Items::DelItemCheck( $bibnum, $itemnumber );	1891	while ( my $item = $items->next ) { # Should be moved to Koha::Acquisition::Order->delete
		1892	my $delcheck = C4::Items::DelItemCheck( $bibnum, $item->itemnumber );
1916		1893
1917	if($delcheck != 1) {	1894	if($delcheck != 1) {
1918	$error->{'delitem'} = 1;	1895	$error->{'delitem'} = 1;

Lines 34-39 use C4::Items; Link Here

(-)a/acqui/basket.pl (-4 / +6 lines)
34	use C4::Suggestions;	34	use C4::Suggestions;
35	use Koha::Biblios;	35	use Koha::Biblios;
36	use Koha::Acquisition::Booksellers;	36	use Koha::Acquisition::Booksellers;
		37	use Koha::Acquisition::Orders;
37	use Koha::Libraries;	38	use Koha::Libraries;
38	use C4::Letters qw/SendAlerts/;	39	use C4::Letters qw/SendAlerts/;
39	use Date::Calc qw/Add_Delta_Days/;	40	use Date::Calc qw/Add_Delta_Days/;
Lines 474-485 sub get_order_infos { Link Here
474	my $cnt_subscriptions = $biblio->subscriptions->count;	475	my $cnt_subscriptions = $biblio->subscriptions->count;
475	my $itemcount = $biblio->items->count;	476	my $itemcount = $biblio->items->count;
476	my $holds_count = $biblio->holds->count;	477	my $holds_count = $biblio->holds->count;
477	my @items = GetItemnumbersFromOrder( $ordernumber );	478	my $order = Koha::Acquisition::Orders->find($ordernumber); # FIXME We should certainly do that at the beginning of this sub
478	my $itemholds = $biblio->holds->search({ itemnumber => { -in => \@items } })->count;	479	my $items = $order->items;
		480	my $itemholds = $biblio->holds->search({ itemnumber => { -in => [ $items->get_column('itemnumber') ] } })->count;
479		481
480	# if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680	482	# if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
481	$line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !($cnt_subscriptions) && !($holds_count);	483	$line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == $items->count && !($cnt_subscriptions) && !($holds_count);
482	$line{items} = ($itemcount) - (scalar @items);	484	$line{items} = $itemcount - $items->count;
483	$line{left_item} = 1 if $line{items} >= 1;	485	$line{left_item} = 1 if $line{items} >= 1;
484	$line{left_biblio} = 1 if $countbiblio > 1;	486	$line{left_biblio} = 1 if $countbiblio > 1;
485	$line{biblios} = $countbiblio - 1;	487	$line{biblios} = $countbiblio - 1;

Lines 150-166 if ($quantityrec > $origquantityrec ) { Link Here

(-)a/acqui/finishreceive.pl (-12 / +16 lines)
150	}	150	}
151	}	151	}
152		152
153	ModItem(	153	my $new_order_object = Koha::Acquisition::Orders->find( $new_ordernumber ); # FIXME we should not need to refetch it
154	{	154	my $items = $new_order_object->items;
155	booksellerid => $booksellerid,	155	while ( my $item = $items->next ) {
156	dateaccessioned => $datereceived,	156	ModItem(
157	datelastseen => $datereceived,	157	{
158	price => $unitprice,	158	booksellerid => $booksellerid,
159	replacementprice => $order->{rrp},	159	dateaccessioned => $datereceived,
160	replacementpricedate => $datereceived,	160	datelastseen => $datereceived,
161	},	161	price => $unitprice,
162	$biblionumber,	162	replacementprice => $order->{rrp},
163	$_	163	replacementpricedate => $datereceived,
164	) foreach GetItemnumbersFromOrder($new_ordernumber);	164	},
		165	$biblionumber,
		166	$item->itemnumber,
		167	);
		168	}
165		169
166	print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");	170	print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid&sticky_filters=1");

Lines 111-117 unless ( $results and @$results) { Link Here

(-)a/acqui/orderreceive.pl (-3 / +4 lines)
111		111
112	# prepare the form for receiving	112	# prepare the form for receiving
113	my $order = $results->[0];	113	my $order = $results->[0];
114	my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;	114	my $order_object = Koha::Acquisition::Orders->find( $ordernumber );
		115	my $basket = $order_object->basket;
115		116
116	# Check if ACQ framework exists	117	# Check if ACQ framework exists
117	my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );	118	my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );
Lines 127-136 if ($AcqCreateItem eq 'receiving') { Link Here
127	);	128	);
128	} elsif ($AcqCreateItem eq 'ordering') {	129	} elsif ($AcqCreateItem eq 'ordering') {
129	my $fw = ($acq_fw) ? 'ACQ' : '';	130	my $fw = ($acq_fw) ? 'ACQ' : '';
130	my @itemnumbers = GetItemnumbersFromOrder($order->{ordernumber});	131	my @itemnumbers = $order_object->items->get_column('itemnumbers');
131	my @items;	132	my @items;
132	foreach (@itemnumbers) {	133	foreach (@itemnumbers) {
133	my $item = GetItem($_);	134	my $item = GetItem($_); # FIXME We do not need this call, we already have the Koha::Items
134	my $descriptions;	135	my $descriptions;
135	$descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} });	136	$descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $fw, kohafield => 'items.notforloan', authorised_value => $item->{notforloan} });
136	$item->{notforloan} = $descriptions->{lib} // '';	137	$item->{notforloan} = $descriptions->{lib} // '';

Lines 67-72 use C4::Suggestions; Link Here

(-)a/acqui/parcel.pl (-5 / +8 lines)
67		67
68	use Koha::Acquisition::Baskets;	68	use Koha::Acquisition::Baskets;
69	use Koha::Acquisition::Bookseller;	69	use Koha::Acquisition::Bookseller;
		70	use Koha::Acquisition::Orders;
70	use Koha::Biblios;	71	use Koha::Biblios;
71	use Koha::DateUtils;	72	use Koha::DateUtils;
72	use Koha::Biblios;	73	use Koha::Biblios;
Lines 125-130 my $subtotal_for_funds; Link Here
125	for my $order ( @orders ) {	126	for my $order ( @orders ) {
126	$order->{'unitprice'} += 0;	127	$order->{'unitprice'} += 0;
127		128
		129	my $order_object = Koha::Acquisition::Orders->find($order->{ordernumber});
128	if ( $bookseller->invoiceincgst ) {	130	if ( $bookseller->invoiceincgst ) {
129	$order->{ecost} = $order->{ecost_tax_included};	131	$order->{ecost} = $order->{ecost_tax_included};
130	$order->{unitprice} = $order->{unitprice_tax_included};	132	$order->{unitprice} = $order->{unitprice_tax_included};
Lines 138-144 for my $order ( @orders ) { Link Here
138		140
139	my %line = %{ $order };	141	my %line = %{ $order };
140	$line{invoice} = $invoice->{invoicenumber};	142	$line{invoice} = $invoice->{invoicenumber};
141	my @itemnumbers = GetItemnumbersFromOrder( $order->{ordernumber} );	143	my @itemnumbers = $order_object->items->get_column('itemnumbers');
142	my $biblio = Koha::Biblios->find( $line{biblionumber} );	144	my $biblio = Koha::Biblios->find( $line{biblionumber} );
143	$line{total_holds} = $biblio ? $biblio->holds->count : 0;	145	$line{total_holds} = $biblio ? $biblio->holds->count : 0;
144	$line{item_holds} = $biblio ? $biblio->current_holds->search(	146	$line{item_holds} = $biblio ? $biblio->current_holds->search(
Lines 241-251 unless( defined $invoice->{closedate} ) { Link Here
241	my $biblio = Koha::Biblios->find( $biblionumber );	243	my $biblio = Koha::Biblios->find( $biblionumber );
242	my $countbiblio = CountBiblioInOrders($biblionumber);	244	my $countbiblio = CountBiblioInOrders($biblionumber);
243	my $ordernumber = $line{'ordernumber'};	245	my $ordernumber = $line{'ordernumber'};
		246	my $order_object = Koha::Acquisition::Orders->find($ordernumber);
244	my $cnt_subscriptions = $biblio ? $biblio->subscriptions->count: 0;	247	my $cnt_subscriptions = $biblio ? $biblio->subscriptions->count: 0;
245	my $itemcount = $biblio ? $biblio->items->count : 0;	248	my $itemcount = $biblio ? $biblio->items->count : 0;
246	my $holds_count = $biblio ? $biblio->holds->count : 0;	249	my $holds_count = $biblio ? $biblio->holds->count : 0;
247	my @items = GetItemnumbersFromOrder( $ordernumber );	250	my @itemnumbers = $order_object->items->get_column('itemnumbers');
248	my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@items } })->count : 0;	251	my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@itemnumbers } })->count : 0;
249		252
250	my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});	253	my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
251	$line{suggestionid} = $suggestion->{suggestionid};	254	$line{suggestionid} = $suggestion->{suggestionid};
Lines 253-260 unless( defined $invoice->{closedate} ) { Link Here
253	$line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};	256	$line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
254		257
255	# if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680	258	# if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
256	$line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !($cnt_subscriptions) && !($holds_count);	259	$line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @itemnumbers && !($cnt_subscriptions) && !($holds_count);
257	$line{items} = ($itemcount) - (scalar @items);	260	$line{items} = ($itemcount) - (scalar @itemnumbers);
258	$line{left_item} = 1 if $line{items} >= 1;	261	$line{left_item} = 1 if $line{items} >= 1;
259	$line{left_biblio} = 1 if $countbiblio > 1;	262	$line{left_biblio} = 1 if $countbiblio > 1;
260	$line{biblios} = $countbiblio - 1;	263	$line{biblios} = $countbiblio - 1;

Lines 641-651 if ( C4::Context->preference('OPACAcquisitionDetails' ) ) { Link Here

(-)a/opac/opac-detail.pl (-4 / +3 lines)
641	});	641	});
642	my $total_quantity = 0;	642	my $total_quantity = 0;
643	for my $order ( @$orders ) {	643	for my $order ( @$orders ) {
644	my $basket = Koha::Acquisition::Orders->find( $order->{ordernumber} )->basket;	644	my $order = Koha::Acquisition::Orders->find( $order->{ordernumber} );
		645	my $basket = $order->basket;
645	if ( $basket->effective_create_items eq 'ordering' ) {	646	if ( $basket->effective_create_items eq 'ordering' ) {
646	for my $itemnumber ( C4::Acquisition::GetItemnumbersFromOrder( $order->{ordernumber} ) ) {	647	@itemnumbers_on_order = $order->items->get_column('itemnumber');
647	push @itemnumbers_on_order, $itemnumber;
648	}
649	}	648	}
650	$total_quantity += $order->{quantity};	649	$total_quantity += $order->{quantity};
651	}	650	}

Lines 89-95 $order->add_item( $itemnumber ); Link Here

(-)a/t/db_dependent/Acquisition/CancelReceipt.t (-9 / +9 lines)
89		89
90	CancelReceipt($ordernumber);	90	CancelReceipt($ordernumber);
91		91
92	is(scalar GetItemnumbersFromOrder($ordernumber), 0, "Create items on receiving: 0 item exist after cancelling a receipt");	92	is($order->items->count, 0, "Create items on receiving: 0 item exist after cancelling a receipt");
93		93
94	my $itemnumber1 = AddItem( { itype => $itemtype }, $biblionumber );	94	my $itemnumber1 = AddItem( { itype => $itemtype }, $biblionumber );
95	my $itemnumber2 = AddItem( { itype => $itemtype }, $biblionumber );	95	my $itemnumber2 = AddItem( { itype => $itemtype }, $biblionumber );
Lines 114-120 $order->add_item( $itemnumber1 ); Link Here
114	$order->add_item( $itemnumber2 );	114	$order->add_item( $itemnumber2 );
115		115
116	is(	116	is(
117	scalar( GetItemnumbersFromOrder( $order->ordernumber ) ),	117	$order->items->count,
118	2,	118	2,
119	"Create items on ordering: 2 items should be linked to the order before receiving"	119	"Create items on ordering: 2 items should be linked to the order before receiving"
120	);	120	);
Lines 128-150 my ( undef, $new_ordernumber ) = ModReceiveOrder( Link Here
128	}	128	}
129	);	129	);
130		130
131	my $new_order = GetOrder( $new_ordernumber );	131	my $new_order = Koha::Acquisition::Orders->find( $new_ordernumber );
132		132
133	is( $new_order->{ordernumber}, $new_ordernumber,	133	is( $new_order->ordernumber, $new_ordernumber,
134	"ModReceiveOrder should return a correct ordernumber" );	134	"ModReceiveOrder should return a correct ordernumber" );
135	isnt( $new_ordernumber, $ordernumber,	135	isnt( $new_ordernumber, $ordernumber,
136	"ModReceiveOrder should return a different ordernumber" );	136	"ModReceiveOrder should return a different ordernumber" );
137	is( $new_order->{parent_ordernumber}, $ordernumber,	137	is( $new_order->parent_ordernumber, $ordernumber,
138	"The new order created by ModReceiveOrder should be linked to the parent order"	138	"The new order created by ModReceiveOrder should be linked to the parent order"
139	);	139	);
140		140
141	is(	141	is(
142	scalar( GetItemnumbersFromOrder( $order->ordernumber ) ),	142	$order->items->count,
143	1,	143	1,
144	"Create items on ordering: 1 item should still be linked to the original order after receiving"	144	"Create items on ordering: 1 item should still be linked to the original order after receiving"
145	);	145	);
146	is(	146	is(
147	scalar( GetItemnumbersFromOrder($new_ordernumber) ),	147	$new_order->items->count,
148	1,	148	1,
149	"Create items on ordering: 1 item should be linked to new order after receiving"	149	"Create items on ordering: 1 item should be linked to new order after receiving"
150	);	150	);
Lines 152-163 is( Link Here
152	CancelReceipt($new_ordernumber);	152	CancelReceipt($new_ordernumber);
153		153
154	is(	154	is(
155	scalar( GetItemnumbersFromOrder($new_ordernumber) ),	155	$new_order->items->count,
156	0,	156	0,
157	"Create items on ordering: no item should be linked to the cancelled order"	157	"Create items on ordering: no item should be linked to the cancelled order"
158	);	158	);
159	is(	159	is(
160	scalar( GetItemnumbersFromOrder( $order->ordernumber ) ),	160	$order->items->count,
161	2,	161	2,
162	"Create items on ordering: items are not deleted after cancelling a receipt"	162	"Create items on ordering: items are not deleted after cancelling a receipt"
163	);	163	);

Lines 72-78 $order->add_item( $itemnumber ); Link Here

(-)a/t/db_dependent/Acquisition/TransferOrder.t (-6 / +7 lines)
72	# Begin tests	72	# Begin tests
73	is(scalar GetOrders($basketno1), 1, "1 order in basket1");	73	is(scalar GetOrders($basketno1), 1, "1 order in basket1");
74	($order) = GetOrders($basketno1);	74	($order) = GetOrders($basketno1);
75	is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 1, "1 item in basket1's order");	75	$order = Koha::Acquisition::Orders->find($order->{ordernumber});
		76	is($order->items->count, 1, "1 item in basket1's order");
76	is(scalar GetOrders($basketno2), 0, "0 order in basket2");	77	is(scalar GetOrders($basketno2), 0, "0 order in basket2");
77		78
78	# Transfering order to basket2	79	# Transfering order to basket2
Lines 81-92 is(scalar GetOrders($basketno1), 0, "0 order in basket1"); Link Here
81	is(scalar GetOrders($basketno2), 1, "1 order in basket2");	82	is(scalar GetOrders($basketno2), 1, "1 order in basket2");
82		83
83	# Determine if the transfer marked things cancelled properly.	84	# Determine if the transfer marked things cancelled properly.
84	is($order->{orderstatus},'new','Before the transfer, the order status should be new');	85	is($order->orderstatus,'new','Before the transfer, the order status should be new');
85	($order) = GetOrders($basketno1, { 'cancelled' => 1 });	86	$order = Koha::Acquisition::Orders->find($order->ordernumber);
86	is($order->{orderstatus},'cancelled','After the transfer, the order status should be set to cancelled');	87	is($order->orderstatus,'cancelled','After the transfer, the order status should be set to cancelled');
87		88
88	($order) = GetOrders($basketno2);	89	($order) = GetOrders($basketno2);
89	is(scalar GetItemnumbersFromOrder($order->{ordernumber}), 1, "1 item in basket2's order");	90	$order = Koha::Acquisition::Orders->find($order->{ordernumber});
		91	is($order->items->count, 1, "1 item in basket2's order");
90		92
91	# Bug 11552	93	# Bug 11552
92	my $orders = SearchOrders({ ordernumber => $newordernumber });	94	my $orders = SearchOrders({ ordernumber => $newordernumber });
93	-