[Phpgroupware-cvs] property/inc/export/Agresso, 1.2

[nomail]

Update of /property/inc/export
Modified Files:
        Branch: 
          Agresso

date: 2004/09/01 21:00:18;  author: sigurdne;  state: Exp;  lines: +15 -10

Log Message:
no message
=====================================================================
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.1 property/inc/export/Agresso:1.2
--- property/inc/export/Agresso:1.1     Thu Jul 15 12:03:25 2004
+++ property/inc/export/Agresso Wed Sep  1 21:00:18 2004
@@ -501,14 +501,6 @@
                                $Bilagsart      = sprintf("%2s",'');// verdi: , 
type: c2, plass: 15 - 16
                                $Transtype      = 'AP';// verdi: GL, type: c2, 
plass: 17 - 18
                                $Firmakode      = sprintf("%-2s",'');// verdi: 
Firmakode, type: c2, plass: 19 - 20
-                               $Konto          = sprintf("%-8s",'');// verdi: 
Art, type: c8, plass: 21 - 28
-                               $Dim_1          = sprintf("%-8s",'');// verdi: 
Ansvarssted, type: c8, plass: 29 - 36
-                               $Dim_2          = sprintf("%-8s",'');// verdi: 
Tjeneste, type: c8, plass: 37 - 44
-                               $Dim_3          = sprintf("%-8s",'');// verdi: 
Objekt, type: c8, plass: 45 - 52
-                               $Dim_4          = sprintf("%-8s",'');// verdi: 
Ressurs, type: c8, plass: 53 - 60
-                               $Dim_5          = sprintf("%-12s",'');// verdi: 
Prosjekt, type: c12, plass: 61 - 72
-                               $Dim_6          = sprintf("%-4s",'');// verdi: 
Blank, type: c4, plass: 73 - 76
-                               $Dim_7          = sprintf("%-4s",'');// verdi: 
Blank, type: c4, plass: 77 - 80
 
                                $Valuteringsdato= 
date(Ymd,strtotime($oRsBilag[$k]['fakturadato']));// verdi: Dato, type: date, 
plass: 251 - 258
                                $Bilagsdato     = 
date(Ymd,strtotime($oRsBilag[$k]['fakturadato'])) ;// verdi: Dato, type: date, 
plass: 259 - 266
@@ -548,6 +540,8 @@
                                //Velg ut alle underbilag
                                
$oRsUnderbilag=$this->soXport->select_underbilag($oRsBilag[$k]['bilagsnr']);    
        
 
+
+//_debug_array($oRsUnderbilag);
                                $underbilag_count= count($oRsUnderbilag);
 
                                for ($i=0;$i<$underbilag_count;$i++)
@@ -596,7 +590,16 @@
                                        $oRsOverfBilag=$oRsUnderbilag[$i];
                                        $oRsOverfBilag['filnavn']= 
basename($Filnavn);
                                        
$oRsOverfBilag['ordrebelop']=$oRsUnderbilag[$i][$BelopFelt];
-                                       
$oRsOverfBilag['dima']=substr($oRsOverfBilag['dima'],0,6);
+
+
+                                       $Konto          = 
sprintf("%-8s",$oRsOverfBilag['fakturanr']);// verdi: Art, type: c8, plass: 21 
- 28
+                                       $Dim_1          = 
sprintf("%-8s",$Att_ansvarlig);// verdi: Ansvarssted, type: c8, plass: 29 - 36
+                                       $Dim_2          = sprintf("%-8s",'');// 
verdi: Tjeneste, type: c8, plass: 37 - 44
+                                       $Dim_3          = 
sprintf("%-8s",substr($oRsOverfBilag['dima'],0,6));// verdi: Objekt, type: c8, 
plass: 45 - 52
+                                       $Dim_4          = sprintf("%-8s",'');// 
verdi: Ressurs, type: c8, plass: 53 - 60
+                                       $Dim_5          = 
sprintf("%-12s",$oRsOverfBilag['project_id']);// verdi: Prosjekt, type: c12, 
plass: 61 - 72
+                                       $Dim_6          = 
sprintf("%-4s",$oRsOverfBilag['dimd']);// verdi: Blank, type: c4, plass: 73 - 76
+                                       $Dim_7          = sprintf("%-4s",'');// 
verdi: Blank, type: c4, plass: 77 - 80
 
                                        
$Avgiftskode=sprintf("%-2s",$oRsOverfBilag['mvakode']);// verdi: Avgiftskode, 
type: c2, plass: 81 - 82
                                        
@@ -695,8 +698,10 @@
                        }
                        else:
                        {
-                               $this->db->transaction_abort();
+//_debug_array($buffer);
                                $message = $buffer;
+                               $this->db->transaction_abort();
+
                        }
                        endif;