From 67c64f2db8d739f9762cb0e3a48e5eb719ebf850 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 4 Mar 2016 15:10:57 -0500 Subject: [PATCH] [PASSED QA] Bug 6934: Fixed Calendar and removed used of unexisting and unused C4::Budgets getCurrency Signed-off-by: Hector Castro Signed-off-by: Katrin Fischer --- .../intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt | 8 ++++---- reports/cash_register_stats.pl | 6 ++---- 2 files changed, 6 insertions(+), 8 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 425d333..341ebca 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 @@ -85,13 +85,13 @@ $(document).ready(function() {

  1. - - + +
    [% INCLUDE 'date-format.inc' %]
  2. - - + +
    [% INCLUDE 'date-format.inc' %]
  3. diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl index 7d89e65..2384ae3 100755 --- a/reports/cash_register_stats.pl +++ b/reports/cash_register_stats.pl @@ -24,7 +24,6 @@ use C4::Koha; use C4::Circulation; use DateTime; use Koha::DateUtils; -use C4::Budgets qw/GetCurrency GetCurrencies/; use Text::CSV::Encoded; #use Data::Dumper; #use Smart::Comments; @@ -64,9 +63,9 @@ my $manualinv_types = $sth_manualinv->fetchall_arrayref({}); if ($do_it) { - $fromDate = output_pref({ dt => eval { dt_from_string($input->param("filter_date_begin")) } || dt_from_string, + $fromDate = output_pref({ dt => eval { dt_from_string($input->param("from")) } || dt_from_string, dateformat => 'sql', dateonly => 1 }); #for sql query - $toDate = output_pref({ dt => eval { dt_from_string($input->param("filter_date_end")) } || dt_from_string, + $toDate = output_pref({ dt => eval { dt_from_string($input->param("to")) } || dt_from_string, dateformat => 'sql', dateonly => 1 }); #for sql query my $whereTType = ''; @@ -132,7 +131,6 @@ if ($do_it) { #} } - my @currency = GetCurrency(); $grantotal = sprintf("%.2f", $grantotal); if($output eq 'screen'){ -- 1.9.1