Attachment #18334 for bug #9806

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

Lines 56-62 use C4::Bookseller qw/GetBookSellerFromId/; Link Here

(-)a/acqui/basketgroup.pl (-3 / +1 lines)
56	use C4::Budgets qw/ConvertCurrency/;	56	use C4::Budgets qw/ConvertCurrency/;
57	use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV/;	57	use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV/;
58	use C4::Bookseller qw/GetBookSellerFromId/;	58	use C4::Bookseller qw/GetBookSellerFromId/;
59	use C4::Branch qw/GetBranches GetBranchName/;	59	use C4::Branch qw/GetBranches/;
60	use C4::Members qw/GetMember/;	60	use C4::Members qw/GetMember/;
61		61
62	our $input=new CGI;	62	our $input=new CGI;
Lines 156-163 sub displaybasketgroups { Link Here
156	my $baskets = shift;	156	my $baskets = shift;
157	if (scalar @$basketgroups != 0) {	157	if (scalar @$basketgroups != 0) {
158	foreach my $basketgroup (@$basketgroups){	158	foreach my $basketgroup (@$basketgroups){
159	$basketgroup -> {'billingplacename'} = GetBranchName($basketgroup -> {'billingplace'});
160	$basketgroup -> {'deliveryplacename'} = GetBranchName($basketgroup -> {'deliveryplace'});
161	my $i = 0;	159	my $i = 0;
162	my $basketsqty = 0;	160	my $basketsqty = 0;
163	while($i < scalar(@$baskets)){	161	while($i < scalar(@$baskets)){




[% USE KohaBranchName %] [% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'doc-head-close.inc' %]

												[% END %]
						</td>
                                    <td>[% basketgroup.id %]</td>
                                    <td>[% basketgroup.billingplace | $KohaBranchName %]</td>
                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
                                    <td>[% basketgroup.basketsqty %]</td>
							<td>
								<input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and print" />

										[% END %]
					</td>
                                    <td>[% basketgroup.id %]</td>
                                    <td>[% basketgroup.billingplace | $KohaBranchName %]</td>
                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
                                    <td>[% basketgroup.basketsqty %]</td>
					<td>
							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
- 

Return to bug 9806

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-6 / +5 lines)
1	[% INCLUDE 'doc-head-open.inc' %]	1	[% USE KohaBranchName %] [% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Basket grouping for [% booksellername \|html %]</title>	2	<title>Koha &rsaquo; Basket grouping for [% booksellername \|html %]</title>
3	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />	3	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
Lines 265-272 function submitForm(form) { Link Here
265	[% END %]	265	[% END %]
266	</td>	266	</td>
267	<td>[% basketgroup.id %]</td>	267	<td>[% basketgroup.id %]</td>
268	<td>[% basketgroup.billingplacename %]</td>	268	<td>[% basketgroup.billingplace \| $KohaBranchName %]</td>
269	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplacename %][% END %]</td>	269	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace \| $KohaBranchName %][% END %]</td>
270	<td>[% basketgroup.basketsqty %]</td>	270	<td>[% basketgroup.basketsqty %]</td>
271	<td>	271	<td>
272	<input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and print" />	272	<input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and print" />
Lines 303-310 function submitForm(form) { Link Here
303	[% END %]	303	[% END %]
304	</td>	304	</td>
305	<td>[% basketgroup.id %]</td>	305	<td>[% basketgroup.id %]</td>
306	<td>[% basketgroup.billingplacename %]</td>	306	<td>[% basketgroup.billingplace \| $KohaBranchName %]</td>
307	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplacename %][% END %]</td>	307	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace \| $KohaBranchName %][% END %]</td>
308	<td>[% basketgroup.basketsqty %]</td>	308	<td>[% basketgroup.basketsqty %]</td>
309	<td>	309	<td>
310	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>	310	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
311	-