Attachment #32911 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 },
          ],
          "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 (-95 / +176 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-120 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	"bAutoWidth": false	122	{ type: "text" },
117	} ));	123	{ type: "text" },
		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	"bAutoWidth": false
		143	} ))
		144	.columnFilter(column_filter_options);
		145	});
118		146
119	});	147	});
120		148
Lines 128-137 function submitForm(form) { Link Here
128		156
129	<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;	157	<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;
130	[% IF ( grouping ) %]	158	[% IF ( grouping ) %]
131	<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>	159	<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 %]
132	[% ELSE %]	160	[% ELSE %]
133	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo; Basket grouping</div>	161	[% IF (booksellerid) %]
		162	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo;
		163	[% END %]
		164	Basket grouping
134	[% END %]	165	[% END %]
		166	</div>
135		167
136	<div id="doc3" class="yui-t2">	168	<div id="doc3" class="yui-t2">
137	<div id="bd">	169	<div id="bd">
Lines 299-392 function submitForm(form) { Link Here
299	</div>	331	</div>
300	</div>	332	</div>
301	[% ELSE %]	333	[% ELSE %]
302	<div id="toolbar" class="btn-toolbar">	334	[% IF booksellerid %]
303	<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>	335	<div id="toolbar" class="btn-toolbar">
304	</div>	336	<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>
305	<h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a></h1>	337	</div>
306	<div id="basket_groups" class="toptabs">	338	[% END %]
307	<ul class="ui-tabs-nav">	339	[% FOREACH bookseller IN booksellers %]
308	[% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>	340	[% IF bookseller.basketgroups.size > 0 %]
309	[% ELSE%]<li><a href="#opened">Open</a></li>[% END %]	341	<h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a></h1>
310	[% IF ( listclosed) %]<li class="ui-tabs-active"><a href="#closed">Closed</a></li>	342	<div class="basket_groups toptabs">
311	[% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]	343	<ul class="ui-tabs-nav">
312	</ul>	344	[% UNLESS ( listclosed ) %]<li class="ui-tabs-active"><a href="#opened[% bookseller.id %]">Open</a></li>
313	<div id="opened">	345	[% ELSE%]<li><a href="#opened[% bookseller.id %]">Open</a></li>[% END %]
314	<table id="basket_group_opened">	346	[% IF ( listclosed ) %]<li class="ui-tabs-active"><a href="#closed[% bookseller.id %]">Closed</a></li>
315	<thead>	347	[% ELSE %]<li><a href="#closed[% bookseller.id %]">Closed</a></li>[% END %]
316	<tr>	348	</ul>
317	<th>Name</th>	349	<div id="opened[% bookseller.id %]">
318	<th>Number</th>	350	<table class="basket_group_opened">
319	<th>Billing place</th>	351	<thead>
320	<th>Delivery place</th>
321	<th>Number of baskets</th>
322	<th>Action</th>
323	</tr>
324	</thead>
325	<tbody>
326	[% FOREACH basketgroup IN basketgroups %]
327	[% UNLESS ( basketgroup.closed ) %]
328	<tr>	352	<tr>
329	<td>[% IF ( basketgroup.name ) %]	353	<th>Search name</th>
330	[% basketgroup.name %]	354	<th>Search no.</th>
331	[% ELSE %]	355	<th>Search billing place</th>
332	Basket group no. [% basketgroup.id %]	356	<th>Search delivery place</th>
333	[% END %]	357	<th>Search no. of baskets</th>
334	</td>	358	<th>Search no. of ordered titles</th>
335	<td>[% basketgroup.id %]</td>	359	<th>Search no. of received titles</th>
336	<td>[% Branches.GetName( basketgroup.billingplace ) %]</td>	360	<th></th>
337	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>	361	<th></th>
338	<td>[% basketgroup.basketsqty %]</td>	362	<th></th>
339	<td>
340	<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
341	<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>
342	<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>
343	</td>
344	</tr>	363	</tr>
345	[% END %]
346	[% END %]
347	</tbody>
348	</table>
349	</div>
350	<div id="closed">
351	<table id="basket_group_closed">
352	<thead>
353	<tr>
354	<th>Name</th>
355	<th>Number</th>
356	<th>Billing place</th>
357	<th>Delivery place</th>
358	<th>Number of baskets</th>
359	<th>Action</th>
360	</tr>
361	</thead>
362	<tbody>
363	[% FOREACH basketgroup IN basketgroups %]
364	[% IF ( basketgroup.closed ) %]
365	<tr>	364	<tr>
366	<td>	365	<th>Name</th>
367	[% IF ( basketgroup.name ) %]	366	<th>No.</th>
368	[% basketgroup.name %]	367	<th>Billing place</th>
369	[% ELSE %]	368	<th>Delivery place</th>
370	Basket group no. [% basketgroup.id %]	369	<th>No. of baskets</th>
371	[% END %]	370	<th>No. of ordered titles</th>
372	</td>	371	<th>No. of received titles</th>
373	<td>[% basketgroup.id %]</td>	372	<th>Ordered amount</th>
374	<td>[% Branches.GetName( basketgroup.billingplace ) %]</td>	373	<th>Charged amount</th>
375	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>	374	<th>Action</th>
376	<td>[% basketgroup.basketsqty %]</td>
377	<td>
378	<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>
379	<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>
380	<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>
381	<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>
382	</td>
383	</tr>	375	</tr>
384	[% END %]	376	</thead>
385	[% END %]	377	<tbody>
386	</tbody>	378	[% FOREACH basketgroup IN bookseller.basketgroups %]
387	</table>	379	[% UNLESS ( basketgroup.closed ) %]
388	</div>	380	<tr>
389	</div>	381	<td>
		382	[% IF ( basketgroup.name ) %]
		383	[% basketgroup.name %]
		384	[% ELSE %]
		385	Basket group no. [% basketgroup.id %]
		386	[% END %]
		387	</td>
		388	<td>[% basketgroup.id %]</td>
		389	<td>[% Branches.GetName(basketgroup.billingplace) %]</td>
		390	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
		391	<td>[% basketgroup.basketsqty %]</td>
		392	<td>[% basketgroup.ordered_titles_count %]</td>
		393	<td>[% basketgroup.received_titles_count %]</td>
		394	<td>[% basketgroup.ordered_amount %]</td>
		395	<td>[% basketgroup.charged_amount %]</td>
		396	<td>
		397	<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
		398	<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>
		399	<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>
		400	</td>
		401	</tr>
		402	[% END %]
		403	[% END %]
		404	</tbody>
		405	</table>
		406	</div>
		407	<div id="closed[% bookseller.id %]">
		408	<table class="basket_group_closed">
		409	<thead>
		410	<tr>
		411	<th>Search name</th>
		412	<th>Search no.</th>
		413	<th>Search date closed</th>
		414	<th>Search billing place</th>
		415	<th>Search delivery place</th>
		416	<th>Search no. of baskets</th>
		417	<th>Search no. of ordered titles</th>
		418	<th>Search no. of received titles</th>
		419	<th></th>
		420	<th></th>
		421	<th></th>
		422	</tr>
		423	<tr>
		424	<th>Name</th>
		425	<th>No.</th>
		426	<th>Date closed</th>
		427	<th>Billing place</th>
		428	<th>Delivery place</th>
		429	<th>No. of baskets</th>
		430	<th>No. of ordered titles</th>
		431	<th>No. of received titles</th>
		432	<th>Ordered amount</th>
		433	<th>Charged amount</th>
		434	<th>Action</th>
		435	</tr>
		436	</thead>
		437	<tbody>
		438	[% FOREACH basketgroup IN bookseller.basketgroups %]
		439	[% IF ( basketgroup.closed ) %]
		440	<tr>
		441	<td>
		442	[% IF ( basketgroup.name ) %]
		443	[% basketgroup.name %]
		444	[% ELSE %]
		445	Basket group no. [% basketgroup.id %]
446	[% END %]
447	</td>
448	<td>[% basketgroup.id %]</td>
449	<td>[% basketgroup.closeddate \|$KohaDates %]</td>
450	<td>[% Branches.GetName(basketgroup.billingplace) %]</td>
451	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
452	<td>[% basketgroup.basketsqty %]</td>
453	<td>[% basketgroup.ordered_titles_count %]</td>
454	<td>[% basketgroup.received_titles_count %]</td>
455	<td>[% basketgroup.ordered_amount %]</td>
456	<td>[% basketgroup.charged_amount %]</td>
457	<td>
458	<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>
459	<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>
460	<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>
461	<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>
462	</td>
463	</tr>
464	[% END %]
465	[% END %]
466	</tbody>
467	</table>
468	</div>
469	</div>
470	[% END %]
471	[% END %]
390	[% END %]	472	[% END %]
391	</div>	473	</div>
392	</div>	474	</div>
393	-