Bug 9374: (follow-up) add FIXME suggesting that use of a regexp is not the long-term...

[koha.git] / acqui / basketgroup.pl

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 8782a45..6fe4db2 100755 (executable)
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -157,16 +157,19 @@ sub displaybasketgroups {
     if (scalar @$basketgroups != 0) {
         foreach my $basketgroup (@$basketgroups){
             my $i = 0;
+            my $basketsqty = 0;
             while($i < scalar(@$baskets)){
                 my $basket = @$baskets[$i];
                 if($basket->{'basketgroupid'} && $basket->{'basketgroupid'} == $basketgroup->{'id'}){
                     $basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
                     push(@{$basketgroup->{'baskets'}}, $basket);
                     splice(@$baskets, $i, 1);
+                    ++$basketsqty;
                     --$i;
                 }
                 ++$i;
             }
+            $basketgroup -> {'basketsqty'} = $basketsqty;
         }
         $template->param(basketgroups => $basketgroups);
     }
@@ -186,7 +189,7 @@ sub printbasketgrouppdf{
     my ($basketgroupid) = @_;
     
     my $pdfformat = C4::Context->preference("OrderPdfFormat");
-    if ($pdfformat eq 'pdfformat::layout3pages' || $pdfformat eq 'pdfformat::layout2pages'){
+    if ($pdfformat eq 'pdfformat::layout3pages' || $pdfformat eq 'pdfformat::layout2pages' || $pdfformat eq 'pdfformat::layout3pagesfr'){
        eval {
         eval "require $pdfformat";
            import $pdfformat;
@@ -466,6 +469,7 @@ if ( $op eq "add" ) {
             name              => $basketgroupname,
             booksellerid      => $booksellerid,
             basketlist        => \@baskets,
+            billingplace      => $billingplace,
             deliveryplace     => $deliveryplace,
             freedeliveryplace => $freedeliveryplace,
             deliverycomment   => $deliverycomment,