Katrin Fischer
c58c3a2286
This is a first step towards more consistency and possibly supporting
multiple input formats as well in the future. It marks all input fields
for monetary values, such as prices, replacement prices etc. with a class
that is linked to a check for number format with the jQuery Validator plugin.
To test:
For any input field to test, try adding various false entries, like "abc" or "1,00".
It should only accept inputs with decimal dot, like: "1.00"
0) Apply patch, restart_all
1) Suggestion
* Add a new suggestion in the staff interface
* Test: price input field at the bottom of the form.
* Accept the suggestion
2) Order form
* Create a new basket
* Create an order line from an existing record
* Test: list price, replacement price, and actual price.
* Check the checkbox for uncertain price before you save
3) Uncertain prices
* Go to the uncertain prices page for this vendor
* Test: price field
Note: this form does its own validation, but the change should not change behaviour for now
* Resolve the uncertain price
* Close order
4) Receive shipment
* Test: Shipping cost
5) Receive the order
* Test: replacement price, actual price
* Check checkbox for price in foreign currency
* Test: price in foreign currency
* Receive order line
6) Invoice summary
* Finish receiving
* Test: shipping cost
* Test: invoice adjustments: amount in the form for the first entry, amount in the table after adding it
7) Merging invoices
* Receive another shipment and create and invoice
* Go to invoices and search all
* Check the 2 entries for merging
* Test: shipping cost
8) Adding orders from a staged/new file
* Export some records using the cart or list
* Create a new basket
* Order from new file
* Import your file, ignore item records
* Test: price and replacement price
+ Bonus: also test with items, test plan and file from bug 22802 are really helpful here
Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c943fddac6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
192 lines
9.5 KiB
Text
192 lines
9.5 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE Koha %]
|
|
[% USE Price %]
|
|
[% PROCESS 'i18n.inc' %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( booksellername ) %]Orders with uncertain prices for vendor [% booksellername | html %][% ELSE %]Orders with uncertain prices[% END %] › Acquisitions › Koha</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="acq_uncertainprice" class="acq">
|
|
[% WRAPPER 'header.inc' %]
|
|
[% INCLUDE 'acquisitions-search.inc' %]
|
|
[% END %]
|
|
|
|
[% WRAPPER 'sub-header.inc' %]
|
|
[% WRAPPER breadcrumbs %]
|
|
[% WRAPPER breadcrumb_item %]
|
|
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
|
|
[% END %]
|
|
[% IF ( booksellername ) %]
|
|
[% WRAPPER breadcrumb_item %]
|
|
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
|
|
[% END %]
|
|
[% WRAPPER breadcrumb_item bc_active= 1 %]
|
|
<span>Uncertain prices for vendor [% booksellername | html %]</span>
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% WRAPPER breadcrumb_item bc_active= 1 %]
|
|
<span>Uncertain prices</span>
|
|
[% END %]
|
|
[% END %]
|
|
[% END #/ WRAPPER breadcrumbs %]
|
|
[% END #/ WRAPPER sub-header.inc %]
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-sm-10 col-sm-push-2">
|
|
<main>
|
|
|
|
[% INCLUDE 'acquisitions-toolbar.inc' %]
|
|
[% IF ( validate ) %]
|
|
[% SET metacontent = '0; url=' _ scriptname _ '?booksellerid=' _ booksellerid %]
|
|
<META HTTP-EQUIV=Refresh CONTENT="[% metacontent | html %]">
|
|
[% ELSE %]
|
|
[% IF ( booksellername ) %]
|
|
<h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
|
|
|
|
<div class="page-section">
|
|
<h2>Contact information</h2>
|
|
<p><strong>Address: </strong>
|
|
[% booksellerpostal | html %]
|
|
[% bookselleraddress1 | html %]
|
|
[% bookselleraddress2 | html %]
|
|
[% bookselleraddress3 | html %]
|
|
[% bookselleraddress4 | html %]
|
|
</p>
|
|
<p><strong>Phone: </strong>
|
|
[% booksellerphone | html %]
|
|
<dl>
|
|
[% FOREACH contact IN contacts %]
|
|
<dt><strong>Contact: </strong></dt>
|
|
<dd>[% contact.name | html %]
|
|
[% contact.position | html %]
|
|
[% contact.phone | html %]
|
|
[% contact.altphone | html %]
|
|
[% contact.email | html %]
|
|
[% contact.notes | html %]
|
|
</dd>
|
|
[% END %]
|
|
</dl>
|
|
[% IF ( booksellernotes ) %]
|
|
<p><strong>Notes: </strong>
|
|
[% booksellernotes | html %]</p>
|
|
[% END %]
|
|
</div> <!-- /.page-section -->
|
|
[% END %]
|
|
|
|
<div class="page-section">
|
|
<h2>Order lines with uncertain prices</h2>
|
|
<form action="[% scriptname | html %]" method="post">
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
|
|
<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" class="btn btn-primary" value="Filter" />
|
|
</form>
|
|
</div> <!-- /.page-section -->
|
|
<form action="[% scriptname | html %]" method="post" id="uncertainprices">
|
|
<fieldset class="rows">
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
|
|
<input type="hidden" name="op" value="validate" />
|
|
<table id="uncertainpricet">
|
|
<thead>
|
|
<tr>
|
|
<th>Basket</th>
|
|
<th>[% tp('noun', 'Order') | html %]</th>
|
|
<th>By</th>
|
|
<th class="NoSort">Uncertain</th>
|
|
<th class="NoSort">Price</th>
|
|
<th class="NoSort">Quantity</th>
|
|
<th class="NoSort">Edit</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH uncertainpriceorder IN uncertainpriceorders %]
|
|
<tr>
|
|
<td>
|
|
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% uncertainpriceorder.basketno | uri %]">[% uncertainpriceorder.basketname | html %]</a>
|
|
</td>
|
|
<td>
|
|
[% INCLUDE 'biblio-title.inc' biblio=uncertainpriceorder link = 1 %]
|
|
[% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author | html %][% END %]
|
|
[% IF ( uncertainpriceorder.publishercode ) %]
|
|
<br /><em>Publisher:</em> [% uncertainpriceorder.publishercode | html %]
|
|
[%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear | html %]
|
|
[%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate | html %]
|
|
[% END %]
|
|
[% END %]
|
|
[% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn | html %][% END %]
|
|
<br />
|
|
</td>
|
|
<td>
|
|
[% uncertainpriceorder.firstname | html %] [% uncertainpriceorder.surname | html %]
|
|
</td>
|
|
<td>
|
|
<input type="checkbox" name="uncertainprice[% uncertainpriceorder.ordernumber | html %]" value="1" checked="checked" />
|
|
</td>
|
|
<td>
|
|
<input class="check_uncertain decimal" data-ordernumber="[% uncertainpriceorder.ordernumber | html %]" type="text" size="10" name="price[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.listprice | $Price on_editing => 1 %]" />
|
|
</td>
|
|
<td>
|
|
[% IF basket.effective_create_items == 'ordering' %]
|
|
[% uncertainpriceorder.quantity | html %]
|
|
<input type="hidden" name="qty[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.quantity | html %]" />
|
|
[% ELSE %]
|
|
<input class="check_uncertain" data-ordernumber="[% uncertainpriceorder.ordernumber | html %]" type="text" size="10" name="qty[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.quantity | html %]" />
|
|
[% END %]
|
|
</td>
|
|
<td class="actions">
|
|
<a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% uncertainpriceorder.basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
</fieldset>
|
|
<fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
</main>
|
|
</div> <!-- /.col-sm-10.col-sm-push-2 -->
|
|
|
|
<div class="col-sm-2 col-sm-pull-10">
|
|
<aside>
|
|
[% INCLUDE 'vendor-menu.inc' %]
|
|
</aside>
|
|
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
|
|
</div> <!-- /.row -->
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/acquisitions-menu.js") | $raw %]
|
|
[% Asset.js("js/acq.js") | $raw %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
<script>
|
|
$(document).ready(function() {
|
|
var uncertainpricet = $("#uncertainpricet").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"aoColumnDefs": [
|
|
{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
|
|
],
|
|
"sPaginationType": "full"
|
|
}));
|
|
$(".check_uncertain").on("change",function(){
|
|
var form = document.getElementById("uncertainprices");
|
|
var ordernumber = $(this).data("ordernumber");
|
|
uncheckbox( form, ordernumber );
|
|
});
|
|
});
|
|
</script>
|
|
[% Asset.js("js/acq.js") | $raw %]
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|