Kyle M Hall
e87cf98c2e
When you notice a typo in your invoice number after finishing with the receiving process, the only way to correct it right now is in the database - or by undoing all the steps and starting over. It would be nice if the invoice number could be edited. Test Plan: 1) Apply this patch 2) Browse to acqui/invoice.pl for an invoice 3) Note the new "Invoice number" field contains the existing invoice 4) Alter the invoice number 5) Save the invoice 6) Note the invoice number has been updated 7) Edit the invoice again 8) Attempt to save the invoice with an empty invoice number field 9) Note that you cannot save the invoice without having an invoice number Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
259 lines
11 KiB
Text
259 lines
11 KiB
Text
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% USE Price %]
|
|
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › Invoice</title>
|
|
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
function updateColumnsVisibility(visible) {
|
|
if ( visible ) {
|
|
$("table .gste, .gsti").show();
|
|
} else {
|
|
[% IF ( invoiceincgst ) %]
|
|
$("table .gste").hide();
|
|
[% ELSE %]
|
|
$("table .gsti").hide();
|
|
[% END %]
|
|
}
|
|
}
|
|
|
|
$(document).ready(function() {
|
|
$("#orderst").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
bInfo: false,
|
|
bPaginate: false,
|
|
bFilter: false,
|
|
sDom: "t",
|
|
"aoColumnDefs": [
|
|
{ "sType": "anti-the", "aTargets": [ "anti-the" ] }
|
|
]
|
|
}));
|
|
[% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
|
|
$("#invoice_files_table").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aoColumnDefs": [
|
|
{ "aTargets": [ "title-string" ], "sType": "title-string" }
|
|
],
|
|
bInfo: false,
|
|
bPaginate: false,
|
|
bFilter: false,
|
|
sDom: "t"
|
|
}));
|
|
[% END %]
|
|
$("#show_all_details").click(function(){
|
|
updateColumnsVisibility( $(this).is(":checked") );
|
|
});
|
|
|
|
$("#show_all_details").prop('checked', false);
|
|
updateColumnsVisibility(false);
|
|
});
|
|
//]]>
|
|
</script>
|
|
</head>
|
|
|
|
<body id="acq_invoice" 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> › <a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a> › <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid %]">[% invoicenumber %]</a></div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
[% IF ( modified ) %]
|
|
<div class="dialog message">
|
|
<p>Invoice has been modified</p>
|
|
</div>
|
|
[% END %]
|
|
<h1>Invoice: [% invoicenumber %]</h1>
|
|
|
|
<p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
|
|
<form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated">
|
|
<fieldset class="rows">
|
|
<ol>
|
|
<li>
|
|
<label for="shipmentdate">Invoice number:</label>
|
|
<input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber %]" class="required" required="required"/>
|
|
<span class="required">Required</span>
|
|
</li>
|
|
|
|
<li><label for="shipmentdate">Shipment date:</label>
|
|
<input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" class="datepicker" /></li>
|
|
|
|
<li><label for="billingdate">Billing date:</label>
|
|
<input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" class="datepicker" /></li>
|
|
|
|
<li><label for="shipmentcost">Shipping cost:</label>
|
|
<input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" /></li>
|
|
<li><label for="shipment_budget_id">Shipping fund:</label>
|
|
<select id="shipment_budget_id" name="shipment_budget_id">
|
|
<option value="">No fund</option>
|
|
[% FOREACH budget IN budgets_loop %]
|
|
[% IF ( budget.selected ) %]
|
|
<option selected="selected" value="[% budget.budget_id %]">
|
|
[% ELSE %]
|
|
<option value="[% budget.budget_id %]">
|
|
[% END %]
|
|
[% budget.budget_name %]
|
|
</option>
|
|
[% END %]
|
|
</select></li>
|
|
|
|
[% IF ( invoiceclosedate ) %]
|
|
<li><span class="label">Status:</span>
|
|
Closed on [% invoiceclosedate | $KohaDates %].</li>
|
|
|
|
<li><label for="reopen">Reopen: </label> <input type="checkbox" name="reopen" id="reopen" /></li>
|
|
[% ELSE %]
|
|
<li><span class="label">Status:</span>
|
|
Open.</li>
|
|
|
|
<li><label for="close">Close: </label> <input type="checkbox" name="close" id="close" />
|
|
</li>
|
|
[% END %]
|
|
</ol>
|
|
<input type="hidden" name="op" value="mod" />
|
|
<input type="hidden" name="invoiceid" value="[% invoiceid %]" />
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input type="submit" value="Save" />
|
|
[% UNLESS orders_loop.size %]
|
|
<a href="invoice.pl?op=delete&invoiceid=[% invoiceid %]">Delete</a>
|
|
[% END %]
|
|
</fieldset>
|
|
</form>
|
|
<p>
|
|
<a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Go to receipt page</a>
|
|
[% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid %]">Manage invoice files</a>[% END %]
|
|
</p>
|
|
<h2>Invoice details</h2>
|
|
[% IF orders_loop.size %]
|
|
<label for="show_all_details">
|
|
<input type="checkbox" style="vertical-align: middle;" id="show_all_details" />
|
|
Show all details
|
|
</label>
|
|
<table id="orderst">
|
|
<thead>
|
|
<tr>
|
|
<th class="anti-the">Summary</th>
|
|
<th>Library</th>
|
|
<th class="gste">Actual cost tax exc.</th>
|
|
<th class="gsti">Actual cost tax inc.</th>
|
|
<th>Qty.</th>
|
|
<th class="gste">Total tax exc. ([% currency.symbol %])</th>
|
|
<th class="gsti">Total tax inc. ([% currency.symbol %])</th>
|
|
<th>GST %</th>
|
|
<th>GST</th>
|
|
<th>Fund</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH order IN orders_loop %]
|
|
<tr>
|
|
<td>
|
|
[% IF order.biblionumber %]
|
|
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
|
|
[% IF ( order.author ) %]
|
|
<br /><em>by</em> [% order.author %]
|
|
[% END %]
|
|
[% ELSE %]
|
|
<em>Deleted bibliographic record, can't find title</em>
|
|
[% END %]
|
|
[% IF ( order.publishercode ) %]
|
|
<br/>[% order.publishercode %]
|
|
[% IF order.publicationyear > 0 %]
|
|
- [% order.publicationyear %]
|
|
[% ELSIF ( order.copyrightdate > 0) %]
|
|
- [% order.copyrightdate %]
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td><p>[% order.branchcode %]</p></td>
|
|
<td class="number gste">[% order.unitpricegste | $Price %]</td>
|
|
<td class="number gsti">[% order.unitpricegsti | $Price %]</td>
|
|
<td class="number">[% order.quantity %]</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 %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
<tfoot>
|
|
[% FOR tf IN foot_loop %]
|
|
<tr>
|
|
<th colspan='2'>Total (GST [% tf.gstrate * 100 | $Price %] %)</th>
|
|
<th class="gste"/><th class="gsti"/>
|
|
<th>[% tf.quantity %]</th>
|
|
<th class="gste">[% tf.totalgste | $Price %]</th>
|
|
<th class="gsti">[% tf.totalgsti | $Price %]</th>
|
|
<th> </th>
|
|
<th>[% tf.gstvalue | $Price %]</th>
|
|
<th> </th>
|
|
</tr>
|
|
[% END %]
|
|
<tr>
|
|
<th colspan='2'>Total ([% currency.symbol %])</th>
|
|
<th class="gste"/><th class="gsti"/>
|
|
<th>[% total_quantity %]</th>
|
|
<th class="gste">[% total_gste | $Price %]</th>
|
|
<th class="gsti">[% total_gsti | $Price %]</th>
|
|
<th> </th>
|
|
<th>[% total_gstvalue | $Price %]</th>
|
|
<th> </th>
|
|
</tr>
|
|
<tr>
|
|
<th colspan="2">Total + Shipment cost ([% currency.symbol %])</th>
|
|
<th class="gste"></th>
|
|
<th class="gsti"></th>
|
|
<th>[% total_quantity %]</th>
|
|
<th class="gste">[% total_gste_shipment | $Price %]</th>
|
|
<th class="gsti">[% total_gsti_shipment | $Price %]</th>
|
|
<th> </th>
|
|
<th>[% total_gstvalue | $Price %]</th>
|
|
<th> </th>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
[% ELSE %]
|
|
<div class="dialog message"><p>No orders yet</p></div>
|
|
[% END %]
|
|
[% IF ( (Koha.Preference('AcqEnableFiles')) && files ) %]
|
|
<br />
|
|
<h2>Files attached to invoice</h2>
|
|
<table id="invoice_files_table">
|
|
<thead>
|
|
<tr>
|
|
<th>Name</th>
|
|
<th>Type</th>
|
|
<th>Description</th>
|
|
<th>Uploaded</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH f IN files %]
|
|
<tr>
|
|
<td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid %]&op=download&view=1&file_id=[% f.file_id %]">[% f.file_name | html %]</a></td>
|
|
<td>[% f.file_type | html %]</td>
|
|
<td>[% f.file_description | html %]</td>
|
|
<td class="title-string">
|
|
<span title="[% f.date_uploaded %]">[% f.date_uploaded | $KohaDates %]</span>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|