Bug 11759: (QA followup) Fix koha-qa errors

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index e896454..ed470ec 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -404,7 +404,7 @@ if (@$barcodes) {
                 $template_params->{getTitleMessageIteminfo} = $iteminfo->{'title'};
                 $template_params->{getBarcodeMessageIteminfo} = $iteminfo->{'barcode'};
                 $template_params->{NEEDSCONFIRMATION} = 1;
-                $template_params->{onsite_checkout} => $onsite_checkout,
+                $template_params->{onsite_checkout} = $onsite_checkout;
                 $confirm_required = 1;
             }
         }
@@ -416,6 +416,7 @@ if (@$barcodes) {
         }
     }
 
+    # FIXME If the issue is confirmed, we launch another time GetMemberIssuesAndFines, now display the issue count after issue
     my ( $od, $issue, $fines ) = GetMemberIssuesAndFines($borrowernumber);
 
     if ($question->{RESERVE_WAITING} or $question->{RESERVED}){

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 7d16375..6b691b7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -13,10 +13,9 @@
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-[% IF ( UseTablesortForCirc ) %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+[% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'datatables-strings.inc' %]
-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>[% END %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery-ui-timepicker-addon.js"></script>
 <script type="text/javascript">
@@ -48,8 +47,8 @@ $(document).ready(function() {
 <div id="doc3" class="yui-t2">
 
    <div id="bd">
-    <div id="yui-main">
-    <div class="yui-b">
+<div id="yui-main">
+<div class="yui-b">
 
 <div class="yui-g">