|
| From: | nomail |
| Subject: | [Phpgroupware-cvs] property/inc/export/Agresso, 1.12 |
| Date: | Tue, 12 Oct 2004 15:51:41 +0200 |
Update of /property/inc/export
Modified Files:
Branch:
Agresso
date: 2004/10/12 13:51:41; author: sigurdne; state: Exp; lines: +21 -12
Log Message:
no message
=====================================================================
Index: property/inc/export/Agresso
diff -u property/inc/export/Agresso:1.11 property/inc/export/Agresso:1.12
--- property/inc/export/Agresso:1.11 Thu Oct 7 13:03:31 2004
+++ property/inc/export/Agresso Tue Oct 12 13:51:41 2004
@@ -527,7 +527,6 @@
$Forfall =
date(Ymd,strtotime($oRsBilag[$k]['forfallsdato']));// verdi: Forfallsdato ,
type: date, plass: 298 - 305
}
- $Fakturanr =
sprintf("%-15s",$oRsBilag[$k]['fakturanr']);// verdi: Fakturanr, type: c15,
plass: 283 - 297
$Rab_forf = sprintf("%-8s",'');// verdi:
Blank, type: date, plass: 306 - 313
$Rabatt = sprintf("%020s",'');// verdi:
Blank, type: money, plass: 314 - 333
$Avt_Kon = sprintf("%-8s",'');// verdi:
Blank, type: c8, plass: 334 - 341
@@ -569,6 +568,7 @@
$BilagId = $oRsUnderbilag[$i]['id'];
$Belop =
$oRsUnderbilag[$i][$BelopFelt]*100;
+ $Belop_ = $Belop;
if($Belop < 0)
{
@@ -577,12 +577,12 @@
if ($oRsUnderbilag[$i]['artid']
== 2)
{
- $Belop = '-' . $Belop;
+ $Belop = '+' . $Belop;
}
else
{
- $Belop = '+' . $Belop;
+ $Belop = '-' . $Belop;
}
}
@@ -592,12 +592,12 @@
if ($oRsUnderbilag[$i]['artid']
== 2)
{
- $Belop = '+' . $Belop;
+ $Belop = '-' . $Belop;
}
else
{
- $Belop = '-' . $Belop;
+ $Belop = '+' . $Belop;
}
}
@@ -622,7 +622,7 @@
if(!$this->debug)
{
-
$this->correct_actual_cost($oRsUnderbilag[$i]['pmwrkord_code'],$Belop,$actual_cost_field,$operator);
+
$this->correct_actual_cost($oRsUnderbilag[$i]['pmwrkord_code'],$Belop_,$actual_cost_field,$operator);
}
}
}
@@ -638,7 +638,7 @@
$oRsOverfBilag['ordrebelop']=$oRsUnderbilag[$i][$BelopFelt];
- $Konto =
sprintf("%-8s",$oRsOverfBilag['fakturanr']);// verdi: Art, type: c8, plass: 21
- 28
+ $Konto =
sprintf("%-8s",$oRsOverfBilag['spbudact_code']);// verdi: Art, type: c8, plass:
21 - 28
$Dim_1 = sprintf("%-8s",'');//
verdi: Ansvarssted, type: c8, plass: 29 - 36
$Dim_2 =
sprintf("%-8s",$oRsOverfBilag['kostra_id']);// verdi: Tjeneste, type: c8,
plass: 37 - 44
$Dim_3 =
sprintf("%-8s",substr($oRsOverfBilag['dima'],0,6));// verdi: Objekt, type: c8,
plass: 45 - 52
@@ -659,6 +659,7 @@
$Belop3 = sprintf("%20s",'');//
verdi: Blank, type: money, plass: 161 - 180
$Belop4 = sprintf("%20s",'');//
verdi: Blank, type: money, plass: 181 - 200
$Tekst =
sprintf("%-50s",'');//sprintf("%-50s",substr($oRsOverfBilag['merknad'],0,50));//
verdi: Tekst, type: text (50), plass: 201 - 250
+ $Fakturanr =
sprintf("%-15s",$oRsOverfBilag['fakturanr']);// verdi: Fakturanr, type: c15,
plass: 283 - 297
$Ordrenummer =
sprintf("%09s",$oRsOverfBilag['pmwrkord_code']);// verdi: Infodoc ordrenr,
type: i4, plass: 342 - 350
@@ -680,7 +681,15 @@
if($i==$last_record)
{
-
+ $Konto =
sprintf("%-8s",'2327010');// 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
+ $Fakturanr =
sprintf("%-15s",'');// verdi: Fakturanr, type: c15, plass: 283 - 297
if($Belop_motpost < 0)
{
@@ -688,12 +697,12 @@
if
($oRsUnderbilag[$i]['artid'] == 2)
{
- $Belop_motpost
= '+' . $Belop_motpost;
+ $Belop_motpost
= '-' . $Belop_motpost;
}
else
{
- $Belop_motpost
= '-' . $Belop_motpost;
+ $Belop_motpost
= '+' . $Belop_motpost;
}
}
else
@@ -702,12 +711,12 @@
if
($oRsUnderbilag[$i]['artid'] == 2)
{
- $Belop_motpost
= '-' . $Belop_motpost;
+ $Belop_motpost
= '+' . $Belop_motpost;
}
else
{
- $Belop_motpost
= '+' . $Belop_motpost;
+ $Belop_motpost
= '-' . $Belop_motpost;
}
}
| [Prev in Thread] | Current Thread | [Next in Thread] |