diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index d6bd5d1f4a..8d22e24ed3 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -56,7 +56,7 @@ use C4::Bookseller qw/GetBookSellerFromId/;
use C4::Budgets qw/ConvertCurrency/;
use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV/;
use C4::Bookseller qw/GetBookSellerFromId/;
-use C4::Branch qw/GetBranches/;
+use C4::Branch qw/GetBranches GetBranchName/;
use C4::Members qw/GetMember/;
our $input=new CGI;
@@ -156,17 +156,22 @@ sub displaybasketgroups {
my $baskets = shift;
if (scalar @$basketgroups != 0) {
foreach my $basketgroup (@$basketgroups){
+ $basketgroup -> {'billingplacename'} = GetBranchName($basketgroup -> {'billingplace'});
+ $basketgroup -> {'deliveryplacename'} = GetBranchName($basketgroup -> {'deliveryplace'});
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);
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index deb20e9bf3..02472228b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -246,7 +246,12 @@ function submitForm(form) {