Attachment #28872 for bug #11708

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

Lines 8566-8572 if (CheckVersion($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (-1 / +1 lines)
8566	ALTER TABLE aqbasketgroups	8566	ALTER TABLE aqbasketgroups
8567	ADD COLUMN closeddate DATE DEFAULT NULL AFTER closed	8567	ADD COLUMN closeddate DATE DEFAULT NULL AFTER closed
8568	\|);	8568	\|);
8569	print "Upgrade to $DBversion done (Bug XXXXX: Add aqbasketgroups.closeddate)\n";	8569	print "Upgrade to $DBversion done (Bug 11708: Add aqbasketgroups.closeddate)\n";
8570	SetVersion($DBversion);	8570	SetVersion($DBversion);
8571	}	8571	}
8572		8572

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (-1 / +3 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_group_manage ) %]
		6	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl">Basket groups</a></li>
		7	[% END %]
6	[% IF ( CAN_user_acquisition_budget_manage ) %]	8	[% IF ( CAN_user_acquisition_budget_manage ) %]
7	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>	9	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
8	<li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>	10	<li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>




[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF booksellerid %]
  <title>Koha &rsaquo; Basket groups for [% booksellername |html %]</title>
[% ELSE %]
  <title>Koha &rsaquo; Basket groups</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="[% interface %]/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>


<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 groups</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 groups
[% END %]
</div>


                    [% END %]
                    [% FOREACH bookseller IN booksellers %]
                        [% IF bookseller.basketgroups.size > 0 %]
                            <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name |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>

                                                <th>No. of baskets</th>
                                                <th>No. of ordered titles</th>
                                                <th>No. of received titles</th>
                                                <th>Amount ordered</th>
                                                <th>Amount spent</th>
                                                <th>Action</th>
                                            </tr>
                                        </thead>

                                                <th>No. of baskets</th>
                                                <th>No. of ordered titles</th>
                                                <th>No. of received titles</th>
                                                <th>Amount ordered</th>
                                                <th>Amount spent</th>
                                                <th>Action</th>
                                            </tr>
                                        </thead>
- 

Return to bug 11708

Lines 2-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-11 / +10 lines)
2	[% USE KohaDates %]	2	[% USE KohaDates %]
3	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
4	[% IF booksellerid %]	4	[% IF booksellerid %]
5	<title>Koha &rsaquo; Basket grouping for [% booksellername \|html %]</title>	5	<title>Koha &rsaquo; Basket groups for [% booksellername \|html %]</title>
6	[% ELSE %]	6	[% ELSE %]
7	<title>Koha &rsaquo; Basket grouping</title>	7	<title>Koha &rsaquo; Basket groups</title>
8	[% END %]	8	[% END %]
9	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />	9	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
10	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
11	[% INCLUDE 'datatables.inc' %]	11	[% INCLUDE 'datatables.inc' %]
12	<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>	12	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
13	<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>	13	<script type="text/javascript" src="[% yuipath %]/utilities/utilities.js"></script>
14	<script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>	14	<script type="text/javascript" src="[% yuipath %]/button/button-min.js"></script>
15	<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 158-169 function submitForm(form) { Link Here
158		158
159	<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;	159	<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;
160	[% IF ( grouping ) %]	160	[% IF ( grouping ) %]
161	<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 %]	161	<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 groups</a> &rsaquo; Add basket group for [% booksellername \|html %]
162	[% ELSE %]	162	[% ELSE %]
163	[% IF (booksellerid) %]	163	[% IF (booksellerid) %]
164	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo;	164	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo;
165	[% END %]	165	[% END %]
166	Basket grouping	166	Basket groups
167	[% END %]	167	[% END %]
168	</div>	168	</div>
169		169
Lines 340-346 function submitForm(form) { Link Here
340	[% END %]	340	[% END %]
341	[% FOREACH bookseller IN booksellers %]	341	[% FOREACH bookseller IN booksellers %]
342	[% IF bookseller.basketgroups.size > 0 %]	342	[% IF bookseller.basketgroups.size > 0 %]
343	<h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a></h1>	343	<h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name \|html %]</a></h1>
344	<div class="basket_groups toptabs">	344	<div class="basket_groups toptabs">
345	<ul class="ui-tabs-nav">	345	<ul class="ui-tabs-nav">
346	[% UNLESS ( listclosed ) %]<li class="ui-tabs-active"><a href="#opened[% bookseller.id %]">Open</a></li>	346	[% UNLESS ( listclosed ) %]<li class="ui-tabs-active"><a href="#opened[% bookseller.id %]">Open</a></li>
Lines 371-378 function submitForm(form) { Link Here
371	<th>No. of baskets</th>	371	<th>No. of baskets</th>
372	<th>No. of ordered titles</th>	372	<th>No. of ordered titles</th>
373	<th>No. of received titles</th>	373	<th>No. of received titles</th>
374	<th>Ordered amount</th>	374	<th>Amount ordered</th>
375	<th>Charged amount</th>	375	<th>Amount spent</th>
376	<th>Action</th>	376	<th>Action</th>
377	</tr>	377	</tr>
378	</thead>	378	</thead>
Lines 431-438 function submitForm(form) { Link Here
431	<th>No. of baskets</th>	431	<th>No. of baskets</th>
432	<th>No. of ordered titles</th>	432	<th>No. of ordered titles</th>
433	<th>No. of received titles</th>	433	<th>No. of received titles</th>
434	<th>Ordered amount</th>	434	<th>Amount ordered</th>
435	<th>Charged amount</th>	435	<th>Amount spent</th>
436	<th>Action</th>	436	<th>Action</th>
437	</tr>	437	</tr>
438	</thead>	438	</thead>
439	-