View | Details | Raw Unified | Return to bug 6934
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-4 / +4 lines)
Lines 85-97 $(document).ready(function() { Link Here
85
            <ol>
85
            <ol>
86
                <br>
86
                <br>
87
                <li>
87
                <li>
88
                    <label for="filter_date_begin">From: </label>
88
                    <label for="from">From: </label>
89
                    <input type="text" size="10" id="filter_date_begin" name="filter_date_begin" value="[% beginDate | $KohaDates %]" class="datepickerfrom" />
89
                    <input type="text" size="10" id="from" name="from" value="[% beginDate | $KohaDates %]" class="datepickerfrom" />
90
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
90
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
91
                </li>
91
                </li>
92
                <li>
92
                <li>
93
                    <label for="filter_date_end">To: </label>
93
                    <label for="to">To: </label>
94
                    <input type="text" size="10" id="filter_date_end" name="filter_date_end" value="[% endDate | $KohaDates %]" class="datepickerto" />
94
                    <input type="text" size="10" id="to" name="to" value="[% endDate | $KohaDates %]" class="datepickerto" />
95
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
95
                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
96
                </li>
96
                </li>
97
97
(-)a/reports/cash_register_stats.pl (-5 / +2 lines)
Lines 24-30 use C4::Koha; Link Here
24
use C4::Circulation;
24
use C4::Circulation;
25
use DateTime;
25
use DateTime;
26
use Koha::DateUtils;
26
use Koha::DateUtils;
27
use C4::Budgets qw/GetCurrency GetCurrencies/;
28
use Text::CSV::Encoded;
27
use Text::CSV::Encoded;
29
#use Data::Dumper;
28
#use Data::Dumper;
30
#use Smart::Comments;
29
#use Smart::Comments;
Lines 64-72 my $manualinv_types = $sth_manualinv->fetchall_arrayref({}); Link Here
64
63
65
if ($do_it) {
64
if ($do_it) {
66
65
67
    $fromDate = output_pref({ dt => eval { dt_from_string($input->param("filter_date_begin")) } || dt_from_string,
66
    $fromDate = output_pref({ dt => eval { dt_from_string($input->param("from")) } || dt_from_string,
68
            dateformat => 'sql', dateonly => 1 }); #for sql query
67
            dateformat => 'sql', dateonly => 1 }); #for sql query
69
    $toDate   = output_pref({ dt => eval { dt_from_string($input->param("filter_date_end")) } || dt_from_string,
68
    $toDate   = output_pref({ dt => eval { dt_from_string($input->param("to")) } || dt_from_string,
70
            dateformat => 'sql', dateonly => 1 }); #for sql query
69
            dateformat => 'sql', dateonly => 1 }); #for sql query
71
70
72
    my $whereTType = '';
71
    my $whereTType = '';
Lines 132-138 if ($do_it) { Link Here
132
        #}
131
        #}
133
    }
132
    }
134
133
135
    my @currency = GetCurrency();
136
    $grantotal = sprintf("%.2f", $grantotal);
134
    $grantotal = sprintf("%.2f", $grantotal);
137
135
138
    if($output eq 'screen'){
136
    if($output eq 'screen'){
139
- 

Return to bug 6934