fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [11720] property: invoice handling


From: Sigurd Nes
Subject: [Fmsystem-commits] [11720] property: invoice handling
Date: Tue, 18 Feb 2014 15:56:42 +0000

Revision: 11720
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11720
Author:   sigurdne
Date:     2014-02-18 15:56:40 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
property: invoice handling

Modified Paths:
--------------
    trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling

Modified: trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling
===================================================================
--- trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling      
2014-02-17 20:29:49 UTC (rev 11719)
+++ trunk/property/inc/export/default/Agresso_Bergen_Kostfordeling      
2014-02-18 15:56:40 UTC (rev 11720)
@@ -659,7 +659,7 @@
 
                                $Valuteringsdato = date(Ymd, 
strtotime($invoice['fakturadato']));// verdi: Dato, type: date, plass: 251 - 258
                                $Bilagsdato              = date(Ymd, 
strtotime($invoice['fakturadato']));// verdi: Dato, type: date, plass: 259 - 266
-                               $Bilagsnr                = sprintf("%-9s", 
substr($invoice['bilagsnr'], -8));// verdi: Bilagsnummer, type: i4, plass: 267 
- 275
+                               $Bilagsnr                = sprintf("%-9s", 
'');// verdi: Bilagsnummer, type: i4, plass: 267 - 275
                                //              $_periode       = 
sprintf("%06s",date(Y,strtotime($invoice['fakturadato'])) . 
sprintf("%02d",$periode));// verdi: Periode, type: i4, plass: 276 - 281
                                $ESL                     = sprintf("%1s", 
'');// verdi: Blank, type: i+C481, plass: 282 - 282
 
@@ -675,8 +675,12 @@
                                $Kid                     = sprintf("%-27s", 
$invoice['kidnr']);// verdi: Kid, type: c27, plass: 351 - 377
                                $Bet_overforing  = sprintf("%-2s", '');// 
verdi: Blank, type: c2, plass: 378 - 379
                                $Status                  = 'N';// verdi: N, 
type: c1, plass: 380 - 380
-                               $Resk_type               = 'P';// verdi: Blank, 
type: c1, plass: 381 - 381
-                               $Resk_nr                 = sprintf("%-9s", 
$invoice['spvend_code']);// verdi: Blank., type: i4, plass: 382 - 390
+//                             $Resk_type               = 'P';// verdi: Blank, 
type: c1, plass: 381 - 381
+                               $Resk_type               = ' ';// verdi: Blank, 
type: c1, plass: 381 - 381
+
+//                             $Resk_nr                 = sprintf("%-9s", 
$invoice['spvend_code']);// verdi: Blank., type: i4, plass: 382 - 390
+                               $Resk_nr                 = sprintf("%-9s", 
'');// verdi: Blank., type: i4, plass: 382 - 390
+
                                $Forskudd                = '0';// verdi: 0, 
type: i1, plass: 391 - 391
                                $Fakturaref              = '000000000';// 
verdi: 0, type: i4, plass: 392 - 400
                                $Fakturaref              = '000000000';// 
verdi: 0, type: i4, plass: 401 - 409
@@ -762,8 +766,8 @@
                                        $invoice_line['filnavn']         = 
basename($Filnavn);
                                        $invoice_line['ordrebelop']      = 
$invoice_line[$BelopFelt];
 
-                                       $Konto   = sprintf("%08s", 
$invoice_line['spbudact_code']);// verdi: Art, type: c8, plass: 21 - 28
-                                       $Dim_1   = sprintf("%08s", 
$invoice_line['dimb']);// 64040 verdi: Ansvarssted, type: c8, plass: 29 - 36
+                                       $Konto   = sprintf("%-8s", 
$invoice_line['spbudact_code']);// verdi: Art, type: c8, plass: 21 - 28
+                                       $Dim_1   = sprintf("%-8s", 
$invoice_line['dimb']);// 64040 verdi: Ansvarssted, type: c8, plass: 29 - 36
                                        $Dim_2   = sprintf("%-8s", 
$invoice_line['kostra_id']);// verdi: Tjeneste, type: c8, plass: 37 - 44
                                        $Dim_3   = sprintf("%-8s", 
substr($invoice_line['dima'], 0, 6));// verdi: Objekt-bygg, type: c8, plass: 45 
- 52
 
