[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Kemner,1.2,1.3

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc/import
In directory subversions:/tmp/cvs-serv6575/inc/import

Modified Files:
        Import_fra_Kemner 
Log Message:
no message

Index: Import_fra_Kemner
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Kemner,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Import_fra_Kemner   26 Oct 2002 09:03:39 -0000      1.2
--- Import_fra_Kemner   29 Oct 2002 16:45:34 -0000      1.3
***************
*** 47,54 ****
                        'KID' => 'kidnr',
                        'MVA' => 'mvakode',
!                       'Beløp [kr]' => 'belop'
                        );
  
!               var $header = 
array('Bilagsnr','Ref.','Gnr/Bnr-seksjon','Konto','Objekt','DimB','KID','MVA','Beløp
 [kr]');
  
                function import_conv()
--- 47,57 ----
                        'KID' => 'kidnr',
                        'MVA' => 'mvakode',
!                       'Beløp [kr]' => 'belop',
!                       'Referanse' => 'referanse',
!                       'BOEI Gateadresse' => 'boei_gateadresse',
                        );
  
!       //      var $header = 
array('Bilagsnr','Ref.','Gnr/Bnr-seksjon','Konto','Objekt','DimB','KID','MVA','Beløp
 [kr]','Referanse','BOEI Gateadresse');
!               var $header = 
array('Bilagsnr','Ref.','Gnr/Bnr-seksjon','Konto','Objekt','DimB','KID','MVA','Beløp
 [kr]','Referanse');
  
                function import_conv()
***************
*** 182,185 ****
--- 185,192 ----
                                                $dima = 
$this->soXport->gabnr_to_objekt($Gnr,$Bnr,$sekjonnr);
                                                $buffer = 
$this->import_new_attrib($buffer,dima,$dima,$invoice_common);
+                                               //finn boei gateadresse for 
kongroll
+                                               
$boei_gateadresse=$this->soXport->dima_to_address($dima);
+                                               $buffer = 
$this->import_new_attrib($buffer,boei_gateadresse,$boei_gateadresse,$invoice_common);
+                                               
                                        break;
                                        
***************
*** 207,213 ****
                        
                                            $Navn = substr($data, 15, 10);
!                                           $Referanse = substr($data, 50, 25);
!                       
!                                       $Merknad = '';
                                        break;
                                        
--- 214,220 ----
                        
                                            $Navn = substr($data, 15, 10);
!                                           $referanse = substr($data, 50, 25);
!                                           $buffer = 
$this->import_new_attrib($buffer,referanse,$referanse,$invoice_common);         
       
!                                       $Merknad = 'Kemner adr: 
'.$referanse."\r\n".'BOEI adr: '.$boei_gateadresse."\r\n";
                                        break;