[Phpgroupware-cvs] property/inc/import/Import_fra_Service_xml, 1.4

[nomail]

Update of /property/inc/import
Modified Files:
        Branch: 
          Import_fra_Service_xml

date: 2004/07/21 18:57:53;  author: sigurdne;  state: Exp;  lines: +8 -5

Log Message:
no message
=====================================================================
Index: property/inc/import/Import_fra_Service_xml
diff -u property/inc/import/Import_fra_Service_xml:1.3 
property/inc/import/Import_fra_Service_xml:1.4
--- property/inc/import/Import_fra_Service_xml:1.3      Wed Jul 14 13:49:25 2004
+++ property/inc/import/Import_fra_Service_xml  Wed Jul 21 18:57:53 2004
@@ -68,24 +68,27 @@
                        
                                        $num = count($data);
                                        $buffer = 
$this->import_start_record($buffer);
+                                       $valid_data=0;
                                        for ($c=0; $c<$num; $c++ )
                                        {
                                                //Send name/value pairs along 
with the buffer
                                                if 
($this->import[$this->header[$c]] != '' && $data[$c]['Data'] != '')
                                                {
 
-//echo 'data'.$data[$c].'<br>';
 //echo '<br>'.$c.': '.$this->import[$this->header[$c]].' => 
'.$data[$c]['Data'];
                                                        $buffer = 
$this->import_new_attrib($buffer, 
$this->import[$this->header[$c]],$data[$c]['Data'],$invoice_common);
                                                        $valid_data= True;
+                                                       if($data[$c]['Data'])
+                                                       {
+                                                               $valid_data++;
+                                                       }
                                                }
                                        }
-                                       if ($valid_data)
+                                       if ($valid_data > 0)
                                        {
                                                $buffer = 
$this->import_end_record($buffer,$invoice_common);
                                                $valid_data= False;
                                        }
-                               
                                }
                        }
 
@@ -171,9 +174,9 @@
                                        }
                                }
 
-                               if($name=='dima' && $invoice_common['auto_tax'])
+                               if($name=='mvakode' && 
$invoice_common['auto_tax'])
                                {
-                                       $value = 
$this->soXport->auto_tax($value);
+                                       $value = 
$this->soXport->auto_tax($buffer[$this->id]['dima']);
                                }
 
                                $buffer[$this->id][$name] = $value;