[Fmsystem-commits] [16883] booking: invoice datalog

[sigurdne]

Revision: 16883
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16883
Author:   sigurdne
Date:     2017-06-28 08:30:46 -0400 (Wed, 28 Jun 2017)
Log Message:
-----------
booking: invoice datalog

Modified Paths:
--------------
    trunk/booking/inc/class.socompleted_reservation_export.inc.php
    trunk/booking/inc/class.socompleted_reservation_export_file.inc.php

Modified: trunk/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
--- trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2017-06-28 10:50:06 UTC (rev 16882)
+++ trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2017-06-28 12:30:46 UTC (rev 16883)
@@ -1121,7 +1121,7 @@
                                $file_format_linebreak = "\n";
                        }
 
-                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode(PHP_EOL, $log),
+                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode("\r\n", $log),
                                'info' => $export_info, 'header_count' => 
$header_count);
                }
 
@@ -1373,7 +1373,7 @@
                                $file_format_linebreak = "\n";
                        }
 
-                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode(PHP_EOL, $log),
+                       return array('data' => implode($file_format_linebreak, 
$output), 'data_log' => implode("\r\n", $log),
                                'info' => $export_info, 'header_count' => 
$header_count);
                }
 

Modified: trunk/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
--- trunk/booking/inc/class.socompleted_reservation_export_file.inc.php 
2017-06-28 10:50:06 UTC (rev 16882)
+++ trunk/booking/inc/class.socompleted_reservation_export_file.inc.php 
2017-06-28 12:30:46 UTC (rev 16883)
@@ -190,7 +190,8 @@
 
                                $log = 
"Reservasjon_Id;Reservasjon_Type;Ordrenr;Kunde navn - Nummer;Varelinjer med 
dato;Bygg;Beløp\n";
                                $log .= $export_log;
-                               $export_log = $log;
+//                             $export_log = $log;
+                               $export_log = iconv("UTF-8", 
"ISO-8859-1//TRANSLIT", $log);
 
                                if ($do_generate_files === false)
                                {