c59e395b74
In acquisition, several templates try to display publisher code and publication year : invoice.tt, parcel.tt, transferorder.tt.
Thoses pages use C4::Acquisition methods GetPendingOrders or GetInvoiceDetails.
The bug is that in the SQL query of those methods, biblioitems.publishercode and biblioitems.publicationyear.
In uncertainprice.pl those datas are fetch using GetBiblioData.
It whould be better to fetch them in GetPendingOrders and GetInvoiceDetails.
This patch changes SQL queries to fetch wanted datas : aqorders.*,biblio.title,biblio.author,biblioitems.isbn,biblioitems.publishercode,biblioitems.publicationyear. GetInvoiceDetails also needs : biblio.seriestitle,biblioitems.volume.
This patch also unifies the way biblio datas are displayed :
<a href="link to catalog using biblionumber">[title]</a> <em>by</em> [author] – [isbn]
<em>Publisher:</em> [publishercode], [publicationyear]
Test plan :
- Choose a biblio record containing a data in :
biblio.title,
biblio.author,
biblioitems.isbn,
biblioitems.publishercode,
biblioitems.publicationyear,
biblio.seriestitle,
biblioitems.volume.
- Create an order using this biblio.
- Look at this order in pages : parcel.pl, transferorder.pl, uncertainprice.pl
=> You see publisher code and publication year
- Look at this order in page : invoice.pl
=> You see publisher code, publication year, series title and volume
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
154 lines
6.6 KiB
Text
154 lines
6.6 KiB
Text
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › [% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername %][% ELSE %]Orders with uncertain prices[% 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">
|
|
//<![CDATA[
|
|
$(document).ready(function() {
|
|
var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aoColumnDefs": [
|
|
{ "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
|
|
],
|
|
"sPaginationType": "four_button"
|
|
} ) );
|
|
$(".check_uncertain").on("change",function(){
|
|
var form = document.getElementById("uncertainprices");
|
|
var ordernumber = $(this).data("ordernumber");
|
|
uncheckbox( form, ordernumber );
|
|
});
|
|
});
|
|
var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the price and try again!");
|
|
//]]>
|
|
</script>
|
|
<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
|
|
</head>
|
|
<body id="acq_uncertainprice" 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> › [% IF ( booksellername ) %]<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> › Uncertain prices for vendor [% booksellername %][% ELSE %]Uncertain prices[% END %]</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% INCLUDE 'acquisitions-toolbar.inc' %]
|
|
[% IF ( validate ) %]
|
|
<META HTTP-EQUIV=Refresh CONTENT="0; url=[% scriptname %]?booksellerid=[% booksellerid %]">
|
|
[% ELSE %]
|
|
[% IF ( booksellername ) %]
|
|
<h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a></h1>
|
|
<h2>Contact information</h2>
|
|
<p><strong>Address: </strong>
|
|
[% booksellerpostal %]
|
|
[% bookselleraddress1 %]
|
|
[% bookselleraddress2 %]
|
|
[% bookselleraddress3 %]
|
|
[% bookselleraddress4 %]
|
|
<a href="[% booksellerurl %]">[% booksellerurl %]</a>
|
|
</p>
|
|
<p><strong>Phone: </strong>
|
|
[% booksellerphone %] / Fax:
|
|
[% booksellerfax %]</p>
|
|
<dl>
|
|
[% FOREACH contact IN contacts %]
|
|
<dt><strong>Contact: </strong></dt>
|
|
<dd>[% contact.name %]
|
|
[% contact.position %]
|
|
[% contact.phone %]
|
|
[% contact.altphone %]
|
|
[% contact.email %]
|
|
[% contact.notes %]
|
|
</dd>
|
|
[% END %]
|
|
</dl>
|
|
[% IF ( booksellernotes ) %]
|
|
<p><strong>Notes: </strong>
|
|
[% booksellernotes %]</p>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
<h2>Orders with uncertain prices</h2>
|
|
<form action="[% scriptname %]" method="post">
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
|
|
<label for="owner">Orders from:</label>
|
|
<select id="owner" name="owner">
|
|
[% IF ( owner ) %]
|
|
<option value="0">Everyone</option>
|
|
<option value="1" selected="selected">me</option>
|
|
[% ELSE %]
|
|
<option value="0" selected="selected">Everyone</option>
|
|
<option value="1">me</option>
|
|
[% END %]
|
|
</select>
|
|
<input type="submit" value="Filter" />
|
|
</form>
|
|
<form action="[% scriptname %]" method="post" id="uncertainprices">
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
|
|
<input type="hidden" name="op" value="validate" />
|
|
<table id="uncertainpricet">
|
|
<thead>
|
|
<tr>
|
|
<th>Basket</th>
|
|
<th>Order</th>
|
|
<th>By</th>
|
|
<th>Uncertain</th>
|
|
<th>Price</th>
|
|
<th>Quantity</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH uncertainpriceorder IN uncertainpriceorders %]
|
|
<tr>
|
|
<td>
|
|
[% uncertainpriceorder.basketname %]
|
|
</td>
|
|
<td>
|
|
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber %]">[% uncertainpriceorder.title |html %]</a>
|
|
[% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]
|
|
[% IF ( uncertainpriceorder.publishercode ) %]
|
|
<br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]
|
|
[%- IF ( uncertainpriceorder.publicationyear ) %], [% uncertainpriceorder.publicationyear %][% END %]
|
|
[% END %]
|
|
[% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]
|
|
<br />
|
|
<a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber %]&booksellerid=[% booksellerid %]&basketno=[% uncertainpriceorder.basketno %]">
|
|
Edit
|
|
</a>
|
|
</td>
|
|
<td>
|
|
[% uncertainpriceorder.firstname %] [% uncertainpriceorder.surname %]
|
|
</td>
|
|
<td>
|
|
<input type="checkbox" name="uncertainprice[% uncertainpriceorder.ordernumber %]" value="1" checked="checked" />
|
|
</td>
|
|
<td>
|
|
<input class="check_uncertain" data-ordernumber="[% uncertainpriceorder.ordernumber %]" type="text" size="10" name="price[% uncertainpriceorder.ordernumber %]" value="[% uncertainpriceorder.listprice %]" />
|
|
</td>
|
|
<td>
|
|
[% IF Koha.Preference('AcqCreateItem') == 'ordering' %]
|
|
[% uncertainpriceorder.quantity %]
|
|
<input type="hidden" name="qty[% uncertainpriceorder.ordernumber %]" value="[% uncertainpriceorder.quantity %]" />
|
|
[% ELSE %]
|
|
<input class="check_uncertain" data-ordernumber="[% uncertainpriceorder.ordernumber %]" type="text" size="10" name="qty[% uncertainpriceorder.ordernumber %]" value="[% uncertainpriceorder.quantity %]" />
|
|
[% END %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<fieldset class="action"><input type="submit" value="Save" /></fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'vendor-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|