Attachment 54096 Details for Bug 6934 – [PASSED QA] Bug 6934: fix problem when export it open in LibreOffice - show values of itype and use TT plugin

[patch] [PASSED QA] Bug 6934: fix problem when export it open in LibreOffice - show values of itype and use TT plugin

PASSED-QA-Bug-6934-fix-problem-when-export-it-open.patch (text/plain), 3.64 KB, created by Katrin Fischer on 2016-08-07 08:23:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2016-08-07 08:23:24 UTC

Size: 3.64 KB

patch

obsolete

>From f6f3f99b0d289fdfb93086dd29f91153637cb77e Mon Sep 17 00:00:00 2001
>From: Bouzid Fergani <bouzid.fergani@inlibro.com>
>Date: Tue, 19 Jul 2016 12:05:14 -0400
>Subject: [PATCH] [PASSED QA] Bug 6934: fix problem when export it open in
> LibreOffice - show values of itype and use TT plugin
>
>Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt   | 7 ++++---
> reports/cash_register_stats.pl                                     | 7 +++----
> 2 files changed, 7 insertions(+), 7 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 276c3e7..29d2bb6 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
>@@ -1,10 +1,11 @@
> [% USE KohaDates %]
>+[% USE Price %]
>+[% USE ItemTypes %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Reports [% IF ( do_it ) %]&rsaquo; Cash register statistics &rsaquo; Results[% ELSE %]&rsaquo; Cash register statistics[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
> [% INCLUDE 'datatables.inc' %]
>-[% INCLUDE 'datatables-strings.inc' %]
> <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
> <script type="text/javascript" id="js">
>  $(document).ready(function() {
>@@ -276,10 +277,10 @@ $(document).ready(function() {
>                     [% END %]
>                 </td>
>                 <td>[% loopresul.note %]</td>
>-                <td style="text-align:right;">[% loopresul.amount %]</td>
>+                <td style="text-align:right;">[% loopresul.amount | $Price %]</td>
>                 <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber %]">[% loopresul.title %]</a></td>
>                 <td>[% loopresul.barcode %]</td>
>-                <td>[% loopresul.itype %]</td>
>+                <td>[% ItemTypes.GetDescription(loopresul.itype) %]</td>
>             </tr>
>         [% END %]
>         <tfoot>
>diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
>index 409aa4e..00561c3 100755
>--- a/reports/cash_register_stats.pl
>+++ b/reports/cash_register_stats.pl
>@@ -144,9 +144,8 @@ if ($do_it) {
>         my $reportfilename = $reportname ? "$reportname.$format" : "reportresults.$format" ;
>         #my $reportfilename = "$reportname.html" ;
>         my $delimiter = C4::Context->preference('delimiter') || ',';
>-        my ( $type, $content );
>+        my ( $content );
>         if ( $format eq 'csv' ) {
>-            my $type = 'application/csv';
>             my $csv = Text::CSV::Encoded->new({ encoding_out => 'UTF-8', sep_char => $delimiter});
>             $csv or die "Text::CSV::Encoded->new({binary => 1}) FAILED: " . Text::CSV::Encoded->error_diag();
>             my @headers = ();
>@@ -175,7 +174,7 @@ if ($do_it) {
>                         $row->{accounttype},
>                         $row->{amount},
>                         $row->{title},
>-                        $row->{barcode};
>+                        $row->{barcode},
>                         $row->{itype};
>                 if ($csv->combine(@rowValues)) {
>                     $content .= Encode::decode('UTF-8',$csv->string()) . "\n";
>@@ -185,7 +184,7 @@ if ($do_it) {
>             }
>         }
>         print $input->header(
>-            -type => $type,
>+            -type => 'text/csv',
>             -attachment=> $reportfilename
>         );
>         print $content;
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 6934: 5634 | 5635 | 5640 | 5641 | 9379 | 9419 | 12602 | 12660 | 31210 | 36476 | 42564 | 42565 | 44847 | 44853 | 45972 | 45973 | 45974 | 48634 | 48642 | 48704 | 48705 | 48706 | 48707 | 48708 | 50429 | 50437 | 50938 | 53496 | 53500 | 53570 | 53571 | 53572 | 53573 | 53574 | 53575 | 53576 | 53577 | 53578 | 53579 | 53581 | 53582 | 53583 | 53584 | 53585 | 53586 | 53587 | 53588 | 53589 | 53590 | 53591 | 53648 | 53650 | 53651 | 53652 | 53653 | 53778 | 53780 | 54010 | 54088 | 54089 | 54090 | 54091 | 54092 | 54093 | 54094 | 54095 | 54096 | 54097 | 54098 | 54099 | 54100 | 55939 | 55988 | 55989 | 55990 | 55991 | 55992 | 55993 | 55994 | 55995 | 55996 | 55997 | 55998 | 55999 | 56000 | 56001 | 56763 | 56764