[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/reports/ca... [rel_3_0]

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Henri-Damien LAURENT <hdl>      07/02/27 14:17:12

Modified files:
        koha-tmpl/intranet-tmpl/prog/en/reports: cat_issues_top.tmpl 
        reports        : acquisitions_stats.pl 

Log message:
        Bug Fixing :
        acquisitions stats summs aqorder quantities.
        Some minor bugs in cat_issues_top.tmpl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reports/acquisitions_stats.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.11.2.3&r2=1.11.2.4

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl 17 Nov 2006 
11:18:30 -0000      1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl 27 Feb 2007 
14:17:12 -0000      1.1.2.3
@@ -1,5 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE 
NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE 
NAME="menu-reports.inc"-->
+
+
+<!-- TMPL_IF NAME="do_it" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" 
-->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -7,9 +11,6 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" 
-->/includes/calendar/calendar-en.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" 
-->/includes/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
-
-
-<!-- TMPL_IF NAME="do_it" -->
 <script language="JavaScript" type="text/javascript">
 function Dopop(link) {
        
newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
@@ -22,7 +23,7 @@
                        <!-- TMPL_LOOP NAME="loopfilter" -->
                                        <p><!-- TMPL_IF NAME="err" -->  
<!--/TMPL_IF --> <!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR 
NAME="filter"--><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --></p>
                        <!-- /TMPL_LOOP -->
-               <!-- /TMPL_IF NAME="loopfilter"-->
+               <!-- /TMPL_IF-->
                
                <table>
                        <tr >
@@ -44,7 +45,7 @@
                                                <!-- TMPL_VAR NAME="rowtitle" 
--></td>
                                                <!-- TMPL_LOOP NAME="loopcell" 
-->
                                                        <!-- TMPL_IF 
NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF 
-->
-                                                               <!-- TMPL_IF 
NAME="reference" --><a 
href="javascript:Dopop('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="reference" -->')" ><!-- /TMPL_IF -->
+                                                               <!-- TMPL_IF 
NAME="reference" --><a 
href="javascript:Dopop('../catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="reference" -->')" ><!-- /TMPL_IF -->
                                                                <!-- TMPL_IF 
NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- TMPL_ELSE -->Item<!-- 
/TMPL_IF -->
                                                                <!-- TMPL_IF 
NAME="reference" --></a><!-- /TMPL_IF -->
                                                        </td>
@@ -53,7 +54,7 @@
                                                        </td>
                                                <!-- /TMPL_LOOP -->
                                        </tr>
-                               <!-- /TMPL_LOOP NAME="looprow" -->
+                               <!-- /TMPL_LOOP -->
                </table>
        <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->

Index: reports/acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -b -r1.11.2.3 -r1.11.2.4
--- reports/acquisitions_stats.pl       18 Dec 2006 16:35:19 -0000      1.11.2.3
+++ reports/acquisitions_stats.pl       27 Feb 2007 14:17:12 -0000      1.11.2.4
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: acquisitions_stats.pl,v 1.11.2.3 2006/12/18 16:35:19 toins Exp $
+# $Id: acquisitions_stats.pl,v 1.11.2.4 2007/02/27 14:17:12 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -608,7 +608,7 @@
     # preparing calculation
     my $strcalc;
     $strcalc .= "SELECT $linefield, $colfield, ";
-    $strcalc .= "COUNT( aqorders.ordernumber ) " if ( $process == 1 );
+    $strcalc .= "SUM( aqorders.quantity ) " if ( $process == 1 );
     $strcalc .= "SUM( aqorders.quantity * aqorders.listprice ) "
       if ( $process == 2 );
     $strcalc .= "FROM (aqorders, aqbasket,aqorderbreakdown)