Attachment 54099 Details for Bug 6934 – [PASSED QA] Bug 6934: fix errors pointed out by the QA script

[patch] [PASSED QA] Bug 6934: fix errors pointed out by the QA script

PASSED-QA-Bug-6934-fix-errors-pointed-out-by-the-Q.patch (text/plain), 4.22 KB, created by Katrin Fischer on 2016-08-07 08:23:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2016-08-07 08:23:39 UTC

Size: 4.22 KB

patch

obsolete

>From 606ccdc2587406cdc24244563b0ff41b4721d4c1 Mon Sep 17 00:00:00 2001
>From: Bouzid Fergani <bouzid.fergani@inlibro.com>
>Date: Thu, 28 Jul 2016 09:38:01 -0400
>Subject: [PATCH] [PASSED QA] 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>
>---
> .../prog/en/modules/reports/cash_register_stats.tt |  2 +-
> .../prog/en/modules/reports/reports-home.tt        | 28 +++++++++++-----------
> reports/cash_register_stats.pl                     |  2 --
> 3 files changed, 15 insertions(+), 17 deletions(-)
>
>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
>--- 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 18eedd2..2430092 100644
>--- 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>
>-      </ul>
>-
>-        [% IF UseKohaPlugins %]
>-        <h2>Report Plugins</h2>
>+        <h2>Statistics wizards</h2>
>         <ul>
>-                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report Plugins</a></li>
>+            <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>
>+                <li><a href="/cgi-bin/koha/plugins/plugins-home.pl?method=report">Report plugins</a></li>
>+            </ul>
>         [% END %]
> 
>     </div>
>diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
>index 40ee489..ac5ea90 100755
>--- 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;
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 6934: 5634 | 5635 | 5640 | 5641 | 9379 | 9419 | 12602 | 12660 | 31210 | 36476 | 42564 | 42565 | 44847 | 44853 | 45972 | 45973 | 45974 | 48634 | 48642 | 48704 | 48705 | 48706 | 48707 | 48708 | 50429 | 50437 | 50938 | 53496 | 53500 | 53570 | 53571 | 53572 | 53573 | 53574 | 53575 | 53576 | 53577 | 53578 | 53579 | 53581 | 53582 | 53583 | 53584 | 53585 | 53586 | 53587 | 53588 | 53589 | 53590 | 53591 | 53648 | 53650 | 53651 | 53652 | 53653 | 53778 | 53780 | 54010 | 54088 | 54089 | 54090 | 54091 | 54092 | 54093 | 54094 | 54095 | 54096 | 54097 | 54098 | 54099 | 54100 | 55939 | 55988 | 55989 | 55990 | 55991 | 55992 | 55993 | 55994 | 55995 | 55996 | 55997 | 55998 | 55999 | 56000 | 56001 | 56763 | 56764