Attachment #31702 for bug #11708

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

Lines 52-64 use C4::Auth; Link Here

(-)a/acqui/basketgroup.pl (-7 / +35 lines)
52	use C4::Output;	52	use C4::Output;
53	use CGI;	53	use CGI;
54		54
55	use C4::Bookseller qw/GetBookSellerFromId/;	55	use C4::Bookseller qw/GetBookSellerFromId GetBookSeller/;
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/;	59	use C4::Branch qw/GetBranches/;
60	use C4::Members qw/GetMember/;	60	use C4::Members qw/GetMember/;
61		61
		62	use List::MoreUtils qw/uniq/;
		63
62	our $input=new CGI;	64	our $input=new CGI;
63		65
64	our ($template, $loggedinuser, $cookie)	66	our ($template, $loggedinuser, $cookie)
Lines 400-411 if ( $op eq "add" ) { Link Here
400	print $input->redirect($redirectpath );	402	print $input->redirect($redirectpath );
401		403
402	}else{	404	}else{
403	# no param : display the list of all basketgroups for a given vendor	405	my @booksellers;
404	my $basketgroups = &GetBasketgroups($booksellerid);	406	if ($booksellerid) {
405	my $bookseller = &GetBookSellerFromId($booksellerid);	407	push @booksellers, GetBookSellerFromId($booksellerid);
406	my $baskets = &GetBasketsByBookseller($booksellerid);	408	$template->param(booksellername => $booksellers[0]->{name});
407		409	} else {
408	displaybasketgroups($basketgroups, $bookseller, $baskets);	410	@booksellers = GetBookSeller('');
		411	}
		412	foreach my $bookseller (@booksellers) {
		413	$bookseller->{basketgroups} = GetBasketgroups($bookseller->{id});
		414	foreach my $basketgroup (@{ $bookseller->{basketgroups} }) {
		415	my $baskets = GetBasketsByBasketgroup($basketgroup->{id});
		416	$basketgroup->{basketsqty} = 0;
		417	$basketgroup->{ordered_amount} = 0.0;
		418	$basketgroup->{charged_amount} = 0.0;
		419	my (@ordered_biblionumbers, @received_biblionumbers);
		420	foreach my $basket (@$baskets) {
		421	$basketgroup->{basketsqty} += 1;
		422	my @orders = GetOrders($basket->{basketno});
		423	foreach my $order (@orders) {
		424	push @ordered_biblionumbers, $order->{biblionumber};
		425	$basketgroup->{ordered_amount} += $order->{ecost} * $order->{quantity};
		426	if ($order->{datereceived}) {
		427	push @received_biblionumbers, $order->{biblionumber};
		428	$basketgroup->{charged_amount} += $order->{ecost} * $order->{quantity};
		429	}
		430	}
		431	}
		432	$basketgroup->{ordered_titles_count} = uniq @ordered_biblionumbers;
		433	$basketgroup->{received_titles_count} = uniq @received_biblionumbers;
		434	}
		435	}
		436	$template->param(booksellers => \@booksellers);
409	}	437	}
410	$template->param(listclosed => ((defined $input->param('listclosed')) && ($input->param('listclosed') eq '1'))? 1:0 );	438	$template->param(listclosed => ((defined $input->param('listclosed')) && ($input->param('listclosed') eq '1'))? 1:0 );
411	#prolly won't use all these, maybe just use print, the rest can be done inside validate	439	#prolly won't use all these, maybe just use print, the rest can be done inside validate

Lines 236-241 tr.even.selected td { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/css/datatables.css (+3 lines)
236		236
237	/* ColumnFilter */	237	/* ColumnFilter */
238	span.filter_column > input.text_filter {	238	span.filter_column > input.text_filter {
		239	box-sizing: border-box;
		240	-moz-box-sizing: border-box;
		241	-webkit-box-sizing: border-box;
239	font-size: 80%;	242	font-size: 80%;
240	width: 100%;	243	width: 100%;
241	}	244	}

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (+1 lines)
2	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>	2	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
3	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]	3	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]
4	<li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>	4	<li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
		5	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl">Basket groups</a></li>
5	[% IF ( CAN_user_acquisition_budget_manage ) %]	6	[% IF ( CAN_user_acquisition_budget_manage ) %]
6	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>	7	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
7	<li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>	8	<li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>




[% USE Branches %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF booksellerid %]
  <title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
[% ELSE %]
  <title>Koha &rsaquo; Basket grouping</title>
