b29493265b
This adds a new basket attribute (create_items) that can optionally be
set to override AcqCreateItem.
The following have been modified to reflect this (with the value of
create_items that causes them to behave differently in parentheses):
* Cancelling receipt of an order (receiving)
* Creating an order by hand or from MARC (ordering)
* Receiving an order (receiving)
* Showing orders with uncertain price (ordering)
* Showing orders (receiving)
* Showing acquisition details in the OPAC (ordering)
Test plan:
1) Create baskets with "Create items when:" set to ordering,
receiving, cataloging and unset.
2) Test each of the above for each of these baskets, verifying that
the basket-specific attribute overrides AcqCreateItem if set and
falls back to the syspref otherwise.
NOTE: A check of AcqCreateItem in opac-detail.tt was removed because it
was redundant; the code path in question cannot be triggered unless
create_items/AcqCreateItems is set to the correct value anyway.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Barbara Fondren <bfondren@roundrocktexas.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
142 lines
6.7 KiB
Text
142 lines
6.7 KiB
Text
[% USE Branches %]
|
|
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions ›
|
|
[% IF ( add_form ) %]
|
|
[% IF ( basketno ) %]Edit basket '[% basketname %]'
|
|
[% ELSE %]Add a basket to [% booksellername %]
|
|
[% END %]
|
|
[% END %]
|
|
</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
|
|
</head>
|
|
<body id="acq_basketheader" 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/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> ›
|
|
[% IF ( add_form ) %]
|
|
[% IF ( basketno ) %]Edit basket '[% basketname |html %]'
|
|
[% ELSE %]Add a basket to [% booksellername %]
|
|
[% END %]
|
|
[% END %]
|
|
</div>
|
|
|
|
<div id="doc" class="yui-t7">
|
|
<div id="bd">
|
|
|
|
<div id="yui-main">
|
|
|
|
[% IF ( add_form ) %]
|
|
[% IF ( basketno ) %]
|
|
<h1>Edit basket [% basketname |html %]</h1>
|
|
[% ELSE %]<h1>Add a basket to [% booksellername %]</h1>
|
|
[% END %]
|
|
<form name="Aform" action="[% script_name %]" method="post" class="validated">
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
|
|
<fieldset class="rows">
|
|
<ol>
|
|
[% IF ( basketno ) %]
|
|
<li>
|
|
<input type="hidden" name="basketno" value="[% basketno %]" />
|
|
<input type="hidden" name="rs_an_edit" value="1" />
|
|
</li>
|
|
[% END %]
|
|
<li>
|
|
<label for="basketname" class="required">Basket name: </label>
|
|
<input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" required="required" class="required" />
|
|
<span class="required">Required</span>
|
|
</li>
|
|
<li>
|
|
<label for="billingplace">Billing place:</label>
|
|
<select name="billingplace" id="billingplace">
|
|
<option value="">--</option>
|
|
[% PROCESS options_for_libraries libraries => Branches.all( selected => billingplace ) %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="deliveryplace">Delivery place:</label>
|
|
<select name="deliveryplace" id="deliveryplace">
|
|
<option value="">--</option>
|
|
[% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="basketbooksellerid">Vendor: </label>
|
|
<select name="basketbooksellerid" id="basketbooksellerid">
|
|
[% FOREACH b IN booksellers %]
|
|
[% IF booksellerid == b.id %]
|
|
<option value="[% b.id %]" selected="selected">[% b.name %]</option>
|
|
[% ELSE %]
|
|
<option value="[% b.id %]">[% b.name %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="basketnote">Internal note: </label>
|
|
<textarea name="basketnote" id="basketnote" rows="5" cols="40">[% basketnote |html %]</textarea>
|
|
</li>
|
|
<li>
|
|
<label for="basketbooksellernote">Vendor note: </label>
|
|
<textarea name="basketbooksellernote" id="basketbooksellernote" rows="5" cols="40">[% basketbooksellernote |html %]</textarea>
|
|
</li>
|
|
[% IF ( contractloop ) %]
|
|
<li><label for="basketcontractnumber">Contract: </label>
|
|
<select id="basketcontractnumber" name="basketcontractnumber">
|
|
<option value=""></option>
|
|
[% FOREACH contractloo IN contractloop %]
|
|
[% IF ( contractloo.selected ) %]
|
|
<option value="[% contractloo.contractnumber %]" selected="selected">[% contractloo.contractname %]</option>
|
|
[% ELSE %]
|
|
<option value="[% contractloo.contractnumber %]">[% contractloo.contractname %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
[% END %]
|
|
<li>
|
|
<label for="is_standing">Orders are standing:</label>
|
|
[% IF is_standing %]
|
|
<input type="checkbox" id="is_standing" name="is_standing" checked="checked" />
|
|
[% ELSE %]
|
|
<input type="checkbox" id="is_standing" name="is_standing"/>
|
|
[% END %]
|
|
<div class="hint">Standing orders do not close when received.</div>
|
|
</li>
|
|
[% UNLESS basketno %]
|
|
<li>
|
|
<label for="create_items">Create items when:</label>
|
|
<select name="create_items" id="create_items">
|
|
[% SWITCH Koha.Preference('AcqCreateItem') %]
|
|
[% CASE 'receiving' %]<option value="">use default (receiving an order).</option>
|
|
[% CASE 'cataloguing' %]<option value="">use default (cataloging the record).</option>
|
|
[% CASE %]<option value="">use default (placing an order).</option>
|
|
[% END %]
|
|
<option value="ordering">placing an order.</option>
|
|
<option value="receiving">receiving an order.</option>
|
|
<option value="cataloguing">cataloging the record.</option>
|
|
</select>
|
|
</li>
|
|
[% END %]
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input type="hidden" name="op" value="add_validate" />
|
|
<input type="submit" value="Save" />
|
|
[% IF ( basketno ) %]
|
|
<a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
|
|
[% ELSE %]
|
|
<a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a>
|
|
[% END %]
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|