Bug 6934: fix errors pointed out by the QA script

Also fix forbidden patterns in koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
index 01e0e4a..5de0626 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
@@ -287,7 +287,7 @@ $(document).ready(function() {
         <tr>
             [% IF transaction_type == "ACT" %]
             <th colspan="7" style="text-align:right;">TOTAL</th>
-            <th style="text-align:right;">[% total %]</th>
+            <th style="text-align:right;">[% total  | $Price %]</th>
             <th colspan="3">&nbsp;</th>
             [% END %]
         </tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
index 1409a09..9ce5d66 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
@@ -28,22 +28,22 @@
             <li><a href="/cgi-bin/koha/reports/dictionary.pl?phase=View%20Dictionary">View dictionary</a></li>
         </ul>
 
-       <h2>Statistics wizards</h2>
-       <ul>
-               <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
-               <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
-               <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li>
-               <li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
-               <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li>
-        <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash register</a></li>
-               <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li>
+        <h2>Statistics wizards</h2>
+        <ul>
+            <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
+            <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
+            <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li>
+            <li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
+            <li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li>
+            <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash register</a></li>
+            <li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li>
       </ul>
 
         [% IF UseKohaPlugins %]
-        <h2>Report plugins</h2>
-        <ul>
+            <h2>Report plugins</h2>
+            <ul>
                 <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li>
-        </ul>
+            </ul>
         [% END %]
 
     </div>

diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
index 40ee489..ac5ea90 100755 (executable)
--- a/reports/cash_register_stats.pl
+++ b/reports/cash_register_stats.pl
@@ -137,13 +137,11 @@ if ($do_it) {
             total => $grantotal,
         );
     } else{
-        my $q_errors;
         my $format = 'csv';
         my $reportname = $input->param('basename');
         my $reportfilename = $reportname ? "$reportname.$format" : "reportresults.$format" ;
         #my $reportfilename = "$reportname.html" ;
         my $delimiter = C4::Context->preference('delimiter') || ',';
-        my ( $content );
             my @rows;
             foreach my $row (@loopresult) {
                 my @rowValues;