[Fmsystem-commits] [8668] property: improved import

[Sigurd Nes]

Revision: 8668
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8668
Author:   sigurdne
Date:     2012-01-24 13:35:13 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
property: improved import

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

Modified: trunk/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
--- trunk/property/inc/cron/default/Import_fra_basware_X205.php 2012-01-24 
13:06:41 UTC (rev 8667)
+++ trunk/property/inc/cron/default/Import_fra_basware_X205.php 2012-01-24 
13:35:13 UTC (rev 8668)
@@ -418,13 +418,32 @@
                                                }
                                        }
 
-                                       if ($order_info['vendor_id'] != 
$_data['SUPPLIER.CODE'])
+                                       $duplicate = false;
+                                       $sql = "SELECT external_ref FROM 
fm_ecobilag WHERE external_ref = '{$_data['SCANNINGNO']}'";
+                                       
$this->db->query($sql,__LINE__,__FILE__);
+                                       if($this->db->next_record())
                                        {
-                                               $this->receipt['message'][] = 
array('msg' => 'Ikke samsvar med leverandør på bestilling og mottatt faktura');
+                                               $duplicate = true;
                                        }
 
-                                       $sql = 'SELECT id FROM fm_vendor WHERE 
id = ' . (int) $_data['SUPPLIER.CODE'];
+                                       $sql = "SELECT external_ref FROM 
fm_ecobilagoverf WHERE external_ref = '{$_data['SCANNINGNO']}'";
                                        
$this->db->query($sql,__LINE__,__FILE__);
+                                       if($this->db->next_record())
+                                       {
+                                               $duplicate = true;
+                                       }
+                                       
+                                       
+                                       if($duplicate)
+                                       {
+                                               $this->receipt['error'][] = 
array('msg' => "Ikke importert duplikat : {$_data['SCANNINGNO']}");
+                                               $this->skip_import = true;
+                                       }
+                                       
+                                       $vendor_id = $_data['SUPPLIER.CODE'];
+
+                                       $sql = 'SELECT id FROM fm_vendor WHERE 
id = ' . (int) $vendor_id;
+                                       
$this->db->query($sql,__LINE__,__FILE__);
                                        if(!$this->db->next_record())
                                        {
                                                $this->receipt['error'][] = 
array('msg' => "Ikke gyldig leverandør id: {$_data['SUPPLIER.CODE']}");
@@ -451,9 +470,14 @@
                                                        }
                                                }
                                        }
+                                       else
+                                       {
+                                               if ($order_info['vendor_id'] != 
$vendor_id)
+                                               {
+                                                       
$this->receipt['message'][] = array('msg' => 'Ikke samsvar med leverandør på 
bestilling og mottatt faktura');
+                                               }
+                                       }
 
-                                       $vendor_id = $_data['SUPPLIER.CODE'];
-
                                        if($this->auto_tax)
                                        {
                                                $buffer[$i]['mvakode'] = 
$this->soXport->tax_b_account_override($buffer[$i]['mvakode'], 
$order_info['spbudact_code']);