Merge branch 'bug_9860' into 3.14-master

This commit is contained in:
Jared Camins-Esakov 2013-04-21 09:33:56 -04:00
commit a75df8f700

View file

@ -317,7 +317,7 @@ $(document).ready(function () {
[% IF ( errmsgloop ) %] [% IF ( errmsgloop ) %]
<div class="dialog alert"> <div class="dialog alert">
<h5>Cannot check in</h5> <h3>Check in message</h3>
[% FOREACH errmsgloo IN errmsgloop %] [% FOREACH errmsgloo IN errmsgloop %]
[% IF ( errmsgloo.badbarcode ) %] [% IF ( errmsgloo.badbarcode ) %]
<p class="problem">No item with barcode: [% errmsgloo.msg %]</p> <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
@ -341,6 +341,7 @@ $(document).ready(function () {
[% END %] [% END %]
[% IF ( errmsgloo.withdrawn ) %] [% IF ( errmsgloo.withdrawn ) %]
[% IF BlockReturnOfWithdrawnItems %] [% IF BlockReturnOfWithdrawnItems %]
<h5>Cannot check in</h5>
<p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p> <p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p>
[% ELSE %] [% ELSE %]
<p class="problem">Item is withdrawn.</p> <p class="problem">Item is withdrawn.</p>