Attachment #73376 for bug #19479

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

Lines 82-88 sub BasketTotal { Link Here

(-)a/acqui/basketgroup.pl (-1 / +5 lines)
82	$total = $total + ( $order->{ecost_tax_excluded} * $order->{quantity} );	82	$total = $total + ( $order->{ecost_tax_excluded} * $order->{quantity} );
83	}	83	}
84	}	84	}
85	$total .= " " . ($bookseller->invoiceprice // 0);	85	# $total .= " " . ($bookseller->invoiceprice // 0);
86	return $total;	86	return $total;
87	}	87	}
88		88
Lines 97-102 sub displaybasketgroups { Link Here
97	my $basketsqty = 0;	97	my $basketsqty = 0;
98	while($i < scalar(@$baskets)){	98	while($i < scalar(@$baskets)){
99	my $basket = @$baskets[$i];	99	my $basket = @$baskets[$i];
		100	my $active_currency = Koha::Acquisition::Currencies->get_active;
		101	$basket->{currency} = $active_currency->currency;
100	if($basket->{'basketgroupid'} && $basket->{'basketgroupid'} == $basketgroup->{'id'}){	102	if($basket->{'basketgroupid'} && $basket->{'basketgroupid'} == $basketgroup->{'id'}){
101	$basket->{total} = BasketTotal($basket->{basketno}, $bookseller);	103	$basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
102	push(@{$basketgroup->{'baskets'}}, $basket);	104	push(@{$basketgroup->{'baskets'}}, $basket);
Lines 254-259 if ( $op eq "add" ) { Link Here
254	my $selecteds = GetBasketsByBasketgroup($basketgroupid);	256	my $selecteds = GetBasketsByBasketgroup($basketgroupid);
255	foreach my $basket(@{$selecteds}){	257	foreach my $basket(@{$selecteds}){
256	$basket->{total} = BasketTotal($basket->{basketno}, $bookseller);	258	$basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
		259	my $active_currency = Koha::Acquisition::Currencies->get_active;
		260	$basket->{currency} = $active_currency->currency;
257	}	261	}
258	$template->param(basketgroupid => $basketgroupid,	262	$template->param(basketgroupid => $basketgroupid,
259	selectedbaskets => $selecteds);	263	selectedbaskets => $selecteds);




[% USE Branches %]
[% USE Price %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />

                                                                        No name, basketnumber: [% basket.basketno %]
                                                                    [% END %]
                                                                </a>, <br />
                                                                Total: [% basket.total | $Price with_symbol => 1 %]
                                                                <input type="hidden" class="basket" name="basket" value="[% basket.basketno %]" />
                                                            </li>
                                                        [% END %]

                                                                No name, basketnumber: [% selectedbasket.basketno %]
                                                            [% END %]
                                                        </a>, <br />
                                                        Total: [% selectedbasket.total | $Price %] ([% selectedbasket.currency %])
                                                        <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
                                                    </li>
                                                [% END %]
- 

Return to bug 19479

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-3 / +3 lines)
1	[% USE Branches %]	1	[% USE Branches %]
		2	[% USE Price %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Basket grouping for [% booksellername \|html %]</title>	4	<title>Koha &rsaquo; Basket grouping for [% booksellername \|html %]</title>
4	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />	5	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />
Lines 173-179 function submitForm(form) { Link Here
173	No name, basketnumber: [% basket.basketno %]	174	No name, basketnumber: [% basket.basketno %]
174	[% END %]	175	[% END %]
175	</a>, <br />	176	</a>, <br />
176	Total: [% basket.total %]	177	Total: [% basket.total \| $Price with_symbol => 1 %]
177	<input type="hidden" class="basket" name="basket" value="[% basket.basketno %]" />	178	<input type="hidden" class="basket" name="basket" value="[% basket.basketno %]" />
178	</li>	179	</li>
179	[% END %]	180	[% END %]
Lines 259-265 function submitForm(form) { Link Here
259	No name, basketnumber: [% selectedbasket.basketno %]	260	No name, basketnumber: [% selectedbasket.basketno %]
260	[% END %]	261	[% END %]
261	</a>, <br />	262	</a>, <br />
262	Total: [% selectedbasket.total %]	263	Total: [% selectedbasket.total \| $Price %] ([% selectedbasket.currency %])
263	<input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />	264	<input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
264	</li>	265	</li>
265	[% END %]	266	[% END %]
266	-