[Phpgroupware-cvs] property/inc/import Import_fra_BKK,1.7

[sigurdne]

Update of property/inc/import

Modified Files:
     Branch: MAIN
            Import_fra_BKK lines: +6 -1

Log Message:
no message

====================================================
Index: property/inc/import/Import_fra_BKK
diff -u property/inc/import/Import_fra_BKK:1.6 
property/inc/import/Import_fra_BKK:1.7
--- property/inc/import/Import_fra_BKK:1.6      Sat Oct 30 15:25:25 2004
+++ property/inc/import/Import_fra_BKK  Sat Jan 29 13:23:26 2005
@@ -11,6 +11,7 @@
                var $header_count = 1;
                var $soXport;
                var $invoice;
+               var $meter_table;

                var $import = array(
                        'Bestilling' => 'pmwrkord_code',
@@ -70,6 +71,10 @@
                        $this->dateformat       = $this->bocommon->dateformat;
                        $this->datetimeformat   = 
$this->bocommon->datetimeformat;
                        $this->next_bilagsnr    = 
$this->invoice->next_bilagsnr();
+                       $this->config = 
CreateObject('phpgwapi.config','property');
+                       $this->config->read_repository();
+                       $this->meter_table = 
$this->config->config_data['meter_table'];
+
                }

                function import($invoice_common,$download)
@@ -205,7 +210,7 @@
                                {
                                        $buffer[$this->id]['merknad'] = 
'anleggsnr:' . $value;

-                                       
$maalerinfo=$this->soXport->anleggsnr_to_objekt($value);
+                                       
$maalerinfo=$this->soXport->anleggsnr_to_objekt($value,$this->meter_table);
                                        $dima=$maalerinfo['dima'];
                                        $loc1=$maalerinfo['loc1'];
 //                                     $maalernr=$maalerinfo['maalernr'];