[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/import Import_fra_BKK Import_fra_B...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc/import Import_fra_BKK Import_fra_B... |
|
Date: |
Thu, 11 Jan 2007 10:23:22 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/01/11 10:23:22
Modified files:
inc/import : Import_fra_BKK Import_fra_BKK_csv
Import_fra_Kemner Import_fra_Kemner_xml
Import_fra_Service Import_fra_Service_xml
Log message:
simplify
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_BKK?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_BKK_csv?cvsroot=phpgroupware&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_Kemner?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_Kemner_xml?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_Service?cvsroot=phpgroupware&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_Service_xml?cvsroot=phpgroupware&r1=1.15&r2=1.16
Patches:
Index: Import_fra_BKK
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_BKK,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Import_fra_BKK 12 May 2005 21:26:28 -0000 1.9
+++ Import_fra_BKK 11 Jan 2007 10:23:22 -0000 1.10
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_BKK,v 1.9 2005/05/12 21:26:28 sigurdne Exp $
+ * @version $Id: Import_fra_BKK,v 1.10 2007/01/11 10:23:22 sigurdne Exp $
*/
/**
@@ -19,7 +19,7 @@
class import_conv
{
var $currentrecord = array(); //used for buffering to allow uid
lines to go first
- var $id;
+ var $id = -1;
var $spbudact_code='12304321';
var $mvakode=0;
var $kildeid=1;
Index: Import_fra_BKK_csv
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_BKK_csv,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Import_fra_BKK_csv 13 Jun 2006 12:39:05 -0000 1.4
+++ Import_fra_BKK_csv 11 Jan 2007 10:23:22 -0000 1.5
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_BKK_csv,v 1.4 2006/06/13 12:39:05 sigurdne
Exp $
+ * @version $Id: Import_fra_BKK_csv,v 1.5 2007/01/11 10:23:22 sigurdne
Exp $
*/
/**
@@ -19,7 +19,7 @@
class import_conv
{
var $currentrecord = array(); //used for buffering to allow uid
lines to go first
- var $id;
+ var $id = -1;
var $spbudact_code='12304321';
var $mvakode=0;
var $kildeid=1;
Index: Import_fra_Kemner
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_Kemner,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Import_fra_Kemner 12 May 2005 21:26:28 -0000 1.7
+++ Import_fra_Kemner 11 Jan 2007 10:23:22 -0000 1.8
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_Kemner,v 1.7 2005/05/12 21:26:28 sigurdne
Exp $
+ * @version $Id: Import_fra_Kemner,v 1.8 2007/01/11 10:23:22 sigurdne
Exp $
*/
/**
@@ -18,7 +18,7 @@
class import_conv
{
var $currentrecord = array(); //used for buffering to allow uid
lines to go first
- var $id;
+ var $id = -1;
var $spbudact_code='11954111';
var $dimb=40;
var $mvakode=0;
Index: Import_fra_Kemner_xml
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_Kemner_xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Import_fra_Kemner_xml 10 Jan 2007 19:43:08 -0000 1.9
+++ Import_fra_Kemner_xml 11 Jan 2007 10:23:22 -0000 1.10
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_Kemner_xml,v 1.9 2007/01/10 19:43:08
sigurdne Exp $
+ * @version $Id: Import_fra_Kemner_xml,v 1.10 2007/01/11 10:23:22
sigurdne Exp $
*/
/**
@@ -18,13 +18,11 @@
class import_conv
{
- var $currentrecord = array(); //used for buffering to allow uid
lines to go first
var $spbudact_code='11954111';
- var $dimb=40;
+ var $dimb=99;
var $mvakode=0;
var $kildeid=1;
var $splitt=0;
- var $type = 'fixed';
var $soXport;
var $invoice;
@@ -63,7 +61,6 @@
$bilagsnr = $this->invoice->next_bilagsnr();
$buffer = array();
- $buffer = $this->import_start_file($buffer);
/* $xmldata=file_get_contents($tsvfile);
$this->xmltool->import_xml($xmldata);
@@ -88,19 +85,31 @@
if (isset($data) AND is_array($data))
{
$num = count($data);
+ $fakturadato = false;
+ $forfallsdato = false;
+ $periode = false;
for ($i = 0; $i < $num; ++$i)
{
- $buffer =
$this->import_start_record($buffer);
$Gnr =
$data[$i]['Header'][0]['Text1'];
$Bnr =
$data[$i]['Header'][0]['Text2'];
$sekjonnr =
$data[$i]['Header'][0]['Text4'];
$fakturanr =
$data[$i]['InvoiceNo'];
+ if(!$fakturadato)
+ {
$fakturadato =
date($this->dateformat,strtotime($data[$i]['Header'][0]['InvoiceDate']));
+ }
+
+ if(!$forfallsdato)
+ {
$forfallsdato =
date($this->dateformat,strtotime($data[$i]['Header'][0]['DueDate']));
+ }
+ if(!$periode)
+ {
$periode =
date('n',strtotime($data[$i]['Header'][0]['InvoiceDate']));
+ }
$belop =
$data[$i]['Summary'][0]['TotalInclTax'];
$kidnr =
$data[$i]['Header'][0]['PaymentInfo'][0]['BacsId'];
@@ -109,37 +118,65 @@
$item_type = 1;
$item_id = '1201' .
$data[$i]['Header'][0]['HeaderText'];
- $buffer =
$this->import_new_attrib($buffer,'fakturanr',$fakturanr,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'periode',$periode,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'forfallsdato',$forfallsdato,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'fakturadato',$fakturadato,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'belop',$belop,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'kidnr',$kidnr,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'gid',$gid,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'bilagsnr',$bilagsnr,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'dimb',$this->dimb,$invoice_common);
+ $buffer[$i]['fakturanr'] = $fakturanr;
+ $buffer[$i]['periode'] = $periode;
+ $buffer[$i]['forfallsdato'] =
$forfallsdato;
+ $buffer[$i]['fakturadato'] =
$fakturadato;
+ $buffer[$i]['belop'] = $belop;
+ $buffer[$i]['godkjentbelop'] = $belop;
- $buffer =
$this->import_new_attrib($buffer,'item_type',$item_type,$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'item_id',$item_id,$invoice_common);
+ $buffer[$i]['kidnr'] = $kidnr;
+ $buffer[$i]['gid'] = $gid;
+ $buffer[$i]['bilagsnr'] = $bilagsnr;
+
+ if(isset($invoice_common['dim_b']) &&
$invoice_common['dim_b'])
+ {
+ $buffer[$i]['dimb'] =
$invoice_common['dim_b'];
+ }
+ else
+ {
+ $buffer[$i]['dimb'] =
$this->dimb;
+ }
+
+ $buffer[$i]['item_type'] = $item_type;
+ $buffer[$i]['item_id'] = $item_id;
//Finn dima fra Boei
$gabinfo =
$this->soXport->gabnr_to_objekt($Gnr,$Bnr,$sekjonnr);
- $buffer =
$this->import_new_attrib($buffer,'dima',$gabinfo['dima'],$invoice_common);
- $buffer =
$this->import_new_attrib($buffer,'loc1',$gabinfo['loc1'],$invoice_common);
- //finn boei gateadresse for kongroll
+ $buffer[$i]['dima'] = $gabinfo['dima'];
+ $buffer[$i]['loc1'] = $gabinfo['loc1'];
+ $buffer[$i]['mvakode'] = $this->mvakode;
+
+ if($gabinfo['loc1'] &&
(isset($invoice_common['auto_tax']) && $invoice_common['auto_tax']))
+ {
+
$mvakode=$this->soXport->auto_tax($gabinfo['loc1']);
+
+ if($mvakode)
+ {
+ $buffer[$i]['mvakode']
= $mvakode;
+ }
+ }
+
+ if(isset($invoice_common['auto_tax'])
&& $invoice_common['auto_tax'])
+ {
+ $buffer[$i]['mvakode'] =
$this->soXport->tax_b_account_override($buffer[$i]['mvakode']
,$this->spbudact_code);
+ $buffer[$i]['mvakode'] =
$this->soXport->tax_vendor_override($buffer[$i]['mvakode']
,$invoice_common['vendor_id']);
+ }
+
+ $buffer[$i]['kostra_id'] =
$this->soXport->get_kostra_id($gabinfo['loc1']);
+
+ //finn boei gateadresse for kontroll
$boei_gateadresse=$this->soXport->dima_to_address($gabinfo['dima']);
- $buffer =
$this->import_new_attrib($buffer,'boei_gateadresse',$boei_gateadresse,$invoice_common);
+ $buffer[$i]['boei_gateadresse'] =
$boei_gateadresse;
$referanse =
$data[$i]['Header'][0]['ShipTo'][0]['AddressInfo'][0]['Address'];
- $buffer =
$this->import_new_attrib($buffer,'referanse',$referanse,$invoice_common);
+ $buffer[$i]['referanse'] = $referanse;
$merknad = '';
$merknad = 'Kemner adr:
'.$referanse."\r\n".'BOEI adr: '.$boei_gateadresse."\r\n";
- $bilagsnr++;
-
foreach
($data[$i]['Details'][0]['Detail'] as $detail)
{
if
(is_array($detail['Products'][0]['SellerProductDescr']))
@@ -181,10 +218,19 @@
}
- $buffer =
$this->import_new_attrib($buffer,'merknad',$merknad,$invoice_common);
-
-
- $buffer =
$this->import_end_record($buffer,$invoice_common);
+ $buffer[$i]['merknad'] = $merknad;
+ $buffer[$i]['splitt'] = $this->splitt;
+ $buffer[$i]['kildeid'] = $this->kildeid;
+ $buffer[$i]['spbudact_code'] =
$this->spbudact_code;
+ $buffer[$i]['typeid'] =
$invoice_common['type'];
+ $buffer[$i]['regtid'] =
date($this->datetimeformat);
+ $buffer[$i]['artid'] =
$invoice_common['art'];
+ $buffer[$i]['spvend_code'] =
$invoice_common['vendor_id'];
+ $buffer[$i]['oppsynsmannid'] =
$invoice_common['janitor'];
+ $buffer[$i]['saksbehandlerid'] =
$invoice_common['supervisor'];
+ $buffer[$i]['budsjettansvarligid'] =
$invoice_common['budget_responsible'];
+//_debug_array($bilagsnr);
+ $bilagsnr++;
}
}
@@ -193,89 +239,6 @@
$buffer =
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
}
-//print_r($buffer);
- return $buffer;
- }
-
-
- function import_start_file($buffer)
- {
- return $buffer;
- }
-
- function import_start_record($buffer)
- {
- $top=array();
- ++$this->id;
- $this->currentrecord = $top;
- return $buffer;
- }
-
- function import_new_attrib($buffer,$name,$value,$invoice_common)
- {
-
- $value = trim($value);
- $value = str_replace('\n','<BR>',$value);
- $value = str_replace('\r','',$value);
-
- $this->currentrecord += array($name => $value);
-
- return $buffer;
- }
-
- function import_end_record($buffer,$invoice_common)
- {
- $buffer[$this->id]='';
-
- while ( list($name, $value) =
each($this->currentrecord))
- {
- if($name=='belop')
- {
- $godkjentbelop=$value;
- }
-
-
- if($name=='dima' &&
$invoice_common['auto_tax']):
- {
-
$mvakode=$this->soXport->auto_tax($value);
-
- if($mvakode)
- {
- $buffer[$this->id]['mvakode'] =
$mvakode;
- }
- else
- {
- $buffer[$this->id]['mvakode'] =
$this->mvakode;
- }
- }
- elseif($name=='dima' &&
!$invoice_common['auto_tax']):
- {
- $buffer[$this->id]['mvakode'] =
$this->mvakode;
- }
- endif;
-
- $buffer[$this->id][$name] = $value;
- $buffer[$this->id]['splitt'] = $this->splitt;
- $buffer[$this->id]['kildeid'] = $this->kildeid;
-
- $buffer[$this->id]['spbudact_code'] =
$this->spbudact_code;
- $buffer[$this->id]['typeid'] =
$invoice_common['type'];
- $buffer[$this->id]['regtid'] =
date($this->datetimeformat);
- $buffer[$this->id]['artid'] =
$invoice_common['art'];
- $buffer[$this->id]['godkjentbelop'] =
$godkjentbelop;
- $buffer[$this->id]['spvend_code'] =
$invoice_common['vendor_id'];
-// $buffer[$this->id]['dimb'] =
$invoice_common['dim_b'];
- $buffer[$this->id]['oppsynsmannid'] =
$invoice_common['janitor'];
- $buffer[$this->id]['saksbehandlerid'] =
$invoice_common['supervisor'];
- $buffer[$this->id]['budsjettansvarligid'] =
$invoice_common['budget_responsible'];
-
- if($invoice_common['auto_tax'])
- {
- $buffer[$this->id]['mvakode'] =
$this->soXport->tax_b_account_override($buffer[$this->id]['mvakode']
,$buffer[$this->id]['spbudact_code']);
- $buffer[$this->id]['mvakode'] =
$this->soXport->tax_vendor_override($buffer[$this->id]['mvakode']
,$buffer[$this->id]['spvend_code']);
- $buffer[$this->id]['kostra_id'] =
$this->soXport->get_kostra_id($buffer[$this->id]['dima']);
- }
- }
return $buffer;
}
Index: Import_fra_Service
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_Service,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- Import_fra_Service 27 Jan 2006 17:03:30 -0000 1.15
+++ Import_fra_Service 11 Jan 2007 10:23:22 -0000 1.16
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_Service,v 1.15 2006/01/27 17:03:30 sigurdne
Exp $
+ * @version $Id: Import_fra_Service,v 1.16 2007/01/11 10:23:22 sigurdne
Exp $
*/
/**
@@ -19,7 +19,7 @@
class import_conv
{
var $currentrecord = array(); //used for buffering to allow uid
lines to go first
- var $id;
+ var $id = -1;
var $kildeid=1;
var $splitt=0;
var $type = 'csv';
@@ -58,7 +58,6 @@
$tsvfile = $invoice_common['tsvfile'];
$conv_type = $invoice_common['conv_type'];
- $row = 0;
$valid_data= False;
$buffer = array();
$buffer = $this->import_start_file($buffer);
@@ -69,7 +68,6 @@
while ($data = fgetcsv($fp,8000,';'))
{
$num = count($data);
- $row++;
$buffer = $this->import_start_record($buffer);
$valid_data=0;
for ($c=0; $c<$num; $c++ )
Index: Import_fra_Service_xml
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_Service_xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- Import_fra_Service_xml 27 Jan 2006 17:03:30 -0000 1.15
+++ Import_fra_Service_xml 11 Jan 2007 10:23:22 -0000 1.16
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage import
- * @version $Id: Import_fra_Service_xml,v 1.15 2006/01/27 17:03:30
sigurdne Exp $
+ * @version $Id: Import_fra_Service_xml,v 1.16 2007/01/11 10:23:22
sigurdne Exp $
*/
/**
@@ -19,7 +19,7 @@
class import_conv
{
var $currentrecord = array(); //used for buffering to allow uid
lines to go first
- var $id;
+ var $id = -1;
var $kildeid=1;
var $splitt=0;
var $type = 'csv';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/import Import_fra_BKK Import_fra_B...,
Sigurd Nes <=