ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / acqui / parcel.pl

diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index da0b4cf..d2b2e00 100755 (executable)
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -125,6 +125,7 @@ my $total_tax_included = 0;
 my $subtotal_for_funds;
 for my $order ( @orders ) {
     $order->{'unitprice'} += 0;
+    $order->{'booksellerid'} = $booksellerid; # required for basket group links
 
     my $order_object = Koha::Acquisition::Orders->find($order->{ordernumber});
     if ( $bookseller->invoiceincgst ) {
@@ -136,11 +137,11 @@ for my $order ( @orders ) {
         $order->{unitprice} = $order->{unitprice_tax_excluded};
     }
 
-    $order->{total} = $order->{unitprice} * $order->{quantity};
+    $order->{total} = get_rounded_price($order->{unitprice}) * $order->{quantity};
 
     my %line = %{ $order };
     $line{invoice} = $invoice->{invoicenumber};
-    my @itemnumbers = $order_object->items->get_column('itemnumbers');
+    my @itemnumbers = $order_object->items->get_column('itemnumber');
     my $biblio = Koha::Biblios->find( $line{biblionumber} );
     $line{total_holds} = $biblio ? $biblio->holds->count : 0;
     $line{item_holds} = $biblio ? $biblio->current_holds->search(
@@ -154,8 +155,8 @@ for my $order ( @orders ) {
     $line{tax_rate} = $line{tax_rate_on_receiving};
     $foot{$line{tax_rate}}{tax_rate} = $line{tax_rate};
     $foot{$line{tax_rate}}{tax_value} += $line{tax_value};
-    $total_tax_excluded += $line{unitprice_tax_excluded} * $line{quantity};
-    $total_tax_included += $line{unitprice_tax_included} * $line{quantity};
+    $total_tax_excluded += get_rounded_price($line{unitprice_tax_excluded}) * $line{quantity};
+    $total_tax_included += get_rounded_price($line{unitprice_tax_included}) * $line{quantity};
 
     my $suggestion   = GetSuggestionInfoFromBiblionumber($line{biblionumber});
     $line{suggestionid}         = $suggestion->{suggestionid};
@@ -174,7 +175,7 @@ for my $order ( @orders ) {
     my $budget_name = GetBudgetName( $line{budget_id} );
     $line{budget_name} = $budget_name;
 
-    $subtotal_for_funds->{ $line{budget_name} }{ecost} += $order->{ecost} * $order->{quantity};
+    $subtotal_for_funds->{ $line{budget_name} }{ecost} += get_rounded_price($order->{ecost}) * $order->{quantity};
     $subtotal_for_funds->{ $line{budget_name} }{unitprice} += $order->{total};
 
     push @loop_received, \%line;
@@ -232,7 +233,7 @@ unless( defined $invoice->{closedate} ) {
         } else {
             $order->{ecost} = $order->{ecost_tax_excluded};
         }
-        $order->{total} = $order->{ecost} * $order->{quantity};
+        $order->{total} = get_rounded_price($order->{ecost}) * $order->{quantity};
 
         my %line = %$order;
 
@@ -241,13 +242,17 @@ unless( defined $invoice->{closedate} ) {
 
         my $biblionumber = $line{'biblionumber'};
         my $biblio = Koha::Biblios->find( $biblionumber );
+               if ( ! $biblio ) {
+                       use Data::Dump qw(dump);
+                       warn "FATAL ERROR: biblionumber $biblionumber not found in line: ",dump( \%line );
+               }
         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 @itemnumbers = $order_object->items->get_column('itemnumber');
         my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@itemnumbers } })->count : 0;
 
         my $suggestion   = GetSuggestionInfoFromBiblionumber($line{biblionumber});