@@ -785,21 +789,12 @@
                                        $Belop2                          = 
sprintf("%20s", '');// verdi: Blank, type: f8, plass: 141 - 160
                                        $Belop3                          = 
sprintf("%20s", '');// verdi: Blank, type: money, plass: 161 - 180
                                        //      $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
+                                       $Belop4                          = 
sprintf("%20s", '');// verdi: Blank, type: money, plass: 181 - 200 - batch_id 
høyre justert
 
-                                       /*
-                                         if($invoice_line['pmwrkord_code'])
-                                         {
-                                         $Tekst        = 
sprintf("%-50s",substr(utf8_decode($this->get_order_title($invoice_line['pmwrkord_code'])),0,50));//sprintf("%-50s",substr($invoice_line['merknad'],0,50));//
 verdi: Tekst, type: text (50), plass: 201 - 250
-                                         }
-                                         else
-                                         {
-                                         $Tekst        = 
sprintf("%-50s",'');//sprintf("%-50s",substr($invoice_line['merknad'],0,50));// 
verdi: Tekst, type: text (50), plass: 201 - 250
-                                         }
-                                        */
-                                       $Tekst = sprintf("%-50s", 
substr($invoice_line['fakturanr'], 0, 50));
+                                       $Tekst = sprintf("%-50s", 
substr("{$invoice['spvend_code']}::{$invoice_line['fakturanr']}", 0, 50));
 
-                                       $Fakturanr = sprintf("%-15s", 
substr(utf8_decode($invoice_line['fakturanr']), 0, 15));// verdi: Fakturanr, 
type: c15, plass: 283 - 297
+       //                              $Fakturanr = sprintf("%-15s", 
substr(utf8_decode($invoice_line['fakturanr']), 0, 15));// verdi: Fakturanr, 
type: c15, plass: 283 - 297
+                                       $Fakturanr = sprintf("%-15s", '');// 
verdi: Fakturanr, type: c15, plass: 283 - 297
 
                                        $Ordrenummer = sprintf("%-9s", 
$invoice_line['pmwrkord_code']);// verdi: Infodoc ordrenr, type: i4, plass: 342 
- 350
                                        //Kopier verdier
@@ -821,7 +816,7 @@
                                        if($_key == $last_record)
                                        {
                                                $Konto           = 
sprintf("%-8s", '2139915');// verdi: Art, type: c8, plass: 21 - 28
-                                               $Dim_1           = 
sprintf("%08s", $invoice_line['dimb']);//sprintf("%-8s",'');// verdi: 
Ansvarssted, type: c8, plass: 29 - 36
+                                               $Dim_1           = 
sprintf("%-8s", $invoice_line['dimb']);//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
@@ -831,17 +826,17 @@
                                                $Fakturanr       = 
sprintf("%-15s", '');// verdi: Fakturanr, type: c15, plass: 283 - 297
                                                $Ordrenummer = sprintf("%-9s", 
'');// verdi: Infodoc ordrenr, type: i4, plass: 342 - 350
                                                //      $Tekst          = 
sprintf("%-50s",'');//sprintf("%-50s",substr($invoice_line['merknad'],0,50));// 
verdi: Tekst, type: text (50), plass: 201 - 250
-                                               $Tekst           = 
sprintf("%-50s", substr($invoice_line['fakturanr'], 0, 50));// verdi: Tekst, 
type: text (50), plass: 201 - 250
+                                               $Tekst           = 
sprintf("%-50s", '');// verdi: Tekst, type: text (50), plass: 201 - 250
                                                //Ikke fortegnskifte for 
kostfordeling (GL)
                                                if($Belop_motpost < 0)
                                                {
                                                        $Belop_motpost   = 
sprintf("%019s", abs($Belop_motpost));
-                                                       $Belop_motpost   = '-' 
. $Belop_motpost;
+                                                       $Belop_motpost   = 
"+{$Belop_motpost}";
                                                }
                                                else
                                                {
                                                        $Belop_motpost   = 
sprintf("%019s", $Belop_motpost);
-                                                       $Belop_motpost   = '+' 
. $Belop_motpost;
+                                                       $Belop_motpost   = 
"-{$Belop_motpost}";
                                                }
 
                                                $Transtype                      
 = 'GL';// verdi: GL, type: c2, plass: 17 - 18




reply via email to

[Prev in Thread] Current Thread [Next in Thread]