[% USE Koha %]
+[% USE KohaDates %]
+[% USE Price %]
[% USE currency = format('%.2f') -%]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha › Acquisitions › [% IF ( date ) %]
- Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %]</title>
-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+ Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% datereceived | $KohaDates %][% ELSE %]Receive orders from [% name %][% END %]</title>
+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/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="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
-[% INCLUDE 'greybox.inc' %]
+<style type="text/css">#dataPreview { width : 80%; } @media (max-width: 767px) { #dataPreview { margin: 0; width : auto; } }</style>
<script type="text/javascript">
//<![CDATA[
{ "sType": "html" },
{ "sType": "html" },
{ "sType": "num-html" },
- { "sType": "html" },
+ { "sType": "anti-the" },
null,
null,
null,
{ "sType": "html" },
{ "sType": "html" },
{ "sType": "num-html" },
- null,
+ { "sType": "anti-the" },
null,
null,
null,
$.cookie("filter_parcel_ean", $("#eanfilter").val());
});
+ $(".previewData").on("click", function(e){
+ e.preventDefault();
+ var ltitle = $(this).text();
+ var page = $(this).attr("href");
+ $("#dataPreviewLabel").text(ltitle);
+ $("#dataPreview .modal-body").load(page + " div");
+ $('#dataPreview').modal({show:true});
+ });
+ $("#dataPreview").on("hidden", function(){
+ $("#dataPreviewLabel").html("");
+ $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
+ });
+
});
// Case-insensitive version of jquery's contains function
[% 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> ›
- [% IF ( datereceived ) %]
+ [% IF datereceived %]
Receipt summary for <i>[% name %]</i>
[% IF ( invoice ) %]
- <i>[ [% invoice %] ]</i>
+ <i>[ [% invoice |html %] ]</i>
[% END %]
- on <i>[% formatteddatereceived %]</i>
+ on <i>[% datereceived | $KohaDates %]</i>
[% ELSE %]
Receive orders from [% name %]
[% END %]
</div>
[% END %]
<h1>
- [% IF ( datereceived ) %]
- Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice %] ] </i>[% END %] on <i>[% formatteddatereceived %]</i>
+ [% IF datereceived %]
+ Receipt summary for <i>[% name %]</i> [% IF ( invoice ) %] <i> [ [% invoice |html %] ] </i>[% END %] on <i>[% datereceived | $KohaDates %]</i>
[% ELSE %]
Receive orders from [% name %]
[% END %]
[% UNLESS no_orders_to_display %]
<div id="acqui_receive_summary">
-<p><strong>Invoice number:</strong> [% invoice %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% formatteddatereceived %]</p>
+<p><strong>Invoice number:</strong> [% invoice |html %] <strong>Received by:</strong> [% loggedinusername %] <strong>On:</strong> [% datereceived | $KohaDates %]</p>
</div>
[% UNLESS (invoiceclosedate) %]
<div id="acqui_receive_search">
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber %]">[% loop_order.title |html %]</a>
[% IF ( loop_order.author ) %] by [% loop_order.author %][% END %]
[% IF ( loop_order.isbn ) %] – [% loop_order.isbn %][% END %]
- [% IF ( loop_order.publishercode ) %]<br />Publisher:[% loop_order.publishercode %][% END %]
+ [% IF ( loop_order.publishercode ) %]
+ <br />Publisher: [% loop_order.publishercode %]
+ [%- IF ( loop_order.publicationyear > 0) -%], [% loop_order.publicationyear %]
+ [%- ELSIF ( loop_order.copyrightdate > 0) -%] [% loop_order.copyrightdate %]
+ [% END %]
+ [% END %]
[% IF ( loop_order.suggestionid ) %]
<br/>
Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %]
[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid %]&type=vendor">Add vendor note</a>]
[% END %]
</td>
- <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
+ <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber %]" class="previewData">Card</a></td>
<td>[% loop_order.quantity %]</td>
- <td>[% loop_order.ecost %]</td>
- <td>[% loop_order.ordertotal %]</td>
+ <td>[% loop_order.ecost | $Price %]</td>
+ <td>[% loop_order.total | $Price %]</td>
<td>[% loop_order.budget_name %]</td>
<td>
<a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber %]&invoiceid=[% invoiceid %]">Receive</a>
</td>
<td>
[% IF ( loop_order.left_holds_on_order ) %]
- <span class="button" title="Can't delete order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't delete order</span><br>
+ <span class="button" title="Can't cancel order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
[% ELSE %]
- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Delete order</a><br />
+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order</a><br />
[% END %]
[% IF ( loop_order.can_del_bib ) %]
- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Delete order and catalog record</a><br />
+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel 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>
+ <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
[% END %]
[% IF ( loop_order.left_item ) %]
<b title="Can't delete catalog record, because of [% loop_order.items %] existing item(s)" >[% loop_order.items %] item(s) left</b><br>
<div id="acqui_receive_receivelist">
<h3>Already received</h3>
-
[% IF ( loop_received ) %]
- [% SET funds = {} %]
- [% SET estimated_total = 0 %]
-
- [% FOREACH loop_receive IN loop_received %]
- [% IF (funds.${ loop_receive.budget.budget_name }.estimated == '') %]
- [% SET funds.${ loop_receive.budget.budget_name }.estimated = 0 %]
- [% END %]
- [% IF (funds.${ loop_receive.budget.budget_name }.actual == '') %]
- [% SET funds.${ loop_receive.budget.budget_name }.actual = 0 %]
- [% END %]
- [% SET estimated_total = estimated_total + ( loop_receive.ecost * loop_receive.quantityreceived ) %]
- [% SET funds.${ loop_receive.budget.budget_name }.estimated = funds.${ loop_receive.budget.budget_name }.estimated + ( loop_receive.ecost * loop_receive.quantityreceived )%]
- [% SET funds.${ loop_receive.budget.budget_name }.actual = funds.${ loop_receive.budget.budget_name }.actual + loop_receive.total %]
- [% END %]
-
<form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
<table id="receivedt">
<thead>
</tr>
</thead>
<tfoot>
- [% FOREACH key IN funds.keys.sort %]
+ [% FOREACH key IN subtotal_for_funds.keys.sort %]
<tr>
- <td colspan="6" class="total">(Tax exc.)</td>
- <td><i>Subtotal for</i> [% key %]</td>
- <td>[% currency( funds.$key.estimated ) %]</td>
- <td>[% currency( funds.$key.actual ) %]</td>
+ [% IF invoiceincgst %]
+ <td colspan="6" class="total">(Tax inc.)</td>
+ [% ELSE %]
+ <td colspan="6" class="total">(Tax exc.)</td>
+ [% END %]
+ <td colspan="2"><i>Subtotal for</i> [% key %]</td>
+ <td>[% subtotal_for_funds.$key.ecost | $Price %]</td>
+ <td>[% subtotal_for_funds.$key.unitprice | $Price %]</td>
<td> </td>
<td> </td>
</tr>
[% END %]
<tr>
<th colspan="10" class="total">Total tax exc.</th>
- <th>[% total_gste %]</th>
+ <th>[% total_tax_excluded | $Price %]</th>
<th></th>
</tr>
[% FOREACH book_foot IN book_foot_loop %]
<tr>
- <th colspan="10">Total (GST [% book_foot.gstrate * 100 | format ("%.1f") %]%)</th>
- <th>[% book_foot.value %]</th>
+ <th colspan="10">Total (GST [% book_foot.tax_rate * 100 %]%)</th>
+ <th>[% book_foot.tax_value | $Price %]</th>
<th></th>
</tr>
[% END %]
<tr>
<th colspan="10" class="total">Total tax inc.</th>
- <th>[% total_gsti %]</th>
+ <th>[% total_tax_included | $Price %]</th>
<th></th>
</tr>
</tfoot>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title |html %]</a>
[% IF ( order.author ) %] / [% order.author %][% END %]
[% IF ( order.isbn ) %] - [% order.isbn %][% END %]
- [% IF ( order.publishercode ) %]<br />Publisher :[% order.publishercode %][% END %]
+ [% IF ( order.publishercode ) %]
+ <br />Publisher: [% order.publishercode %]
+ [%- IF ( order.publicationyear > 0) -%], [% order.publicationyear %]
+ [%- ELSIF ( order.copyrightdate > 0) -%] [% order.copyrightdate %]
+ [% END %]
+ [% END %]
[% IF ( order.suggestionid ) %]
<br/>
Suggested by: [% order.surnamesuggestedby %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby %] [% END %]
(<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid %]&op=show">suggestion #[% order.suggestionid %]</a>)
[% END %]
</td>
- <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
+ <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber %]" class="previewData">Card</a></td>
<td>[% order.quantityreceived %]</td>
<td>[% order.budget.budget_name %]</td>
- <td>[% order.ecost %]</td>
- <td>[% order.unitprice %]</td>
- <td>[% order.total %]</td>
+ <td>[% order.ecost | $Price %]</td>
+ <td>[% order.unitprice | $Price %]</td>
+ <td>[% order.total | $Price %]</td>
<td>
- [% IF loop_receive.cannot_cancel or ( Koha.Preference("AcqCreateItem") == "receiving" and loop_receive.holds > 0 ) %]
+ [% IF loop_receive.cannot_cancel or ( order.basket.effective_create_items == "receiving" and loop_receive.holds > 0 ) %]
[% IF loop_receive.cannot_cancel %]
[% span_title = BLOCK %]
Cannot cancel receipt of this order line because it
</tbody>
</table>
</form>
+
[% ELSE %]There are no received orders.[% END %]
</div>
+<div id="dataPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dataPreviewLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
+ <h3 id="dataPreviewLabel">MARC preview</h3>
+ </div>
+ <div class="modal-body">
+ <div id="loading"> <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading </div>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
+ </div>
+ </div>
+ </div>
+</div>
+
[% IF (invoiceclosedate) %]
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">View invoice</a>
[% ELSE %]
projects / koha.git / blobdiff