[Fmsystem-commits] [11552] more on import

[Sigurd Nes]

Revision: 11552
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11552
Author:   sigurdne
Date:     2013-12-20 18:49:00 +0000 (Fri, 20 Dec 2013)
Log Message:
-----------
more on import

Modified Paths:
--------------
    trunk/property/inc/cron/default/Import_fra_agresso_X205.php

Modified: trunk/property/inc/cron/default/Import_fra_agresso_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2013-12-20 
18:34:09 UTC (rev 11551)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2013-12-20 
18:49:00 UTC (rev 11552)
@@ -566,7 +566,7 @@
                                else if (!$order_info['order_exist'])
                                {
                                        $merknad = 'bestillingsnummeret ikke 
gyldig: ' . $_order_id;
-                                       $this->receipt['error'][] = array('msg' 
=> $merknad);
+                                       $this->receipt['error'][] = array('msg' 
=> "{$merknad}, fil: {$file}");
                                }
                                else
                                {
@@ -735,6 +735,11 @@
 //_debug_array($buffer);
 //_debug_array($this->receipt);
 //_debug_array($order_info['toarray']);
+                       if($this->debug && $this->skip_import)
+                       {
+                               _debug_array("Skip import - file: {$file}");
+                       }
+                       
                        if(!$this->skip_import)
                        {
                                if($update_voucher && $bilagsnr)
@@ -752,7 +757,7 @@
                                        }
                                }
 
-                               if($order_info['toarray'] && !$this->skip_email)
+                               if($order_info['toarray'] && 
(!$this->skip_email || !$this->debug))
                                {
 
                                        $from = "Ikke svar<address@hidden>";