Merge branch 'bug_9860' into 3.14-master
This commit is contained in:
commit
a75df8f700
1 changed files with 2 additions and 1 deletions
|
@ -317,7 +317,7 @@ $(document).ready(function () {
|
|||
|
||||
[% IF ( errmsgloop ) %]
|
||||
<div class="dialog alert">
|
||||
<h5>Cannot check in</h5>
|
||||
<h3>Check in message</h3>
|
||||
[% FOREACH errmsgloo IN errmsgloop %]
|
||||
[% IF ( errmsgloo.badbarcode ) %]
|
||||
<p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
|
||||
|
@ -341,6 +341,7 @@ $(document).ready(function () {
|
|||
[% END %]
|
||||
[% IF ( errmsgloo.withdrawn ) %]
|
||||
[% IF BlockReturnOfWithdrawnItems %]
|
||||
<h5>Cannot check in</h5>
|
||||
<p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p>
|
||||
[% ELSE %]
|
||||
<p class="problem">Item is withdrawn.</p>
|
||||
|
|
Loading…
Reference in a new issue