[Phpgroupware-cvs] property/inc/import Import_fra_BKK_csv Import_f...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/03/18 16:33:16

Modified files:
        inc/import     : Import_fra_BKK_csv Import_fra_Kemner_xml 
                         Import_fra_Service 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_BKK_csv?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.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/property/inc/import/Import_fra_Service?cvsroot=phpgroupware&r1=1.18&r2=1.19

Patches:
Index: Import_fra_BKK_csv
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_BKK_csv,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Import_fra_BKK_csv  26 Jan 2007 14:58:56 -0000      1.7
+++ Import_fra_BKK_csv  18 Mar 2007 16:33:16 -0000      1.8
@@ -24,7 +24,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.7 2007/01/26 14:58:56 sigurdne 
Exp $
+       * @version $Id: Import_fra_BKK_csv,v 1.8 2007/03/18 16:33:16 sigurdne 
Exp $
        */
 
        /**
@@ -56,10 +56,10 @@
                        'Adresse' => 'stedsnavn',
                        'MVA' => 'mvakode',
                        'Tjeneste'=> 'kostra_id',
-                       'Beløp [kr]' => 'belop'
+                       'Belop [kr]' => 'belop'
                        );
 
-               var $header = array('Fakt. Nr','Måler 
nr','Konto','Objekt','MVA','Beløp [kr]','Omr','Adresse');
+               var $header = array('Fakt. Nr','Måler 
nr','Konto','Objekt','MVA','Belop [kr]','Omr','Adresse');
 
                var $import_bkk = 
array('kundenr','under_fakturanr','Utskriftsdato','Forfdato','Maalepunktid',
                        'stedsnavn','Girobeloep','maalernr','kunde_navn');
@@ -157,7 +157,7 @@
                                $buffer = 
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
                        }
 
-                       $this->header = array('Fakt. Nr','Måler 
nr','Konto','Objekt','MVA','Tjeneste','Beløp [kr]','Omr','Adresse');
+                       $this->header = array('Fakt. Nr','Måler 
nr','Konto','Objekt','MVA','Tjeneste','Belop [kr]','Omr','Adresse');
                        return $buffer;
                }
                
@@ -198,7 +198,7 @@
 
                                if($name=='anleggsnr')
                                {
-                                       $buffer[$this->id]['merknad'] .= "\r\n" 
. 'anleggsnr:' . $value;
+                                       $buffer[$this->id]['merknad'] .= "\r\n" 
. 'anleggsnr:' . $this->bocommon->ascii2utf($value);
                                        
                                        
$maalerinfo=$this->anleggsnr_to_objekt($value,$this->meter_table);
                                        $dima=$maalerinfo['dima'];
@@ -238,11 +238,11 @@
                                }
                                if($name=='kunde_navn')
                                {
-                                       $buffer[$this->id]['merknad'] .= "\r\n" 
. 'Kundenavn: '  . $value;
+                                       $buffer[$this->id]['merknad'] .= "\r\n" 
. 'Kundenavn: '  . $this->bocommon->ascii2utf($value);
                                }
                                if($name=='stedsnavn')
                                {
-                                       $buffer[$this->id]['merknad'] .= "\r\n" 
. 'Adresse: '  . $value;
+                                       $buffer[$this->id]['merknad'] .= "\r\n" 
. 'Adresse: '  . $this->bocommon->ascii2utf($value);
                                }
 
                                $buffer[$this->id][$name] = $value;

Index: Import_fra_Kemner_xml
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_Kemner_xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Import_fra_Kemner_xml       28 Jan 2007 19:13:19 -0000      1.12
+++ Import_fra_Kemner_xml       18 Mar 2007 16:33:16 -0000      1.13
@@ -24,7 +24,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.12 2007/01/28 19:13:19 
sigurdne Exp $
+       * @version $Id: Import_fra_Kemner_xml,v 1.13 2007/03/18 16:33:16 
sigurdne Exp $
        */
 
        /**
@@ -52,12 +52,12 @@
                        'KID' => 'kidnr',
                        'MVA' => 'mvakode',
                        'Tjeneste'=> 'kostra_id',
-                       'Beløp [kr]' => 'belop',
+                       'Belop [kr]' => 'belop',
                        'Referanse' => 'referanse',
                        'BOEI Gateadresse' => 'boei_gateadresse',
                        );
 
-               var $header = 
array('Bilagsnr','Fakturanr','Gnr/Bnr-seksjon','Konto','Objekt','DimB','KID','MVA','Tjeneste','Beløp
 [kr]','Referanse');
+               var $header = 
array('Bilagsnr','Fakturanr','Gnr/Bnr-seksjon','Konto','Objekt','DimB','KID','MVA','Tjeneste','Belop
 [kr]','Referanse');
 
                function import_conv()
                {

Index: Import_fra_Service
===================================================================
RCS file: /sources/phpgroupware/property/inc/import/Import_fra_Service,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Import_fra_Service  6 Feb 2007 08:02:49 -0000       1.18
+++ Import_fra_Service  18 Mar 2007 16:33:16 -0000      1.19
@@ -24,7 +24,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.18 2007/02/06 08:02:49 sigurdne 
Exp $
+       * @version $Id: Import_fra_Service,v 1.19 2007/03/18 16:33:16 sigurdne 
Exp $
        */
 
        /**
@@ -51,10 +51,10 @@
                        'Fag/Timer/Matr' => 'dimd',
                        'MVA' => 'mvakode',
                        'Tjeneste'=> 'kostra_id',
-                       'Beløp [kr]' => 'belop'
+                       'Belop [kr]' => 'belop'
                        );
 
-               var $header = array('Bestilling','Fakt. 
Nr','Konto','Objekt','Fag/Timer/Matr','MVA','Beløp [kr]');
+               var $header = array('Bestilling','Fakt. 
Nr','Konto','Objekt','Fag/Timer/Matr','MVA','Belop [kr]');
 
                function import_conv()
                {
@@ -117,7 +117,7 @@
                        }
 
 //_debug_array($buffer);
-                       $this->header = array('Bestilling','Fakt. 
Nr','Konto','Objekt','Fag/Timer/Matr','MVA','Tjeneste','Beløp [kr]');
+                       $this->header = array('Bestilling','Fakt. 
Nr','Konto','Objekt','Fag/Timer/Matr','MVA','Tjeneste','Belop [kr]');
 
                        return $buffer;
                }
@@ -139,7 +139,7 @@
                function import_new_attrib($buffer,$name,$value,$invoice_common)
                {
 
-                       $value = trim($value);
+                       $value = $this->bocommon->ascii2utf(trim($value));
                        $value = str_replace('\n','<BR>',$value);
                        $value = str_replace('\r','',$value);