Owen Leonard
81c90ba3bf
This patch adds a new menu for vendor-related pages in which
vendor related "views" can be linked to: baskets, basket groups,
contracts, invoices, uncertain prices.
The acquisitions toolbar is pared down to vendor-related actions:
New basket, contract, or vendor; edit vendor, delete vendor,
receive shipment.
Other small improvements have been made to other pages: corrections
to breadcrumbs and title tags, adding useful links betweeen pages.
Vendor menu and toolbar are added to booksellers.pl
when there is only one "search result" (i.e. a vendor id is passed).
- Menu appears when booksellerid variable is present
- Redundant heading removed
- Additional variables added to enable proper display of the toolbar
- Revision corrects broken links pointed out by QA.
- Revision adds check of existing baskets and subscriptions as a
condition on display of the vendor delete button.
TODO: Add coverage of Basket groups page.
To test, navigate Acquisitions pages and test as many links and buttons
as you can, confirming that nothing is broken on vendor pages, invoice
pages, contract pages, uncertain price pages, etc.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass - I like this very much!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Tests done:
1) New toolbar - vendor search
- no results = button to create new vendor shows
- 1 result = additional new options show
- more than one result = button to create new vendor shows
2) Vendor views
- acq toolbar consistent with 1 result in vendor search
- new tabs on the left
- checked all links have the needed parameters and work correctly
3) New toolbar - different pages
- Toolbar is formatted consistently
- Delete vendor shows only up when it should - no baskets or
subscriptions
- Links work correctly
Works nicely, great groundwork for further improvements.
TODO Add new toolbar to (new) invoices page.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
175 lines
6.6 KiB
Text
175 lines
6.6 KiB
Text
[% USE KohaDates %]
|
|
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › Invoice</title>
|
|
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
|
|
[% INCLUDE 'datatables-strings.inc' %]
|
|
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
$(document).ready(function() {
|
|
$("#orderst").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
bInfo: false,
|
|
bPaginate: false,
|
|
bFilter: false,
|
|
sDom: "t"
|
|
}));
|
|
});
|
|
//]]>
|
|
</script>
|
|
</head>
|
|
|
|
<body>
|
|
[% 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">
|
|
<p>Invoice has been modified</p>
|
|
</div>
|
|
[% END %]
|
|
<h1>Invoice: [% invoicenumber %]</h1>
|
|
|
|
<p>Supplier: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
|
|
<form action="" method="post">
|
|
<fieldset>
|
|
<label for="shipmentdate">Shipment date:</label>
|
|
<input type="text" size="10" id="shipmentdate" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" readonly="readonly" class="datepicker" />
|
|
<p></p>
|
|
<label for="billingdate">Billing date:</label>
|
|
<input type="text" size="10" id="billingdate" name="billingdate" value="[% billingdate | $KohaDates %]" readonly="readonly" class="datepicker" />
|
|
<p></p>
|
|
<label for="shipmentcost">Shipment cost:</label>
|
|
<input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" />
|
|
<label for="shipment_budget_id">Budget:</label>
|
|
<select id="shipment_budget_id" name="shipment_budget_id">
|
|
<option value="">No budget</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>
|
|
<p></p>
|
|
<label>Status:</label>
|
|
[% IF ( invoiceclosedate ) %]
|
|
Closed on [% invoiceclosedate | $KohaDates %].
|
|
<p></p>
|
|
<input type="checkbox" name="reopen" id="reopen" />
|
|
<label for="reopen">Reopen</label>
|
|
[% ELSE %]
|
|
Open.
|
|
<p></p>
|
|
<input type="checkbox" name="close" id="close" />
|
|
<label for="close">Close</label>
|
|
[% END %]
|
|
<input type="hidden" name="op" value="mod" />
|
|
<input type="hidden" name="invoiceid" value="[% invoiceid %]" />
|
|
<fieldset class="action">
|
|
<input type="submit" value="Save">
|
|
</fieldset>
|
|
</fieldset>
|
|
</form>
|
|
<p>
|
|
<a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid %]">Go to receipt page</a>
|
|
</p>
|
|
<h2>Invoice details</h2>
|
|
[% IF orders_loop.size %]
|
|
<table id="orderst">
|
|
<thead>
|
|
<tr>
|
|
<th>Summary</th>
|
|
<th>Publisher</th>
|
|
<th>Branch</th>
|
|
<th>RRP</th>
|
|
<th>Est.</th>
|
|
<th>Qty.</th>
|
|
<th>Total</th>
|
|
<th>Fund</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH order IN orders_loop %]
|
|
<tr>
|
|
<td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
|
|
[% IF ( order.author ) %]
|
|
<br /><em>by</em> [% order.author %]
|
|
[% END %]
|
|
</p></td>
|
|
<td>
|
|
[% IF ( order.publishercode ) %]
|
|
<p>[% order.publishercode %]
|
|
[% IF ( order.publicationyear ) %]
|
|
- [% order.publicationyear %]
|
|
[% END %]
|
|
</p>
|
|
[% END %]
|
|
</td>
|
|
<td><p>[% order.branchcode %]</p></td>
|
|
<td>[% order.rrp %]</td>
|
|
<td>[% order.ecost %]</td>
|
|
<td class="number">[% order.quantity %]</td>
|
|
<td>[% order.total %]</td>
|
|
<td>[% order.budget_name %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
<tfoot>
|
|
<tr>
|
|
<th colspan="3">Total Tax Exc.</th>
|
|
<th>[% total_rrp_gste %]</th>
|
|
<th> </th>
|
|
<th>[% total_quantity %]</th>
|
|
<th>[% total_est_gste %]</th>
|
|
<th> </th>
|
|
</tr>
|
|
<tr>
|
|
<th colspan='3'>Tax ([% gist %]%)</th>
|
|
<th>[% gist_rrp %]</th>
|
|
<th> </th>
|
|
<th> </th>
|
|
<th>[% gist_est %]</th>
|
|
<th> </th>
|
|
</tr>
|
|
<tr>
|
|
<th colspan='3'>Total Tax Inc. ([% currency %])</th>
|
|
<th>[% total_rrp_gsti %]</th>
|
|
<th> </th>
|
|
<th>[% total_quantity %]</th>
|
|
<th>[% total_est_gsti %]</th>
|
|
<th> </th>
|
|
</tr>
|
|
<tr>
|
|
<th colspan="3">Total + Shipment cost ([% currency %])</th>
|
|
<th> </th>
|
|
<th> </th>
|
|
<th>[% total_quantity %]</th>
|
|
<th>[% total_gsti_shipment %]</th>
|
|
<th> </th>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
[% ELSE %]
|
|
<p>No orders yet</p>
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'acquisitions-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|