[Fmsystem-commits] [11554] more on import

[Sigurd Nes]

Revision: 11554
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11554
Author:   sigurdne
Date:     2013-12-20 20:58:37 +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 
20:43:44 UTC (rev 11553)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2013-12-20 
20:58:37 UTC (rev 11554)
@@ -724,7 +724,7 @@
 
                                if(isset($order_info['supervisor']) && 
$order_info['supervisor'])
                                {
-                               $buffer[$i]['saksbehandlerid']          = 
$order_info['supervisor'];
+                                       $buffer[$i]['saksbehandlerid']          
= $order_info['supervisor'];
                                }
 
                                if(isset($order_info['budget_responsible']) && 
$order_info['budget_responsible'])
@@ -741,8 +741,13 @@
                                _debug_array("Skip import - file: {$file}");
                        }
                        
-                       if(!$this->skip_import)
+                       if($this->skip_import)
                        {
+                               $this->skip_import = false;
+                               return false;
+                       }
+                       else
+                       {
                                if($update_voucher && $bilagsnr)
                                {
                                        $this->db->query("DELETE FROM 
fm_ecobilag WHERE external_ref = '{$_data['SCANNINGNO']}'",__LINE__,__FILE__);
@@ -810,8 +815,6 @@
                                $GLOBALS['phpgw']->db->Exception_On_Error = 
false;
                                return $bilagsnr;
                        }
-                       $this->skip_import = false;
-                       return false;
                }
 
                function get_order_info($order_id = '')
@@ -865,6 +868,14 @@
                function import_end_file($buffer)
                {
                        $num = $this->soXport->add($buffer);
+                       if($this->debug)
+                       {
+                               _debug_array("import_end_file() ");
+                               echo 'buffer: ';
+                               _debug_array($buffer);
+                               _debug_array("num: {$num}");
+                       }
+
                        if($num > 0)
                        {
                                $this->receipt['message'][]= array('msg' => 
"Importert {$num} poster til bilag {$buffer[0]['bilagsnr']}, SCANNINGNO: 
{$buffer[0]['external_ref']}, KEY: {$buffer[0]['external_voucher_id']}");