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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt (-1 / +1 lines)
Lines 35-41 Link Here
35
		<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li>
35
		<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalog</a></li>
36
		<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
36
		<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
37
		<li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li>
37
		<li><a href="/cgi-bin/koha/reports/serials_stats.pl">Serials</a></li>
38
        <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash Register</a></li>
38
        <li><a href="/cgi-bin/koha/reports/cash_register_stats.pl">Cash register</a></li>
39
		<li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li>
39
		<li><a href="/cgi-bin/koha/reports/reserves_stats.pl">Holds</a></li>
40
      </ul>
40
      </ul>
41
41
(-)a/reports/cash_register_stats.pl (-21 / +18 lines)
Lines 25-32 use C4::Circulation; Link Here
25
use DateTime;
25
use DateTime;
26
use Koha::DateUtils;
26
use Koha::DateUtils;
27
use Text::CSV::Encoded;
27
use Text::CSV::Encoded;
28
#use Data::Dumper;
29
#use Smart::Comments;
30
28
31
my $input            = new CGI;
29
my $input            = new CGI;
32
my $dbh              = C4::Context->dbh;
30
my $dbh              = C4::Context->dbh;
Lines 153-184 if ($do_it) { Link Here
153
            $csv or die "Text::CSV::Encoded->new({binary => 1}) FAILED: " . Text::CSV::Encoded->error_diag();
151
            $csv or die "Text::CSV::Encoded->new({binary => 1}) FAILED: " . Text::CSV::Encoded->error_diag();
154
            my @headers = ();
152
            my @headers = ();
155
            push @headers, "mfirstname",
153
            push @headers, "mfirstname",
156
			            "cardnumber",
154
                        "cardnumber",
157
			            "bfirstname",
155
                        "bfirstname",
158
			            "branchname",
156
                        "branchname",
159
			            "date",
157
                        "date",
160
			            "accounttype",
158
                        "accounttype",
161
			            "amount",
159
                        "amount",
162
			            "title",
160
                        "title",
163
			            "barcode",
161
                        "barcode",
164
			            "itype";
162
                        "itype";
165
            if ($csv->combine(@headers)) {
163
            if ($csv->combine(@headers)) {
166
                $content .= Encode::decode('UTF-8', $csv->string()) . "\n";
164
                $content .= Encode::decode('UTF-8', $csv->string()) . "\n";
167
            } else {
165
            } else {
168
                push @$q_errors, { combine => 'HEADER ROW: ' . $csv->error_diag() } ;
166
                push @$q_errors, { combine => 'HEADER ROW: ' . $csv->error_diag() } ;
169
            }
167
            }
170
            foreach my $row (@loopresult) {
168
            foreach my $row (@loopresult) {
171
				my @rowValues = ();
169
                my @rowValues = ();
172
                push @rowValues, $row->{mfirstname},
170
                push @rowValues, $row->{mfirstname},
173
                        $row->{cardnumber},
171
                        $row->{cardnumber},
174
						$row->{bfirstname},
172
                        $row->{bfirstname},
175
						$row->{branchname},
173
                        $row->{branchname},
176
						$row->{date},
174
                        $row->{date},
177
						$row->{accounttype},
175
                        $row->{accounttype},
178
						$row->{amount},
176
                        $row->{amount},
179
						$row->{title},
177
                        $row->{title},
180
						$row->{barcode};
178
                        $row->{barcode};
181
						$row->{itype};
179
                        $row->{itype};
182
                if ($csv->combine(@rowValues)) {
180
                if ($csv->combine(@rowValues)) {
183
                    $content .= Encode::decode('UTF-8',$csv->string()) . "\n";
181
                    $content .= Encode::decode('UTF-8',$csv->string()) . "\n";
184
                } else {
182
                } else {
185
- 

Return to bug 6934