Bug 31051: Fix test

[koha-ffzg.git] / reports / cash_register_stats.pl

diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
index a59fcdb..c2b22f9 100755 (executable)
--- a/reports/cash_register_stats.pl
+++ b/reports/cash_register_stats.pl
@@ -16,17 +16,15 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use C4::Auth;
+use C4::Auth qw( get_template_and_user );
 use CGI;
 use C4::Context;
-use C4::Reports;
-use C4::Output;
-use C4::Koha;
-use C4::Circulation;
+use C4::Reports qw( GetDelimiterChoices );
+use C4::Output qw( output_html_with_http_headers );
 use DateTime;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Text::CSV::Encoded;
-use List::Util qw/any/;
+use List::Util qw( any );
 
 use Koha::Account::CreditTypes;
 use Koha::Account::DebitTypes;
@@ -39,7 +37,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
     query => $input,
     type => "intranet",
     flagsrequired => {reports => '*'},
-    debug => 1,
 });
 
 my $do_it            = $input->param('do_it');
@@ -54,8 +51,8 @@ $template->param(
 );
 
 #Initialize date pickers to today
-my $fromDate = dt_from_string;
-my $toDate   = dt_from_string;
+my $fromDate = $input->param("from") || dt_from_string;
+my $toDate   = $input->param("to")   || dt_from_string;
 
 my @debit_types =
   Koha::Account::DebitTypes->search()->as_list;
@@ -65,10 +62,6 @@ my $registerid;
 
 if ($do_it) {
 
-    $fromDate = output_pref({ dt => eval { dt_from_string(scalar $input->param("from")) } || dt_from_string,
-            dateformat => 'sql', dateonly => 1 }); #for sql query
-    $toDate   = output_pref({ dt => eval { dt_from_string(scalar $input->param("to")) } || dt_from_string,
-            dateformat => 'sql', dateonly => 1 }); #for sql query
 
     my $whereTType = q{};
     my @extra_params; # if we add conditions to the select we need extra params
@@ -103,17 +96,20 @@ if ($do_it) {
     }
 
     my $query = "
-    SELECT round(amount,2) AS amount, description,
+    SELECT round(amount,2) AS amount, al.description,
         bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
         bo.cardnumber, br.branchname, bo.borrowernumber,
-        al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note, al.timestamp,
+        al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, COALESCE(act.description,al.credit_type_code,adt.description,al.debit_type_code) AS type_description, al.amountoutstanding, al.note, al.timestamp,
         bi.title, bi.biblionumber, i.barcode, i.itype
         FROM accountlines al
         LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
         LEFT JOIN borrowers m ON (al.manager_id = m.borrowernumber)
-        LEFT JOIN branches br ON (br.branchcode = m.branchcode )
+        LEFT JOIN cash_registers cr ON (al.register_id = cr.id)
+        LEFT JOIN branches br ON (br.branchcode = cr.branch)
         LEFT JOIN items i ON (i.itemnumber = al.itemnumber)
         LEFT JOIN biblio bi ON (bi.biblionumber = i.biblionumber)
+        LEFT JOIN account_credit_types act ON (al.credit_type_code = act.code)
+        LEFT JOIN account_debit_types adt ON (al.debit_type_code = adt.code)
         WHERE CAST(al.date AS DATE) BETWEEN ? AND ?
         $whereTType
         $whereBranchCode
@@ -157,7 +153,7 @@ if ($do_it) {
         my $format = 'csv';
         my $reportname = $input->param('basename');
         my $reportfilename = $reportname ? "$reportname.$format" : "reportresults.$format" ;
-        my $delimiter = C4::Context->preference('CSVDelimiter') || ',';
+        my $delimiter = C4::Context->csv_delimiter;
             my @rows;
             foreach my $row (@loopresult) {
                 my @rowValues;
@@ -167,8 +163,7 @@ if ($do_it) {
                         $row->{branchname},
                         $row->{date},
                         $row->{timestamp},
-                        $row->{credit_type},
-                        $row->{debit_type},
+                        $row->{type_description},
                         $row->{note},
                         $row->{amount},
                         $row->{title},
@@ -177,7 +172,7 @@ if ($do_it) {
                     push (@rows, \@rowValues) ;
                 }
                 my @total;
-                for (1..6){push(@total,"")};
+                for (1..7){push(@total,"")};
                 push(@total, $grantotal);
         print $input->header(
             -type       => 'text/csv',