[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/import/Import_fra_Service, 1.4
From: |
nomail |
Subject: |
[Phpgroupware-cvs] property/inc/import/Import_fra_Service, 1.4 |
Date: |
Wed, 21 Jul 2004 20:57:53 +0200 |
Update of /property/inc/import
Modified Files:
Branch:
Import_fra_Service
date: 2004/07/21 18:57:53; author: sigurdne; state: Exp; lines: +11 -8
Log Message:
no message
=====================================================================
Index: property/inc/import/Import_fra_Service
diff -u property/inc/import/Import_fra_Service:1.3
property/inc/import/Import_fra_Service:1.4
--- property/inc/import/Import_fra_Service:1.3 Wed Jul 14 13:49:25 2004
+++ property/inc/import/Import_fra_Service Wed Jul 21 18:57:53 2004
@@ -44,8 +44,7 @@
$buffer = array();
$buffer = $this->import_start_file($buffer);
$fp = fopen($tsvfile,'r');
-//print_r($header);
-//echo '<br>';
+
for ($i = 1; $i < $this->header_count &&
fgetcsv($fp,8000,';'); ++$i);
while ($data = fgetcsv($fp,8000,';'))
@@ -53,19 +52,22 @@
$num = count($data);
$row++;
$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] != '')
+ if ($this->import[$this->header[$c]] !=
'')
{
-//echo 'data'.$data[$c].'<br>';
//echo '<br>'.$c.': '.$this->import[$this->header[$c]].' => '.$data[$c];
$buffer =
$this->import_new_attrib($buffer,
$this->import[$this->header[$c]],$data[$c],$invoice_common);
- $valid_data= True;
+ if($data[$c])
+ {
+ $valid_data++;
+ }
}
}
- if ($valid_data)
+ if ($valid_data > 0)
{
$buffer =
$this->import_end_record($buffer,$invoice_common);
$valid_data= False;
@@ -157,9 +159,10 @@
}
}
- if($name=='dima' && $invoice_common['auto_tax'])
+//_debug_array($name);
+ 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/import/Import_fra_Service, 1.4,
nomail <=