Merge branch 'bug_9397' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-03-02 12:18:19 -05:00
commit 7e529fed2e
1 changed files with 1 additions and 1 deletions

View File

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