8b1bda9ed8
Improvements to the display of lists of ordered and received orders:
- Show the vendor's name instead of the internal number
To test:
- Make sure you have some pending and received orders
- Access the Spent and Ordered pages by clicking on the
amount ordered or spent on the acq start page
- Verify that
- Vendor name shows
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
137 lines
4.5 KiB
Text
137 lines
4.5 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE KohaDates %]
|
|
[% USE ItemTypes %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › Spent</title>
|
|
[% Asset.css("css/datatables.css") | $raw %]
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="acq_spent" class="acq">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% 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> › Spent - [% fund_code | html %]</div>
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-sm-10 col-sm-push-2">
|
|
<main>
|
|
|
|
<h1>Fund: [% fund_code | html %]</h1>
|
|
<h2>Spent</h2>
|
|
|
|
<table id="spent">
|
|
<thead>
|
|
<tr>
|
|
<th class="anti-the">Title</th>
|
|
<th>Order</th>
|
|
<th>Vendor</th>
|
|
<th>Invoice</th>
|
|
<th>Item type</th>
|
|
<th>Received</th>
|
|
<th>Unit price</th>
|
|
<th class="title-string">Date ordered</th>
|
|
<th class="title-string">Date received</th>
|
|
<th>Subtotal</th>
|
|
</tr>
|
|
</thead>
|
|
|
|
[% FOREACH order IN spent %]
|
|
<tr>
|
|
<td class="cell">
|
|
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">
|
|
[% order.title | html %]
|
|
</a>
|
|
</td>
|
|
<td class="cell">
|
|
[% order.ordernumber | html %]
|
|
</td>
|
|
<td class="cell">
|
|
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a>
|
|
</td>
|
|
<td class="cell">
|
|
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a>
|
|
</td>
|
|
<td class="cell">
|
|
[% ItemTypes.GetDescription( order.itype ) | html %]
|
|
</td>
|
|
<td class="cell">
|
|
[% order.quantityreceived | html %]
|
|
</td>
|
|
<td class="cell">
|
|
[% order.unitprice | html %]
|
|
</td>
|
|
<td class="cell">
|
|
<span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
|
|
</td>
|
|
<td class="cell">
|
|
<span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span>
|
|
</td>
|
|
<td class="data cell">
|
|
[% order.rowtotal | html %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
|
|
<tfoot>
|
|
[% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %]
|
|
<tr>
|
|
<td colspan="9"> Sub total </td>
|
|
<td class="data"> [% subtotal | html %] </td>
|
|
</tr>
|
|
[% END %]
|
|
[% IF shipmentcosts.size %]
|
|
[% FOREACH shipmentcost IN shipmentcosts %]
|
|
<tr>
|
|
<td></td>
|
|
<td colspan="8">Shipping cost for invoice [% shipmentcost.invoicenumber | html %]</td>
|
|
<td class="data total">[% shipmentcost.shipmentcost | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
[% END %]
|
|
[% IF ( adjustments && adjustments.count > 0 ) %]
|
|
[% FOREACH adjustment IN adjustments %]
|
|
<tr>
|
|
<td></td>
|
|
<td colspan="8">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td>
|
|
<td class="data total">[% adjustment.adjustment | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
[% END %]
|
|
<tr>
|
|
<td colspan="9">TOTAL</td>
|
|
<td class="data total">[% total | html %]</td>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
|
|
</main>
|
|
</div> <!-- /.col-sm-10.col-sm-push-2 -->
|
|
|
|
<div class="col-sm-2 col-sm-pull-10">
|
|
<aside>
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</aside>
|
|
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
|
|
</div> <!-- /.row -->
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/acquisitions-menu.js") | $raw %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script>
|
|
$(document).ready(function() {
|
|
$("#spent").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aoColumnDefs": [
|
|
{ "sType": "anti-the", "aTargets" : [ "anti-the" ] },
|
|
{ "sType": "title-string", "aTargets" : [ "title-string" ] }
|
|
],
|
|
"sPaginationType": "four_button"
|
|
} ) );
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|