[Fmsystem-commits] [14288] booking: invoice log

[Sigurd Nes]

Revision: 14288
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14288
Author:   sigurdne
Date:     2015-11-06 13:12:48 +0000 (Fri, 06 Nov 2015)
Log Message:
-----------
booking: invoice log

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

Modified: trunk/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
--- trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2015-11-05 23:58:34 UTC (rev 14287)
+++ trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2015-11-06 13:12:48 UTC (rev 14288)
@@ -890,7 +890,7 @@
                                        $log_cost = $reservation['cost'];
                                        $log_varelinjer_med_dato = 
$reservation['article_description'].' - '.$reservation['description'];
 
-                                       $log[] = 
$log_order_id.';'.$log_customer_name.' - 
'.$log_customer_nr.';'.$log_varelinjer_med_dato.';'.$log_buidling.';'.$log_cost;
+                                       $log[] = 
$reservation['id'].';'.$reservation['reservation_type'].';'. 
$log_order_id.';'.$log_customer_name.' - 
'.$log_customer_nr.';'.$log_varelinjer_med_dato.';'.$log_buidling.';'.$log_cost;
                                } else {
 
                                        //item level
@@ -974,7 +974,7 @@
                                        $log_cost = $reservation['cost'];
                                        $log_varelinjer_med_dato = 
$reservation['article_description'].' - '.$reservation['description'];
 
-                                       $log[] = 
$log_order_id.';'.$log_customer_name.' - 
'.$log_customer_nr.';'.$log_varelinjer_med_dato.';'.$log_buidling.';'.$log_cost;
+                                       $log[] = 
$reservation['id'].';'.$reservation['reservation_type'].';'. 
$log_order_id.';'.$log_customer_name.' - 
'.$log_customer_nr.';'.$log_varelinjer_med_dato.';'.$log_buidling.';'.$log_cost;
 
                                }
                        }
@@ -1148,7 +1148,7 @@
                                $log_cost = $reservation['cost'];
                                $log_varelinjer_med_dato = 
$reservation['article_description'].' - '.$reservation['description'];
 
-                               $log[] = $log_order_id.';'.$log_customer_name.' 
- 
'.$log_customer_nr.';'.$log_varelinjer_med_dato.';'.$log_buidling.';'.$log_cost;
+                               $log[] = 
$reservation['id'].';'.$reservation['reservation_type'].';'. 
$log_order_id.';'.$log_customer_name.' - 
'.$log_customer_nr.';'.$log_varelinjer_med_dato.';'.$log_buidling.';'.$log_cost;
 
                                $output[] = implode('', str_replace(array("\n", 
"\r"), '', $startpost));
                                $output[] = implode('', str_replace(array("\n", 
"\r"), '', $fakturalinje));

Modified: trunk/booking/inc/class.uicompleted_reservation_export_file.inc.php
===================================================================
--- trunk/booking/inc/class.uicompleted_reservation_export_file.inc.php 
2015-11-05 23:58:34 UTC (rev 14287)
+++ trunk/booking/inc/class.uicompleted_reservation_export_file.inc.php 
2015-11-06 13:12:48 UTC (rev 14288)
@@ -155,7 +155,8 @@
                                        'label' => lang('Download'), 
                                        'href' => $this->link_to('download', 
array('id' => $export_file['id']))
                                );
-                if ($export_file['total_items'] > 0 and $export_file['id'] > 
$config->config_data['invoice_last_id'] and 
!empty($export_file['log_filename'])) {
+                if ($export_file['total_items'] > 0 and 
!empty($export_file['log_filename'])) //and $export_file['id'] > 
$config->config_data['invoice_last_id'] )
+                               {
                                $export_file['log'] = array(
                                        'label' => lang('log'), 
                                        'href' => $this->link_to('log', 
array('id' => $export_file['id']))