[% USE KohaDates %]
+[% USE Price %]
+[% USE AuthorisedValues %]
+
[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title>
+<title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'datatables.inc' %]
[% UNLESS ( closedate ) %]
<script type="text/javascript">
//<![CDATA[
- function confirm_close() {
- var is_confirmed = confirm(_("Are you sure you want to close this basket?"));
- if (is_confirmed) {
- window.location = "[% script_name %]?op=close&basketno=[% basketno %]";
- }
- }
function delete_basket(basketno,booksellerid,delbiblio) {
window.location = "[% script_name %]?op=delete_confirm&delbiblio="+delbiblio+"&basketno="+basketno+"&booksellerid="+booksellerid;
}
- function confirm_delete_item(ordernumber, biblionumber) {
- var is_confirmed = confirm(_("Are you sure you want to delete this order ?"));
- if (is_confirmed) {
- window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber;
- }
- }
-
- function confirm_delete_biblio(ordernumber, biblionumber) {
- var is_confirmed = confirm(_("Are you sure you want to delete this catalog record and order ?"));
- if (is_confirmed) {
- window.location = "addorder.pl?ordernumber="+ordernumber+"&basketno=[% basketno %]&quantity=0&biblionumber="+biblionumber+"&delbiblio=1";
- }
- }
-
function transfer_order_popup(ordernumber) {
var url = "/cgi-bin/koha/acqui/transferorder.pl?"
+ "ordernumber=" + ordernumber
});
});
- function basketUserSearchPopup(f) {
+ function UserSearchPopup(f) {
window.open(
- "/cgi-bin/koha/acqui/aqbasketuser_search.pl",
- 'BasketUserSearchPopup',
- 'width=740,height=450,toolbar=no,'
+ "/cgi-bin/koha/acqui/add_user_search.pl",
+ 'UserSearchPopup',
+ 'width=740, height=450, scrollbars=yes, toolbar=no,'
);
}
- function add_basket_user(borrowernumber, borrowername) {
- var ids = $("#basketusers_ids").val();
+ function add_user(borrowernumber, borrowername) {
+ var ids = $("#users_ids").val();
if(ids.length > 0) {
ids = ids.split(':');
} else {
}
if (ids.indexOf(borrowernumber) < 0) {
ids.push(borrowernumber);
- $("#basketusers_ids").val(ids.join(':'));
+ $("#users_ids").val(ids.join(':'));
var li = '<li id="user_'+borrowernumber+'">'+borrowername
- + ' [<a style="cursor:pointer" onclick="del_basket_user('+borrowernumber+');">'
+ + ' [<a style="cursor:pointer" onclick="del_user('+borrowernumber+');">'
+ _("Delete user") + '</a>]</li>';
- $("#basketusers_names").append(li);
+ $("#users_names").append(li);
return 0;
}
return -1;
}
- function del_basket_user(borrowernumber) {
+ function del_user(borrowernumber) {
$("#user_"+borrowernumber).remove();
- var ids = $("#basketusers_ids").val().split(':');
+ var ids = $("#users_ids").val().split(':');
ids.splice(ids.indexOf(borrowernumber.toString()), 1);
- $("#basketusers_ids").val(ids.join(':'));
+ $("#users_ids").val(ids.join(':'));
}
//]]>
</script>
[% INCLUDE 'acquisitions-search.inc' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a> › [% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a> › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</div>
<div id="doc3" class="yui-t2">
[% UNLESS ( selectbasketg ) %]
[% UNLESS ( closedate ) %]
<div id="toolbar" class="btn-toolbar">
- <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-small" data-toggle="modal"><i class="icon-plus"></i> Add to basket</a></div>
- <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&op=add_form" class="btn btn-small" id="basketheadbutton"><i class="icon-pencil"></i> Edit basket</a></div>
- <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-small" data-toggle="modal" id="delbasketbutton"><i class="icon-remove"></i> Delete this basket</a></div>
+ [% IF active %]
+ <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-small" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div>
+ [% END %]
+ <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&op=add_form" class="btn btn-small" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div>
+ [%# FIXME This action should not be available for everyone %]
+ <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-small" data-toggle="modal" id="delbasketbutton"><i class="fa fa-remove"></i> Delete this basket</a></div>
[% IF ( unclosable ) %]
[% ELSIF ( uncertainprices ) %]
<div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&owner=1" class="btn btn-small" id="uncertpricesbutton">Uncertain prices</a></div>
[% ELSE %]
<div class="btn-group">
- <a href="[% script_name %]?op=close&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="closebutton"><i class="icon-remove-sign"></i> Close this basket</a>
+ <a href="[% script_name %]?op=close&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="closebutton"><i class="fa fa-remove-sign"></i> Close this basket</a>
</div>
[% END %]
- <div class="btn-group"><a href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket as CSV</a></div>
+ <div class="btn-group"><a href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket as CSV</a></div>
</div>
<!-- Modal for confirm deletion box-->
<div class="modal hide" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true">
[% ELSE %]
[% UNLESS ( grouped ) %]
<div id="toolbar" class="btn-toolbar">
- <div class="btn-group"><a href="#" class="btn btn-small" id="reopenbutton"><i class="icon-refresh"></i> Reopen this basket</a></div>
- <div class="btn-group"><a href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket as CSV</a></div>
+ <div class="btn-group"><a href="#" class="btn btn-small" id="reopenbutton"><i class="fa fa-refresh"></i> Reopen this basket</a></div>
+ <div class="btn-group"><a href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket as CSV</a></div>
</div>
[% END %]
[% END %]
<META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl">
[% END %]
[% ELSE %]
- <h1>[% UNLESS ( basketno ) %]New [% END %][% IF ( delete_confirm ) %]Delete [% END %]Basket [% basketname|html %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a></h1>
- [% IF ( delete_confirm ) %]
- <h2>
- <span class="yui-button yui-link-button">
- <em class="first-child">
- <a href="[% script_name %]?op=delete_confirm&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="yui-link-button">Yes, delete this basket!</a>
- </em>
- </span>
- <span class="yui-button yui-link-button">
- <em class="first-child">
- <a href="[% script_name %]?basketno=[% basketno %]" class="yui-link-button">Cancel</a>
- </em>
- </span>
- </h2>
- [% END %]
+ <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a></h1>
[% IF ( basketno ) %]
<div id="acqui_basket_summary" class="yui-g">
<div class="rows">
<form action="" method="post">
<span class="label">Managed by:</span>
<div style="float:left">
- <ul id="basketusers_names" style="padding-left:0">
- [% FOREACH user IN basketusers %]
+ <ul id="users_names" style="padding-left:0">
+ [% FOREACH user IN users %]
<li id="user_[% user.borrowernumber %]">
[% user.firstname %] [% user.surname %]
- [<a onclick="del_basket_user([% user.borrowernumber %]);" style="cursor:pointer">Delete user</a>]
+ [<a onclick="del_user([% user.borrowernumber %]);" style="cursor:pointer">Delete user</a>]
</li>
[% END %]
</ul>
<input type="hidden" id="basketno" name="basketno" value="[% basketno %]" />
- <input type="hidden" id="basketusers_ids" name="basketusers_ids" value="[% basketusers_ids %]" />
+ <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids %]" />
<input type="hidden" id="op" name="op" value="mod_users" />
- <input type="button" id="add_user" onclick="basketUserSearchPopup();" value="Add user" />
+ <input type="button" id="add_user" onclick="UserSearchPopup();" value="Add user" />
<input type="submit" value="Save changes" />
</div>
</form>
</li>
<li id="branch">
- <span class="label">Branch:</span>
+ <span class="label">Library:</span>
[% IF basketbranchname %]
[% basketbranchname %]
[% ELSE %]
- No branch
+ No library
[% END %]
[% IF branches_loop.size %]
<form action="" method="post">
<select id="branch" name="branch">
- <option value="">(no branch)</option>
+ <option value="">(no library)</option>
[% FOREACH branch IN branches_loop %]
[% IF (branch.selected) %]
<option selected="selected" value="[% branch.branchcode %]"> [% branch.branchname %]</option>
<ol>
<li>
<span class="label">Basket group:</span>
+ [% IF basketgroup.id and not basketgroup.name %]
+ [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %]
+ [% END %]
[% IF basketgroup.closed %]
[% IF ( CAN_user_acquisition_group_manage ) %]
<a href="basketgroup.pl?op=add&booksellerid=[% booksellerid %]&basketgroupid=[% basketgroup.id %]" title="basketgroup">[% basketgroup.name %] (closed)</a>
[% basketgroup.name %] (closed)
[% END %]
[% ELSIF ( ! CAN_user_acquisition_group_manage ) %]
- [%- IF basketgroup.name -%]
+ [%- IF basketgroup.id -%]
[% basketgroup.name %]
[%- ELSE -%]
No group
[%- END -%]
[% ELSE %]
<select id="basketgroupid" name="basketgroupid">
- <option value="new">Add new group</option>
+ <option value="">No group</option>
[% FOREACH bg IN basketgroups %]
[% IF ( bg.default ) %]
<option value="[% bg.id %]" selected="selected">[% bg.name %]</option>
[% END %]
[% END %]
[% END %]
+ <option value="new">Add new group</option>
</select>
<input type="hidden" id="basketno" value="[% basketno %]" name="basketno" />
<input type="hidden" value="mod_basket" name="op" />
</div>
</div>
[% END %]
+ [% IF ( duplinbatch ) %]<div class="dialog alert">
+ <h4>Duplicate warning</h4>
+ <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch %]&basketno=[% basketno %]&booksellerid=[% booksellerid %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p>
+ </div>[% END %]
- [% UNLESS ( delete_confirm ) %]
<div id="acqui_basket_content" class="yui-g">
[% IF ( books_loop ) %]
<h2>Orders</h2>
<table id="orders">
<thead>
<tr>
+ <th>No.</th>
<th>Order</th>
<th class="gste">RRP tax exc.</th>
<th class="gste">ecost tax exc.</th>
<tfoot>
[% FOREACH foot_loo IN book_foot_loop %]
<tr>
- <th>Total (GST [% foot_loo.gstgsti %])</th>
+ <th></th>
+ <th>Total (GST [% foot_loo.gstrate * 100 | $Price %])</th>
<th class="gste"> </th>
<th class="gste"> </th>
<th class="gsti"> </th>
<th class="gsti"> </th>
<th>[% foot_loo.quantity %]</th>
- <th class="gste">[% foot_loo.totalgste %]</th>
- <th class="gsti">[% foot_loo.totalgsti %]</th>
+ <th class="gste">[% foot_loo.totalgste | $Price%]</th>
+ <th class="gsti">[% foot_loo.totalgsti | $Price %]</th>
<th> </th>
- <th>[% foot_loo.gstvalue %]</th>
+ <th>[% foot_loo.gstvalue | $Price %]</th>
<th> </th>
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
</tr>
[% END %]
<tr>
+ <th></th>
<th>Total ([% currency %])</th>
<th class="gste"> </th>
<th class="gste"> </th>
<th class="gsti"> </th>
<th class="gsti"> </th>
<th>[% total_quantity %]</th>
- <th class="gste">[% total_gste %]</th>
- <th class="gsti">[% total_gsti %]</th>
+ <th class="gste">[% total_gste | $Price %]</th>
+ <th class="gsti">[% total_gsti | $Price %]</th>
<th> </th>
- <th>[% total_gstvalue %]</th>
+ <th>[% total_gstvalue | $Price %]</th>
<th> </th>
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
[% FOREACH books_loo IN books_loop %]
[% IF ( books_loo.order_received ) %]<tr class="disabled">[% ELSE %][% IF ( books_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %][% END %]
<td>
- <p>[% IF ( books_loo.order_received ) %] (rcvd)[% END %]
- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
+ [% books_loo.ordernumber %]
+ </td>
+ <td>
+ <p>
+ [% IF ( books_loo.order_received ) %] (rcvd)[% END %]
+ [% IF books_loo.title %]
+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a>[% IF books_loo.author %] by [% books_loo.author %][% END %]
+ [% ELSE %]
+ <em>Deleted bibliographic record, can't find title</em><br />
+ [% END %]
<br />
[% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
[% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
(<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&op=show">suggestion #[% books_loo.suggestionid %]</a>)
[% END %]
</p>
- [% IF ( books_loo.notes ) %]
- <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
+ [% IF ( books_loo.order_internalnote ) %]
+ <p class="ordernote"><strong>Internal note: </strong>[% books_loo.order_internalnote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Change internal note</a>]</p>
+ [% ELSE %]
+ [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=internal">Add internal note</a>]
+ [% END %]
+ [% IF ( books_loo.order_vendornote ) %]
+ <p class="ordernote"><strong>Vendor note: </strong>[% books_loo.order_vendornote|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Change vendor note</a>]</p>
[% ELSE %]
- <p>[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Add note</a>]</p>
+ [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]&type=vendor">Add vendor note</a>]
[% END %]
[% IF (books_loo.transferred_from) %]
[% basket = books_loo.transferred_from.basket %]
</td>
[% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
[%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
- <td class="number gste [% IF books_loo.rrpgste.search(zero_regex) %]error[% END %]">[% books_loo.rrpgste %]</td>
- <td class="number gste [% IF books_loo.ecostgste.search(zero_regex) %]error[% END %]">[% books_loo.ecostgste %]</td>
- <td class="number gsti [% IF books_loo.rrpgsti.search(zero_regex) %]error[% END %]">[% books_loo.rrpgsti %]</td>
- <td class="number gsti [% IF books_loo.ecostgsti.search(zero_regex) %]error[% END %]">[% books_loo.ecostgsti %]</td>
+ <td class="number gste [% IF books_loo.rrpgste.search(zero_regex) %]error[% END %]">[% books_loo.rrpgste | $Price %]</td>
+ <td class="number gste [% IF books_loo.ecostgste.search(zero_regex) %]error[% END %]">[% books_loo.ecostgste | $Price%]</td>
+ <td class="number gsti [% IF books_loo.rrpgsti.search(zero_regex) %]error[% END %]">[% books_loo.rrpgsti | $Price %]</td>
+ <td class="number gsti [% IF books_loo.ecostgsti.search(zero_regex) %]error[% END %]">[% books_loo.ecostgsti | $Price %]</td>
<td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity %]</td>
- <td class="number gste [% IF books_loo.totalgste.search(zero_regex) %]error[% END %]">[% books_loo.totalgste %]</td>
- <td class="number gsti [% IF books_loo.totalgsti.search(zero_regex) %]error[% END %]">[% books_loo.totalgsti %]</td>
- <td class="number [% IF books_loo.gstgsti.search(zero_regex) %]error[% END %]">[% books_loo.gstgsti %]</td>
- <td class="number [% IF books_loo.gstvalue.search(zero_regex) %]error[% END %]">[% books_loo.gstvalue %]</td>
+ <td class="number gste [% IF books_loo.totalgste.search(zero_regex) %]error[% END %]">[% books_loo.totalgste | $Price %]</td>
+ <td class="number gsti [% IF books_loo.totalgsti.search(zero_regex) %]error[% END %]">[% books_loo.totalgsti | $Price %]</td>
+ <td class="number">[% books_loo.gstrate * 100 | $Price %]</td>
+ <td class="number [% IF books_loo.gstvalue.search(zero_regex) %]error[% END %]">[% books_loo.gstvalue | $Price %]</td>
<td>[% books_loo.budget_name %]</td>
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
[% IF ( books_loo.left_holds_on_order ) %]
<span class="button" title="Can't delete order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
[% ELSE %]
- <a href="javascript:confirm_delete_item([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order</a><br>
+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Delete order</a><br>
[% END %]
[% IF ( books_loo.can_del_bib ) %]
- <a href="javascript:confirm_delete_biblio([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order and catalog record</a><br>
+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Delete order and catalog record</a><br>
[% ELSE %]
<span class="button" title="Can't delete catalog record, see constraints below">Can't delete order and catalog record</span><br>
[% END %]
<table id="cancelledorderst">
<thead>
<tr>
+ <th>No.</th>
<th>Order</th>
<th class="gste">RRP tax exc.</th>
<th class="gste">ecost tax exc.</th>
[% FOREACH order IN cancelledorders_loop %]
<tr style="color:grey">
<td>
+ [% order.ordernumber %]
+ </td>
+ <td>
<p>
[% IF ( order.order_received ) %] (rcvd)[% END %]
[% IF (order.title) %]
- [% order.title |html %] by [% order.author %]<br />
+ [% order.title |html %][% IF order.author %] by [% order.author %][% END %]
[% ELSE %]
- <em>Deleted bibliographic record, can't find title</em><br />
+ <em>Deleted bibliographic record, can't find title</em>
[% END %]
- [% IF ( order.notes ) %] [% order.notes %][% END %]
+ <br />
+ [% IF ( order.order_internalnote ) %] [% order.order_internalnote %][% END %]
[% IF ( order.isbn ) %] - [% order.isbn %][% END %]
[% IF ( order.issn ) %] - [% order.issn %][% END %]
[% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
[% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
+ [% IF ( order.cancellationreason ) %]
+ <br />
+ Cancellation reason: [% AuthorisedValues.GetByCode( 'ORDER_CANCELLATION_REASON', order.cancellationreason ) %]
+ [% END %]
</p>
[% IF order.transferred_to %]
[% basket = order.transferred_to.basket %]
</p>
[% END %]
</td>
- <td class="number gste">[% order.rrpgste %]</td>
- <td class="number gste">[% order.ecostgste %]</td>
- <td class="number gsti">[% order.rrpgsti %]</td>
- <td class="number gsti">[% order.ecostgsti %]</td>
+ <td class="number gste">[% order.rrpgste | $Price %]</td>
+ <td class="number gste">[% order.ecostgste | $Price %]</td>
+ <td class="number gsti">[% order.rrpgsti | $Price %]</td>
+ <td class="number gsti">[% order.ecostgsti | $Price %]</td>
<td class="number">[% order.quantity %]</td>
- <td class="number gste">[% order.totalgste %]</td>
- <td class="number gsti">[% order.totalgsti %]</td>
- <td class="number">[% order.gstgsti %]</td>
- <td class="number">[% order.gstvalue %]</td>
+ <td class="number gste">[% order.totalgste | $Price %]</td>
+ <td class="number gsti">[% order.totalgsti | $Price %]</td>
+ <td class="number">[% order.gstrate * 100 | $Price %]</td>
+ <td class="number">[% order.gstvalue | $Price %]</td>
<td>[% order.budget_name %]
</tr>
[% END %]
</div>
</div>
+ [% IF active %]
[% INCLUDE 'acquisitions-add-to-basket.inc' %]
- [% END %]
+ [% END %]
+
[% END %]
[% END %]
[% END %] [% ELSE %] <!-- if we want just to select a basketgroup for a closed basket -->
projects / koha_ffzg / blobdiff