Nick Clemens
3c2ce5df6f
To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
132 lines
3.9 KiB
Text
132 lines
3.9 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE KohaDates %]
|
|
[% USE ItemTypes %]
|
|
[% USE Price %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › Ordered</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="acq_ordered" 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> › Ordered - [% 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>Ordered</h2>
|
|
|
|
<table id="spent">
|
|
<thead>
|
|
<tr>
|
|
<th class="anti-the"> Title </th>
|
|
<th> Order </th>
|
|
<th> Vendor </th>
|
|
<th> Item type </th>
|
|
<th> Left on order </th>
|
|
<th> Estimated cost per unit </th>
|
|
<th class="title-string"> Date ordered </th>
|
|
<th> Subtotal </th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH order IN ordered %]
|
|
<tr>
|
|
<td class="cell">
|
|
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">
|
|
[% order.title | html %]
|
|
</a>
|
|
</td>
|
|
<td class="cell">
|
|
[% IF ( CAN_user_acquisition_order_manage ) %]
|
|
<a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&booksellerid=[% order.booksellerid | uri %]&basketno=[% order.basketno | uri %]">[% order.ordernumber | html %]</a>
|
|
[% ELSE %]
|
|
[% order.ordernumber | html %]
|
|
[% END %]
|
|
</td>
|
|
<td class="cell">
|
|
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
|
|
</td>
|
|
<td class="cell">
|
|
[% ItemTypes.GetDescription( order.itype ) | html %]
|
|
</td>
|
|
<td class="cell">
|
|
[% order.left | html %]
|
|
</td>
|
|
<td class="data cell">
|
|
[% order.ecost_tax_included | $Price %]
|
|
</td>
|
|
<td class="cell">
|
|
<span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span>
|
|
</td>
|
|
<td class="data cell">
|
|
[% order.subtotal | $Price %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
<tfoot>
|
|
[% IF ( adjustments && adjustments.count > 0 ) %]
|
|
[% FOREACH adjustment IN adjustments %]
|
|
<tr>
|
|
<td></td>
|
|
<td colspan="6">Adjustment cost for invoice
|
|
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% adjustment.invoiceid | uri %]">
|
|
[% adjustment.invoice.invoicenumber | html %]
|
|
</a>
|
|
</td>
|
|
<td class="data total">[% adjustment.adjustment | $Price %]</td>
|
|
</tr>
|
|
[% END %]
|
|
|
|
[% END %]
|
|
<tr>
|
|
<td> Total </td>
|
|
<td> </td>
|
|
<td> </td>
|
|
<td> </td>
|
|
<td> </td>
|
|
<td> </td>
|
|
<td> </td>
|
|
<td class="data">
|
|
[% total | $Price %]
|
|
</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' %]
|