[Fmsystem-commits] [11595] Property: fix re-import from Agresso

[Sigurd Nes]

Revision: 11595
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11595
Author:   sigurdne
Date:     2014-01-14 19:16:59 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
Property: fix re-import from Agresso

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 2014-01-14 
19:02:02 UTC (rev 11594)
+++ trunk/property/inc/cron/default/Import_fra_agresso_X205.php 2014-01-14 
19:16:59 UTC (rev 11595)
@@ -48,6 +48,7 @@
                protected $skip_import = false;
                protected $skip_email = false;
                protected $export;
+               protected $skip_update_voucher_id = false;
 
                function __construct()
                {
@@ -121,6 +122,7 @@
                        {
                                foreach($file_list as $file)
                                {
+                                       $this->skip_update_voucher_id = false;
                                        $this->db->transaction_begin();
                                        $bilagsnr = $this->import($file);
                                        if($this->debug)
@@ -523,6 +525,7 @@
                                $this->db->query($sql,__LINE__,__FILE__);
                                if($this->db->next_record())
                                {
+                                       $this->skip_update_voucher_id = true;
                                        $update_voucher = true;
                                        $_bilagsnr_ut = 
$this->db->f('bilagsnr_ut');
                                        $bilagsnr = $this->db->f('bilagsnr');
@@ -537,6 +540,7 @@
                                $this->db->query($sql,__LINE__,__FILE__);
                                if($this->db->next_record())
                                {
+                                       $this->skip_update_voucher_id = true;
                                        $update_voucher = true;
                                        $_bilagsnr_ut = 
$this->db->f('bilagsnr_ut');
                                        $bilagsnr = $this->db->f('bilagsnr');
@@ -779,7 +783,7 @@
 
                function import_end_file($buffer)
                {
-                       $num = $this->soXport->add($buffer);
+                       $num = 
$this->soXport->add($buffer,$this->skip_update_voucher_id);
                        if($this->debug)
                        {
                                _debug_array("import_end_file() ");