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

[sigurdne]

Update of property/inc/export

Modified Files:
     Branch: MAIN
            Agresso lines: +29 -4

Log Message:
no message

====================================================
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.19 property/inc/export/Agresso:1.20
--- property/inc/export/Agresso:1.19    Mon Feb  7 13:22:11 2005
+++ property/inc/export/Agresso Tue Apr 12 14:14:54 2005
@@ -568,7 +568,7 @@

                                if($pre_transfer)
                                {
-                                       $Bilagsart      = 
sprintf("%2s",'FE');// verdi: , type: c2, plass: 15 - 16
+                                       $Bilagsart      = 
sprintf("%2s",'FF');// verdi: , type: c2, plass: 15 - 16
                                        $Forfall        = '20991231';// verdi: 
Forfallsdato , type: date, plass: 298 - 305
                                }
                                else
@@ -738,12 +738,14 @@
                                        $Antall         = sprintf("%11s",'');// 
verdi: Blank, type: i4, plass: 130 - 140
                                        $Belop2         = sprintf("%20s",'');// 
verdi: Blank, type: f8, plass: 141 - 160
                                        $Belop3         = sprintf("%20s",'');// 
verdi: Blank, type: money, plass: 161 - 180
-                                       $Belop4         = sprintf("%20s",'');// 
verdi: Blank, type: money, plass: 181 - 200
+
+                               //      $Belop4 (også kalt "money3" )blir brukt 
for identifisere overføring på tvers av filer.
+                                       $Belop4         = 
sprintf("%20s",$batchid);// verdi: Blank, type: money, plass: 181 - 200 - 
batch_id høyre justert


                                        if($oRsOverfBilag['pmwrkord_code'])
                                        {
-                                               $Tekst  = 
sprintf("%-50s",$this->get_order_title($oRsOverfBilag['pmwrkord_code']));//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));//
 verdi: Tekst, type: text (50), plass: 201 - 250
+                                               $Tekst  = 
sprintf("%-50s",substr($this->get_order_title($oRsOverfBilag['pmwrkord_code']),0,50));//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));//
 verdi: Tekst, type: text (50), plass: 201 - 250
                                        }
                                        else
                                        {
@@ -848,11 +850,22 @@
                        {
                                $fp = fopen($Filnavn, "wb");
                                fwrite($fp,$buffer);
+
                                if(fclose($fp))
                                {
+                                       $file_written=True;
+                               }
+
+                               if($file_written && 
$this->config->config_data['invoice_export_method']!='ftp'):
+                               {
+                                       $transfer_ok = True;
+                               }
+                               elseif($file_written):
+                               {
                                        $transfer_ok = 
$this->transfer($buffer,$Filnavn,$batchid,$tranfser_bilag);
                                }
-
+                               endif;
+
                                if($transfer_ok)
                                {
                                        $this->db->transaction_commit();
@@ -866,12 +879,24 @@
                        }
                        elseif($download=='on' && $pre_transfer && 
!$this->debug):
                        {
+
                                $fp = fopen($Filnavn, "wb");
                                fwrite($fp,$buffer);
+
                                if(fclose($fp))
                                {
+                                       $file_written=True;
+                               }
+
+                               if($file_written && 
$this->config->config_data['invoice_export_method']!='ftp'):
+                               {
+                                       $transfer_ok = True;
+                               }
+                               elseif($file_written):
+                               {
                                        $transfer_ok = 
$this->transfer($buffer,$Filnavn,$batchid,$tranfser_bilag);
                                }
+                               endif;

                                if($transfer_ok)
                                {