[Phpgroupware-cvs] CVS: property/inc/import Import_fra_BKK,1.11,1.12 Import_fra_Kemner,1.12,1.13

[Sigurd Nes <address@hidden>]

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

Modified Files:
        Import_fra_BKK Import_fra_Kemner 
Log Message:
no message

Index: Import_fra_BKK
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_BKK,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Import_fra_BKK      22 May 2003 09:54:11 -0000      1.11
--- Import_fra_BKK      2 Jul 2003 18:57:47 -0000       1.12
***************
*** 228,233 ****
                                        
$maalerinfo=$this->soXport->anleggsnr_to_objekt($value);
                                        $dima=$maalerinfo['dima'];
  //                                    $maalernr=$maalerinfo['maalernr'];
!                                       $omraade=$maalerinfo['omraade'];
                                }
                                if($name=='stedsnavn')
--- 228,234 ----
                                        
$maalerinfo=$this->soXport->anleggsnr_to_objekt($value);
                                        $dima=$maalerinfo['dima'];
+                                       $loc1=$maalerinfo['loc1'];
  //                                    $maalernr=$maalerinfo['maalernr'];
!                                       $omraade=$maalerinfo['district'];
                                }
                                if($name=='stedsnavn')
***************
*** 241,244 ****
--- 242,246 ----
                                $buffer[$this->id]['fakturanr'] = 
$invoice_common['invoice_num'];
                                $buffer[$this->id]['dima'] = $dima;
+                               $buffer[$this->id]['loc1'] = $loc1;
                                $buffer[$this->id]['omraade'] = $omraade;
  //                            $buffer[$this->id]['maalernr'] = $maalernr;

Index: Import_fra_Kemner
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Kemner,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Import_fra_Kemner   22 May 2003 09:54:11 -0000      1.12
--- Import_fra_Kemner   2 Jul 2003 18:57:47 -0000       1.13
***************
*** 193,198 ****
  
                                                //Finn dima fra Boei
!                                               $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);
--- 193,199 ----
  
                                                //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
                                                
$boei_gateadresse=$this->soXport->dima_to_address($dima);