[% END %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'datatables.inc' %]
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
<script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>
<script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script>

}

 $(document).ready(function() {
    $(".basket_groups").tabs();

    $("table").each(function () {
      var column_filter_options = {
        sPlaceHolder: "head:after",
        aoColumns: [
          { type: "text" },
          { type: "text" },
          { type: "text" },
          { type: "text" },
          { type: "text" },
          { type: "text" },
          { type: "text" },
          null,
          null,
          null
        ]
      };
      if ($(this).hasClass('basket_group_closed')) {
        // There is one more column in closed basketgroups tables
        column_filter_options.aoColumns.unshift({ type: "text" });
      }
      $(this).dataTable($.extend(true, {}, dataTablesDefaults, {
          "aoColumnDefs": [
              { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
          ],
          sDom: 't',
          "bAutoWidth": false
      } ))
      .columnFilter(column_filter_options);
    });

 });



<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
[% IF ( grouping ) %]
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket grouping</a> &rsaquo; Add basket group for [% booksellername |html %]
[% ELSE %]
  [% IF (booksellerid) %]
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo;
  [% END %]
  Basket grouping
[% END %]
</div>

<div id="doc3" class="yui-t2">
    <div id="bd">

                        </div>
                    </div>
                [% ELSE %]
                    [% IF booksellerid %]
                        <div id="toolbar" class="btn-toolbar">
                            <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="newbasketgroup"><i class="icon-plus"></i> New basket group</a></div>
                        </div>
                    [% END %]
                    [% FOREACH bookseller IN booksellers %]
                        [% IF bookseller.basketgroups.size > 0 %]
                            <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
                            <div class="basket_groups toptabs">
                                <ul class="ui-tabs-nav">
                                    [% UNLESS ( listclosed ) %]<li class="ui-tabs-active"><a href="#opened[% bookseller.id %]">Open</a></li>
                                    [% ELSE%]<li><a href="#opened[% bookseller.id %]">Open</a></li>[% END %]
                                    [% IF ( listclosed ) %]<li class="ui-tabs-active"><a href="#closed[% bookseller.id %]">Closed</a></li>
                                    [% ELSE %]<li><a href="#closed[% bookseller.id %]">Closed</a></li>[% END %]
                                </ul>
                                <div id="opened[% bookseller.id %]">
                                    <table class="basket_group_opened">
                                        <thead>
                                        <th>Delivery place</th>
                                        <th>Number of baskets</th>
                                        <th>Action</th>
                                    </tr>
                                </thead>
                                <tbody>
                                    [% FOREACH basketgroup IN basketgroups %]
                                        [% UNLESS ( basketgroup.closed ) %]
                                            <tr>
                                                <th>Search name</th>
                                                <th>Search no.</th>
                                                <th>Search billing place</th>
                                                <th>Search delivery place</th>
                                                <th>Search no. of baskets</th>
                                                <th>Search no. of ordered titles</th>
                                                <th>Search no. of received titles</th>
                                                <th></th>
                                                <th></th>
                                                <th></th>
                                                <td>
                                                    <input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
                                                </td>
                                            </tr>
                                        [% END %]
                                    [% END %]
                                </tbody>
                            </table>
                        </div>
                        <div id="closed">
                            <table id="basket_group_closed">
                                <thead>
                                    <tr>
                                        <th>Name</th>
                                        <th>Number</th>
                                        <th>Billing place</th>
                                        <th>Delivery place</th>
                                        <th>Number of baskets</th>
                                        <th>Action</th>
                                    </tr>
                                </thead>
                                <tbody>
                                    [% FOREACH basketgroup IN basketgroups %]
                                        [% IF ( basketgroup.closed ) %]
                                            <tr>
                                                <th>Name</th>
                                                <th>No.</th>
                                                <th>Billing place</th>
                                                <th>Delivery place</th>
                                                <th>No. of baskets</th>
                                                <th>No. of ordered titles</th>
                                                <th>No. of received titles</th>
                                                <th>Ordered amount</th>
                                                <th>Charged amount</th>
                                                <th>Action</th>
                                                <td>[% basketgroup.basketsqty %]</td>
                                                <td>
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
                                                    <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>
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
                                                    <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
                                                </td>
                                            </tr>
                                        </thead>
                                        <tbody>
                                            [% FOREACH basketgroup IN bookseller.basketgroups %]
                                                [% UNLESS ( basketgroup.closed ) %]
                                                    <tr>
                                                        <td>
                                                            [% IF ( basketgroup.name ) %]
                                                                [% basketgroup.name %]
                                                            [% ELSE %]
                                                                Basket group no. [% basketgroup.id %]
                                                            [% END %]
                                                        </td>
                                                        <td>[% basketgroup.id %]</td>
                                                        <td>[% Branches.GetName(basketgroup.billingplace) %]</td>
                                                        <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
                                                        <td>[% basketgroup.basketsqty %]</td>
                                                        <td>[% basketgroup.ordered_titles_count %]</td>
                                                        <td>[% basketgroup.received_titles_count %]</td>
                                                        <td>[% basketgroup.ordered_amount %]</td>
                                                        <td>[% basketgroup.charged_amount %]</td>
                                                        <td>
                                                            <input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
                                                        </td>
                                                    </tr>
                                                [% END %]
                                            [% END %]
                                        </tbody>
                                    </table>
                                </div>
                                <div id="closed[% bookseller.id %]">
                                    <table class="basket_group_closed">
                                        <thead>
                                            <tr>
                                                <th>Search name</th>
                                                <th>Search no.</th>
                                                <th>Search date closed</th>
                                                <th>Search billing place</th>
                                                <th>Search delivery place</th>
                                                <th>Search no. of baskets</th>
                                                <th>Search no. of ordered titles</th>
                                                <th>Search no. of received titles</th>
                                                <th></th>
                                                <th></th>
                                                <th></th>
                                            </tr>
                                            <tr>
                                                <th>Name</th>
                                                <th>No.</th>
                                                <th>Date closed</th>
                                                <th>Billing place</th>
                                                <th>Delivery place</th>
                                                <th>No. of baskets</th>
                                                <th>No. of ordered titles</th>
                                                <th>No. of received titles</th>
                                                <th>Ordered amount</th>
                                                <th>Charged amount</th>
                                                <th>Action</th>
                                            </tr>
                                        </thead>
                                        <tbody>
                                            [% FOREACH basketgroup IN bookseller.basketgroups %]
                                                [% IF ( basketgroup.closed ) %]
                                                    <tr>
                                                        <td>
                                                            [% IF ( basketgroup.name ) %]
                                                                [% basketgroup.name %]
                                                            [% ELSE %]
                                                                Basket group no. [% basketgroup.id %]
                                                            [% END %]
                                                        </td>
                                                        <td>[% basketgroup.id %]</td>
                                                        <td>[% basketgroup.closeddate |$KohaDates %]</td>
                                                        <td>[% Branches.GetName(basketgroup.billingplace) %]</td>
                                                        <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
                                                        <td>[% basketgroup.basketsqty %]</td>
                                                        <td>[% basketgroup.ordered_titles_count %]</td>
                                                        <td>[% basketgroup.received_titles_count %]</td>
                                                        <td>[% basketgroup.ordered_amount %]</td>
                                                        <td>[% basketgroup.charged_amount %]</td>
                                                        <td>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
                                                            <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>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
                                                        </td>
                                                    </tr>
                                                [% END %]
                                            [% END %]
                                        </tbody>
                                    </table>
                                </div>
                            </div>
                        [% END %]
                    [% END %]
                [% END %]
            </div>
        </div>
- 

Return to bug 11708

Lines 1-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-96 / +177 lines)
1	[% USE Branches %]	1	[% USE Branches %]
		2	[% USE KohaDates %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Basket grouping for [% booksellername \|html %]</title>	4	[% IF booksellerid %]
		5	<title>Koha &rsaquo; Basket grouping for [% booksellername \|html %]</title>
		6	[% ELSE %]
		7	<title>Koha &rsaquo; Basket grouping</title>
		8	[% END %]
4	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />	9	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
6	[% INCLUDE 'datatables.inc' %]	11	[% INCLUDE 'datatables.inc' %]
		12	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
7	<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>	13	<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
8	<script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>	14	<script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>
9	<script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script>	15	<script type="text/javascript" src="[% yuipath %]/container/container_core-min.js"></script>
Lines 107-121 function submitForm(form) { Link Here
107	}	113	}
108		114
109	$(document).ready(function() {	115	$(document).ready(function() {
110	$("#basket_groups").tabs();	116	$(".basket_groups").tabs();
111		117
112	$("table").dataTable($.extend(true, {}, dataTablesDefaults, {	118	$("table").each(function () {
113	"aoColumnDefs": [	119	var column_filter_options = {
114	{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },	120	sPlaceHolder: "head:after",
115	],	121	aoColumns: [
116	sDom: 't',	122	{ type: "text" },
117	"bAutoWidth": false	123	{ type: "text" },
118	} ));	124	{ type: "text" },
		125	{ type: "text" },
		126	{ type: "text" },
		127	{ type: "text" },
		128	{ type: "text" },
		129	null,
		130	null,
		131	null
		132	]
		133	};
		134	if ($(this).hasClass('basket_group_closed')) {
		135	// There is one more column in closed basketgroups tables
		136	column_filter_options.aoColumns.unshift({ type: "text" });
		137	}
		138	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {
		139	"aoColumnDefs": [
		140	{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
		141	],
		142	sDom: 't',
		143	"bAutoWidth": false
		144	} ))
		145	.columnFilter(column_filter_options);
		146	});
119		147
120	});	148	});
121		149
Lines 129-138 function submitForm(form) { Link Here
129		157
130	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;	158	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
131	[% IF ( grouping ) %]	159	[% IF ( grouping ) %]
132	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket grouping</a> &rsaquo; Add basket group for [% booksellername \|html %]</div>	160	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket grouping</a> &rsaquo; Add basket group for [% booksellername \|html %]
133	[% ELSE %]	161	[% ELSE %]
134	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo; Basket grouping</div>	162	[% IF (booksellerid) %]
		163	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo;
		164	[% END %]
		165	Basket grouping
135	[% END %]	166	[% END %]
		167	</div>
136		168
137	<div id="doc3" class="yui-t2">	169	<div id="doc3" class="yui-t2">
138	<div id="bd">	170	<div id="bd">
Lines 300-393 function submitForm(form) { Link Here
300	</div>	332	</div>
301	</div>	333	</div>
302	[% ELSE %]	334	[% ELSE %]
303	<div id="toolbar" class="btn-toolbar">	335	[% IF booksellerid %]
304	<div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid %]" class="btn btn-small" id="newbasketgroup"><i class="icon-plus"></i> New basket group</a></div>	336	<div id="toolbar" class="btn-toolbar">
305	</div>	337	<div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid %]" class="btn btn-small" id="newbasketgroup"><i class="icon-plus"></i> New basket group</a></div>
306	<h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a></h1>	338	</div>
307	<div id="basket_groups" class="toptabs">	339	[% END %]
308	<ul class="ui-tabs-nav">	340	[% FOREACH bookseller IN booksellers %]
309	[% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>	341	[% IF bookseller.basketgroups.size > 0 %]
310	[% ELSE%]<li><a href="#opened">Open</a></li>[% END %]	342	<h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a></h1>
311	[% IF ( listclosed) %]<li class="ui-tabs-active"><a href="#closed">Closed</a></li>	343	<div class="basket_groups toptabs">
312	[% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]	344	<ul class="ui-tabs-nav">
313	</ul>	345	[% UNLESS ( listclosed ) %]<li class="ui-tabs-active"><a href="#opened[% bookseller.id %]">Open</a></li>
314	<div id="opened">	346	[% ELSE%]<li><a href="#opened[% bookseller.id %]">Open</a></li>[% END %]
315	<table id="basket_group_opened">	347	[% IF ( listclosed ) %]<li class="ui-tabs-active"><a href="#closed[% bookseller.id %]">Closed</a></li>
316	<thead>	348	[% ELSE %]<li><a href="#closed[% bookseller.id %]">Closed</a></li>[% END %]
317	<tr>	349	</ul>
318	<th>Name</th>	350	<div id="opened[% bookseller.id %]">
319	<th>Number</th>	351	<table class="basket_group_opened">
320	<th>Billing place</th>	352	<thead>
321	<th>Delivery place</th>
322	<th>Number of baskets</th>
323	<th>Action</th>
324	</tr>
325	</thead>
326	<tbody>
327	[% FOREACH basketgroup IN basketgroups %]
328	[% UNLESS ( basketgroup.closed ) %]
329	<tr>	353	<tr>
330	<td>[% IF ( basketgroup.name ) %]	354	<th>Search name</th>
331	[% basketgroup.name %]	355	<th>Search no.</th>
332	[% ELSE %]	356	<th>Search billing place</th>
333	Basket group no. [% basketgroup.id %]	357	<th>Search delivery place</th>
334	[% END %]	358	<th>Search no. of baskets</th>
335	</td>	359	<th>Search no. of ordered titles</th>
336	<td>[% basketgroup.id %]</td>	360	<th>Search no. of received titles</th>
337	<td>[% Branches.GetName( basketgroup.billingplace ) %]</td>	361	<th></th>
338	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>	362	<th></th>
339	<td>[% basketgroup.basketsqty %]</td>	363	<th></th>
340	<td>
341	<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
342	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
343	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
344	</td>
345	</tr>	364	</tr>
346	[% END %]
347	[% END %]
348	</tbody>
349	</table>
350	</div>
351	<div id="closed">
352	<table id="basket_group_closed">
353	<thead>
354	<tr>
355	<th>Name</th>
356	<th>Number</th>
357	<th>Billing place</th>
358	<th>Delivery place</th>
359	<th>Number of baskets</th>
360	<th>Action</th>
361	</tr>
362	</thead>
363	<tbody>
364	[% FOREACH basketgroup IN basketgroups %]
365	[% IF ( basketgroup.closed ) %]
366	<tr>	365	<tr>
367	<td>	366	<th>Name</th>
368	[% IF ( basketgroup.name ) %]	367	<th>No.</th>
369	[% basketgroup.name %]	368	<th>Billing place</th>
370	[% ELSE %]	369	<th>Delivery place</th>
371	Basket group no. [% basketgroup.id %]	370	<th>No. of baskets</th>
372	[% END %]	371	<th>No. of ordered titles</th>
373	</td>	372	<th>No. of received titles</th>
374	<td>[% basketgroup.id %]</td>	373	<th>Ordered amount</th>
375	<td>[% Branches.GetName( basketgroup.billingplace ) %]</td>	374	<th>Charged amount</th>
376	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>	375	<th>Action</th>
377	<td>[% basketgroup.basketsqty %]</td>
378	<td>
379	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
380	<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>
381	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
382	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
383	</td>
384	</tr>	376	</tr>
385	[% END %]	377	</thead>
386	[% END %]	378	<tbody>
387	</tbody>	379	[% FOREACH basketgroup IN bookseller.basketgroups %]
388	</table>	380	[% UNLESS ( basketgroup.closed ) %]
389	</div>	381	<tr>
390	</div>	382	<td>
		383	[% IF ( basketgroup.name ) %]
		384	[% basketgroup.name %]
		385	[% ELSE %]
		386	Basket group no. [% basketgroup.id %]
		387	[% END %]
		388	</td>
		389	<td>[% basketgroup.id %]</td>
		390	<td>[% Branches.GetName(basketgroup.billingplace) %]</td>
		391	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
		392	<td>[% basketgroup.basketsqty %]</td>
		393	<td>[% basketgroup.ordered_titles_count %]</td>
		394	<td>[% basketgroup.received_titles_count %]</td>
		395	<td>[% basketgroup.ordered_amount %]</td>
		396	<td>[% basketgroup.charged_amount %]</td>
		397	<td>
		398	<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
		399	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
		400	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
		401	</td>
		402	</tr>
		403	[% END %]
		404	[% END %]
		405	</tbody>
		406	</table>
		407	</div>
		408	<div id="closed[% bookseller.id %]">
		409	<table class="basket_group_closed">
		410	<thead>
		411	<tr>
		412	<th>Search name</th>
		413	<th>Search no.</th>
		414	<th>Search date closed</th>
		415	<th>Search billing place</th>
		416	<th>Search delivery place</th>
		417	<th>Search no. of baskets</th>
		418	<th>Search no. of ordered titles</th>
		419	<th>Search no. of received titles</th>
		420	<th></th>
		421	<th></th>
		422	<th></th>
		423	</tr>
		424	<tr>
		425	<th>Name</th>
		426	<th>No.</th>
		427	<th>Date closed</th>
		428	<th>Billing place</th>
		429	<th>Delivery place</th>
		430	<th>No. of baskets</th>
		431	<th>No. of ordered titles</th>
		432	<th>No. of received titles</th>
		433	<th>Ordered amount</th>
		434	<th>Charged amount</th>
		435	<th>Action</th>
		436	</tr>
		437	</thead>
		438	<tbody>
		439	[% FOREACH basketgroup IN bookseller.basketgroups %]
		440	[% IF ( basketgroup.closed ) %]
		441	<tr>
		442	<td>
		443	[% IF ( basketgroup.name ) %]
		444	[% basketgroup.name %]
		445	[% ELSE %]
		446	Basket group no. [% basketgroup.id %]
447	[% END %]
448	</td>
449	<td>[% basketgroup.id %]</td>
450	<td>[% basketgroup.closeddate \|$KohaDates %]</td>
451	<td>[% Branches.GetName(basketgroup.billingplace) %]</td>
452	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
453	<td>[% basketgroup.basketsqty %]</td>
454	<td>[% basketgroup.ordered_titles_count %]</td>
455	<td>[% basketgroup.received_titles_count %]</td>
456	<td>[% basketgroup.ordered_amount %]</td>
457	<td>[% basketgroup.charged_amount %]</td>
458	<td>
459	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
460	<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>
461	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
462	<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
463	</td>
464	</tr>
465	[% END %]
466	[% END %]
467	</tbody>
468	</table>
469	</div>
470	</div>
471	[% END %]
472	[% END %]
391	[% END %]	473	[% END %]
392	</div>	474	</div>
393	</div>	475	</div>
394	-