Bug 2624: Fix for non-persistent check boxes in check-in screen.

Found this bug when playing with AutomaticItemReturn. The "Forgive overdue charges" and "Dropbox mode" would lose their value the item was transfered (if automatic transfer was off), caught a hold, or caught a hold at another location.
This patch does not completely do away with the problem.  If an item is checked-in in simple mode, then one of the forms mentioned above opens, then the user checks one of the selection boxes, the value is not retained.  Javasript would have to be added to transfer the value to the confirmation form when the checkbox is clicked.

This patch also cleans up a few minor XHTML errors.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 77cbb88..a06dc49 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -117,6 +117,8 @@ function Dopop(link) {
                 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
                 <input type="hidden" name="resbarcode" value="<!-- TMPL_VAR Name="barcode" -->" />
                 <input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
+                <input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
+                <input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
                 </form>
        </div>
     <!-- /TMPL_IF -->
@@ -149,6 +151,8 @@ function Dopop(link) {
                 <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
             <!-- /TMPL_LOOP -->
             <input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
+            <input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
+            <input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
             <input type="hidden" name="barcode" value="0" />
         </form>
                </div>
@@ -167,8 +171,10 @@ function Dopop(link) {
     <form method="post" action="returns.pl" name="mainform" id="mainform">              
        <input type="submit" name="dotransfer" value="Yes" class="submit" />
        <input type="submit" name="notransfer" value="No" class="submit" />
-       <input type="hidden" name="tobranch" value="<!-- TMPL_VAR NAME="homebranch" -->">
-       <input type="hidden" name="transferitem" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+       <input type="hidden" name="tobranch" value="<!-- TMPL_VAR NAME="homebranch" -->" />
+       <input type="hidden" name="transferitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+        <input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
+        <input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
        <!--TMPL_LOOP Name="inputloop" -->     
        <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" /> 
        <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" /> 
@@ -239,10 +245,11 @@ function Dopop(link) {
             <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
             <input type="hidden" name="resbarcode" value="<!-- TMPL_VAR Name="barcode" -->" />
             <input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
+            <input type="hidden" name="exemptfine" value="<!-- TMPL_VAR Name="exemptfine" -->" />
+            <input type="hidden" name="dropboxmode" value="<!-- TMPL_VAR Name="dropboxmode" -->" />
         </form>
        </div>
     <!-- /TMPL_IF -->
-       </div>
 <!-- TMPL_ELSE -->
 
 <!-- TMPL_IF NAME="errmsgloop" -->
@@ -314,7 +321,6 @@ function Dopop(link) {
                     </li>
                     <!-- /TMPL_IF --> <!-- overduecharges -->
                     <li>
-                        <!-- (fixme) -->
                         <!-- TMPL_IF NAME="dropboxmode" -->
                         <input type="checkbox" id="dropboxcheck" name="dropboxmode" value="dropboxmode" checked="checked" />
                         <!-- TMPL_ELSE -->