gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 6934: Fixed Calendar and removed used of unexisting and unused C4::Budgets getCurrency 

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>
This commit is contained in:
remi 2016-03-04 15:10:57 -05:00 committed by Kyle M Hall
parent 4ed68d1e71
commit 03e654ee2e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
View File

@ -85,13 +85,13 @@ $(document).ready(function() {
<ol>
<br>
<li>
<label for="filter_date_begin">From: </label>
<input type="text" size="10" id="filter_date_begin" name="filter_date_begin" value="[% beginDate | $KohaDates %]" class="datepickerfrom" />
<label for="from">From: </label>
<input type="text" size="10" id="from" name="from" value="[% beginDate | $KohaDates %]" class="datepickerfrom" />
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
</li>
<li>
<label for="filter_date_end">To: </label>
<input type="text" size="10" id="filter_date_end" name="filter_date_end" value="[% endDate | $KohaDates %]" class="datepickerto" />
<label for="to">To: </label>
<input type="text" size="10" id="to" name="to" value="[% endDate | $KohaDates %]" class="datepickerto" />
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
</li>

6
reports/cash_register_stats.pl
View File

@ -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'){